merging master, resolving conflict in SpecificationVersion

erosb · erosb · commit 7b489c52c149 · 2018-01-11T20:35:05.000+01:00
diff --git a/core/src/main/java/org/everit/json/schema/EarlyFailingFailureReporter.java b/core/src/main/java/org/everit/json/schema/EarlyFailingFailureReporter.java
@@ -1,6 +1,6 @@
 package org.everit.json.schema;
 
-public class EarlyFailingFailureReporter extends ValidationFailureReporter {
+class EarlyFailingFailureReporter extends ValidationFailureReporter {
 
     public EarlyFailingFailureReporter(Schema schema) {
         super(schema);
@@ -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;
+        }
+    }
 }
diff --git a/core/src/main/java/org/everit/json/schema/ObjectSchemaValidatingVisitor.java b/core/src/main/java/org/everit/json/schema/ObjectSchemaValidatingVisitor.java
@@ -10,7 +10,7 @@
 
 import org.json.JSONObject;
 
-public class ObjectSchemaValidatingVisitor extends Visitor {
+class ObjectSchemaValidatingVisitor extends Visitor {
 
     private final Object subject;
 
diff --git a/core/src/main/java/org/everit/json/schema/internal/URIV4FormatValidator.java b/core/src/main/java/org/everit/json/schema/internal/URIV4FormatValidator.java
@@ -0,0 +1,27 @@
+package org.everit.json.schema.internal;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Optional;
+import org.everit.json.schema.FormatValidator;
+
+public class URIV4FormatValidator implements FormatValidator {
+
+    @Override
+    public Optional<String> validate(final String subject) {
+        try {
+            URI uri = new URI(subject);
+            return Optional.empty();
+        } catch (URISyntaxException | NullPointerException e) {
+            return failure(subject);
+        }
+    }
+
+    protected Optional<String> failure(String subject) {
+        return Optional.of(String.format("[%s] is not a valid URI", subject));
+    }
+
+    @Override public String formatName() {
+        return "uri";
+    }
+}
diff --git a/core/src/main/java/org/everit/json/schema/loader/SpecificationVersion.java b/core/src/main/java/org/everit/json/schema/loader/SpecificationVersion.java
@@ -11,17 +11,18 @@
 import java.util.Map;
 
 import org.everit.json.schema.FormatValidator;
+import org.everit.json.schema.internal.DateFormatValidator;
 import org.everit.json.schema.internal.DateTimeFormatValidator;
 import org.everit.json.schema.internal.EmailFormatValidator;
 import org.everit.json.schema.internal.HostnameFormatValidator;
 import org.everit.json.schema.internal.IPV4Validator;
 import org.everit.json.schema.internal.IPV6Validator;
 import org.everit.json.schema.internal.JsonPointerFormatValidator;
+import org.everit.json.schema.internal.TimeFormatValidator;
 import org.everit.json.schema.internal.URIFormatValidator;
 import org.everit.json.schema.internal.URIReferenceFormatValidator;
 import org.everit.json.schema.internal.URITemplateFormatValidator;
-import org.everit.json.schema.internal.DateFormatValidator;
-import org.everit.json.schema.internal.TimeFormatValidator;
+import org.everit.json.schema.internal.URIV4FormatValidator;
 
 /**
  * @author erosb
@@ -131,7 +132,7 @@ private static final List<String> keywords(String... keywords) {
     static {
         Map<String, FormatValidator> formatValidators = new HashMap<>();
         formatValidators.put("date-time", new DateTimeFormatValidator());
-        formatValidators.put("uri", new URIFormatValidator());
+        formatValidators.put("uri", new URIV4FormatValidator());
         formatValidators.put("email", new EmailFormatValidator());
         formatValidators.put("ipv4", new IPV4Validator());
         formatValidators.put("ipv6", new IPV6Validator());
@@ -144,6 +145,7 @@ private static final List<String> keywords(String... keywords) {
     static {
         Map<String, FormatValidator> v6Validators = new HashMap<>(V4_VALIDATORS);
         v6Validators.put("json-pointer", new JsonPointerFormatValidator());
+        v6Validators.put("uri", new URIFormatValidator());
         v6Validators.put("uri-reference", new URIReferenceFormatValidator());
         v6Validators.put("uri-template", new URITemplateFormatValidator());
         V6_VALIDATORS = unmodifiableMap(v6Validators);
diff --git a/core/src/test/java/org/everit/json/schema/internal/DefaultFormatValidatorTest.java b/core/src/test/java/org/everit/json/schema/internal/DefaultFormatValidatorTest.java
@@ -266,9 +266,14 @@ public void uriFailure() {
     }
 
     @Test
-    public void relativeURIRefFails() {
+    public void relativeURIRefFailsInDraft6() {
         assertFailure("abc", new URIFormatValidator(), "[abc] is not a valid URI");
     }
+
+    @Test
+    public void relativeURIRefSucceedsInDraft4() {
+        assertSuccess("abc", new URIV4FormatValidator());
+    }
     //
     //    @Test
     //    public void protocolRelativeUriSuccess() {
diff --git a/core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java b/core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java
@@ -4,6 +4,7 @@
 import static org.everit.json.schema.TestSupport.asStream;
 import static org.everit.json.schema.TestSupport.loadAsV6;
 import static org.everit.json.schema.TestSupport.v6Loader;
+import org.everit.json.schema.internal.URIV4FormatValidator;
 import static org.everit.json.schema.loader.SpecificationVersion.DRAFT_6;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -70,7 +71,7 @@ public void booleanSchema() {
     public void builderhasDefaultFormatValidators() {
         SchemaLoader actual = SchemaLoader.builder().schemaJson(get("booleanSchema")).build();
         assertTrue(actual.getFormatValidator("date-time").get() instanceof DateTimeFormatValidator);
-        assertTrue(actual.getFormatValidator("uri").get() instanceof URIFormatValidator);
+        assertTrue(actual.getFormatValidator("uri").get() instanceof URIV4FormatValidator);
         assertTrue(actual.getFormatValidator("email").get() instanceof EmailFormatValidator);
         assertTrue(actual.getFormatValidator("ipv4").get() instanceof IPV4Validator);
         assertTrue(actual.getFormatValidator("ipv6").get() instanceof IPV6Validator);
diff --git a/tests/src/test/java/org/everit/json/schema/TestCase.java b/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);
+    }
+
 }
diff --git a/tests/src/test/java/org/everit/json/schema/TestSuiteTest.java b/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();
+    }
+
 }
diff --git a/tests/src/test/java/org/everit/json/schema/V6TestSuiteTest.java b/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();
     }
 
 }
diff --git a/tests/src/test/resources/org/everit/json/schema/draft4/format.json b/tests/src/test/resources/org/everit/json/schema/draft4/format.json
@@ -45,8 +45,8 @@
       },
       {
         "data": "abc",
-        "description": "an invalid URI though valid URI reference",
-        "valid": false
+        "description": "a URI that actually is a valid URI reference",
+        "valid": true
       }
     ]
   },

Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,17 @@ public static void stopJetty() throws Exception {`
`36`	`36`
`37`	`37`	`public V6TestSuiteTest(TestCase testcase, String descr) {`
`38`	`38`	`this.tc = testcase;`
	`39`	`+ tc.loadSchema(SchemaLoader.builder().draftV6Support());`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`@Test`
`42`		`- public void test() {`
`43`		`- tc.runTest(SchemaLoader.builder().draftV6Support());`
	`43`	`+ public void testInCollectingMode() {`
	`44`	`+ tc.runTestInCollectingMode();`
	`45`	`+ }`
	`46`	`+`
	`47`	`+ @Test`
	`48`	`+ public void testInEarlyFailingMode() {`
	`49`	`+ tc.runTestInEarlyFailureMode();`
`44`	`50`	`}`
`45`	`51`
`46`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`"data": "abc",`
`48`		`- "description": "an invalid URI though valid URI reference",`
`49`		`- "valid": false`
	`48`	`+ "description": "a URI that actually is a valid URI reference",`
	`49`	`+ "valid": true`
`50`	`50`	`}`
`51`	`51`	`]`
`52`	`52`	`},`