You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/12/15 21:16:30 UTC
[sling-org-apache-sling-servlets-get] branch master updated: SLING-11727 Fixed Flaky Tests (#9)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git
The following commit(s) were added to refs/heads/master by this push:
new bbf043e SLING-11727 Fixed Flaky Tests (#9)
bbf043e is described below
commit bbf043e6d39f1fcc752311f64d858f43b4f2cd4e
Author: priyanka-28 <52...@users.noreply.github.com>
AuthorDate: Fri Dec 16 02:46:26 2022 +0530
SLING-11727 Fixed Flaky Tests (#9)
Co-authored-by: Priyanka Awatramani <ap...@Priyankas-MacBook-Pro.local>
---
.../get/impl/helpers/JsonRendererTest.java | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
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 java.util.Calendar;
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 class JsonRendererTest {
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 @@ public class JsonRendererTest {
" \"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 {