adding toString() implementations to CombinedSchema events

Author: erosb

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

@@ -18,6 +18,8 @@ public static Builder builder() {
         return new Builder();
     }
 
+    public static final FalseSchema INSTANCE = FalseSchema.builder().build();
+
     /**
      * Constructor.
      *

core/src/main/java/org/everit/json/schema/listener/CombinedSchemaMatchEvent.java

@@ -13,6 +13,7 @@ public CombinedSchemaMatchEvent(CombinedSchema schema, Schema subSchema,
 
     @Override void describeTo(JSONObject obj) {
         obj.put("type", "match");
+        obj.put("keyword", schema.getCriterion().toString());
     }
 
     @Override public boolean equals(Object o) {

core/src/main/java/org/everit/json/schema/listener/CombinedSchemaMismatchEvent.java

@@ -6,6 +6,7 @@
 import org.everit.json.schema.Schema;
 import org.everit.json.schema.ValidationException;
 import org.json.JSONObject;
+import org.json.JSONTokener;
 
 public class CombinedSchemaMismatchEvent extends CombinedSchemaValidationEvent implements MismatchEvent {
 
@@ -21,7 +22,10 @@ public CombinedSchemaMismatchEvent(CombinedSchema schema, Schema subSchema, Obje
     }
 
     @Override void describeTo(JSONObject obj) {
-        throw new UnsupportedOperationException("not yet implemented");
+        obj.put("type", "mismatch");
+        obj.put("keyword", schema.getCriterion().toString());
+        obj.put("subSchema", new JSONTokener(subSchema.toString()).nextValue());
+        obj.put("failure", failure.toJSON());
     }
 
     @Override public boolean equals(Object o) {

core/src/main/java/org/everit/json/schema/listener/CombinedSchemaValidationEvent.java

@@ -7,7 +7,7 @@
 
 public abstract class CombinedSchemaValidationEvent extends ValidationEvent<CombinedSchema> {
 
-    private final Schema subSchema;
+    final Schema subSchema;
 
     public CombinedSchemaValidationEvent(CombinedSchema schema, Schema subSchema, Object instance) {
         super(schema, instance);

core/src/test/java/org/everit/json/schema/listener/EventToStringTest.java

@@ -1,19 +1,20 @@
 package org.everit.json.schema.listener;
 
+import static java.util.Arrays.asList;
 import static org.everit.json.schema.JSONMatcher.sameJsonAs;
 import static org.everit.json.schema.listener.ConditionalSchemaValidationEvent.Keyword.IF;
-import static org.everit.json.schema.listener.ConditionalSchemaValidationEvent.Keyword.THEN;
 import static org.junit.Assert.assertThat;
 
+import org.everit.json.schema.CombinedSchema;
 import org.everit.json.schema.ConditionalSchema;
+import org.everit.json.schema.FalseSchema;
 import org.everit.json.schema.ReferenceSchema;
 import org.everit.json.schema.ResourceLoader;
 import org.everit.json.schema.StringSchema;
 import org.everit.json.schema.TrueSchema;
 import org.everit.json.schema.ValidationException;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class EventToStringTest {
@@ -33,6 +34,12 @@ public class EventToStringTest {
     private static final ConditionalSchema CONDITIONAL_SCHEMA = ConditionalSchema.builder()
             .ifSchema(TrueSchema.builder().build())
             .build();
+    public static final CombinedSchema COMBINED_SCHEMA = CombinedSchema.builder()
+            .criterion(CombinedSchema.ANY_CRITERION)
+            .subschemas(asList(
+                    TrueSchema.INSTANCE,
+                    FalseSchema.INSTANCE
+            )).build();
 
     static {
         INSTANCE.put("hello", new JSONArray("[\"world\"]"));
@@ -86,12 +93,24 @@ public void conditionalSchemaMismatchEvent() {
         assertThat(actual, sameJsonAs(expected));
     }
 
-    @Test @Ignore
-    public void combinedSchemaMatchEventToString_withBooleanSchema() {
-        JSONObject expected = LOADER.readObj("conditional-match-then-boolean.json");
-        ConditionalSchemaMatchEvent subject = new ConditionalSchemaMatchEvent(CONDITIONAL_SCHEMA, INSTANCE, THEN);
+    @Test
+    public void combinedSchemaMatchEventToString() {
+        JSONObject expected = LOADER.readObj("combined-schema-match.json");
+        CombinedSchemaMatchEvent subject = new CombinedSchemaMatchEvent(COMBINED_SCHEMA, TrueSchema.INSTANCE, INSTANCE);
+
+        JSONObject actual = new JSONObject(subject.toString());
+
+        assertThat(actual, sameJsonAs(expected));
+    }
+
+    @Test
+    public void combinedSchemaMismatchEventToString() {
+        JSONObject expected = LOADER.readObj("combined-schema-mismatch.json");
+        ValidationException exc = new ValidationException(COMBINED_SCHEMA, "message", "anyOf", "#/schema/location");
+        CombinedSchemaMismatchEvent subject = new CombinedSchemaMismatchEvent(COMBINED_SCHEMA, FalseSchema.INSTANCE, INSTANCE, exc);
 
         JSONObject actual = new JSONObject(subject.toJSON(true, true).toString());
+
         assertThat(actual, sameJsonAs(expected));
     }
 

core/src/test/resources/org/everit/jsonvalidator/listener/combined-schema-match.json

@@ -0,0 +1,4 @@
+{
+  "type": "match",
+  "keyword": "anyOf"
+}

core/src/test/resources/org/everit/jsonvalidator/listener/combined-schema-mismatch.json

@@ -0,0 +1,23 @@
+{
+  "type": "mismatch",
+  "keyword": "anyOf",
+  "schema": {
+    "anyOf": [
+      {},
+      false
+    ]
+  },
+  "subSchema": false,
+  "instance": {
+    "hello": [
+      "world"
+    ]
+  },
+  "failure": {
+    "schemaLocation": "#/schema/location",
+    "pointerToViolation": "#",
+    "causingExceptions": [],
+    "keyword": "anyOf",
+    "message": "message"
+  }
+}