implemented uri-reference format

Author: erosb

core/src/main/java/org/everit/json/schema/internal/URIReferenceFormatValidator.java

@@ -1,13 +1,22 @@
 package org.everit.json.schema.internal;
 
+import static java.lang.String.format;
+
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Optional;
 
 import org.everit.json.schema.FormatValidator;
 
 public class URIReferenceFormatValidator implements FormatValidator {
 
     @Override public Optional<String> validate(String subject) {
-        throw new UnsupportedOperationException("not yet implemented");
+        try {
+            new URI(subject);
+            return Optional.empty();
+        } catch (URISyntaxException e) {
+            return Optional.of(format("[%s] is not a valid URI reference", subject));
+        }
     }
 
     @Override public String formatName() {

core/src/test/java/org/everit/json/schema/internal/DefaultFormatValidatorTest.java

@@ -15,12 +15,9 @@
  */
 package org.everit.json.schema.internal;
 
-import static org.junit.Assert.assertTrue;
+import static org.everit.json.schema.internal.ValidatorTestSupport.assertFailure;
+import static org.everit.json.schema.internal.ValidatorTestSupport.assertSuccess;
 
-import java.util.Optional;
-
-import org.everit.json.schema.FormatValidator;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class DefaultFormatValidatorTest {
@@ -29,20 +26,6 @@ public class DefaultFormatValidatorTest {
 
     private static final String IPV6_ADDR = "2001:db8:85a3:0:0:8a2e:370:7334";
 
-    private void assertFailure(final String subject, final FormatValidator format,
-            final String expectedFailure) {
-        Optional<String> opt = format.validate(subject);
-        Assert.assertNotNull("the optional is not null", opt);
-        assertTrue("failure exists", opt.isPresent());
-        Assert.assertEquals(expectedFailure, opt.get());
-    }
-
-    private void assertSuccess(final String subject, final FormatValidator format) {
-        Optional<String> opt = format.validate(subject);
-        Assert.assertNotNull("the optional is not null", opt);
-        Assert.assertFalse("failure not exist", opt.isPresent());
-    }
-
     @Test
     public void dateTimeExceedingLimits() {
         assertFailure("1996-60-999T16:39:57-08:00", new DateTimeFormatValidator(),

core/src/test/java/org/everit/json/schema/internal/JsonPointerFormatValidatorTest.java

@@ -1,9 +1,7 @@
 package org.everit.json.schema.internal;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import java.util.Optional;
+import static org.everit.json.schema.internal.ValidatorTestSupport.assertFailure;
+import static org.everit.json.schema.internal.ValidatorTestSupport.assertSuccess;
 
 import org.junit.Test;
 
@@ -13,21 +11,17 @@ public class JsonPointerFormatValidatorTest {
 
     @Test
     public void uriSuccess() {
-        assertEmpty(subject.validate("#/hello"));
-    }
-
-    private void assertEmpty(Optional<String> actual) {
-        assertSame(Optional.empty(), actual);
+        assertSuccess("#/hello", subject);
     }
 
     @Test
     public void stringSuccess() {
-        assertEmpty(subject.validate("/hello"));
+        assertSuccess("/hello", subject);
     }
 
     @Test
     public void illegalLeadingCharFailure() {
-        assertEquals(Optional.of("[aaa] is not a valid JSON pointer"), subject.validate("aaa"));
+        assertFailure("aaa", subject, "[aaa] is not a valid JSON pointer");
     }
 
 }

core/src/test/java/org/everit/json/schema/internal/URIReferenceFormatValidatorTest.java

@@ -1,5 +1,8 @@
 package org.everit.json.schema.internal;
 
+import static org.everit.json.schema.internal.ValidatorTestSupport.assertFailure;
+import static org.everit.json.schema.internal.ValidatorTestSupport.assertSuccess;
+
 import org.junit.Test;
 
 public class URIReferenceFormatValidatorTest {
@@ -8,6 +11,22 @@ public class URIReferenceFormatValidatorTest {
 
     @Test
     public void success() {
+        assertSuccess("http://foo.bar/?baz=qux#quux", subject);
+    }
+
+    @Test
+    public void protocolRelativeRef() {
+        assertSuccess("//foo.bar/?baz=qux#quux", subject);
+    }
 
+    @Test
+    public void pathSuccess() {
+        assertSuccess("/abc", subject);
     }
+
+    @Test
+    public void illegalCharFailure() {
+        assertFailure("\\\\WINDOWS\\fileshare", subject, "[\\\\WINDOWS\\fileshare] is not a valid URI reference");
+    }
+
 }

core/src/test/java/org/everit/json/schema/internal/ValidatorTestSupport.java

@@ -0,0 +1,28 @@
+package org.everit.json.schema.internal;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.Optional;
+
+import org.everit.json.schema.FormatValidator;
+import org.junit.Assert;
+
+public final class ValidatorTestSupport {
+
+    static void assertSuccess(final String subject, final FormatValidator format) {
+        Optional<String> opt = format.validate(subject);
+        Assert.assertNotNull("the optional is not null", opt);
+        Assert.assertFalse("failure not exist", opt.isPresent());
+    }
+
+    static void assertFailure(final String subject, final FormatValidator format,
+            final String expectedFailure) {
+        Optional<String> opt = format.validate(subject);
+        Assert.assertNotNull("the optional is not null", opt);
+        assertTrue("failure exists", opt.isPresent());
+        Assert.assertEquals(expectedFailure, opt.get());
+    }
+
+    private ValidatorTestSupport() {
+    }
+}