Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-06 22:29:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixed locale problem with fiat comparison in tests, added comments

Browse source
This commit is contained in:
Manfred Karrer 2014-08-26 18:19:24 +02:00
parent 5415878356
commit 627b49c7c1
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/io/bitsquare/gui/util/BSFormatter.java
View file

@ -65,6 +65,10 @@ public class BSFormatter {
BSFormatter.currencyCode = currencyCode; BSFormatter.currencyCode = currencyCode;
} }
/**
* Note that setting the locale does not set the currency as it might be independent.
* @param locale
*/
public static void setLocale(Locale locale) { public static void setLocale(Locale locale) {
BSFormatter.locale = locale; BSFormatter.locale = locale;
} }

29
src/test/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenterTest.java
View file

@ -33,8 +33,6 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.*; import static org.junit.Assert.*;
//TODO: Fiat to Fiat comparision fails even value is the same -> investigate equals method in fiat and report bug if
// there is any
public class CreateOfferPresenterTest { public class CreateOfferPresenterTest {
private static final Logger log = LoggerFactory.getLogger(CreateOfferPresenterTest.class); private static final Logger log = LoggerFactory.getLogger(CreateOfferPresenterTest.class);
@ -43,7 +41,8 @@ public class CreateOfferPresenterTest {
CreateOfferModel model = new CreateOfferModel(null, null, null, null); CreateOfferModel model = new CreateOfferModel(null, null, null, null);
BSFormatter.setLocale(Locale.US); BSFormatter.setLocale(Locale.US);
BSFormatter.setFiatCurrencyCode("USD");
CreateOfferPresenter presenter = new CreateOfferPresenter(model); CreateOfferPresenter presenter = new CreateOfferPresenter(model);
presenter.onViewInitialized(); presenter.onViewInitialized();
@ -52,37 +51,37 @@ public class CreateOfferPresenterTest {
presenter.amount.set("1"); presenter.amount.set("1");
assertEquals("500.00", presenter.volume.get()); assertEquals("500.00", presenter.volume.get());
assertEquals(Coin.COIN, model.amountAsCoin); assertEquals(Coin.COIN, model.amountAsCoin);
assertEquals(Fiat.valueOf("EUR", 500 * 10000).getValue(), model.priceAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 500 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("EUR", 500 * 10000).getValue(), model.tradeVolumeAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 500 * 10000), model.tradeVolumeAsFiat);
assertEquals(Coin.parseCoin("0.1011"), model.totalToPayAsCoin.get()); assertEquals(Coin.parseCoin("0.1011"), model.totalToPayAsCoin.get());
presenter.price.set("500"); presenter.price.set("500");
presenter.volume.set("500"); presenter.volume.set("500");
assertEquals("1.00", presenter.amount.get()); assertEquals("1.00", presenter.amount.get());
assertEquals(Coin.COIN, model.amountAsCoin); assertEquals(Coin.COIN, model.amountAsCoin);
assertEquals(Fiat.valueOf("EUR", 500 * 10000).getValue(), model.priceAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 500 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("EUR", 500 * 10000).getValue(), model.tradeVolumeAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 500 * 10000), model.tradeVolumeAsFiat);
presenter.price.set("300"); presenter.price.set("300");
presenter.volume.set("1000"); presenter.volume.set("1000");
assertEquals("3.3333", presenter.amount.get()); assertEquals("3.3333", presenter.amount.get());
assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin); assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin);
assertEquals(Fiat.valueOf("EUR", 300 * 10000).getValue(), model.priceAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 300 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("EUR", 9999900).getValue(), model.tradeVolumeAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 9999900), model.tradeVolumeAsFiat);
presenter.price.set("300"); presenter.price.set("300");
presenter.amount.set("3.3333"); presenter.amount.set("3.3333");
assertEquals("999.99", presenter.volume.get()); assertEquals("999.99", presenter.volume.get());
assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin); assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin);
assertEquals(Fiat.valueOf("EUR", 300 * 10000).getValue(), model.priceAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 300 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("EUR", 9999900).getValue(), model.tradeVolumeAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 9999900), model.tradeVolumeAsFiat);
presenter.price.set("300"); presenter.price.set("300");
presenter.amount.set("3.33333333"); presenter.amount.set("3.33333333");
assertEquals("999.99", presenter.volume.get()); assertEquals("999.99", presenter.volume.get());
assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin); assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin);
assertEquals(Fiat.valueOf("EUR", 300 * 10000).getValue(), model.priceAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 300 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("EUR", 9999900).getValue(), model.tradeVolumeAsFiat.getValue()); assertEquals(Fiat.valueOf("USD", 9999900), model.tradeVolumeAsFiat);
model.collateralAsLong.set(100); model.collateralAsLong.set(100);
@ -99,8 +98,8 @@ public class CreateOfferPresenterTest {
assertEquals("Wire", presenter.bankAccountType.get()); assertEquals("Wire", presenter.bankAccountType.get());
model.bankAccountCurrency.set("EUR"); model.bankAccountCurrency.set("USD");
assertEquals("EUR", presenter.bankAccountCurrency.get()); assertEquals("USD", presenter.bankAccountCurrency.get());
model.bankAccountCurrency.set("USD"); model.bankAccountCurrency.set("USD");
assertEquals("USD", presenter.bankAccountCurrency.get()); assertEquals("USD", presenter.bankAccountCurrency.get());