initial implementation of ValidationException#toJSON(); fixed bug in ObjectComparator, now the comparison of JSONObjects is independent from the order of keys returned by JSONObject#getNames()

Author: erosb

core/src/main/java/org/everit/json/schema/ObjectComparator.java

@@ -62,9 +62,18 @@ private static boolean deepEqualArrays(final JSONArray arr1, final JSONArray arr
     return true;
   }
 
+  private static String[] sortedNamesOf(final JSONObject obj) {
+    String[] raw = JSONObject.getNames(obj);
+    if (raw == null) {
+      return null;
+    }
+    Arrays.sort(raw, String.CASE_INSENSITIVE_ORDER);
+    return raw;
+  }
+
   private static boolean deepEqualObjects(final JSONObject jsonObj1, final JSONObject jsonObj2) {
-    String[] obj1Names = JSONObject.getNames(jsonObj1);
-    if (!Arrays.equals(obj1Names, JSONObject.getNames(jsonObj2))) {
+    String[] obj1Names = sortedNamesOf(jsonObj1);
+    if (!Arrays.equals(obj1Names, sortedNamesOf(jsonObj2))) {
       return false;
     }
     if (obj1Names == null) {

core/src/main/java/org/everit/json/schema/ValidationException.java

@@ -21,6 +21,9 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 /**
  * Thrown by {@link Schema} subclasses on validation failure.
  */
@@ -318,4 +321,13 @@ public int getViolationCount() {
   public String getKeyword() {
     return keyword;
   }
+
+  public JSONObject toJSON() {
+    JSONObject rval = new JSONObject();
+    rval.put("keyword", keyword);
+    rval.put("pointerToViolation", getPointerToViolation());
+    rval.put("message", getMessage());
+    rval.put("causingExceptions", new JSONArray());
+    return rval;
+  }
 }

core/src/test/java/org/everit/json/schema/ValidationExceptionTest.java

@@ -19,6 +19,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.json.JSONObject;
+import org.json.JSONTokener;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -185,4 +187,25 @@ public void toStringWithCauses() {
     Assert.assertEquals("#: 3 schema violations found", subject.getMessage());
   }
 
+  @Test
+  public void testToJSON() {
+    ValidationException subject =
+        new ValidationException(BooleanSchema.INSTANCE, new StringBuilder("#/a/b"),
+            "exception message", Collections.emptyList(), "type");
+    JSONObject expected = new JSONObject(new JSONTokener(
+        getClass().getResourceAsStream("/org/everit/jsonvalidator/exception-to-json.json")));
+
+    JSONObject actual = subject.toJSON();
+    Assert.assertEquals(4, JSONObject.getNames(actual).length);
+    Assert.assertEquals(expected.get("keyword"), actual.get("keyword"));
+    Assert.assertEquals(expected.get("pointerToViolation"), actual.get("pointerToViolation"));
+    Assert.assertEquals(expected.get("message"), actual.get("message"));
+    // Assert.assertEquals(expected.getJSONArray("causingExceptions"),
+    // actual.getJSONArray("causingExceptions"));
+    Assert.assertTrue(ObjectComparator.deepEquals(expected.getJSONArray("causingExceptions"),
+        actual.getJSONArray("causingExceptions")));
+    Assert.assertTrue(ObjectComparator.deepEquals(expected,
+        actual));
+  }
+
 }

core/src/test/resources/org/everit/jsonvalidator/exception-to-json.json

@@ -0,0 +1,6 @@
+{
+	"pointerToViolation" : "#/a/b",
+	"message" : "#/a/b: exception message",
+	"keyword" : "type",
+	"causingExceptions" : []
+}