introducing ResourceLoader testsupport class instead of repeated resource-loading code

Author: erosb

core/src/test/java/org/everit/json/schema/ArraySchemaTest.java

@@ -29,8 +29,9 @@
 
 public class ArraySchemaTest {
 
-    private static final JSONObject ARRAYS = new JSONObject(new JSONTokener(
-            ArraySchemaTest.class.getResourceAsStream("/org/everit/jsonvalidator/arraytestcases.json")));
+    private static final ResourceLoader loader = ResourceLoader.DEFAULT;
+
+    private static final JSONObject ARRAYS = loader.readObj("arraytestcases.json");
 
     @Test
     public void additionalItemsSchema() {
@@ -170,21 +171,16 @@ public void equalsVerifier() {
                 .verify();
     }
 
-    private JSONObject read(final String fileName) {
-        return new JSONObject(new JSONTokener(
-                getClass().getResourceAsStream("/org/everit/jsonvalidator/tostring/" + fileName)));
-    }
-
     @Test
     public void toStringTest() {
-        JSONObject rawSchemaJson = read("arrayschema-list.json");
+        JSONObject rawSchemaJson = loader.readObj("tostring/arrayschema-list.json");
         String actual = SchemaLoader.load(rawSchemaJson).toString();
         assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
     }
 
     @Test
     public void toStringAdditionalItems() {
-        JSONObject rawSchemaJson = read("arrayschema-list.json");
+        JSONObject rawSchemaJson = loader.readObj("tostring/arrayschema-list.json");
         rawSchemaJson.remove("items");
         rawSchemaJson.put("additionalItems", false);
         String actual = SchemaLoader.load(rawSchemaJson).toString();
@@ -193,15 +189,15 @@ public void toStringAdditionalItems() {
 
     @Test
     public void toStringNoExplicitType() {
-        JSONObject rawSchemaJson = read("arrayschema-list.json");
+        JSONObject rawSchemaJson = loader.readObj("tostring/arrayschema-list.json");
         rawSchemaJson.remove("type");
         String actual = SchemaLoader.load(rawSchemaJson).toString();
         assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
     }
 
     @Test
     public void toStringTupleSchema() {
-        JSONObject rawSchemaJson = read("arrayschema-tuple.json");
+        JSONObject rawSchemaJson = loader.readObj("tostring/arrayschema-tuple.json");
         String actual = SchemaLoader.load(rawSchemaJson).toString();
         assertTrue(ObjectComparator.deepEquals(rawSchemaJson, new JSONObject(actual)));
     }

core/src/test/java/org/everit/json/schema/ObjectSchemaTest.java

@@ -24,9 +24,7 @@
 
 public class ObjectSchemaTest {
 
-    private static final JSONObject OBJECTS = new JSONObject(new JSONTokener(
-            ObjectSchemaTest.class
-                    .getResourceAsStream("/org/everit/jsonvalidator/objecttestcases.json")));
+    private static final JSONObject OBJECTS  = ResourceLoader.DEFAULT.readObj("objecttestcases.json");
 
     @Test
     public void additionalPropertiesOnEmptyObject() {

core/src/test/java/org/everit/json/schema/PointerBubblingTest.java

@@ -23,14 +23,14 @@
 
 public class PointerBubblingTest {
 
-    private final JSONObject allSchemas = new JSONObject(new JSONTokener(
-            getClass().getResourceAsStream("/org/everit/jsonvalidator/testschemas.json")));
+    private static final ResourceLoader loader = ResourceLoader.DEFAULT;
+
+    private final JSONObject allSchemas = loader.readObj("testschemas.json");
 
     private final Schema rectangleSchema = SchemaLoader
             .load(allSchemas.getJSONObject("pointerResolution"));
 
-    private final JSONObject testInputs = new JSONObject(new JSONTokener(
-            getClass().getResourceAsStream("/org/everit/jsonvalidator/objecttestcases.json")));
+    private final JSONObject testInputs = loader.readObj("objecttestcases.json");
 
     @Test
     public void rectangleMultipleFailures() {

core/src/test/java/org/everit/json/schema/ResourceLoader.java

@@ -0,0 +1,37 @@
+package org.everit.json.schema;
+
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+import java.io.InputStream;
+
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
+
+public class ResourceLoader {
+
+    public static final ResourceLoader DEFAULT = new ResourceLoader("/org/everit/jsonvalidator/");
+
+    private final String rootPath;
+
+    public ResourceLoader(String rootPath) {
+        this.rootPath = requireNonNull(rootPath, "rootPath cannot be null");
+    }
+
+    public JSONObject readObj(String relPath) {
+        InputStream stream = getStream(relPath);
+        return new JSONObject(new JSONTokener(stream));
+    }
+
+    public InputStream getStream(String relPath) {
+        String absPath = rootPath + relPath;
+        InputStream rval = getClass().getResourceAsStream(absPath);
+        if (rval == null) {
+            throw new IllegalArgumentException(
+                    format("failed to load resource by relPath [%s].\n"
+                    + "InputStream by path [%s] is null", relPath, absPath));
+        }
+        return rval;
+    }
+
+}

core/src/test/java/org/everit/json/schema/ValidationExceptionTest.java

@@ -192,16 +192,11 @@ public void testToJSON() {
         ValidationException subject =
                 new ValidationException(BooleanSchema.INSTANCE, new StringBuilder("#/a/b"),
                         "exception message", Collections.emptyList(), "type");
-        JSONObject expected = readFile("/org/everit/jsonvalidator/exception-to-json.json");
+        JSONObject expected = ResourceLoader.DEFAULT.readObj("exception-to-json.json");
         JSONObject actual = subject.toJSON();
         Assert.assertTrue(ObjectComparator.deepEquals(expected, actual));
     }
 
-    private JSONObject readFile(final String absPath) {
-        return new JSONObject(new JSONTokener(
-                getClass().getResourceAsStream(absPath)));
-    }
-
     @Test
     public void toJSONNullPointerToViolation() {
         ValidationException subject =
@@ -222,7 +217,7 @@ public void toJSONWithCauses() {
         ValidationException subject =
                 new ValidationException(BooleanSchema.INSTANCE, new StringBuilder("#/a"),
                         "exception message", Arrays.asList(cause), "type");
-        JSONObject expected = readFile("/org/everit/jsonvalidator/exception-to-json-with-causes.json");
+        JSONObject expected = ResourceLoader.DEFAULT.readObj("exception-to-json-with-causes.json");
         JSONObject actual = subject.toJSON();
         Assert.assertTrue(ObjectComparator.deepEquals(expected, actual));
     }

core/src/test/java/org/everit/json/schema/loader/CustomFormatValidatorTest.java

@@ -16,6 +16,7 @@
 package org.everit.json.schema.loader;
 
 import org.everit.json.schema.FormatValidator;
+import org.everit.json.schema.ResourceLoader;
 import org.everit.json.schema.ValidationException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -26,6 +27,8 @@
 
 public class CustomFormatValidatorTest {
 
+    private final ResourceLoader loader = ResourceLoader.DEFAULT;
+
     static class EvenCharNumValidator implements FormatValidator {
 
         @Override
@@ -38,19 +41,14 @@ public Optional<String> validate(final String subject) {
         }
     }
 
-    private JSONObject read(final String path) {
-        return new JSONObject(new JSONTokener(getClass().getResourceAsStream(path)));
-    }
-
     @Test
     public void test() {
         SchemaLoader schemaLoader = SchemaLoader.builder()
-                .schemaJson(read("/org/everit/jsonvalidator/customformat-schema.json"))
+                .schemaJson(loader.readObj("customformat-schema.json"))
                 .addFormatValidator("evenlength", new EvenCharNumValidator())
                 .build();
         try {
-            schemaLoader.load().build()
-                    .validate(read("/org/everit/jsonvalidator/customformat-data.json"));
+            schemaLoader.load().build().validate(loader.readObj("customformat-data.json"));
             Assert.fail("did not throw exception");
         } catch (ValidationException ve) {
         }

core/src/test/java/org/everit/json/schema/loader/DefinesPropertyTest.java

@@ -16,6 +16,7 @@
 package org.everit.json.schema.loader;
 
 import org.everit.json.schema.ObjectSchema;
+import org.everit.json.schema.ResourceLoader;
 import org.everit.json.schema.Schema;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -27,14 +28,7 @@
 
 public class DefinesPropertyTest {
 
-    private static JSONObject ALL_SCHEMAS;
-
-    @BeforeClass
-    public static void before() {
-        InputStream stream = DefinesPropertyTest.class.getResourceAsStream(
-                "/org/everit/jsonvalidator/testschemas.json");
-        ALL_SCHEMAS = new JSONObject(new JSONTokener(stream));
-    }
+    private static JSONObject ALL_SCHEMAS = ResourceLoader.DEFAULT.readObj("testschemas.json");
 
     private JSONObject get(final String schemaName) {
         return ALL_SCHEMAS.getJSONObject(schemaName);
@@ -110,8 +104,8 @@ public void objectEscape() {
     @Test
     public void testOfTest() {
         ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("patternPropsAndSchemaDeps"));
-        JSONObject input = new JSONObject(new JSONTokener(
-                getClass().getResourceAsStream("/org/everit/jsonvalidator/objecttestcases.json")))
+        JSONObject input = ResourceLoader.DEFAULT
+                .readObj("objecttestcases.json")
                 .getJSONObject("validOfPatternPropsAndSchemaDeps");
         actual.validate(input);
     }

core/src/test/java/org/everit/json/schema/loader/ExtendTest.java

@@ -16,18 +16,20 @@
 package org.everit.json.schema.loader;
 
 import org.everit.json.schema.ObjectComparator;
+import org.everit.json.schema.ResourceLoader;
 import org.json.JSONObject;
 import org.json.JSONTokener;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class ExtendTest {
 
+    private static final ResourceLoader loader = ResourceLoader.DEFAULT;
+
     private static JSONObject OBJECTS;
 
     static {
-        OBJECTS = new JSONObject(new JSONTokener(
-                ExtendTest.class.getResourceAsStream("/org/everit/jsonvalidator/merge-testcases.json")));
+        OBJECTS = loader.readObj("merge-testcases.json");
     }
 
     @Test

core/src/test/java/org/everit/json/schema/loader/ResolutionScopeTest.java

@@ -15,6 +15,7 @@
  */
 package org.everit.json.schema.loader;
 
+import org.everit.json.schema.ResourceLoader;
 import org.everit.json.schema.loader.internal.DefaultSchemaClient;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -24,13 +25,7 @@
 
 public class ResolutionScopeTest {
 
-    private static JSONObject ALL_SCHEMAS;
-
-    static {
-        InputStream stream = SchemaLoaderTest.class.getResourceAsStream(
-                "/org/everit/jsonvalidator/testschemas.json");
-        ALL_SCHEMAS = new JSONObject(new JSONTokener(stream));
-    }
+    private static JSONObject ALL_SCHEMAS = ResourceLoader.DEFAULT.readObj("testschemas.json");
 
     private JSONObject get(final String schemaName) {
         return ALL_SCHEMAS.getJSONObject(schemaName);

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -34,14 +34,7 @@
 
 public class SchemaLoaderTest {
 
-    private static JSONObject ALL_SCHEMAS;
-
-    @BeforeClass
-    public static void before() {
-        InputStream stream = SchemaLoaderTest.class.getResourceAsStream(
-                "/org/everit/jsonvalidator/testschemas.json");
-        ALL_SCHEMAS = new JSONObject(new JSONTokener(stream));
-    }
+    private static JSONObject ALL_SCHEMAS = ResourceLoader.DEFAULT.readObj("testschemas.json");
 
     @Test
     public void additionalItemSchema() {