From 0112d82755f07838de44f31725ba6a697d4355b6 Mon Sep 17 00:00:00 2001 From: stleary Date: Fri, 13 May 2016 23:13:06 -0500 Subject: [PATCH] add JSONPointerTest to test suite, fix resource for gradle build --- build.gradle | 3 +++ src/test/org/json/junit/JSONPointerTest.java | 7 ++----- src/test/org/json/junit/JunitTestSuite.java | 5 +++-- .../{org/json/junit => resources}/jsonpointer-testdoc.json | 0 4 files changed, 8 insertions(+), 7 deletions(-) rename src/test/{org/json/junit => resources}/jsonpointer-testdoc.json (100%) diff --git a/build.gradle b/build.gradle index 943080f..8dbd0fe 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,9 @@ sourceSets { java { srcDir 'src/test' } + resources { + srcDir 'resources' + } } } diff --git a/src/test/org/json/junit/JSONPointerTest.java b/src/test/org/json/junit/JSONPointerTest.java index 820023b..c100617 100644 --- a/src/test/org/json/junit/JSONPointerTest.java +++ b/src/test/org/json/junit/JSONPointerTest.java @@ -4,10 +4,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; -import org.json.JSONObject; -import org.json.JSONPointer; -import org.json.JSONPointerException; -import org.json.JSONTokener; +import org.json.*; import org.junit.Test; public class JSONPointerTest { @@ -16,7 +13,7 @@ public class JSONPointerTest { static { document = new JSONObject(new JSONTokener( - JSONPointerTest.class.getResourceAsStream("/org/json/junit/jsonpointer-testdoc.json"))); + JSONPointerTest.class.getClassLoader().getResourceAsStream("jsonpointer-testdoc.json"))); } private Object query(String pointer) { diff --git a/src/test/org/json/junit/JunitTestSuite.java b/src/test/org/json/junit/JunitTestSuite.java index ceff6f1..3863931 100644 --- a/src/test/org/json/junit/JunitTestSuite.java +++ b/src/test/org/json/junit/JunitTestSuite.java @@ -14,7 +14,8 @@ import org.junit.runners.Suite; JSONStringerTest.class, JSONObjectTest.class, JSONArrayTest.class, - EnumTest.class + EnumTest.class, + JSONPointerTest.class }) public class JunitTestSuite { -} \ No newline at end of file +} diff --git a/src/test/org/json/junit/jsonpointer-testdoc.json b/src/test/resources/jsonpointer-testdoc.json similarity index 100% rename from src/test/org/json/junit/jsonpointer-testdoc.json rename to src/test/resources/jsonpointer-testdoc.json