commit | 5a1218d5bf569ffe0ddf67f80c4ce795799eee7e | [log] [tgz] |
---|---|---|
author | Andy Seaborne <andy@apache.org> | Thu Jul 09 12:29:45 2020 +0100 |
committer | Andy Seaborne <andy@apache.org> | Thu Jul 09 12:30:05 2020 +0100 |
tree | 60edd09673f65fc1ef62ae2eb8da2449b111f1a1 | |
parent | 20918a6bea39b1cbe56c1ca3c5781e1368884f92 [diff] |
Move SHACLC reader tests so that they get packed properly in a release
diff --git a/jena-shacl/src/test/java/org/apache/jena/shacl/compact/TestShaclCompact.java b/jena-shacl/src/test/java/org/apache/jena/shacl/compact/TestShaclCompact.java index 9bfc3a1..62098c6 100644 --- a/jena-shacl/src/test/java/org/apache/jena/shacl/compact/TestShaclCompact.java +++ b/jena-shacl/src/test/java/org/apache/jena/shacl/compact/TestShaclCompact.java
@@ -63,7 +63,7 @@ @Test public void property_or_3() { testv("property-or-3"); } @Test public void shapeRef() { testv("shapeRef"); } - private final String DIR = "testing/shaclc-valid/"; + private final String DIR = "src/test/resources/shaclc-valid/"; private final String BASE ="urn:x-base:default"; private void testv(String string) {
diff --git a/jena-shacl/testing/shaclc-valid/array-in.shaclc b/jena-shacl/src/test/resources/shaclc-valid/array-in.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/array-in.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/array-in.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/array-in.ttl b/jena-shacl/src/test/resources/shaclc-valid/array-in.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/array-in.ttl rename to jena-shacl/src/test/resources/shaclc-valid/array-in.ttl
diff --git a/jena-shacl/testing/shaclc-valid/basic-shape-iri.shaclc b/jena-shacl/src/test/resources/shaclc-valid/basic-shape-iri.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/basic-shape-iri.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/basic-shape-iri.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/basic-shape-iri.ttl b/jena-shacl/src/test/resources/shaclc-valid/basic-shape-iri.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/basic-shape-iri.ttl rename to jena-shacl/src/test/resources/shaclc-valid/basic-shape-iri.ttl
diff --git a/jena-shacl/testing/shaclc-valid/basic-shape-with-target.shaclc b/jena-shacl/src/test/resources/shaclc-valid/basic-shape-with-target.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/basic-shape-with-target.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/basic-shape-with-target.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/basic-shape-with-target.ttl b/jena-shacl/src/test/resources/shaclc-valid/basic-shape-with-target.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/basic-shape-with-target.ttl rename to jena-shacl/src/test/resources/shaclc-valid/basic-shape-with-target.ttl
diff --git a/jena-shacl/testing/shaclc-valid/basic-shape-with-targets.shaclc b/jena-shacl/src/test/resources/shaclc-valid/basic-shape-with-targets.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/basic-shape-with-targets.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/basic-shape-with-targets.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/basic-shape-with-targets.ttl b/jena-shacl/src/test/resources/shaclc-valid/basic-shape-with-targets.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/basic-shape-with-targets.ttl rename to jena-shacl/src/test/resources/shaclc-valid/basic-shape-with-targets.ttl
diff --git a/jena-shacl/testing/shaclc-valid/basic-shape.shaclc b/jena-shacl/src/test/resources/shaclc-valid/basic-shape.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/basic-shape.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/basic-shape.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/basic-shape.ttl b/jena-shacl/src/test/resources/shaclc-valid/basic-shape.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/basic-shape.ttl rename to jena-shacl/src/test/resources/shaclc-valid/basic-shape.ttl
diff --git a/jena-shacl/testing/shaclc-valid/class.shaclc b/jena-shacl/src/test/resources/shaclc-valid/class.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/class.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/class.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/class.ttl b/jena-shacl/src/test/resources/shaclc-valid/class.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/class.ttl rename to jena-shacl/src/test/resources/shaclc-valid/class.ttl
diff --git a/jena-shacl/testing/shaclc-valid/comment.shaclc b/jena-shacl/src/test/resources/shaclc-valid/comment.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/comment.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/comment.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/comment.ttl b/jena-shacl/src/test/resources/shaclc-valid/comment.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/comment.ttl rename to jena-shacl/src/test/resources/shaclc-valid/comment.ttl
diff --git a/jena-shacl/testing/shaclc-valid/complex1.shaclc b/jena-shacl/src/test/resources/shaclc-valid/complex1.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/complex1.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/complex1.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/complex1.ttl b/jena-shacl/src/test/resources/shaclc-valid/complex1.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/complex1.ttl rename to jena-shacl/src/test/resources/shaclc-valid/complex1.ttl
diff --git a/jena-shacl/testing/shaclc-valid/complex2.shaclc b/jena-shacl/src/test/resources/shaclc-valid/complex2.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/complex2.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/complex2.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/complex2.ttl b/jena-shacl/src/test/resources/shaclc-valid/complex2.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/complex2.ttl rename to jena-shacl/src/test/resources/shaclc-valid/complex2.ttl
diff --git a/jena-shacl/testing/shaclc-valid/count-0-1.shaclc b/jena-shacl/src/test/resources/shaclc-valid/count-0-1.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/count-0-1.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/count-0-1.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/count-0-1.ttl b/jena-shacl/src/test/resources/shaclc-valid/count-0-1.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/count-0-1.ttl rename to jena-shacl/src/test/resources/shaclc-valid/count-0-1.ttl
diff --git a/jena-shacl/testing/shaclc-valid/count-0-unlimited.shaclc b/jena-shacl/src/test/resources/shaclc-valid/count-0-unlimited.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/count-0-unlimited.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/count-0-unlimited.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/count-0-unlimited.ttl b/jena-shacl/src/test/resources/shaclc-valid/count-0-unlimited.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/count-0-unlimited.ttl rename to jena-shacl/src/test/resources/shaclc-valid/count-0-unlimited.ttl
diff --git a/jena-shacl/testing/shaclc-valid/count-1-2.shaclc b/jena-shacl/src/test/resources/shaclc-valid/count-1-2.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/count-1-2.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/count-1-2.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/count-1-2.ttl b/jena-shacl/src/test/resources/shaclc-valid/count-1-2.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/count-1-2.ttl rename to jena-shacl/src/test/resources/shaclc-valid/count-1-2.ttl
diff --git a/jena-shacl/testing/shaclc-valid/count-1-unlimited.shaclc b/jena-shacl/src/test/resources/shaclc-valid/count-1-unlimited.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/count-1-unlimited.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/count-1-unlimited.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/count-1-unlimited.ttl b/jena-shacl/src/test/resources/shaclc-valid/count-1-unlimited.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/count-1-unlimited.ttl rename to jena-shacl/src/test/resources/shaclc-valid/count-1-unlimited.ttl
diff --git a/jena-shacl/testing/shaclc-valid/datatype.shaclc b/jena-shacl/src/test/resources/shaclc-valid/datatype.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/datatype.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/datatype.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/datatype.ttl b/jena-shacl/src/test/resources/shaclc-valid/datatype.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/datatype.ttl rename to jena-shacl/src/test/resources/shaclc-valid/datatype.ttl
diff --git a/jena-shacl/testing/shaclc-valid/directives.shaclc b/jena-shacl/src/test/resources/shaclc-valid/directives.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/directives.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/directives.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/directives.ttl b/jena-shacl/src/test/resources/shaclc-valid/directives.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/directives.ttl rename to jena-shacl/src/test/resources/shaclc-valid/directives.ttl
diff --git a/jena-shacl/testing/shaclc-valid/empty.shaclc b/jena-shacl/src/test/resources/shaclc-valid/empty.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/empty.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/empty.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/empty.ttl b/jena-shacl/src/test/resources/shaclc-valid/empty.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/empty.ttl rename to jena-shacl/src/test/resources/shaclc-valid/empty.ttl
diff --git a/jena-shacl/testing/shaclc-valid/nestedShape.shaclc b/jena-shacl/src/test/resources/shaclc-valid/nestedShape.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/nestedShape.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/nestedShape.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/nestedShape.ttl b/jena-shacl/src/test/resources/shaclc-valid/nestedShape.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/nestedShape.ttl rename to jena-shacl/src/test/resources/shaclc-valid/nestedShape.ttl
diff --git a/jena-shacl/testing/shaclc-valid/node-or-2.shaclc b/jena-shacl/src/test/resources/shaclc-valid/node-or-2.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/node-or-2.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/node-or-2.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/node-or-2.ttl b/jena-shacl/src/test/resources/shaclc-valid/node-or-2.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/node-or-2.ttl rename to jena-shacl/src/test/resources/shaclc-valid/node-or-2.ttl
diff --git a/jena-shacl/testing/shaclc-valid/node-or-3-not.shaclc b/jena-shacl/src/test/resources/shaclc-valid/node-or-3-not.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/node-or-3-not.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/node-or-3-not.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/node-or-3-not.ttl b/jena-shacl/src/test/resources/shaclc-valid/node-or-3-not.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/node-or-3-not.ttl rename to jena-shacl/src/test/resources/shaclc-valid/node-or-3-not.ttl
diff --git a/jena-shacl/testing/shaclc-valid/nodeKind.shaclc b/jena-shacl/src/test/resources/shaclc-valid/nodeKind.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/nodeKind.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/nodeKind.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/nodeKind.ttl b/jena-shacl/src/test/resources/shaclc-valid/nodeKind.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/nodeKind.ttl rename to jena-shacl/src/test/resources/shaclc-valid/nodeKind.ttl
diff --git a/jena-shacl/testing/shaclc-valid/path-alternative.shaclc b/jena-shacl/src/test/resources/shaclc-valid/path-alternative.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-alternative.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/path-alternative.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/path-alternative.ttl b/jena-shacl/src/test/resources/shaclc-valid/path-alternative.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-alternative.ttl rename to jena-shacl/src/test/resources/shaclc-valid/path-alternative.ttl
diff --git a/jena-shacl/testing/shaclc-valid/path-complex.shaclc b/jena-shacl/src/test/resources/shaclc-valid/path-complex.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-complex.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/path-complex.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/path-complex.ttl b/jena-shacl/src/test/resources/shaclc-valid/path-complex.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-complex.ttl rename to jena-shacl/src/test/resources/shaclc-valid/path-complex.ttl
diff --git a/jena-shacl/testing/shaclc-valid/path-inverse.shaclc b/jena-shacl/src/test/resources/shaclc-valid/path-inverse.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-inverse.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/path-inverse.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/path-inverse.ttl b/jena-shacl/src/test/resources/shaclc-valid/path-inverse.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-inverse.ttl rename to jena-shacl/src/test/resources/shaclc-valid/path-inverse.ttl
diff --git a/jena-shacl/testing/shaclc-valid/path-oneOrMore.shaclc b/jena-shacl/src/test/resources/shaclc-valid/path-oneOrMore.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-oneOrMore.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/path-oneOrMore.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/path-oneOrMore.ttl b/jena-shacl/src/test/resources/shaclc-valid/path-oneOrMore.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-oneOrMore.ttl rename to jena-shacl/src/test/resources/shaclc-valid/path-oneOrMore.ttl
diff --git a/jena-shacl/testing/shaclc-valid/path-sequence.shaclc b/jena-shacl/src/test/resources/shaclc-valid/path-sequence.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-sequence.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/path-sequence.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/path-sequence.ttl b/jena-shacl/src/test/resources/shaclc-valid/path-sequence.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-sequence.ttl rename to jena-shacl/src/test/resources/shaclc-valid/path-sequence.ttl
diff --git a/jena-shacl/testing/shaclc-valid/path-zeroOrMore.shaclc b/jena-shacl/src/test/resources/shaclc-valid/path-zeroOrMore.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-zeroOrMore.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/path-zeroOrMore.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/path-zeroOrMore.ttl b/jena-shacl/src/test/resources/shaclc-valid/path-zeroOrMore.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-zeroOrMore.ttl rename to jena-shacl/src/test/resources/shaclc-valid/path-zeroOrMore.ttl
diff --git a/jena-shacl/testing/shaclc-valid/path-zeroOrOne.shaclc b/jena-shacl/src/test/resources/shaclc-valid/path-zeroOrOne.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-zeroOrOne.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/path-zeroOrOne.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/path-zeroOrOne.ttl b/jena-shacl/src/test/resources/shaclc-valid/path-zeroOrOne.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/path-zeroOrOne.ttl rename to jena-shacl/src/test/resources/shaclc-valid/path-zeroOrOne.ttl
diff --git a/jena-shacl/testing/shaclc-valid/property-empty.shaclc b/jena-shacl/src/test/resources/shaclc-valid/property-empty.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/property-empty.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/property-empty.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/property-empty.ttl b/jena-shacl/src/test/resources/shaclc-valid/property-empty.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/property-empty.ttl rename to jena-shacl/src/test/resources/shaclc-valid/property-empty.ttl
diff --git a/jena-shacl/testing/shaclc-valid/property-not.shaclc b/jena-shacl/src/test/resources/shaclc-valid/property-not.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/property-not.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/property-not.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/property-not.ttl b/jena-shacl/src/test/resources/shaclc-valid/property-not.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/property-not.ttl rename to jena-shacl/src/test/resources/shaclc-valid/property-not.ttl
diff --git a/jena-shacl/testing/shaclc-valid/property-or-2.shaclc b/jena-shacl/src/test/resources/shaclc-valid/property-or-2.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/property-or-2.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/property-or-2.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/property-or-2.ttl b/jena-shacl/src/test/resources/shaclc-valid/property-or-2.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/property-or-2.ttl rename to jena-shacl/src/test/resources/shaclc-valid/property-or-2.ttl
diff --git a/jena-shacl/testing/shaclc-valid/property-or-3.shaclc b/jena-shacl/src/test/resources/shaclc-valid/property-or-3.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/property-or-3.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/property-or-3.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/property-or-3.ttl b/jena-shacl/src/test/resources/shaclc-valid/property-or-3.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/property-or-3.ttl rename to jena-shacl/src/test/resources/shaclc-valid/property-or-3.ttl
diff --git a/jena-shacl/testing/shaclc-valid/shapeRef.shaclc b/jena-shacl/src/test/resources/shaclc-valid/shapeRef.shaclc similarity index 100% rename from jena-shacl/testing/shaclc-valid/shapeRef.shaclc rename to jena-shacl/src/test/resources/shaclc-valid/shapeRef.shaclc
diff --git a/jena-shacl/testing/shaclc-valid/shapeRef.ttl b/jena-shacl/src/test/resources/shaclc-valid/shapeRef.ttl similarity index 100% rename from jena-shacl/testing/shaclc-valid/shapeRef.ttl rename to jena-shacl/src/test/resources/shaclc-valid/shapeRef.ttl