moving MetaSchemaTest to integration tests

Author: erosb

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

@@ -522,36 +522,24 @@ private Schema.Builder<?> loadForType(final Object type) {
    * Returns a schema builder instance after looking up the JSON pointer.
    */
   private Schema.Builder<?> lookupReference(final String relPointerString) {
-    JSONPointer pointer;
     String absPointerString = id + relPointerString;
+    if (pointerSchemas.containsKey(absPointerString)) {
+      return pointerSchemas.get(absPointerString);
+    }
+    JSONPointer pointer;
     if (absPointerString.startsWith("#")) {
-      if (pointerSchemas.containsKey(absPointerString)) {
-        return pointerSchemas.get(absPointerString);
-      } else {
-        ReferenceSchema.Builder refBuilder = ReferenceSchema.builder();
-        pointerSchemas.put(absPointerString, refBuilder);
-        pointer = JSONPointer.forDocument(rootSchemaJson, absPointerString);
-        QueryResult result = pointer.query();
-        SchemaLoader childLoader = new SchemaLoader(id, result.getQueryResult(),
-            result.getContainingDocument(), pointerSchemas, httpClient);
-        Schema referredSchema = childLoader.load().build();
-        refBuilder.build().setReferredSchema(referredSchema);
-        return refBuilder;
-      }
+      pointer = JSONPointer.forDocument(rootSchemaJson, absPointerString);
     } else {
-      if (pointerSchemas.containsKey(absPointerString)) {
-        return pointerSchemas.get(absPointerString);
-      }
-      ReferenceSchema.Builder refBuilder = ReferenceSchema.builder();
-      pointerSchemas.put(absPointerString, refBuilder);
       pointer = JSONPointer.forURL(httpClient, absPointerString);
-      QueryResult result = pointer.query();
-      SchemaLoader childLoader = new SchemaLoader(id, result.getQueryResult(),
-          result.getContainingDocument(), pointerSchemas, httpClient);
-      Schema referredSchema = childLoader.load().build();
-      refBuilder.build().setReferredSchema(referredSchema);
-      return refBuilder;
     }
+    ReferenceSchema.Builder refBuilder = ReferenceSchema.builder();
+    pointerSchemas.put(absPointerString, refBuilder);
+    QueryResult result = pointer.query();
+    SchemaLoader childLoader = new SchemaLoader(id, result.getQueryResult(),
+        result.getContainingDocument(), pointerSchemas, httpClient);
+    Schema referredSchema = childLoader.load().build();
+    refBuilder.build().setReferredSchema(referredSchema);
+    return refBuilder;
   }
 
   private boolean schemaHasAnyOf(final Collection<String> propNames) {

core/src/main/java/org/everit/json/schema/loader/internal/JSONPointer.java

@@ -152,7 +152,6 @@ public QueryResult query() {
     if (fragment.isEmpty()) {
       return new QueryResult(document, document);
     }
-    System.out.println("\tquerying " + fragment);
     String[] path = fragment.split("/");
     if (path[0] == null || !path[0].startsWith("#")) {
       throw new IllegalArgumentException("JSON pointers must start with a '#'");

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

@@ -40,10 +40,16 @@
 @RunWith(Parameterized.class)
 public class IntegrationTest {
 
+  private static Server server;
+
+  private static JSONArray loadTests(final InputStream input) {
+    return new JSONArray(new JSONTokener(input));
+  }
+
   @Parameters(name = "{2}")
   public static List<Object[]> params() {
     List<Object[]> rval = new ArrayList<>();
-    Reflections refs = new Reflections("org.everit.json.schema",
+    Reflections refs = new Reflections("org.everit.json.schema.draft4",
         new ResourcesScanner());
     Set<String> paths = refs.getResources(Pattern.compile(".*\\.json"));
     for (String path : paths) {
@@ -70,22 +76,6 @@ public static List<Object[]> params() {
     return rval;
   }
 
-  private static JSONArray loadTests(final InputStream input) {
-    return new JSONArray(new JSONTokener(input));
-  }
-
-  private final String schemaDescription;
-
-  private final JSONObject schemaJson;
-
-  private final String inputDescription;
-
-  private final Object input;
-
-  private final boolean expectedToBeValid;
-
-  private static Server server;
-
   @BeforeClass
   public static void startJetty() throws Exception {
     server = new Server(1234);
@@ -102,6 +92,16 @@ public static void stopJetty() throws Exception {
     }
   }
 
+  private final String schemaDescription;
+
+  private final JSONObject schemaJson;
+
+  private final String inputDescription;
+
+  private final Object input;
+
+  private final boolean expectedToBeValid;
+
   public IntegrationTest(final String schemaDescription, final JSONObject schemaJson,
       final String inputDescription,
       final Object input, final Boolean expectedToBeValid) {

core/src/test/java/org/everit/json/schema/MetaSchemaTest.java renamed to tests/src/test/java/org/everit/json/schema/MetaSchemaTest.java

@@ -26,10 +26,12 @@ public class MetaSchemaTest {
   public void validateMetaSchema() {
 
     JSONObject jsonSchema = new JSONObject(new JSONTokener(
-            MetaSchemaTest.class.getResourceAsStream("/org/everit/jsonvalidator/json-schema-draft-04.json")));
+        MetaSchemaTest.class
+            .getResourceAsStream("/org/everit/json/schema/json-schema-draft-04.json")));
 
     JSONObject jsonSubject = new JSONObject(new JSONTokener(
-            MetaSchemaTest.class.getResourceAsStream("/org/everit/jsonvalidator/json-schema-draft-04.json")));
+        MetaSchemaTest.class
+            .getResourceAsStream("/org/everit/json/schema/json-schema-draft-04.json")));
 
     Schema schema = SchemaLoader.load(jsonSchema);
     schema.validate(jsonSubject);