From 0f28f99ba9fbc48668f4ce42767668789bb1cc97 Mon Sep 17 00:00:00 2001
From: contextshuffling <contextshuffling@gmail.com>
Date: Tue, 21 Jan 2020 16:08:08 +0800
Subject: [PATCH] Make tests more stable by using JSONAssert equals

---
 pom.xml                                         |  7 +++++++
 .../java/net/openhft/lang/values/ArrayTest.java | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55226e67a..8c879de44 100755
--- a/pom.xml
+++ b/pom.xml
@@ -205,6 +205,13 @@
             <version>2.7.1</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/test/java/net/openhft/lang/values/ArrayTest.java b/src/test/java/net/openhft/lang/values/ArrayTest.java
index ba058b3f3..f11c7b006 100644
--- a/src/test/java/net/openhft/lang/values/ArrayTest.java
+++ b/src/test/java/net/openhft/lang/values/ArrayTest.java
@@ -20,7 +20,9 @@ import net.openhft.chronicle.core.OS;
 import net.openhft.chronicle.core.pool.ClassAliasPool;
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.ChronicleMapBuilder;
+import org.json.JSONException;
 import org.junit.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,7 +33,7 @@ import static org.junit.Assert.assertEquals;
 public class ArrayTest {
 
     @Test
-    public void test0() throws IOException {
+    public void test0() throws IOException, JSONException{
         ClassAliasPool.CLASS_ALIASES.addAlias(MovingAverageArray.class);
 
         File file = new File(OS.getTarget() + "/pf-PosistionsAndClose-" + System.nanoTime());
@@ -49,7 +51,7 @@ public class ArrayTest {
                 .of(Long.class, MovingAverageArray.class)
                 .createPersistedTo(file);
         MovingAverageArray m = mapRead.get(1L);
-        assertEquals("!MovingAverageArray {\n" +
+        assertJSONEqualsAfterPrefix("!MovingAverageArray {\n" +
                 "  values: [\n" +
                 "    { movingAverage: 0.1, high: 0.1, low: 0.1, stdDev: 0.1 },\n" +
                 "    { movingAverage: 1.1, high: 1.1, low: 1.1, stdDev: 1.1 },\n" +
@@ -61,7 +63,7 @@ public class ArrayTest {
                 "}\n", m.toString());
         MovingAverageArray m2 = mapRead.getUsing(2L, m);
         assertSame(m, m2); // object is recycled, so no objects are created.
-        assertEquals("!MovingAverageArray {\n" +
+        assertJSONEqualsAfterPrefix("!MovingAverageArray {\n" +
                 "  values: [\n" +
                 "    { movingAverage: 0.2, high: 0.2, low: 0.2, stdDev: 0.2 },\n" +
                 "    { movingAverage: 1.2, high: 1.2, low: 1.2, stdDev: 1.2 },\n" +
@@ -79,4 +81,11 @@ public class ArrayTest {
         }
         return sample;
     }
-}
\ No newline at end of file
+
+    private void assertJSONEqualsAfterPrefix(String s1, String s2) throws JSONException {
+        String[] a1 = s1.split(" ", 2);
+        String[] a2 = s2.split(" ", 2);
+        assertEquals(a1[0], a2[0]);
+        JSONAssert.assertEquals(a1[1], a2[1], false);
+    }
+}