Implement failure reporting for ConditionalSchema.

Author: zgyorffi

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

@@ -4,6 +4,7 @@
 import static org.everit.json.schema.EnumSchema.toJavaValue;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -144,12 +145,33 @@ void visitConditionalSchema(ConditionalSchema conditionalSchema) {
                 (!conditionalSchema.getThenSchema().isPresent() && !conditionalSchema.getElseSchema().isPresent())) {
             return;
         }
-        ValidationException exception = getFailureOfSchema(conditionalSchema.getIfSchema().get(), subject);
-        if (exception != null) {
-            conditionalSchema.getElseSchema().ifPresent(elseSchema -> elseSchema.validate(subject));
+        ValidationException ifSchemaException = getFailureOfSchema(conditionalSchema.getIfSchema().get(), subject);
+        if (ifSchemaException != null) {
+            if (conditionalSchema.getElseSchema().isPresent()) {
+                ValidationException elseSchemaException = getFailureOfSchema(conditionalSchema.getElseSchema().get(), subject);
+                if (elseSchemaException != null) {
+                    failureReporter.failure(new ValidationException(conditionalSchema,
+                            new StringBuilder(new StringBuilder("#")),
+                            "Data is invalid for schema of both \"if\" and \"else\" ",
+                            Arrays.asList(ifSchemaException, elseSchemaException),
+                            "else",
+                            conditionalSchema.getSchemaLocation()));
+                }
+            }
             return;
         }
-        conditionalSchema.getThenSchema().ifPresent(schema -> schema.validate(subject));
+        if (conditionalSchema.getThenSchema().isPresent()) {
+            Schema schema = conditionalSchema.getThenSchema().get();
+            ValidationException thenSchemaException = getFailureOfSchema(schema, subject);
+            if (thenSchemaException != null) {
+                failureReporter.failure(new ValidationException(conditionalSchema,
+                        new StringBuilder(new StringBuilder("#")),
+                        "Data is invalid for schema of \"then\" ",
+                        Arrays.asList(thenSchemaException),
+                        "then",
+                        conditionalSchema.getSchemaLocation()));
+            }
+        }
     }
 
     ValidationException getFailureOfSchema(Schema schema, Object input) {

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

@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import static org.everit.json.schema.TestSupport.buildWithLocation;
+
 public class ConditionalSchemaTest {
 
     private static final StringSchema MAX_LENGTH_STRING_SCHEMA = StringSchema.builder().maxLength(4).build();
@@ -46,9 +48,15 @@ public void onlyElseSuccess() {
 
     // if-then
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void ifSubschemaSuccessThenSubschemaFailure() {
-        ConditionalSchema.builder().ifSchema(MAX_LENGTH_STRING_SCHEMA).thenSchema(PATTERN_STRING_SCHEMA).build().validate("bar");
+        ConditionalSchema subject = buildWithLocation(ConditionalSchema.builder().ifSchema(MAX_LENGTH_STRING_SCHEMA).thenSchema(PATTERN_STRING_SCHEMA));
+        TestSupport.failureOf(subject)
+                .expectedKeyword("then")
+                .expectedPointer("#")
+                .expectedViolatedSchema(subject)
+                .input("bar")
+                .expect();
     }
 
     @Test
@@ -73,9 +81,15 @@ public void ifSubschemaSuccessElseSubschemaFailure() {
         ConditionalSchema.builder().ifSchema(MAX_LENGTH_STRING_SCHEMA).elseSchema(PATTERN_STRING_SCHEMA).build().validate("bar");
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void ifSubschemaFailureElseSubschemaFailure() {
-        ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).elseSchema(MAX_LENGTH_STRING_SCHEMA).build().validate("barbar");
+        ConditionalSchema subject = buildWithLocation(ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).elseSchema(MAX_LENGTH_STRING_SCHEMA));
+        TestSupport.failureOf(subject)
+                .expectedKeyword("else")
+                .expectedPointer("#")
+                .expectedViolatedSchema(subject)
+                .input("barbar")
+                .expect();
     }
 
     @Test
@@ -122,34 +136,58 @@ public void ifSubschemaSuccessThenSubschemaSuccessElseSubSchemaFailure() {
         ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).elseSchema(MIN_LENGTH_STRING_SCHEMA).build().validate("foo");
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void ifSubschemaSuccessThenSubschemaFailureElseSubSchemaSuccess() {
-        ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).elseSchema(MIN_LENGTH_STRING_SCHEMA).build().validate("foobar");
+        ConditionalSchema subject = buildWithLocation(ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).elseSchema(MIN_LENGTH_STRING_SCHEMA));
+        TestSupport.failureOf(subject)
+                .expectedKeyword("then")
+                .expectedPointer("#")
+                .expectedViolatedSchema(subject)
+                .input("foobar")
+                .expect();
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void ifSubschemaSuccessThenSubschemaFailureElseSubSchemaFailure() {
-        ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).elseSchema(MIN_LENGTH_STRING_SCHEMA).build().validate("foooo");
+        ConditionalSchema subject = buildWithLocation(ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).elseSchema(MIN_LENGTH_STRING_SCHEMA));
+        TestSupport.failureOf(subject)
+                .expectedKeyword("then")
+                .expectedPointer("#")
+                .expectedViolatedSchema(subject)
+                .input("foooo")
+                .expect();
     }
 
     @Test
     public void ifSubschemaFailureThenSubschemaSuccessElseSubSchemaSuccess() {
         ConditionalSchema.builder().ifSchema(MAX_LENGTH_STRING_SCHEMA).thenSchema(PATTERN_STRING_SCHEMA).elseSchema(MIN_LENGTH_STRING_SCHEMA).build().validate("foobar");
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void ifSubschemaFailureThenSubschemaSuccessElseSubSchemaFailure() {
-        ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).elseSchema(MIN_LENGTH_STRING_SCHEMA).build().validate("bar");
+        ConditionalSchema subject = buildWithLocation(ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MAX_LENGTH_STRING_SCHEMA).elseSchema(MIN_LENGTH_STRING_SCHEMA));
+        TestSupport.failureOf(subject)
+                .expectedKeyword("else")
+                .expectedPointer("#")
+                .expectedViolatedSchema(subject)
+                .input("bar")
+                .expect();
     }
 
     @Test
     public void ifSubschemaFailureThenSubschemaFailureElseSubSchemaSuccess() {
         ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MIN_LENGTH_STRING_SCHEMA).elseSchema(MAX_LENGTH_STRING_SCHEMA).build().validate("bar");
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void ifSubschemaFailureThenSubschemaFailureElseSubSchemaFailure() {
-        ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MIN_LENGTH_STRING_SCHEMA).elseSchema(MAX_LENGTH_STRING_SCHEMA).build().validate("barbarbar");
+        ConditionalSchema subject = buildWithLocation(ConditionalSchema.builder().ifSchema(PATTERN_STRING_SCHEMA).thenSchema(MIN_LENGTH_STRING_SCHEMA).elseSchema(MAX_LENGTH_STRING_SCHEMA));
+        TestSupport.failureOf(subject)
+                .expectedKeyword("else")
+                .expectedPointer("#")
+                .expectedViolatedSchema(subject)
+                .input("barbarbar")
+                .expect();
     }
 
 }