testing cleanup

Author: erosb

core/src/main/java/org/everit/json/schema/loader/SchemaLoader.java

@@ -539,14 +539,16 @@ private Schema.Builder<?> lookupReference(final String relPointerString, final J
     if (pointerSchemas.containsKey(absPointerString)) {
       return pointerSchemas.get(absPointerString);
     }
-    JSONPointer pointer = absPointerString.startsWith("#")
-        ? JSONPointer.forDocument(rootSchemaJson, absPointerString)
-        : JSONPointer.forURL(httpClient, absPointerString);
+    boolean isExternal = !absPointerString.startsWith("#");
+    JSONPointer pointer = isExternal
+        ? JSONPointer.forURL(httpClient, absPointerString)
+        : JSONPointer.forDocument(rootSchemaJson, absPointerString);
     ReferenceSchema.Builder refBuilder = ReferenceSchema.builder();
     pointerSchemas.put(absPointerString, refBuilder);
     QueryResult result = pointer.query();
     JSONObject resultObject = extend(withoutRef(ctx), result.getQueryResult());
-    SchemaLoader childLoader = selfBuilder().schemaJson(resultObject)
+    SchemaLoader childLoader = selfBuilder().resolutionScope(isExternal ? null : id)
+        .schemaJson(resultObject)
             .rootSchemaJson(result.getContainingDocument()).build();
     Schema referredSchema = childLoader.load().build();
     refBuilder.build().setReferredSchema(referredSchema);

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

@@ -40,6 +40,7 @@ public IssueServlet(final File documentRoot) {
   @Override
   protected void doGet(final HttpServletRequest req, final HttpServletResponse resp)
       throws ServletException, IOException {
+    System.out.println("GET " + req.getPathInfo());
     File content = fileByPath(req.getPathInfo());
     resp.setContentType("application/json");
     try (

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

@@ -28,8 +28,6 @@
 import java.util.Optional;
 
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -62,6 +60,8 @@ public static List<Object[]> params() {
 
   private Server server;
 
+  private ServletSupport servletSupport;
+
   public IssueTest(final File issueDir, final String ignored) {
     this.issueDir = Objects.requireNonNull(issueDir, "issueDir cannot be null");
   }
@@ -73,15 +73,8 @@ private Optional<File> fileByName(final String fileName) {
   }
 
   private void initJetty(final File documentRoot) {
-    server = new Server(1234);
-    ServletHandler handler = new ServletHandler();
-    server.setHandler(handler);
-    handler.addServletWithMapping(new ServletHolder(new IssueServlet(documentRoot)), "/*");
-    try {
-      server.start();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
+    servletSupport = new ServletSupport(documentRoot);
+    servletSupport.initJetty();
   }
 
   private Schema loadSchema() {
@@ -99,14 +92,9 @@ private Schema loadSchema() {
   }
 
   private void stopJetty() {
-    if (server != null) {
-      try {
-        server.stop();
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
+    if (servletSupport != null) {
+      servletSupport.stopJetty();
     }
-    server = null;
   }
 
   @Test

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2011 Everit Kft. (http://www.everit.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.everit.json.schema;
+
+import java.net.URISyntaxException;
+
+import org.eclipse.jetty.server.Server;
+import org.everit.json.schema.loader.SchemaLoader;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.junit.Test;
+
+public class RelativeURITest {
+
+  private Server server;
+
+  @Test
+  public void test() throws URISyntaxException {
+    ServletSupport.withDocumentRoot("/org/everit/json/schema/relative-uri/")
+        .run(this::run);
+  }
+
+  private void run() {
+    SchemaLoader
+        .builder()
+        .resolutionScope("http://localhost:1234/schema/")
+        .schemaJson(
+            new JSONObject(new JSONTokener(getClass().getResourceAsStream(
+                "/org/everit/json/schema/relative-uri/schema/main.json"))))
+            .build().load().build();
+  }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2011 Everit Kft. (http://www.everit.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.everit.json.schema;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.Objects;
+
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+
+public class ServletSupport {
+
+  public static ServletSupport withDocumentRoot(final String path) {
+    try {
+      return withDocumentRoot(new File(ServletSupport.class.getResource(path).toURI()));
+    } catch (URISyntaxException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static ServletSupport withDocumentRoot(final File documentRoot) {
+    return new ServletSupport(documentRoot);
+  }
+
+  private final File documentRoot;
+
+  public ServletSupport(final File documentRoot) {
+    this.documentRoot = Objects.requireNonNull(documentRoot, "documentRoot cannot be null");
+  }
+
+  public void run(final Runnable runnable) {
+    initJetty();
+    runnable.run();
+    stopJetty();
+  }
+
+  private Server server;
+
+  public void initJetty() {
+    server = new Server(1234);
+    ServletHandler handler = new ServletHandler();
+    server.setHandler(handler);
+    handler.addServletWithMapping(new ServletHolder(new IssueServlet(documentRoot)), "/*");
+    try {
+      server.start();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public void stopJetty() {
+    if (server != null) {
+      try {
+        server.stop();
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+    server = null;
+  }
+
+}

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

@@ -15,6 +15,7 @@
  */
 package org.everit.json.schema;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +24,7 @@
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.everit.json.schema.loader.SchemaLoader;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -81,7 +83,8 @@ public static void startJetty() throws Exception {
     server = new Server(1234);
     ServletHandler handler = new ServletHandler();
     server.setHandler(handler);
-    handler.addServletWithMapping(TestSuiteTestServlet.class, "/*");
+    handler.addServletWithMapping(new ServletHolder(new IssueServlet(new File(ServletSupport.class
+        .getResource("/org/everit/json/schema/draft4/remotes").toURI()))), "/*");
     server.start();
   }
 
@@ -130,5 +133,4 @@ public void test() {
       throw new AssertionError("schema loading error for " + schemaDescription, e);
     }
   }
-
 }

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

@@ -0,0 +1,6 @@
+{
+	"type" : "object",
+	"properties" : {
+		"rect" : { "$ref" : "props.json#/definitions/Rectangle" }
+	}
+}

tests/src/test/resources/org/everit/json/schema/relative-uri/schema/main.json

@@ -0,0 +1,14 @@
+{
+	"definitions" : {
+		"Rectangle" : {
+			"type" : "object",
+			"properties" : {
+				"a" : { "$ref" : "#/definitions/Size" },
+				"b" : { "$ref" : "#/definitions/Size" }
+			}
+		},
+		"Size" : {
+			"type" : "number"
+		}
+	}
+}