This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new adce00c JENA-1763: Move SHACL test files
new 51ba4db Merge pull request #610 from afs/release
adce00c is described below
commit adce00cfdf7f648a8f87eed6f1d6a8620dd77b3f
Author: Andy Seaborne <[email protected]>
AuthorDate: Wed Sep 25 13:18:31 2019 +0100
JENA-1763: Move SHACL test files
---
.../test/java/org/apache/jena/shacl/testing/RunManifest.java | 4 ++--
.../org/apache/jena/shacl/tests/TestValidationReport.java | 4 ++--
.../org/apache/jena/shacl/tests/jena_shacl/TS_JenaShacl.java | 2 +-
.../java/org/apache/jena/shacl/tests/std/TestShaclCoreWG.java | 2 +-
.../org/apache/jena/shacl/tests/std/TestShaclSparqlWG.java | 11 +++++------
.../test/resources}/local/additional/implicit-subclass-1.ttl | 0
.../test/resources}/local/additional/lang-simple-1.ttl | 0
jena-shacl/{testing => src/test/resources}/local/manifest.ttl | 0
jena-shacl/{testing => src/test/resources}/std/README | 0
.../test/resources}/std/core/complex/manifest.ttl | 0
.../test/resources}/std/core/complex/personexample.ttl | 0
.../resources}/std/core/complex/shacl-shacl-data-shapes.ttl | 0
.../test/resources}/std/core/complex/shacl-shacl.ttl | 0
.../{testing => src/test/resources}/std/core/manifest.ttl | 0
.../test/resources}/std/core/misc/deactivated-001.ttl | 0
.../test/resources}/std/core/misc/deactivated-002.ttl | 0
.../test/resources}/std/core/misc/manifest.ttl | 0
.../test/resources}/std/core/misc/message-001.ttl | 0
.../test/resources}/std/core/misc/severity-001.ttl | 0
.../test/resources}/std/core/misc/severity-002.ttl | 0
.../{testing => src/test/resources}/std/core/node/and-001.ttl | 0
.../{testing => src/test/resources}/std/core/node/and-002.ttl | 0
.../test/resources}/std/core/node/class-001.ttl | 0
.../test/resources}/std/core/node/class-002.ttl | 0
.../test/resources}/std/core/node/class-003.ttl | 0
.../test/resources}/std/core/node/closed-001.ttl | 0
.../test/resources}/std/core/node/closed-002.ttl | 0
.../test/resources}/std/core/node/datatype-001.ttl | 0
.../test/resources}/std/core/node/datatype-002.ttl | 0
.../test/resources}/std/core/node/disjoint-001.ttl | 0
.../test/resources}/std/core/node/equals-001.ttl | 0
.../test/resources}/std/core/node/hasValue-001.ttl | 0
.../{testing => src/test/resources}/std/core/node/in-001.ttl | 0
.../test/resources}/std/core/node/languageIn-001.ttl | 0
.../test/resources}/std/core/node/manifest.ttl | 0
.../test/resources}/std/core/node/maxExclusive-001.ttl | 0
.../test/resources}/std/core/node/maxInclusive-001.ttl | 0
.../test/resources}/std/core/node/maxLength-001.ttl | 0
.../test/resources}/std/core/node/minExclusive-001.ttl | 0
.../test/resources}/std/core/node/minInclusive-001.ttl | 0
.../test/resources}/std/core/node/minInclusive-002.ttl | 0
.../test/resources}/std/core/node/minInclusive-003.ttl | 0
.../test/resources}/std/core/node/minLength-001.ttl | 0
.../test/resources}/std/core/node/node-001.ttl | 0
.../test/resources}/std/core/node/nodeKind-001.ttl | 0
.../{testing => src/test/resources}/std/core/node/not-001.ttl | 0
.../{testing => src/test/resources}/std/core/node/not-002.ttl | 0
.../{testing => src/test/resources}/std/core/node/or-001.ttl | 0
.../test/resources}/std/core/node/pattern-001.ttl | 0
.../test/resources}/std/core/node/pattern-002.ttl | 0
.../test/resources}/std/core/node/qualified-001-data.ttl | 0
.../test/resources}/std/core/node/qualified-001-shapes.ttl | 0
.../test/resources}/std/core/node/qualified-001.ttl | 0
.../test/resources}/std/core/node/xone-001.ttl | 0
.../test/resources}/std/core/node/xone-duplicate-data.ttl | 0
.../test/resources}/std/core/node/xone-duplicate-shapes.ttl | 0
.../test/resources}/std/core/node/xone-duplicate.ttl | 0
.../test/resources}/std/core/path/manifest.ttl | 0
.../test/resources}/std/core/path/path-alternative-001.ttl | 0
.../test/resources}/std/core/path/path-complex-001.ttl | 0
.../test/resources}/std/core/path/path-complex-002-data.ttl | 0
.../test/resources}/std/core/path/path-complex-002-shapes.ttl | 0
.../test/resources}/std/core/path/path-complex-002.ttl | 0
.../test/resources}/std/core/path/path-inverse-001.ttl | 0
.../test/resources}/std/core/path/path-oneOrMore-001.ttl | 0
.../test/resources}/std/core/path/path-sequence-001.ttl | 0
.../test/resources}/std/core/path/path-sequence-002.ttl | 0
.../resources}/std/core/path/path-sequence-duplicate-001.ttl | 0
.../test/resources}/std/core/path/path-strange-001.ttl | 0
.../test/resources}/std/core/path/path-strange-002.ttl | 0
.../test/resources}/std/core/path/path-unused-001-data.ttl | 0
.../test/resources}/std/core/path/path-unused-001-shapes.ttl | 0
.../test/resources}/std/core/path/path-unused-001.ttl | 0
.../test/resources}/std/core/path/path-zeroOrMore-001.ttl | 0
.../test/resources}/std/core/path/path-zeroOrOne-001.ttl | 0
.../test/resources}/std/core/property/and-001.ttl | 0
.../test/resources}/std/core/property/class-001.ttl | 0
.../test/resources}/std/core/property/datatype-001.ttl | 0
.../test/resources}/std/core/property/datatype-002.ttl | 0
.../test/resources}/std/core/property/datatype-003.ttl | 0
.../resources}/std/core/property/datatype-ill-formed-data.ttl | 0
.../std/core/property/datatype-ill-formed-shapes.ttl | 0
.../test/resources}/std/core/property/datatype-ill-formed.ttl | 0
.../test/resources}/std/core/property/disjoint-001.ttl | 0
.../test/resources}/std/core/property/equals-001.ttl | 0
.../test/resources}/std/core/property/hasValue-001.ttl | 0
.../test/resources}/std/core/property/in-001.ttl | 0
.../test/resources}/std/core/property/languageIn-001.ttl | 0
.../test/resources}/std/core/property/lessThan-001.ttl | 0
.../test/resources}/std/core/property/lessThan-002.ttl | 0
.../resources}/std/core/property/lessThanOrEquals-001.ttl | 0
.../test/resources}/std/core/property/manifest.ttl | 0
.../test/resources}/std/core/property/maxCount-001.ttl | 0
.../test/resources}/std/core/property/maxCount-002.ttl | 0
.../test/resources}/std/core/property/maxExclusive-001.ttl | 0
.../test/resources}/std/core/property/maxInclusive-001.ttl | 0
.../test/resources}/std/core/property/maxLength-001.ttl | 0
.../test/resources}/std/core/property/minCount-001.ttl | 0
.../test/resources}/std/core/property/minCount-002.ttl | 0
.../test/resources}/std/core/property/minExclusive-001.ttl | 0
.../test/resources}/std/core/property/minExclusive-002.ttl | 0
.../test/resources}/std/core/property/minLength-001.ttl | 0
.../test/resources}/std/core/property/node-001.ttl | 0
.../test/resources}/std/core/property/node-002.ttl | 0
.../test/resources}/std/core/property/nodeKind-001.ttl | 0
.../test/resources}/std/core/property/not-001.ttl | 0
.../test/resources}/std/core/property/or-001.ttl | 0
.../test/resources}/std/core/property/or-datatypes-001.ttl | 0
.../test/resources}/std/core/property/pattern-001.ttl | 0
.../test/resources}/std/core/property/pattern-002.ttl | 0
.../test/resources}/std/core/property/property-001.ttl | 0
.../std/core/property/qualifiedMinCountDisjoint-001.ttl | 0
.../resources}/std/core/property/qualifiedValueShape-001.ttl | 0
.../std/core/property/qualifiedValueShapesDisjoint-001.ttl | 0
.../test/resources}/std/core/property/uniqueLang-001.ttl | 0
.../test/resources}/std/core/property/uniqueLang-002-data.ttl | 0
.../resources}/std/core/property/uniqueLang-002-shapes.ttl | 0
.../test/resources}/std/core/property/uniqueLang-002.ttl | 0
.../test/resources}/std/core/targets/manifest.ttl | 0
.../test/resources}/std/core/targets/multipleTargets-001.ttl | 0
.../test/resources}/std/core/targets/targetClass-001.ttl | 0
.../resources}/std/core/targets/targetClassImplicit-001.ttl | 0
.../test/resources}/std/core/targets/targetNode-001.ttl | 0
.../test/resources}/std/core/targets/targetObjectsOf-001.ttl | 0
.../test/resources}/std/core/targets/targetSubjectsOf-001.ttl | 0
.../test/resources}/std/core/targets/targetSubjectsOf-002.ttl | 0
.../test/resources}/std/core/validation-reports/manifest.ttl | 0
.../resources}/std/core/validation-reports/shared-data.ttl | 0
.../resources}/std/core/validation-reports/shared-shapes.ttl | 0
.../test/resources}/std/core/validation-reports/shared.ttl | 0
jena-shacl/{testing => src/test/resources}/std/manifest.ttl | 0
.../test/resources}/std/sparql/component/manifest.ttl | 0
.../resources}/std/sparql/component/nodeValidator-001.ttl | 0
.../test/resources}/std/sparql/component/optional-001.ttl | 0
.../std/sparql/component/propertyValidator-select-001.ttl | 0
.../test/resources}/std/sparql/component/validator-001.ttl | 0
.../{testing => src/test/resources}/std/sparql/manifest.ttl | 0
.../test/resources}/std/sparql/node/manifest.ttl | 0
.../test/resources}/std/sparql/node/prefixes-001.ttl | 0
.../test/resources}/std/sparql/node/sparql-001.ttl | 0
.../test/resources}/std/sparql/node/sparql-002.ttl | 0
.../test/resources}/std/sparql/node/sparql-003.ttl | 0
.../test/resources}/std/sparql/pre-binding/manifest.ttl | 0
.../test/resources}/std/sparql/pre-binding/manifest.ttl-orig | 0
.../resources}/std/sparql/pre-binding/pre-binding-001.ttl | 0
.../resources}/std/sparql/pre-binding/pre-binding-002.ttl | 0
.../resources}/std/sparql/pre-binding/pre-binding-003.ttl | 0
.../resources}/std/sparql/pre-binding/pre-binding-004.ttl | 0
.../resources}/std/sparql/pre-binding/pre-binding-005.ttl | 0
.../resources}/std/sparql/pre-binding/pre-binding-006.ttl | 0
.../resources}/std/sparql/pre-binding/pre-binding-007.ttl | 0
.../resources}/std/sparql/pre-binding/shapesGraph-001.ttl | 0
.../std/sparql/pre-binding/unsupported-sparql-001.ttl | 0
.../std/sparql/pre-binding/unsupported-sparql-002.ttl | 0
.../std/sparql/pre-binding/unsupported-sparql-003.ttl | 0
.../std/sparql/pre-binding/unsupported-sparql-004.ttl | 0
.../std/sparql/pre-binding/unsupported-sparql-005.ttl | 0
.../std/sparql/pre-binding/unsupported-sparql-006.ttl | 0
.../test/resources}/std/sparql/property/manifest.ttl | 0
.../test/resources}/std/sparql/property/sparql-001.ttl | 0
.../test/resources}/validation-reports/report1-conforms.ttl | 0
.../test/resources}/validation-reports/report2.ttl | 0
162 files changed, 11 insertions(+), 12 deletions(-)
diff --git
a/jena-shacl/src/test/java/org/apache/jena/shacl/testing/RunManifest.java
b/jena-shacl/src/test/java/org/apache/jena/shacl/testing/RunManifest.java
index 7f12686..71315fe 100644
--- a/jena-shacl/src/test/java/org/apache/jena/shacl/testing/RunManifest.java
+++ b/jena-shacl/src/test/java/org/apache/jena/shacl/testing/RunManifest.java
@@ -50,8 +50,8 @@ public class RunManifest {
}
List<String> omitManifests = new ArrayList<>();
- // Miss out.
-
//omitManifests.add(IRILib.filenameToIRI("testing/std/core/validation-reports/manifest.ttl"));
+ // Miss out. e.g.
+
//omitManifests.add(IRILib.filenameToIRI("src/test/resources/std/core/validation-reports/manifest.ttl"));
List<ShaclTestItem> testCases = ShaclTests.manifest(manifest,
omitManifests);
diff --git
a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/TestValidationReport.java
b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/TestValidationReport.java
index 024b160..1053630 100644
---
a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/TestValidationReport.java
+++
b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/TestValidationReport.java
@@ -33,12 +33,12 @@ public class TestValidationReport {
// Round trip :: RDF -> Validation Report -> RDF
@Test public void rtRDF_1() {
- Graph graph =
RDFDataMgr.loadGraph("testing/validation-reports/report1-conforms.ttl");
+ Graph graph =
RDFDataMgr.loadGraph("src/test/resources/validation-reports/report1-conforms.ttl");
testRoundTripGraph("conforms", graph);
}
@Test public void rtRDF_2() {
- Graph graph =
RDFDataMgr.loadGraph("testing/validation-reports/report2.ttl");
+ Graph graph =
RDFDataMgr.loadGraph("src/test/resources/validation-reports/report2.ttl");
testRoundTripGraph("report2", graph);
}
diff --git
a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/jena_shacl/TS_JenaShacl.java
b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/jena_shacl/TS_JenaShacl.java
index 3cbbb05..711c064 100644
---
a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/jena_shacl/TS_JenaShacl.java
+++
b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/jena_shacl/TS_JenaShacl.java
@@ -34,7 +34,7 @@ public class TS_JenaShacl {
@Parameters(name = "{0}")
public static Collection<Object[]> data() throws Exception {
- String manifest = "testing/local/manifest.ttl";
+ String manifest = "src/test/resources/local/manifest.ttl";
List<String> omitManifests = new ArrayList<>();
return ShaclTests.junitParameters(manifest, omitManifests);
}
diff --git
a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/std/TestShaclCoreWG.java
b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/std/TestShaclCoreWG.java
index ef2fe9e..633570a 100644
---
a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/std/TestShaclCoreWG.java
+++
b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/std/TestShaclCoreWG.java
@@ -34,7 +34,7 @@ public class TestShaclCoreWG {
@Parameters(name = "{0}")
public static Collection<Object[]> data() throws Exception {
- String manifest = "testing/std/core/manifest.ttl";
+ String manifest = "src/test/resources/std/core/manifest.ttl";
List<String> omitManifests = new ArrayList<>();
return ShaclTests.junitParameters(manifest, omitManifests);
}
diff --git
a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/std/TestShaclSparqlWG.java
b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/std/TestShaclSparqlWG.java
index fb184d6..75ed8f3 100644
---
a/jena-shacl/src/test/java/org/apache/jena/shacl/tests/std/TestShaclSparqlWG.java
+++
b/jena-shacl/src/test/java/org/apache/jena/shacl/tests/std/TestShaclSparqlWG.java
@@ -34,14 +34,13 @@ public class TestShaclSparqlWG {
@Parameters(name = "{0}")
public static Collection<Object[]> data() throws Exception {
- String manifest = "testing/std/sparql/manifest.ttl";
+ String manifest = "src/test/resources/std/sparql/manifest.ttl";
// The W3C WG tests for SPARQL-based Constraints is made up of:
- //String manifest = "testing/std/sparql/property/manifest.ttl";
- //String manifest = "testing/std/sparql/pre-binding/manifest.ttl";
- //String manifest = "testing/std/sparql/node/manifest.ttl";
- //String manifest = "testing/std/sparql/component/manifest.ttl";
-
+ //String manifest =
"src/test/resources/std/sparql/property/manifest.ttl";
+ //String manifest =
"src/test/resources/std/sparql/pre-binding/manifest.ttl";
+ //String manifest = "src/test/resources/std/sparql/node/manifest.ttl";
+ //String manifest =
"src/test/resources/std/sparql/component/manifest.ttl";
List<String> omitManifests = new ArrayList<>();
return ShaclTests.junitParameters(manifest, omitManifests);
diff --git a/jena-shacl/testing/local/additional/implicit-subclass-1.ttl
b/jena-shacl/src/test/resources/local/additional/implicit-subclass-1.ttl
similarity index 100%
rename from jena-shacl/testing/local/additional/implicit-subclass-1.ttl
rename to jena-shacl/src/test/resources/local/additional/implicit-subclass-1.ttl
diff --git a/jena-shacl/testing/local/additional/lang-simple-1.ttl
b/jena-shacl/src/test/resources/local/additional/lang-simple-1.ttl
similarity index 100%
rename from jena-shacl/testing/local/additional/lang-simple-1.ttl
rename to jena-shacl/src/test/resources/local/additional/lang-simple-1.ttl
diff --git a/jena-shacl/testing/local/manifest.ttl
b/jena-shacl/src/test/resources/local/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/local/manifest.ttl
rename to jena-shacl/src/test/resources/local/manifest.ttl
diff --git a/jena-shacl/testing/std/README
b/jena-shacl/src/test/resources/std/README
similarity index 100%
rename from jena-shacl/testing/std/README
rename to jena-shacl/src/test/resources/std/README
diff --git a/jena-shacl/testing/std/core/complex/manifest.ttl
b/jena-shacl/src/test/resources/std/core/complex/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/complex/manifest.ttl
rename to jena-shacl/src/test/resources/std/core/complex/manifest.ttl
diff --git a/jena-shacl/testing/std/core/complex/personexample.ttl
b/jena-shacl/src/test/resources/std/core/complex/personexample.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/complex/personexample.ttl
rename to jena-shacl/src/test/resources/std/core/complex/personexample.ttl
diff --git a/jena-shacl/testing/std/core/complex/shacl-shacl-data-shapes.ttl
b/jena-shacl/src/test/resources/std/core/complex/shacl-shacl-data-shapes.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/complex/shacl-shacl-data-shapes.ttl
rename to
jena-shacl/src/test/resources/std/core/complex/shacl-shacl-data-shapes.ttl
diff --git a/jena-shacl/testing/std/core/complex/shacl-shacl.ttl
b/jena-shacl/src/test/resources/std/core/complex/shacl-shacl.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/complex/shacl-shacl.ttl
rename to jena-shacl/src/test/resources/std/core/complex/shacl-shacl.ttl
diff --git a/jena-shacl/testing/std/core/manifest.ttl
b/jena-shacl/src/test/resources/std/core/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/manifest.ttl
rename to jena-shacl/src/test/resources/std/core/manifest.ttl
diff --git a/jena-shacl/testing/std/core/misc/deactivated-001.ttl
b/jena-shacl/src/test/resources/std/core/misc/deactivated-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/misc/deactivated-001.ttl
rename to jena-shacl/src/test/resources/std/core/misc/deactivated-001.ttl
diff --git a/jena-shacl/testing/std/core/misc/deactivated-002.ttl
b/jena-shacl/src/test/resources/std/core/misc/deactivated-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/misc/deactivated-002.ttl
rename to jena-shacl/src/test/resources/std/core/misc/deactivated-002.ttl
diff --git a/jena-shacl/testing/std/core/misc/manifest.ttl
b/jena-shacl/src/test/resources/std/core/misc/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/misc/manifest.ttl
rename to jena-shacl/src/test/resources/std/core/misc/manifest.ttl
diff --git a/jena-shacl/testing/std/core/misc/message-001.ttl
b/jena-shacl/src/test/resources/std/core/misc/message-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/misc/message-001.ttl
rename to jena-shacl/src/test/resources/std/core/misc/message-001.ttl
diff --git a/jena-shacl/testing/std/core/misc/severity-001.ttl
b/jena-shacl/src/test/resources/std/core/misc/severity-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/misc/severity-001.ttl
rename to jena-shacl/src/test/resources/std/core/misc/severity-001.ttl
diff --git a/jena-shacl/testing/std/core/misc/severity-002.ttl
b/jena-shacl/src/test/resources/std/core/misc/severity-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/misc/severity-002.ttl
rename to jena-shacl/src/test/resources/std/core/misc/severity-002.ttl
diff --git a/jena-shacl/testing/std/core/node/and-001.ttl
b/jena-shacl/src/test/resources/std/core/node/and-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/and-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/and-001.ttl
diff --git a/jena-shacl/testing/std/core/node/and-002.ttl
b/jena-shacl/src/test/resources/std/core/node/and-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/and-002.ttl
rename to jena-shacl/src/test/resources/std/core/node/and-002.ttl
diff --git a/jena-shacl/testing/std/core/node/class-001.ttl
b/jena-shacl/src/test/resources/std/core/node/class-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/class-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/class-001.ttl
diff --git a/jena-shacl/testing/std/core/node/class-002.ttl
b/jena-shacl/src/test/resources/std/core/node/class-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/class-002.ttl
rename to jena-shacl/src/test/resources/std/core/node/class-002.ttl
diff --git a/jena-shacl/testing/std/core/node/class-003.ttl
b/jena-shacl/src/test/resources/std/core/node/class-003.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/class-003.ttl
rename to jena-shacl/src/test/resources/std/core/node/class-003.ttl
diff --git a/jena-shacl/testing/std/core/node/closed-001.ttl
b/jena-shacl/src/test/resources/std/core/node/closed-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/closed-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/closed-001.ttl
diff --git a/jena-shacl/testing/std/core/node/closed-002.ttl
b/jena-shacl/src/test/resources/std/core/node/closed-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/closed-002.ttl
rename to jena-shacl/src/test/resources/std/core/node/closed-002.ttl
diff --git a/jena-shacl/testing/std/core/node/datatype-001.ttl
b/jena-shacl/src/test/resources/std/core/node/datatype-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/datatype-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/datatype-001.ttl
diff --git a/jena-shacl/testing/std/core/node/datatype-002.ttl
b/jena-shacl/src/test/resources/std/core/node/datatype-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/datatype-002.ttl
rename to jena-shacl/src/test/resources/std/core/node/datatype-002.ttl
diff --git a/jena-shacl/testing/std/core/node/disjoint-001.ttl
b/jena-shacl/src/test/resources/std/core/node/disjoint-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/disjoint-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/disjoint-001.ttl
diff --git a/jena-shacl/testing/std/core/node/equals-001.ttl
b/jena-shacl/src/test/resources/std/core/node/equals-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/equals-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/equals-001.ttl
diff --git a/jena-shacl/testing/std/core/node/hasValue-001.ttl
b/jena-shacl/src/test/resources/std/core/node/hasValue-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/hasValue-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/hasValue-001.ttl
diff --git a/jena-shacl/testing/std/core/node/in-001.ttl
b/jena-shacl/src/test/resources/std/core/node/in-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/in-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/in-001.ttl
diff --git a/jena-shacl/testing/std/core/node/languageIn-001.ttl
b/jena-shacl/src/test/resources/std/core/node/languageIn-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/languageIn-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/languageIn-001.ttl
diff --git a/jena-shacl/testing/std/core/node/manifest.ttl
b/jena-shacl/src/test/resources/std/core/node/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/manifest.ttl
rename to jena-shacl/src/test/resources/std/core/node/manifest.ttl
diff --git a/jena-shacl/testing/std/core/node/maxExclusive-001.ttl
b/jena-shacl/src/test/resources/std/core/node/maxExclusive-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/maxExclusive-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/maxExclusive-001.ttl
diff --git a/jena-shacl/testing/std/core/node/maxInclusive-001.ttl
b/jena-shacl/src/test/resources/std/core/node/maxInclusive-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/maxInclusive-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/maxInclusive-001.ttl
diff --git a/jena-shacl/testing/std/core/node/maxLength-001.ttl
b/jena-shacl/src/test/resources/std/core/node/maxLength-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/maxLength-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/maxLength-001.ttl
diff --git a/jena-shacl/testing/std/core/node/minExclusive-001.ttl
b/jena-shacl/src/test/resources/std/core/node/minExclusive-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/minExclusive-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/minExclusive-001.ttl
diff --git a/jena-shacl/testing/std/core/node/minInclusive-001.ttl
b/jena-shacl/src/test/resources/std/core/node/minInclusive-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/minInclusive-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/minInclusive-001.ttl
diff --git a/jena-shacl/testing/std/core/node/minInclusive-002.ttl
b/jena-shacl/src/test/resources/std/core/node/minInclusive-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/minInclusive-002.ttl
rename to jena-shacl/src/test/resources/std/core/node/minInclusive-002.ttl
diff --git a/jena-shacl/testing/std/core/node/minInclusive-003.ttl
b/jena-shacl/src/test/resources/std/core/node/minInclusive-003.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/minInclusive-003.ttl
rename to jena-shacl/src/test/resources/std/core/node/minInclusive-003.ttl
diff --git a/jena-shacl/testing/std/core/node/minLength-001.ttl
b/jena-shacl/src/test/resources/std/core/node/minLength-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/minLength-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/minLength-001.ttl
diff --git a/jena-shacl/testing/std/core/node/node-001.ttl
b/jena-shacl/src/test/resources/std/core/node/node-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/node-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/node-001.ttl
diff --git a/jena-shacl/testing/std/core/node/nodeKind-001.ttl
b/jena-shacl/src/test/resources/std/core/node/nodeKind-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/nodeKind-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/nodeKind-001.ttl
diff --git a/jena-shacl/testing/std/core/node/not-001.ttl
b/jena-shacl/src/test/resources/std/core/node/not-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/not-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/not-001.ttl
diff --git a/jena-shacl/testing/std/core/node/not-002.ttl
b/jena-shacl/src/test/resources/std/core/node/not-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/not-002.ttl
rename to jena-shacl/src/test/resources/std/core/node/not-002.ttl
diff --git a/jena-shacl/testing/std/core/node/or-001.ttl
b/jena-shacl/src/test/resources/std/core/node/or-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/or-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/or-001.ttl
diff --git a/jena-shacl/testing/std/core/node/pattern-001.ttl
b/jena-shacl/src/test/resources/std/core/node/pattern-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/pattern-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/pattern-001.ttl
diff --git a/jena-shacl/testing/std/core/node/pattern-002.ttl
b/jena-shacl/src/test/resources/std/core/node/pattern-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/pattern-002.ttl
rename to jena-shacl/src/test/resources/std/core/node/pattern-002.ttl
diff --git a/jena-shacl/testing/std/core/node/qualified-001-data.ttl
b/jena-shacl/src/test/resources/std/core/node/qualified-001-data.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/qualified-001-data.ttl
rename to jena-shacl/src/test/resources/std/core/node/qualified-001-data.ttl
diff --git a/jena-shacl/testing/std/core/node/qualified-001-shapes.ttl
b/jena-shacl/src/test/resources/std/core/node/qualified-001-shapes.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/qualified-001-shapes.ttl
rename to jena-shacl/src/test/resources/std/core/node/qualified-001-shapes.ttl
diff --git a/jena-shacl/testing/std/core/node/qualified-001.ttl
b/jena-shacl/src/test/resources/std/core/node/qualified-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/qualified-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/qualified-001.ttl
diff --git a/jena-shacl/testing/std/core/node/xone-001.ttl
b/jena-shacl/src/test/resources/std/core/node/xone-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/xone-001.ttl
rename to jena-shacl/src/test/resources/std/core/node/xone-001.ttl
diff --git a/jena-shacl/testing/std/core/node/xone-duplicate-data.ttl
b/jena-shacl/src/test/resources/std/core/node/xone-duplicate-data.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/xone-duplicate-data.ttl
rename to jena-shacl/src/test/resources/std/core/node/xone-duplicate-data.ttl
diff --git a/jena-shacl/testing/std/core/node/xone-duplicate-shapes.ttl
b/jena-shacl/src/test/resources/std/core/node/xone-duplicate-shapes.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/xone-duplicate-shapes.ttl
rename to jena-shacl/src/test/resources/std/core/node/xone-duplicate-shapes.ttl
diff --git a/jena-shacl/testing/std/core/node/xone-duplicate.ttl
b/jena-shacl/src/test/resources/std/core/node/xone-duplicate.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/node/xone-duplicate.ttl
rename to jena-shacl/src/test/resources/std/core/node/xone-duplicate.ttl
diff --git a/jena-shacl/testing/std/core/path/manifest.ttl
b/jena-shacl/src/test/resources/std/core/path/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/manifest.ttl
rename to jena-shacl/src/test/resources/std/core/path/manifest.ttl
diff --git a/jena-shacl/testing/std/core/path/path-alternative-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-alternative-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-alternative-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-alternative-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-complex-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-complex-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-complex-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-complex-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-complex-002-data.ttl
b/jena-shacl/src/test/resources/std/core/path/path-complex-002-data.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-complex-002-data.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-complex-002-data.ttl
diff --git a/jena-shacl/testing/std/core/path/path-complex-002-shapes.ttl
b/jena-shacl/src/test/resources/std/core/path/path-complex-002-shapes.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-complex-002-shapes.ttl
rename to
jena-shacl/src/test/resources/std/core/path/path-complex-002-shapes.ttl
diff --git a/jena-shacl/testing/std/core/path/path-complex-002.ttl
b/jena-shacl/src/test/resources/std/core/path/path-complex-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-complex-002.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-complex-002.ttl
diff --git a/jena-shacl/testing/std/core/path/path-inverse-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-inverse-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-inverse-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-inverse-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-oneOrMore-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-oneOrMore-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-oneOrMore-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-oneOrMore-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-sequence-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-sequence-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-sequence-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-sequence-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-sequence-002.ttl
b/jena-shacl/src/test/resources/std/core/path/path-sequence-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-sequence-002.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-sequence-002.ttl
diff --git a/jena-shacl/testing/std/core/path/path-sequence-duplicate-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-sequence-duplicate-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-sequence-duplicate-001.ttl
rename to
jena-shacl/src/test/resources/std/core/path/path-sequence-duplicate-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-strange-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-strange-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-strange-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-strange-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-strange-002.ttl
b/jena-shacl/src/test/resources/std/core/path/path-strange-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-strange-002.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-strange-002.ttl
diff --git a/jena-shacl/testing/std/core/path/path-unused-001-data.ttl
b/jena-shacl/src/test/resources/std/core/path/path-unused-001-data.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-unused-001-data.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-unused-001-data.ttl
diff --git a/jena-shacl/testing/std/core/path/path-unused-001-shapes.ttl
b/jena-shacl/src/test/resources/std/core/path/path-unused-001-shapes.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-unused-001-shapes.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-unused-001-shapes.ttl
diff --git a/jena-shacl/testing/std/core/path/path-unused-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-unused-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-unused-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-unused-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-zeroOrMore-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-zeroOrMore-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-zeroOrMore-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-zeroOrMore-001.ttl
diff --git a/jena-shacl/testing/std/core/path/path-zeroOrOne-001.ttl
b/jena-shacl/src/test/resources/std/core/path/path-zeroOrOne-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/path/path-zeroOrOne-001.ttl
rename to jena-shacl/src/test/resources/std/core/path/path-zeroOrOne-001.ttl
diff --git a/jena-shacl/testing/std/core/property/and-001.ttl
b/jena-shacl/src/test/resources/std/core/property/and-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/and-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/and-001.ttl
diff --git a/jena-shacl/testing/std/core/property/class-001.ttl
b/jena-shacl/src/test/resources/std/core/property/class-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/class-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/class-001.ttl
diff --git a/jena-shacl/testing/std/core/property/datatype-001.ttl
b/jena-shacl/src/test/resources/std/core/property/datatype-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/datatype-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/datatype-001.ttl
diff --git a/jena-shacl/testing/std/core/property/datatype-002.ttl
b/jena-shacl/src/test/resources/std/core/property/datatype-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/datatype-002.ttl
rename to jena-shacl/src/test/resources/std/core/property/datatype-002.ttl
diff --git a/jena-shacl/testing/std/core/property/datatype-003.ttl
b/jena-shacl/src/test/resources/std/core/property/datatype-003.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/datatype-003.ttl
rename to jena-shacl/src/test/resources/std/core/property/datatype-003.ttl
diff --git a/jena-shacl/testing/std/core/property/datatype-ill-formed-data.ttl
b/jena-shacl/src/test/resources/std/core/property/datatype-ill-formed-data.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/datatype-ill-formed-data.ttl
rename to
jena-shacl/src/test/resources/std/core/property/datatype-ill-formed-data.ttl
diff --git
a/jena-shacl/testing/std/core/property/datatype-ill-formed-shapes.ttl
b/jena-shacl/src/test/resources/std/core/property/datatype-ill-formed-shapes.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/datatype-ill-formed-shapes.ttl
rename to
jena-shacl/src/test/resources/std/core/property/datatype-ill-formed-shapes.ttl
diff --git a/jena-shacl/testing/std/core/property/datatype-ill-formed.ttl
b/jena-shacl/src/test/resources/std/core/property/datatype-ill-formed.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/datatype-ill-formed.ttl
rename to
jena-shacl/src/test/resources/std/core/property/datatype-ill-formed.ttl
diff --git a/jena-shacl/testing/std/core/property/disjoint-001.ttl
b/jena-shacl/src/test/resources/std/core/property/disjoint-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/disjoint-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/disjoint-001.ttl
diff --git a/jena-shacl/testing/std/core/property/equals-001.ttl
b/jena-shacl/src/test/resources/std/core/property/equals-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/equals-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/equals-001.ttl
diff --git a/jena-shacl/testing/std/core/property/hasValue-001.ttl
b/jena-shacl/src/test/resources/std/core/property/hasValue-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/hasValue-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/hasValue-001.ttl
diff --git a/jena-shacl/testing/std/core/property/in-001.ttl
b/jena-shacl/src/test/resources/std/core/property/in-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/in-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/in-001.ttl
diff --git a/jena-shacl/testing/std/core/property/languageIn-001.ttl
b/jena-shacl/src/test/resources/std/core/property/languageIn-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/languageIn-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/languageIn-001.ttl
diff --git a/jena-shacl/testing/std/core/property/lessThan-001.ttl
b/jena-shacl/src/test/resources/std/core/property/lessThan-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/lessThan-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/lessThan-001.ttl
diff --git a/jena-shacl/testing/std/core/property/lessThan-002.ttl
b/jena-shacl/src/test/resources/std/core/property/lessThan-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/lessThan-002.ttl
rename to jena-shacl/src/test/resources/std/core/property/lessThan-002.ttl
diff --git a/jena-shacl/testing/std/core/property/lessThanOrEquals-001.ttl
b/jena-shacl/src/test/resources/std/core/property/lessThanOrEquals-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/lessThanOrEquals-001.ttl
rename to
jena-shacl/src/test/resources/std/core/property/lessThanOrEquals-001.ttl
diff --git a/jena-shacl/testing/std/core/property/manifest.ttl
b/jena-shacl/src/test/resources/std/core/property/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/manifest.ttl
rename to jena-shacl/src/test/resources/std/core/property/manifest.ttl
diff --git a/jena-shacl/testing/std/core/property/maxCount-001.ttl
b/jena-shacl/src/test/resources/std/core/property/maxCount-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/maxCount-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/maxCount-001.ttl
diff --git a/jena-shacl/testing/std/core/property/maxCount-002.ttl
b/jena-shacl/src/test/resources/std/core/property/maxCount-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/maxCount-002.ttl
rename to jena-shacl/src/test/resources/std/core/property/maxCount-002.ttl
diff --git a/jena-shacl/testing/std/core/property/maxExclusive-001.ttl
b/jena-shacl/src/test/resources/std/core/property/maxExclusive-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/maxExclusive-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/maxExclusive-001.ttl
diff --git a/jena-shacl/testing/std/core/property/maxInclusive-001.ttl
b/jena-shacl/src/test/resources/std/core/property/maxInclusive-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/maxInclusive-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/maxInclusive-001.ttl
diff --git a/jena-shacl/testing/std/core/property/maxLength-001.ttl
b/jena-shacl/src/test/resources/std/core/property/maxLength-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/maxLength-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/maxLength-001.ttl
diff --git a/jena-shacl/testing/std/core/property/minCount-001.ttl
b/jena-shacl/src/test/resources/std/core/property/minCount-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/minCount-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/minCount-001.ttl
diff --git a/jena-shacl/testing/std/core/property/minCount-002.ttl
b/jena-shacl/src/test/resources/std/core/property/minCount-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/minCount-002.ttl
rename to jena-shacl/src/test/resources/std/core/property/minCount-002.ttl
diff --git a/jena-shacl/testing/std/core/property/minExclusive-001.ttl
b/jena-shacl/src/test/resources/std/core/property/minExclusive-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/minExclusive-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/minExclusive-001.ttl
diff --git a/jena-shacl/testing/std/core/property/minExclusive-002.ttl
b/jena-shacl/src/test/resources/std/core/property/minExclusive-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/minExclusive-002.ttl
rename to jena-shacl/src/test/resources/std/core/property/minExclusive-002.ttl
diff --git a/jena-shacl/testing/std/core/property/minLength-001.ttl
b/jena-shacl/src/test/resources/std/core/property/minLength-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/minLength-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/minLength-001.ttl
diff --git a/jena-shacl/testing/std/core/property/node-001.ttl
b/jena-shacl/src/test/resources/std/core/property/node-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/node-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/node-001.ttl
diff --git a/jena-shacl/testing/std/core/property/node-002.ttl
b/jena-shacl/src/test/resources/std/core/property/node-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/node-002.ttl
rename to jena-shacl/src/test/resources/std/core/property/node-002.ttl
diff --git a/jena-shacl/testing/std/core/property/nodeKind-001.ttl
b/jena-shacl/src/test/resources/std/core/property/nodeKind-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/nodeKind-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/nodeKind-001.ttl
diff --git a/jena-shacl/testing/std/core/property/not-001.ttl
b/jena-shacl/src/test/resources/std/core/property/not-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/not-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/not-001.ttl
diff --git a/jena-shacl/testing/std/core/property/or-001.ttl
b/jena-shacl/src/test/resources/std/core/property/or-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/or-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/or-001.ttl
diff --git a/jena-shacl/testing/std/core/property/or-datatypes-001.ttl
b/jena-shacl/src/test/resources/std/core/property/or-datatypes-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/or-datatypes-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/or-datatypes-001.ttl
diff --git a/jena-shacl/testing/std/core/property/pattern-001.ttl
b/jena-shacl/src/test/resources/std/core/property/pattern-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/pattern-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/pattern-001.ttl
diff --git a/jena-shacl/testing/std/core/property/pattern-002.ttl
b/jena-shacl/src/test/resources/std/core/property/pattern-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/pattern-002.ttl
rename to jena-shacl/src/test/resources/std/core/property/pattern-002.ttl
diff --git a/jena-shacl/testing/std/core/property/property-001.ttl
b/jena-shacl/src/test/resources/std/core/property/property-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/property-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/property-001.ttl
diff --git
a/jena-shacl/testing/std/core/property/qualifiedMinCountDisjoint-001.ttl
b/jena-shacl/src/test/resources/std/core/property/qualifiedMinCountDisjoint-001.ttl
similarity index 100%
rename from
jena-shacl/testing/std/core/property/qualifiedMinCountDisjoint-001.ttl
rename to
jena-shacl/src/test/resources/std/core/property/qualifiedMinCountDisjoint-001.ttl
diff --git a/jena-shacl/testing/std/core/property/qualifiedValueShape-001.ttl
b/jena-shacl/src/test/resources/std/core/property/qualifiedValueShape-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/qualifiedValueShape-001.ttl
rename to
jena-shacl/src/test/resources/std/core/property/qualifiedValueShape-001.ttl
diff --git
a/jena-shacl/testing/std/core/property/qualifiedValueShapesDisjoint-001.ttl
b/jena-shacl/src/test/resources/std/core/property/qualifiedValueShapesDisjoint-001.ttl
similarity index 100%
rename from
jena-shacl/testing/std/core/property/qualifiedValueShapesDisjoint-001.ttl
rename to
jena-shacl/src/test/resources/std/core/property/qualifiedValueShapesDisjoint-001.ttl
diff --git a/jena-shacl/testing/std/core/property/uniqueLang-001.ttl
b/jena-shacl/src/test/resources/std/core/property/uniqueLang-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/uniqueLang-001.ttl
rename to jena-shacl/src/test/resources/std/core/property/uniqueLang-001.ttl
diff --git a/jena-shacl/testing/std/core/property/uniqueLang-002-data.ttl
b/jena-shacl/src/test/resources/std/core/property/uniqueLang-002-data.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/uniqueLang-002-data.ttl
rename to
jena-shacl/src/test/resources/std/core/property/uniqueLang-002-data.ttl
diff --git a/jena-shacl/testing/std/core/property/uniqueLang-002-shapes.ttl
b/jena-shacl/src/test/resources/std/core/property/uniqueLang-002-shapes.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/uniqueLang-002-shapes.ttl
rename to
jena-shacl/src/test/resources/std/core/property/uniqueLang-002-shapes.ttl
diff --git a/jena-shacl/testing/std/core/property/uniqueLang-002.ttl
b/jena-shacl/src/test/resources/std/core/property/uniqueLang-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/property/uniqueLang-002.ttl
rename to jena-shacl/src/test/resources/std/core/property/uniqueLang-002.ttl
diff --git a/jena-shacl/testing/std/core/targets/manifest.ttl
b/jena-shacl/src/test/resources/std/core/targets/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/targets/manifest.ttl
rename to jena-shacl/src/test/resources/std/core/targets/manifest.ttl
diff --git a/jena-shacl/testing/std/core/targets/multipleTargets-001.ttl
b/jena-shacl/src/test/resources/std/core/targets/multipleTargets-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/targets/multipleTargets-001.ttl
rename to jena-shacl/src/test/resources/std/core/targets/multipleTargets-001.ttl
diff --git a/jena-shacl/testing/std/core/targets/targetClass-001.ttl
b/jena-shacl/src/test/resources/std/core/targets/targetClass-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/targets/targetClass-001.ttl
rename to jena-shacl/src/test/resources/std/core/targets/targetClass-001.ttl
diff --git a/jena-shacl/testing/std/core/targets/targetClassImplicit-001.ttl
b/jena-shacl/src/test/resources/std/core/targets/targetClassImplicit-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/targets/targetClassImplicit-001.ttl
rename to
jena-shacl/src/test/resources/std/core/targets/targetClassImplicit-001.ttl
diff --git a/jena-shacl/testing/std/core/targets/targetNode-001.ttl
b/jena-shacl/src/test/resources/std/core/targets/targetNode-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/targets/targetNode-001.ttl
rename to jena-shacl/src/test/resources/std/core/targets/targetNode-001.ttl
diff --git a/jena-shacl/testing/std/core/targets/targetObjectsOf-001.ttl
b/jena-shacl/src/test/resources/std/core/targets/targetObjectsOf-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/targets/targetObjectsOf-001.ttl
rename to jena-shacl/src/test/resources/std/core/targets/targetObjectsOf-001.ttl
diff --git a/jena-shacl/testing/std/core/targets/targetSubjectsOf-001.ttl
b/jena-shacl/src/test/resources/std/core/targets/targetSubjectsOf-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/targets/targetSubjectsOf-001.ttl
rename to
jena-shacl/src/test/resources/std/core/targets/targetSubjectsOf-001.ttl
diff --git a/jena-shacl/testing/std/core/targets/targetSubjectsOf-002.ttl
b/jena-shacl/src/test/resources/std/core/targets/targetSubjectsOf-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/targets/targetSubjectsOf-002.ttl
rename to
jena-shacl/src/test/resources/std/core/targets/targetSubjectsOf-002.ttl
diff --git a/jena-shacl/testing/std/core/validation-reports/manifest.ttl
b/jena-shacl/src/test/resources/std/core/validation-reports/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/validation-reports/manifest.ttl
rename to jena-shacl/src/test/resources/std/core/validation-reports/manifest.ttl
diff --git a/jena-shacl/testing/std/core/validation-reports/shared-data.ttl
b/jena-shacl/src/test/resources/std/core/validation-reports/shared-data.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/validation-reports/shared-data.ttl
rename to
jena-shacl/src/test/resources/std/core/validation-reports/shared-data.ttl
diff --git a/jena-shacl/testing/std/core/validation-reports/shared-shapes.ttl
b/jena-shacl/src/test/resources/std/core/validation-reports/shared-shapes.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/validation-reports/shared-shapes.ttl
rename to
jena-shacl/src/test/resources/std/core/validation-reports/shared-shapes.ttl
diff --git a/jena-shacl/testing/std/core/validation-reports/shared.ttl
b/jena-shacl/src/test/resources/std/core/validation-reports/shared.ttl
similarity index 100%
rename from jena-shacl/testing/std/core/validation-reports/shared.ttl
rename to jena-shacl/src/test/resources/std/core/validation-reports/shared.ttl
diff --git a/jena-shacl/testing/std/manifest.ttl
b/jena-shacl/src/test/resources/std/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/manifest.ttl
rename to jena-shacl/src/test/resources/std/manifest.ttl
diff --git a/jena-shacl/testing/std/sparql/component/manifest.ttl
b/jena-shacl/src/test/resources/std/sparql/component/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/component/manifest.ttl
rename to jena-shacl/src/test/resources/std/sparql/component/manifest.ttl
diff --git a/jena-shacl/testing/std/sparql/component/nodeValidator-001.ttl
b/jena-shacl/src/test/resources/std/sparql/component/nodeValidator-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/component/nodeValidator-001.ttl
rename to
jena-shacl/src/test/resources/std/sparql/component/nodeValidator-001.ttl
diff --git a/jena-shacl/testing/std/sparql/component/optional-001.ttl
b/jena-shacl/src/test/resources/std/sparql/component/optional-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/component/optional-001.ttl
rename to jena-shacl/src/test/resources/std/sparql/component/optional-001.ttl
diff --git
a/jena-shacl/testing/std/sparql/component/propertyValidator-select-001.ttl
b/jena-shacl/src/test/resources/std/sparql/component/propertyValidator-select-001.ttl
similarity index 100%
rename from
jena-shacl/testing/std/sparql/component/propertyValidator-select-001.ttl
rename to
jena-shacl/src/test/resources/std/sparql/component/propertyValidator-select-001.ttl
diff --git a/jena-shacl/testing/std/sparql/component/validator-001.ttl
b/jena-shacl/src/test/resources/std/sparql/component/validator-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/component/validator-001.ttl
rename to jena-shacl/src/test/resources/std/sparql/component/validator-001.ttl
diff --git a/jena-shacl/testing/std/sparql/manifest.ttl
b/jena-shacl/src/test/resources/std/sparql/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/manifest.ttl
rename to jena-shacl/src/test/resources/std/sparql/manifest.ttl
diff --git a/jena-shacl/testing/std/sparql/node/manifest.ttl
b/jena-shacl/src/test/resources/std/sparql/node/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/node/manifest.ttl
rename to jena-shacl/src/test/resources/std/sparql/node/manifest.ttl
diff --git a/jena-shacl/testing/std/sparql/node/prefixes-001.ttl
b/jena-shacl/src/test/resources/std/sparql/node/prefixes-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/node/prefixes-001.ttl
rename to jena-shacl/src/test/resources/std/sparql/node/prefixes-001.ttl
diff --git a/jena-shacl/testing/std/sparql/node/sparql-001.ttl
b/jena-shacl/src/test/resources/std/sparql/node/sparql-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/node/sparql-001.ttl
rename to jena-shacl/src/test/resources/std/sparql/node/sparql-001.ttl
diff --git a/jena-shacl/testing/std/sparql/node/sparql-002.ttl
b/jena-shacl/src/test/resources/std/sparql/node/sparql-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/node/sparql-002.ttl
rename to jena-shacl/src/test/resources/std/sparql/node/sparql-002.ttl
diff --git a/jena-shacl/testing/std/sparql/node/sparql-003.ttl
b/jena-shacl/src/test/resources/std/sparql/node/sparql-003.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/node/sparql-003.ttl
rename to jena-shacl/src/test/resources/std/sparql/node/sparql-003.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/manifest.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/manifest.ttl
rename to jena-shacl/src/test/resources/std/sparql/pre-binding/manifest.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/manifest.ttl-orig
b/jena-shacl/src/test/resources/std/sparql/pre-binding/manifest.ttl-orig
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/manifest.ttl-orig
rename to jena-shacl/src/test/resources/std/sparql/pre-binding/manifest.ttl-orig
diff --git a/jena-shacl/testing/std/sparql/pre-binding/pre-binding-001.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/pre-binding-001.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-001.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/pre-binding-002.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/pre-binding-002.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-002.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/pre-binding-003.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-003.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/pre-binding-003.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-003.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/pre-binding-004.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-004.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/pre-binding-004.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-004.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/pre-binding-005.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-005.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/pre-binding-005.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-005.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/pre-binding-006.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-006.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/pre-binding-006.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-006.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/pre-binding-007.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-007.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/pre-binding-007.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/pre-binding-007.ttl
diff --git a/jena-shacl/testing/std/sparql/pre-binding/shapesGraph-001.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/shapesGraph-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/shapesGraph-001.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/shapesGraph-001.ttl
diff --git
a/jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-001.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-001.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-001.ttl
diff --git
a/jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-002.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-002.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-002.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-002.ttl
diff --git
a/jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-003.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-003.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-003.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-003.ttl
diff --git
a/jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-004.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-004.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-004.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-004.ttl
diff --git
a/jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-005.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-005.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-005.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-005.ttl
diff --git
a/jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-006.ttl
b/jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-006.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/pre-binding/unsupported-sparql-006.ttl
rename to
jena-shacl/src/test/resources/std/sparql/pre-binding/unsupported-sparql-006.ttl
diff --git a/jena-shacl/testing/std/sparql/property/manifest.ttl
b/jena-shacl/src/test/resources/std/sparql/property/manifest.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/property/manifest.ttl
rename to jena-shacl/src/test/resources/std/sparql/property/manifest.ttl
diff --git a/jena-shacl/testing/std/sparql/property/sparql-001.ttl
b/jena-shacl/src/test/resources/std/sparql/property/sparql-001.ttl
similarity index 100%
rename from jena-shacl/testing/std/sparql/property/sparql-001.ttl
rename to jena-shacl/src/test/resources/std/sparql/property/sparql-001.ttl
diff --git a/jena-shacl/testing/validation-reports/report1-conforms.ttl
b/jena-shacl/src/test/resources/validation-reports/report1-conforms.ttl
similarity index 100%
rename from jena-shacl/testing/validation-reports/report1-conforms.ttl
rename to jena-shacl/src/test/resources/validation-reports/report1-conforms.ttl
diff --git a/jena-shacl/testing/validation-reports/report2.ttl
b/jena-shacl/src/test/resources/validation-reports/report2.ttl
similarity index 100%
rename from jena-shacl/testing/validation-reports/report2.ttl
rename to jena-shacl/src/test/resources/validation-reports/report2.ttl
