mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add null check (for tests) and fix missing param for test class.

Browse source 
Fix test with price display.
This commit is contained in:
chimp1984 2020-12-15 19:51:49 -05:00
parent 1106d01ff7
commit bb3dbf3d78
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
2 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -239,9 +239,12 @@ class OfferBookViewModel extends ActivatableViewModel {
applyFilterPredicate();
setMarketPriceFeedCurrency();
bsq30DayAveragePrice = AveragePriceUtil.getAveragePriceTuple(preferences,
tradeStatisticsManager,
30).second;
// Null check needed for tests passing null for tradeStatisticsManager
if (tradeStatisticsManager != null) {
bsq30DayAveragePrice = AveragePriceUtil.getAveragePriceTuple(preferences,
tradeStatisticsManager,
30).second;
}
}
@Override

36
desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java
View file

@ -41,9 +41,9 @@ import bisq.core.payment.payload.SepaAccountPayload;
import bisq.core.payment.payload.SpecificBanksAccountPayload;
import bisq.core.provider.price.MarketPrice;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.util.coin.BsqFormatter;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.coin.ImmutableCoinFormatter;
import bisq.core.util.coin.BsqFormatter;
import bisq.common.config.Config;
@ -229,7 +229,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, null, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
assertEquals(0, model.maxPlacesForAmount.intValue());
}
@ -243,7 +243,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
model.activate();
assertEquals(6, model.maxPlacesForAmount.intValue());
@ -261,7 +261,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
model.activate();
assertEquals(15, model.maxPlacesForAmount.intValue());
@ -280,7 +280,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, null, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
assertEquals(0, model.maxPlacesForVolume.intValue());
}
@ -294,7 +294,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
model.activate();
assertEquals(5, model.maxPlacesForVolume.intValue());
@ -312,7 +312,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
model.activate();
assertEquals(9, model.maxPlacesForVolume.intValue());
@ -331,7 +331,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, null, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
assertEquals(0, model.maxPlacesForPrice.intValue());
}
@ -345,7 +345,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
model.activate();
assertEquals(7, model.maxPlacesForPrice.intValue());
@ -363,7 +363,7 @@ public class OfferBookViewModelTest {
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);
final OfferBookViewModel model = new OfferBookViewModel(null, null, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
assertEquals(0, model.maxPlacesForMarketPriceMargin.intValue());
}
@ -391,7 +391,7 @@ public class OfferBookViewModelTest {
offerBookListItems.addAll(item1, item2);
final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, priceFeedService,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
model.activate();
assertEquals(8, model.maxPlacesForMarketPriceMargin.intValue()); //" (1.97%)"
@ -412,7 +412,7 @@ public class OfferBookViewModelTest {
when(priceFeedService.getMarketPrice(anyString())).thenReturn(new MarketPrice("USD", 12684.0450, Instant.now().getEpochSecond(), true));
final OfferBookViewModel model = new OfferBookViewModel(null, openOfferManager, offerBook, empty, null, null, null,
null, null, null, null, coinFormatter, new BsqFormatter());
null, null, null, null, null, coinFormatter, new BsqFormatter());
final OfferBookListItem item = make(btcBuyItem.but(
with(useMarketBasedPrice, true),
@ -429,13 +429,15 @@ public class OfferBookViewModelTest {
offerBookListItems.addAll(lowItem, fixedItem);
model.activate();
assertEquals("12557.2046 (1.00%)", model.getPrice(lowItem));
assertEquals("12557.2046", model.getPrice(lowItem));
assertEquals("(1.00%)", model.getPriceAsPercentage(lowItem));
assertEquals("10.0000", model.getPrice(fixedItem));
offerBookListItems.addAll(item);
assertEquals("14206.1304 (-12.00%)", model.getPrice(item));
assertEquals("12557.2046 (1.00%)", model.getPrice(lowItem));
assertEquals("14206.1304", model.getPrice(item));
assertEquals("(-12.00%)", model.getPriceAsPercentage(item));
assertEquals("12557.2046", model.getPrice(lowItem));
assertEquals("(1.00%)", model.getPriceAsPercentage(lowItem));
}
private PaymentAccount getAliPayAccount(String currencyCode) {