mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2264 from devinbileck/fix-failing-test

Browse Source 
Fix CurrencyListTest when locale is not en_US
This commit is contained in:
Christoph Atteneder 2019-01-14 11:08:04 +01:00 committed by GitHub
commit 4b283f6a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/src/test/java/bisq/desktop/util/CurrencyListTest.java
View File

@ -25,6 +25,7 @@ import bisq.core.user.Preferences;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Currency;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -44,8 +45,10 @@ import static org.mockito.Mockito.when;
@PrepareForTest(Preferences.class) @PrepareForTest(Preferences.class)
@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"}) @PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
public class CurrencyListTest { public class CurrencyListTest {
private static final TradeCurrency USD = new FiatCurrency("USD"); private static final Locale locale = new Locale("en", "US");
private static final TradeCurrency RUR = new FiatCurrency("RUR");
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 BTC = new CryptoCurrency("BTC", "Bitcoin");
private static final TradeCurrency ETH = new CryptoCurrency("ETH", "Ether"); private static final TradeCurrency ETH = new CryptoCurrency("ETH", "Ether");
private static final TradeCurrency BSQ = new CryptoCurrency("BSQ", "Bisq Token"); private static final TradeCurrency BSQ = new CryptoCurrency("BSQ", "Bisq Token");
@ -56,7 +59,7 @@ public class CurrencyListTest {
@Before @Before
public void setUp() { public void setUp() {
Locale.setDefault(new Locale("en", "US")); Locale.setDefault(locale);
CurrencyPredicates predicates = mock(CurrencyPredicates.class); CurrencyPredicates predicates = mock(CurrencyPredicates.class);
when(predicates.isCryptoCurrency(USD)).thenReturn(false); when(predicates.isCryptoCurrency(USD)).thenReturn(false);