test: add jsonassert

Author: lavkesh

src/test/java/io/odpf/depot/message/field/proto/MapFieldTest.java

@@ -6,9 +6,9 @@
 import com.google.protobuf.Value;
 import io.odpf.depot.TestMapMessage;
 import io.odpf.depot.TestMessage;
-import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 public class MapFieldTest {
 
@@ -28,12 +28,10 @@ public void shouldReturnMap() {
         Object metadata = message.getField(message.getDescriptorForType().findFieldByName("metadata"));
         MapField field1 = new MapField(currentState);
         MapField field2 = new MapField(metadata);
-        Assert.assertEquals(
-                new JSONObject("{\"country\":\"japan\",\"city\":\"tokyo\",\"currency\":\"jpy\"}").toString(),
-                new JSONObject(field1.getString()).toString());
-        Assert.assertEquals(
-                new JSONObject("{\"23\":{\"order_url\":\"\",\"order_number\":\"order1\",\"order_details\":\"\"},\"10\":{\"order_url\":\"\",\"order_number\":\"order2\",\"order_details\":\"\"}}").toString(),
-                new JSONObject(field2.getString()).toString());
+        String expectedJson = "{\"country\":\"japan\",\"city\":\"tokyo\",\"currency\":\"jpy\"}";
+        JSONAssert.assertEquals(expectedJson, field1.getString(), true);
+        expectedJson = "{\"23\":{\"order_url\":\"\",\"order_number\":\"order1\",\"order_details\":\"\"},\"10\":{\"order_url\":\"\",\"order_number\":\"order2\",\"order_details\":\"\"}}";
+        JSONAssert.assertEquals(expectedJson, field2.getString(), true);
     }
 
     @Test
@@ -45,9 +43,8 @@ public void shouldReturnDurationMap() {
                 .build();
         Object durations = message.getField(message.getDescriptorForType().findFieldByName("durations"));
         MapField field1 = new MapField(durations);
-        Assert.assertEquals(
-                new JSONObject("{\"d1\":\"1234s\",\"d2\":\"1200.000000123s\"}").toString(),
-                new JSONObject(field1.getString()).toString());
+        String expectedJson = "{\"d1\":\"1234s\",\"d2\":\"1200.000000123s\"}";
+        JSONAssert.assertEquals(expectedJson, field1.getString(), true);
     }
 
     @Test
@@ -59,9 +56,8 @@ public void shouldReturnTimestampMap() {
                 .build();
         Object timeStamps = message.getField(message.getDescriptorForType().findFieldByName("time_stamps"));
         MapField field1 = new MapField(timeStamps);
-        Assert.assertEquals(
-                new JSONObject("{\"ts2\":\"2022-12-02T06:46:34Z\",\"ts1\":\"2022-12-02T06:29:54Z\"}").toString(),
-                new JSONObject(field1.getString()).toString());
+        String expectedJson = "{\"ts2\":\"2022-12-02T06:46:34Z\",\"ts1\":\"2022-12-02T06:29:54Z\"}";
+        JSONAssert.assertEquals(expectedJson, field1.getString(), true);
     }
 
     @Test

src/test/java/io/odpf/depot/message/field/proto/MessageFieldTest.java

@@ -3,9 +3,8 @@
 import com.google.protobuf.Timestamp;
 import io.odpf.depot.TestMessage;
 import io.odpf.depot.TestNestedRepeatedMessage;
-import org.json.JSONObject;
-import org.junit.Assert;
 import org.junit.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 public class MessageFieldTest {
 
@@ -17,9 +16,8 @@ public void shouldReturnJsonStringForMessage() {
                 .setOrderUrl("url")
                 .build();
         MessageField field = new MessageField(message);
-        Assert.assertEquals(
-                new JSONObject("{\"order_number\":\"number\",\"order_url\":\"url\",\"order_details\":\"details\"}").toString(),
-                new JSONObject(field.getString()).toString());
+        String expectedJson = "{\"order_number\":\"number\",\"order_url\":\"url\",\"order_details\":\"details\"}";
+        JSONAssert.assertEquals(expectedJson, field.getString(), true);
     }
 
     @Test
@@ -77,8 +75,21 @@ public void shouldReturnMessageForRepeatedMessage() {
                 + "  },\n"
                 + "  \"number_field\": 10\n"
                 + "}\n";
-        Assert.assertEquals(
-                new JSONObject(expectedJson).toString(),
-                new JSONObject(field.getString()).toString());
+        JSONAssert.assertEquals(expectedJson, field.getString(), true);
+
+        expectedJson = "[\n"
+                + "  {\n"
+                + "    \"order_number\": \"number\",\n"
+                + "    \"order_url\": \"url\",\n"
+                + "    \"order_details\": \"details\"\n"
+                + "  },\n"
+                + "  {\n"
+                + "    \"order_number\": \"o2\",\n"
+                + "    \"order_url\": \"url2\",\n"
+                + "    \"order_details\": \"d2\"\n"
+                + "  }\n"
+                + "]";
+        field = new MessageField(message.getField(message.getDescriptorForType().findFieldByName("repeated_message")));
+        JSONAssert.assertEquals(expectedJson, field.getString(), true);
     }
 }