Use JSONAssert to compare JSON strings (#3116)

yahoo · Dec 10, 2023 · 845956c · 845956c
1 parent 80439b6
commit 845956c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/elide-core/pom.xml b/elide-core/pom.xml
@@ -157,6 +157,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/elide-core/src/test/java/com/yahoo/elide/jsonapi/JsonApiTest.java b/elide-core/src/test/java/com/yahoo/elide/jsonapi/JsonApiTest.java
@@ -8,6 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doThrow;
@@ -52,9 +53,11 @@
 import example.Parent;
 
 import org.apache.commons.collections4.IterableUtils;
+import org.json.JSONException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
@@ -236,7 +239,11 @@ public void writeSingleIncluded() throws JsonProcessingException {
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
         assertEquals(data, jsonApiDocument.getData());
 
-        assertEquals(expected, doc);
+        try {
+            JSONAssert.assertEquals(expected, doc, true);
+        } catch (JSONException e) {
+            fail(e);
+        }
         checkEquality(jsonApiDocument);
     }
 
@@ -332,7 +339,11 @@ public void writeListIncluded() throws JsonProcessingException {
         String doc = mapper.writeJsonApiDocument(jsonApiDocument);
         assertEquals(data, jsonApiDocument.getData());
 
-        assertEquals(expected, doc);
+        try {
+            JSONAssert.assertEquals(expected, doc, true);
+        } catch (JSONException e) {
+            fail(e);
+        }
         checkEquality(jsonApiDocument);
     }