commit bbf043e6d39f1fcc752311f64d858f43b4f2cd4e
author priyanka-28 <52324780+priyanka-28@users.noreply.github.com> Fri Dec 16 02:46:26 2022 +0530
committer GitHub <noreply@github.com> Thu Dec 15 22:16:26 2022 +0100
tree 89882a0d8bb51f54176c317c118a239602761abf
parent 1cea3ae36df79c75d489caa34bb933e7b7fb2b9e

SLING-11727 Fixed Flaky Tests (#9)

Co-authored-by: Priyanka Awatramani <apple@Priyankas-MacBook-Pro.local>

src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java

diff --git a/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java b/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
index b5ac6a0..6881796 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
@@ -28,6 +28,8 @@
 
 import javax.json.Json;
 import javax.json.JsonObject;
+import javax.json.JsonPatch;
+import javax.json.JsonReader;
 
 import org.apache.jackrabbit.util.ISO8601;
 import org.apache.sling.testing.mock.sling.junit.SlingContext;
@@ -182,7 +184,15 @@
     public void testBooleansNoTidy() throws IOException {
         context.currentResource("/content/booleans");
         final String expected = "{\"b2\":false,\"jcr:primaryType\":\"nt:unstructured\",\"s1\":\"true\",\"b1\":true,\"s2\":\"false\"}";
-        assertEquals(expected, getJsonFromRequestResponse());
+        JsonPatch diff;
+        try(JsonReader jsonReader = Json.createReader(new StringReader(expected));
+            JsonReader jsonReader1 = Json.createReader(new StringReader(getJsonFromRequestResponse()));
+        ){
+            JsonObject expectedObject = jsonReader.readObject();
+            JsonObject targetObject = jsonReader1.readObject();
+            diff = Json.createDiff(expectedObject, targetObject);
+        }
+        assertEquals("[]", diff.toString());
     }
 
     @Test
@@ -197,7 +207,15 @@
             "  \"b1\": true,\n" +
             "  \"s2\": \"false\"\n" +
             "  }";
-        assertEquals(expected, getJsonFromRequestResponse());
+        JsonPatch diff;
+        try(JsonReader jsonReader = Json.createReader(new StringReader(expected));
+            JsonReader jsonReader1 = Json.createReader(new StringReader(getJsonFromRequestResponse()));
+        ){
+            JsonObject expectedObject = jsonReader.readObject();
+            JsonObject targetObject = jsonReader1.readObject();
+            diff = Json.createDiff(expectedObject, targetObject);
+        }
+        assertEquals("[]", diff.toString());
     }
 
     private JsonObject getJsonFromReader() throws IOException {