running acceptance tests in early-failing mode

Now both `V6TestSuiteTest` and `TestSuiteTest` to run the testsuites both in collecting mode and early-failing mode, so now
both classes have 2 `@Test` methods.

Also an easy fix of different `ValidationFailureReporter#inContextOf()` behavior in collecting and early-failing mode (throwing vs collecting exceptions).

Author: erosb

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

@@ -13,4 +13,12 @@ public EarlyFailingFailureReporter(Schema schema) {
     @Override public void validationFinished() {
 
     }
+
+    @Override ValidationException inContextOfSchema(Schema schema, Runnable task) {
+        try {
+            return super.inContextOfSchema(schema, task);
+        } catch (ValidationException e) {
+            return e;
+        }
+    }
 }

tests/src/test/java/org/everit/json/schema/TestCase.java

@@ -57,6 +57,8 @@ static List<Object[]> loadAsParamsFromPackage(String packageName) {
 
     final boolean expectedToBeValid;
 
+    private Schema schema;
+
     private TestCase(JSONObject input, JSONObject schemaTest, String fileName) {
         schemaDescription = "[" + fileName + "]/" + schemaTest.getString("description");
         schemaJson = schemaTest.get("schema");
@@ -65,28 +67,36 @@ private TestCase(JSONObject input, JSONObject schemaTest, String fileName) {
         inputData = input.get("data");
     }
 
-    private void testInEarlyFailureMode(Schema schema) {
-        //        validator = new ValidatorBuilder().failEarly().build();
-        //        validator = new ValidatorBuilder().failEarly().loadDefaultValues().build();
-        //        validator.performValidation(schema, inputData);
+    public void runTestInEarlyFailureMode() {
+        testWithValidator(Validator.builder().failEarly().build(), schema);
     }
 
-    public void runTest(SchemaLoader.SchemaLoaderBuilder loaderBuilder) {
+    private void testWithValidator(Validator validator, Schema schema) {
         try {
-            SchemaLoader loader = loaderBuilder.schemaJson(schemaJson).build();
-            Schema schema = loader.load().build();
-            schema.validate(inputData);
+            validator.performValidation(schema, inputData);
             if (!expectedToBeValid) {
                 throw new AssertionError("false success for " + inputDescription);
             }
         } catch (ValidationException e) {
             if (expectedToBeValid) {
                 throw new AssertionError("false failure for " + inputDescription, e);
             }
+        }
+    }
+
+    public void loadSchema(SchemaLoader.SchemaLoaderBuilder loaderBuilder) {
+        try {
+            SchemaLoader loader = loaderBuilder.schemaJson(schemaJson).build();
+            this.schema = loader.load().build();
         } catch (SchemaException e) {
             throw new AssertionError("schema loading failure for " + schemaDescription, e);
         } catch (JSONException e) {
             throw new AssertionError("schema loading error for " + schemaDescription, e);
         }
     }
+
+    public void runTestInCollectingMode() {
+        testWithValidator(Validator.builder().build(), schema);
+    }
+
 }

tests/src/test/java/org/everit/json/schema/TestSuiteTest.java

@@ -1,16 +1,15 @@
 package org.everit.json.schema;
 
+import java.util.List;
+
 import org.everit.json.schema.loader.SchemaLoader;
-import org.json.JSONException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import java.util.List;
-
 @RunWith(Parameterized.class)
 public class TestSuiteTest {
 
@@ -35,10 +34,17 @@ public static void stopJetty() throws Exception {
 
     public TestSuiteTest(TestCase testcase, String descr) {
         this.tc = testcase;
+        tc.loadSchema(SchemaLoader.builder());
     }
 
     @Test
-    public void test() {
-        tc.runTest(SchemaLoader.builder());
+    public void testInCollectingMode() {
+        tc.runTestInCollectingMode();
     }
+
+    @Test
+    public void testInEarlyFailingMode() {
+        tc.runTestInEarlyFailureMode();
+    }
+
 }

tests/src/test/java/org/everit/json/schema/V6TestSuiteTest.java

@@ -36,11 +36,17 @@ public static void stopJetty() throws Exception {
 
     public V6TestSuiteTest(TestCase testcase, String descr) {
         this.tc = testcase;
+        tc.loadSchema(SchemaLoader.builder().draftV6Support());
     }
 
     @Test
-    public void test() {
-        tc.runTest(SchemaLoader.builder().draftV6Support());
+    public void testInCollectingMode() {
+        tc.runTestInCollectingMode();
+    }
+
+    @Test
+    public void testInEarlyFailingMode() {
+        tc.runTestInEarlyFailureMode();
     }
 
 }