From f0c435a6bb73541973dc1160b55db03fac0e293f Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 7 Nov 2018 20:56:35 -0500
Subject: [PATCH] Merge

---
 .../java/bisq/desktop/util/GUIUtilTest.java   | 47 -------------------
 1 file changed, 47 deletions(-)

diff --git a/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java b/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
index fcc4d68b18..681b82028b 100644
--- a/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
+++ b/desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
@@ -18,27 +18,10 @@
 package bisq.desktop.util;
 
 import bisq.core.locale.GlobalSettings;
-import bisq.core.locale.Res;
-import bisq.core.locale.TradeCurrency;
 
-import javafx.util.StringConverter;
-
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 import org.junit.Before;
-import org.junit.Test;
-
-import static bisq.desktop.maker.CurrencyListItemMakers.bitcoinItem;
-import static bisq.desktop.maker.CurrencyListItemMakers.euroItem;
-import static bisq.desktop.maker.CurrencyListItemMakers.numberOfTrades;
-import static bisq.desktop.maker.PreferenceMakers.empty;
-import static bisq.desktop.maker.TradeCurrencyMakers.bitcoin;
-import static bisq.desktop.maker.TradeCurrencyMakers.euro;
-import static com.natpryce.makeiteasy.MakeItEasy.make;
-import static com.natpryce.makeiteasy.MakeItEasy.with;
-import static org.junit.Assert.assertEquals;
 
 public class GUIUtilTest {
 
@@ -47,34 +30,4 @@ public class GUIUtilTest {
         Locale.setDefault(new Locale("en", "US"));
         GlobalSettings.setLocale(new Locale("en", "US"));
     }
-
-    @Test
-    public void testTradeCurrencyConverter() {
-        Map<String, Integer> offerCounts = new HashMap<String, Integer>() {{
-            put("BTC", 11);
-            put("EUR", 10);
-        }};
-        StringConverter<TradeCurrency> tradeCurrencyConverter = GUIUtil.getTradeCurrencyConverter(
-                Res.get("shared.oneOffer"),
-                Res.get("shared.multipleOffers"),
-                offerCounts
-        );
-
-        assertEquals("✦ Bitcoin (BTC) - 11 offers", tradeCurrencyConverter.toString(bitcoin));
-        assertEquals("★ Euro (EUR) - 10 offers", tradeCurrencyConverter.toString(euro));
-    }
-
-    @Test
-    public void testCurrencyListWithOffersConverter() {
-        Res.setBaseCurrencyCode("BTC");
-        Res.setBaseCurrencyName("Bitcoin");
-        StringConverter<CurrencyListItem> currencyListItemConverter = GUIUtil.getCurrencyListItemConverter(Res.get("shared.oneOffer"),
-                Res.get("shared.multipleOffers"),
-                empty);
-
-        assertEquals("✦ Bitcoin (BTC) - 10 offers", currencyListItemConverter.toString(make(bitcoinItem.but(with(numberOfTrades, 10)))));
-        assertEquals("★ Euro (EUR) - 0 offers", currencyListItemConverter.toString(make(euroItem)));
-        assertEquals("★ Euro (EUR) - 1 offer", currencyListItemConverter.toString(make(euroItem.but(with(numberOfTrades, 1)))));
-
-    }
 }