From e31a3149049e5aef604338983ec631276d584c2e Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Fri, 11 Jan 2019 16:17:56 +0100
Subject: [PATCH 1/2] Fix ignored test cases

---
 .../desktop/main/offer/offerbook/OfferBookViewModelTest.java | 5 ++---
 desktop/src/test/java/bisq/desktop/util/BSFormatterTest.java | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java b/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java
index 4520cc7fa23..7e6195633b5 100644
--- a/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java
+++ b/desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookViewModelTest.java
@@ -405,7 +405,6 @@ public void testMaxCharactersForPriceDistance() {
         assertEquals(10, model.maxPlacesForMarketPriceMargin.intValue()); //" (-10.00%)"
     }
 
-    @Ignore
     @Test
     public void testGetPrice() {
         OfferBook offerBook = mock(OfferBook.class);
@@ -435,10 +434,10 @@ public void testGetPrice() {
         model.activate();
 
         assertEquals("12557.2046 (1.00%)", model.getPrice(lowItem));
-        assertEquals("   10.0000        ", model.getPrice(fixedItem));
+        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("12557.2046 (1.00%)", model.getPrice(lowItem));
 
 
     }
diff --git a/desktop/src/test/java/bisq/desktop/util/BSFormatterTest.java b/desktop/src/test/java/bisq/desktop/util/BSFormatterTest.java
index d563d79e2c8..81b86db9385 100644
--- a/desktop/src/test/java/bisq/desktop/util/BSFormatterTest.java
+++ b/desktop/src/test/java/bisq/desktop/util/BSFormatterTest.java
@@ -34,7 +34,6 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -180,7 +179,6 @@ public void testFormatAmountWithAlignmenWithDecimals() {
         assertEquals("0.1000 - 0.2000", formatter.formatAmount(offer, 4, true, 15));
     }
 
-    @Ignore
     @Test
     public void testFormatAmountWithAlignmenWithDecimalsNoRange() {
         OfferPayload offerPayload = mock(OfferPayload.class);
@@ -188,7 +186,7 @@ public void testFormatAmountWithAlignmenWithDecimalsNoRange() {
         when(offerPayload.getMinAmount()).thenReturn(10000000L);
         when(offerPayload.getAmount()).thenReturn(10000000L);
 
-        assertEquals("         0.1000", formatter.formatAmount(offer, 4, true, 15));
+        assertEquals("0.1000", formatter.formatAmount(offer, 4, true, 15));
     }
 
     @Test

From fe864724f3c4b0383c729a80082d28a4be2417ea Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Fri, 11 Jan 2019 16:59:18 +0100
Subject: [PATCH 2/2] Configure jMockit for desktop module

---
 build.gradle                                               | 7 +++++++
 .../main/market/trades/TradesChartsViewModelTest.java      | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ddf8b497bca..92e2892da56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -318,6 +318,13 @@ configure(project(':desktop')) {
         testCompileOnly "org.projectlombok:lombok:$lombokVersion"
         testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
     }
+
+    test {
+        systemProperty 'jdk.attach.allowAttachSelf', true
+
+        def jmockit = configurations.testCompile.files.find { it.name.contains("jmockit") }.absolutePath
+        jvmArgs "-javaagent:$jmockit"
+    }
 }
 
 
diff --git a/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java b/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java
index 579176b2692..1b5e40005a4 100644
--- a/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java
+++ b/desktop/src/test/java/bisq/desktop/main/market/trades/TradesChartsViewModelTest.java
@@ -60,13 +60,10 @@
 import mockit.Tested;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-//TODO @Christoph Can you have a look why JMockit is nto working anymore in that module?
-@Ignore
 public class TradesChartsViewModelTest {
     @Tested
     TradesChartsViewModel model;