Skip to content

Commit

Permalink
Merge pull request #2264 from devinbileck/fix-failing-test
Browse files Browse the repository at this point in the history
Fix CurrencyListTest when locale is not en_US
  • Loading branch information
ripcurlx authored Jan 14, 2019
2 parents 6e753a2 + 7a16b3f commit 4b283f6
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions desktop/src/test/java/bisq/desktop/util/CurrencyListTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.google.common.collect.Lists;

import java.util.ArrayList;
import java.util.Currency;
import java.util.List;
import java.util.Locale;

Expand All @@ -44,8 +45,10 @@
@PrepareForTest(Preferences.class)
@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
public class CurrencyListTest {
private static final TradeCurrency USD = new FiatCurrency("USD");
private static final TradeCurrency RUR = new FiatCurrency("RUR");
private static final Locale locale = new Locale("en", "US");

private static final TradeCurrency USD = new FiatCurrency(Currency.getInstance("USD"), locale);
private static final TradeCurrency RUR = new FiatCurrency(Currency.getInstance("RUR"), locale);
private static final TradeCurrency BTC = new CryptoCurrency("BTC", "Bitcoin");
private static final TradeCurrency ETH = new CryptoCurrency("ETH", "Ether");
private static final TradeCurrency BSQ = new CryptoCurrency("BSQ", "Bisq Token");
Expand All @@ -56,7 +59,7 @@ public class CurrencyListTest {

@Before
public void setUp() {
Locale.setDefault(new Locale("en", "US"));
Locale.setDefault(locale);

CurrencyPredicates predicates = mock(CurrencyPredicates.class);
when(predicates.isCryptoCurrency(USD)).thenReturn(false);
Expand Down

0 comments on commit 4b283f6

Please sign in to comment.