This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit f1918053a2314d1248a2b224682cc717fde70bc0 Author: Andy Seaborne <[email protected]> AuthorDate: Mon Mar 2 13:08:13 2026 +0000 Reorg RRX RDF 1.1 tests --- .../riot/lang/rdfxml/rrx/AbstractTestRDFXML_RRX.java | 2 +- .../rrx/{RunTestRDFXML.java => RunTestRDFXML11.java} | 9 +++++---- .../apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX.java | 16 ++++++++-------- .../jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java | 4 ++-- .../jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java | 4 ++-- .../jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java | 4 ++-- .../jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java | 4 ++-- .../jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java | 4 ++-- .../jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java | 4 ++-- jena-arq/testing/RIOT/rrx/README | 4 ---- jena-arq/testing/RIOT/{rrx-files => rrx11-files}/README | 4 ++-- .../{rrx-files => rrx11-files}/bad-object-type-1.rdf | 0 .../{rrx-files => rrx11-files}/bad-object-type-2.rdf | 0 .../{rrx-files => rrx11-files}/bad-object-type-3.rdf | 0 .../RIOT/{rrx-files => rrx11-files}/bad-rdf-id-node.rdf | 0 .../{rrx-files => rrx11-files}/bad-rdf-resource-node.rdf | 0 .../bad-unqualified-attribute1.rdf | 0 .../bad-unqualified-attribute2.rdf | 0 .../bad-unqualified-attribute3.rdf | 0 .../bad-unqualified-attribute4.rdf | 0 .../bad-unqualified-attribute5.rdf | 0 .../{rrx-files => rrx11-files}/bad-unqualified-class.rdf | 0 .../bad-unqualified-property.rdf | 0 .../{rrx-files => rrx11-files}/base-external-needed.rdf | 0 .../RIOT/{rrx-files => rrx11-files}/base-inner.rdf | 0 .../RIOT/{rrx-files => rrx11-files}/base-none.rdf | 0 .../RIOT/{rrx-files => rrx11-files}/cim_statements01.rdf | 0 .../multiple_objects_lex_node.rdf | 0 .../multiple_objects_node_lex.rdf | 0 .../multiple_objects_node_node.rdf | 0 .../RIOT/{rrx-files => rrx11-files}/nested_object.rdf | 0 .../{rrx-files => rrx11-files}/parseType-unknown.rdf | 0 .../RIOT/{rrx-files => rrx11-files}/parseType-warn.rdf | 0 jena-arq/testing/RIOT/rrx11/README | 7 +++++++ .../testing/RIOT/{rrx => rrx11}/attribute-property01.rdf | 0 .../testing/RIOT/{rrx => rrx11}/attribute-property02.rdf | 0 .../testing/RIOT/{rrx => rrx11}/attribute-property03.rdf | 0 .../testing/RIOT/{rrx => rrx11}/attribute-property04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/base01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/base02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/base03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/base04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/base05.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/base06.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/basic01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/basic02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/basic03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/basic04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/basic05.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/basic06.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/basic07.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/basic08.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/blankNodeIds01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/blankNodeIds02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/blankNodeIds03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/collections01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/collections02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/collections03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/collections04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/collections05.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/collections06.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/comments01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/comments02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/containers01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/containers02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/containers03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/containers04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/datatype01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/datatype02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/empty1.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/empty2.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/empty3.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/entities01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/entities02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/lang01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/lang02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/lang03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/lang04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/objects01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/objects02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/reification01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/reification02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/reification03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/reification04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/reification05.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/striped01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/striped02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/striped03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/striped04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/striped05.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/type01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/type02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/type03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xml.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xml10.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xml11.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xmlliteral01.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xmlliteral02.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xmlliteral03.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xmlliteral04.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xmlliteral05.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xmlliteral06.rdf | 0 jena-arq/testing/RIOT/{rrx => rrx11}/xmlliteral07.rdf | 0 103 files changed, 35 insertions(+), 31 deletions(-) diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/AbstractTestRDFXML_RRX.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/AbstractTestRDFXML_RRX.java index 65c1bcafaa..4ab92ee57e 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/AbstractTestRDFXML_RRX.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/AbstractTestRDFXML_RRX.java @@ -49,6 +49,6 @@ public abstract class AbstractTestRDFXML_RRX { @Test public void test() { - RunTestRDFXML.runTestCompareARP(testLabel, factory, implName, filename); + RunTestRDFXML11.runTestCompareARP(testLabel, factory, implName, filename); } } diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML11.java similarity index 99% rename from jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java rename to jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML11.java index 2f6547dbef..2853947404 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML11.java @@ -46,13 +46,14 @@ import org.apache.jena.riot.system.*; import org.apache.jena.sparql.graph.GraphFactory; /** Ways to run tests on parsers. */ -public class RunTestRDFXML { +public class RunTestRDFXML11 { @SuppressWarnings("removal") static ReaderRIOTFactory arpFactory = ReaderRDFXML_ARP1.factory; /** - * The RDF/XML tests from rdf-tests CG + * The RDF/XML tests from rdf-tests CG for RDF 1.1 + * * These are also run from {@link org.apache.jena.riot.lang.rdfxml.Scripts_RRX_RDFXML}. * Here, the exact warnings and errors are checked. */ @@ -92,7 +93,7 @@ public class RunTestRDFXML { * Check the files on disk agree with the built-in order list. */ static List<String> localTestFiles() { - Path LOCAL_DIR = Path.of("testing/RIOT/rrx/"); + Path LOCAL_DIR = Path.of("testing/RIOT/rrx11/"); Set<String> found; try { found = Files @@ -379,7 +380,7 @@ public class RunTestRDFXML { if ( expectedErrorHandler != null ) checkErrorHandler(testLabel, expectedErrorHandler, errorHandlerTest); return; - } catch(RiotException ex) { + } catch (RiotException ex) { // output.println("## "+testLabel); // ex.printStackTrace(); fail("Unexpected parse error: "+ex.getMessage()); diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX.java index 4b24b00f77..02de07683d 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX.java @@ -43,7 +43,7 @@ import org.apache.jena.atlas.io.IO; import org.apache.jena.atlas.io.IOX; import org.apache.jena.riot.*; import org.apache.jena.riot.lang.rdfxml.RRX; -import org.apache.jena.riot.lang.rdfxml.rrx.RunTestRDFXML.ErrorHandlerCollector; +import org.apache.jena.riot.lang.rdfxml.rrx.RunTestRDFXML11.ErrorHandlerCollector; import org.apache.jena.riot.system.ParserProfile; import org.apache.jena.riot.system.RiotLib; import org.apache.jena.riot.system.StreamRDF; @@ -62,7 +62,7 @@ import org.apache.jena.riot.system.StreamRDFWriter; @MethodSource("provideArgs") public class TestExtraRRX { - private static String DIR = "testing/RIOT/rrx-files/"; + private static String DIR = "testing/RIOT/rrx11-files/"; private record TestArgs(String label, Lang lang) {} @@ -239,16 +239,16 @@ public class TestExtraRRX { trackFilename(filename); ReaderRIOTFactory factory = RDFParserRegistry.getFactory(lang); String fn = DIR+filename; - RunTestRDFXML.runTestPlain(filename, factory, label, fn); - RunTestRDFXML.runTestCompareARP(fn, factory, label, fn); + RunTestRDFXML11.runTestPlain(filename, factory, label, fn); + RunTestRDFXML11.runTestCompareARP(fn, factory, label, fn); } private void warningTest(String filename, int warnings) { trackFilename(filename); ReaderRIOTFactory factory = RDFParserRegistry.getFactory(lang); String fn = DIR+filename; - RunTestRDFXML.runTestExpectWarning(filename, factory, label, warnings, fn); - RunTestRDFXML.runTestCompareARP(fn, factory, label, fn); + RunTestRDFXML11.runTestExpectWarning(filename, factory, label, warnings, fn); + RunTestRDFXML11.runTestCompareARP(fn, factory, label, fn); } /** @@ -276,9 +276,9 @@ public class TestExtraRRX { trackFilename(filename); ReaderRIOTFactory factory = RDFParserRegistry.getFactory(lang); String fn = DIR+filename; - RunTestRDFXML.runTestExpectFailure(filename, factory, label, fn); + RunTestRDFXML11.runTestExpectFailure(filename, factory, label, fn); if ( compare ) - RunTestRDFXML.runTestCompareARP(fn, factory, label, fn); + RunTestRDFXML11.runTestCompareARP(fn, factory, label, fn); } static Set<String> localTestFiles() { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java index fde5d05c89..554681b6f6 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_SAX.java @@ -40,8 +40,8 @@ public class Test_RRX_Local_SAX extends AbstractTestRDFXML_RRX { private static String implLabel = "SAX"; private static Stream<RRX_TestFileArgs> provideArgs() { - List<String> testfiles = RunTestRDFXML.localTestFiles(); - return RunTestRDFXML.makeTestSetup(implLabel, rdfxmlSAXfactory, testfiles).stream(); + List<String> testfiles = RunTestRDFXML11.localTestFiles(); + return RunTestRDFXML11.makeTestSetup(implLabel, rdfxmlSAXfactory, testfiles).stream(); } public Test_RRX_Local_SAX(RRX_TestFileArgs args) { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java index 7fe89cc658..d9bc4cc4b8 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXev.java @@ -41,8 +41,8 @@ public class Test_RRX_Local_StAXev extends AbstractTestRDFXML_RRX { private static String implLabel = "StAX(ev)"; private static Stream<RRX_TestFileArgs> provideArgs() { - List<String> testfiles = RunTestRDFXML.localTestFiles(); - return RunTestRDFXML.makeTestSetup(implLabel, rdfxmlStAXevFactory, testfiles).stream(); + List<String> testfiles = RunTestRDFXML11.localTestFiles(); + return RunTestRDFXML11.makeTestSetup(implLabel, rdfxmlStAXevFactory, testfiles).stream(); } public Test_RRX_Local_StAXev(RRX_TestFileArgs args) { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java index 36a684ede5..f47d90af5d 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_Local_StAXsr.java @@ -41,8 +41,8 @@ public class Test_RRX_Local_StAXsr extends AbstractTestRDFXML_RRX { private static String implLabel = "StAX(sr)"; private static Stream<RRX_TestFileArgs> provideArgs() { - List<String> testfiles = RunTestRDFXML.localTestFiles(); - return RunTestRDFXML.makeTestSetup(implLabel, rdfxmlStAXsrFactory, testfiles).stream(); + List<String> testfiles = RunTestRDFXML11.localTestFiles(); + return RunTestRDFXML11.makeTestSetup(implLabel, rdfxmlStAXsrFactory, testfiles).stream(); } public Test_RRX_Local_StAXsr(RRX_TestFileArgs args) { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java index 5e02d57457..166e6934a6 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_SAX.java @@ -37,8 +37,8 @@ public class Test_RRX_W3C_SAX extends AbstractTestRDFXML_RRX { private static String implLabel = "SAX"; private static Stream<RRX_TestFileArgs> provideArgs() { - List<String> testfiles = RunTestRDFXML.w3cTestFiles(); - return RunTestRDFXML.makeTestSetup(implLabel, rdfxmlSAXfactory, testfiles).stream(); + List<String> testfiles = RunTestRDFXML11.w3cTestFiles(); + return RunTestRDFXML11.makeTestSetup(implLabel, rdfxmlSAXfactory, testfiles).stream(); } public Test_RRX_W3C_SAX(RRX_TestFileArgs args) { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java index 9bc83a00dc..839464c6ee 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXev.java @@ -38,8 +38,8 @@ public class Test_RRX_W3C_StAXev extends AbstractTestRDFXML_RRX { private static String implLabel = "StAX(ev)"; private static Stream<RRX_TestFileArgs> provideArgs() { - List<String> testfiles = RunTestRDFXML.w3cTestFiles(); - return RunTestRDFXML.makeTestSetup(implLabel, rdfxmlStAXevFactory, testfiles).stream(); + List<String> testfiles = RunTestRDFXML11.w3cTestFiles(); + return RunTestRDFXML11.makeTestSetup(implLabel, rdfxmlStAXevFactory, testfiles).stream(); } public Test_RRX_W3C_StAXev(RRX_TestFileArgs args) { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java index a8523fc05a..05d805f519 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/Test_RRX_W3C_StAXsr.java @@ -38,8 +38,8 @@ public class Test_RRX_W3C_StAXsr extends AbstractTestRDFXML_RRX { private static String implLabel = "StAX(sr)"; private static Stream<RRX_TestFileArgs> provideArgs() { - List<String> testfiles = RunTestRDFXML.w3cTestFiles(); - return RunTestRDFXML.makeTestSetup(implLabel, rdfxmlStAXsrFactory, testfiles).stream(); + List<String> testfiles = RunTestRDFXML11.w3cTestFiles(); + return RunTestRDFXML11.makeTestSetup(implLabel, rdfxmlStAXsrFactory, testfiles).stream(); } public Test_RRX_W3C_StAXsr(RRX_TestFileArgs args) { diff --git a/jena-arq/testing/RIOT/rrx/README b/jena-arq/testing/RIOT/rrx/README deleted file mode 100644 index 399d3bf1ca..0000000000 --- a/jena-arq/testing/RIOT/rrx/README +++ /dev/null @@ -1,4 +0,0 @@ -== Basic positive tests for RRX - -The tests in this directory cover RDF/XML features. -See RunTestRDFXML.java. diff --git a/jena-arq/testing/RIOT/rrx-files/README b/jena-arq/testing/RIOT/rrx11-files/README similarity index 88% rename from jena-arq/testing/RIOT/rrx-files/README rename to jena-arq/testing/RIOT/rrx11-files/README index 5970528032..42f9a2a4cd 100644 --- a/jena-arq/testing/RIOT/rrx-files/README +++ b/jena-arq/testing/RIOT/rrx11-files/README @@ -1,11 +1,11 @@ -## Files for specific tests of RRX. +== Files for specific tests of RRX. This directory contained files used for specific tests of RRX to suppliment the basic positive tests - errors and extensions. -Used by: TestRRX.java +Used by: TestExtraRRX.java # Extensions to RDF/XML diff --git a/jena-arq/testing/RIOT/rrx-files/bad-object-type-1.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-object-type-1.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-object-type-1.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-object-type-1.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-object-type-2.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-object-type-2.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-object-type-2.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-object-type-2.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-object-type-3.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-object-type-3.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-object-type-3.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-object-type-3.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-rdf-id-node.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-rdf-id-node.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-rdf-id-node.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-rdf-id-node.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-rdf-resource-node.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-rdf-resource-node.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-rdf-resource-node.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-rdf-resource-node.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute1.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute1.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute1.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute1.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute2.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute2.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute2.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute2.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute3.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute3.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute3.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute3.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute4.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute4.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute4.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute4.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute5.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute5.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-unqualified-attribute5.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-unqualified-attribute5.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-unqualified-class.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-unqualified-class.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-unqualified-class.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-unqualified-class.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/bad-unqualified-property.rdf b/jena-arq/testing/RIOT/rrx11-files/bad-unqualified-property.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/bad-unqualified-property.rdf rename to jena-arq/testing/RIOT/rrx11-files/bad-unqualified-property.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/base-external-needed.rdf b/jena-arq/testing/RIOT/rrx11-files/base-external-needed.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/base-external-needed.rdf rename to jena-arq/testing/RIOT/rrx11-files/base-external-needed.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/base-inner.rdf b/jena-arq/testing/RIOT/rrx11-files/base-inner.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/base-inner.rdf rename to jena-arq/testing/RIOT/rrx11-files/base-inner.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/base-none.rdf b/jena-arq/testing/RIOT/rrx11-files/base-none.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/base-none.rdf rename to jena-arq/testing/RIOT/rrx11-files/base-none.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/cim_statements01.rdf b/jena-arq/testing/RIOT/rrx11-files/cim_statements01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/cim_statements01.rdf rename to jena-arq/testing/RIOT/rrx11-files/cim_statements01.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/multiple_objects_lex_node.rdf b/jena-arq/testing/RIOT/rrx11-files/multiple_objects_lex_node.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/multiple_objects_lex_node.rdf rename to jena-arq/testing/RIOT/rrx11-files/multiple_objects_lex_node.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/multiple_objects_node_lex.rdf b/jena-arq/testing/RIOT/rrx11-files/multiple_objects_node_lex.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/multiple_objects_node_lex.rdf rename to jena-arq/testing/RIOT/rrx11-files/multiple_objects_node_lex.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/multiple_objects_node_node.rdf b/jena-arq/testing/RIOT/rrx11-files/multiple_objects_node_node.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/multiple_objects_node_node.rdf rename to jena-arq/testing/RIOT/rrx11-files/multiple_objects_node_node.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/nested_object.rdf b/jena-arq/testing/RIOT/rrx11-files/nested_object.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/nested_object.rdf rename to jena-arq/testing/RIOT/rrx11-files/nested_object.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/parseType-unknown.rdf b/jena-arq/testing/RIOT/rrx11-files/parseType-unknown.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/parseType-unknown.rdf rename to jena-arq/testing/RIOT/rrx11-files/parseType-unknown.rdf diff --git a/jena-arq/testing/RIOT/rrx-files/parseType-warn.rdf b/jena-arq/testing/RIOT/rrx11-files/parseType-warn.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx-files/parseType-warn.rdf rename to jena-arq/testing/RIOT/rrx11-files/parseType-warn.rdf diff --git a/jena-arq/testing/RIOT/rrx11/README b/jena-arq/testing/RIOT/rrx11/README new file mode 100644 index 0000000000..473c373e02 --- /dev/null +++ b/jena-arq/testing/RIOT/rrx11/README @@ -0,0 +1,7 @@ +== Basic positive tests for RRX + +The tests in this directory cover RDF/XML features for RDF 1.1 +See RunTestRDFXML.java. + +Tests are run by comparing the results to ARP. + diff --git a/jena-arq/testing/RIOT/rrx/attribute-property01.rdf b/jena-arq/testing/RIOT/rrx11/attribute-property01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/attribute-property01.rdf rename to jena-arq/testing/RIOT/rrx11/attribute-property01.rdf diff --git a/jena-arq/testing/RIOT/rrx/attribute-property02.rdf b/jena-arq/testing/RIOT/rrx11/attribute-property02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/attribute-property02.rdf rename to jena-arq/testing/RIOT/rrx11/attribute-property02.rdf diff --git a/jena-arq/testing/RIOT/rrx/attribute-property03.rdf b/jena-arq/testing/RIOT/rrx11/attribute-property03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/attribute-property03.rdf rename to jena-arq/testing/RIOT/rrx11/attribute-property03.rdf diff --git a/jena-arq/testing/RIOT/rrx/attribute-property04.rdf b/jena-arq/testing/RIOT/rrx11/attribute-property04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/attribute-property04.rdf rename to jena-arq/testing/RIOT/rrx11/attribute-property04.rdf diff --git a/jena-arq/testing/RIOT/rrx/base01.rdf b/jena-arq/testing/RIOT/rrx11/base01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/base01.rdf rename to jena-arq/testing/RIOT/rrx11/base01.rdf diff --git a/jena-arq/testing/RIOT/rrx/base02.rdf b/jena-arq/testing/RIOT/rrx11/base02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/base02.rdf rename to jena-arq/testing/RIOT/rrx11/base02.rdf diff --git a/jena-arq/testing/RIOT/rrx/base03.rdf b/jena-arq/testing/RIOT/rrx11/base03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/base03.rdf rename to jena-arq/testing/RIOT/rrx11/base03.rdf diff --git a/jena-arq/testing/RIOT/rrx/base04.rdf b/jena-arq/testing/RIOT/rrx11/base04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/base04.rdf rename to jena-arq/testing/RIOT/rrx11/base04.rdf diff --git a/jena-arq/testing/RIOT/rrx/base05.rdf b/jena-arq/testing/RIOT/rrx11/base05.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/base05.rdf rename to jena-arq/testing/RIOT/rrx11/base05.rdf diff --git a/jena-arq/testing/RIOT/rrx/base06.rdf b/jena-arq/testing/RIOT/rrx11/base06.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/base06.rdf rename to jena-arq/testing/RIOT/rrx11/base06.rdf diff --git a/jena-arq/testing/RIOT/rrx/basic01.rdf b/jena-arq/testing/RIOT/rrx11/basic01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/basic01.rdf rename to jena-arq/testing/RIOT/rrx11/basic01.rdf diff --git a/jena-arq/testing/RIOT/rrx/basic02.rdf b/jena-arq/testing/RIOT/rrx11/basic02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/basic02.rdf rename to jena-arq/testing/RIOT/rrx11/basic02.rdf diff --git a/jena-arq/testing/RIOT/rrx/basic03.rdf b/jena-arq/testing/RIOT/rrx11/basic03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/basic03.rdf rename to jena-arq/testing/RIOT/rrx11/basic03.rdf diff --git a/jena-arq/testing/RIOT/rrx/basic04.rdf b/jena-arq/testing/RIOT/rrx11/basic04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/basic04.rdf rename to jena-arq/testing/RIOT/rrx11/basic04.rdf diff --git a/jena-arq/testing/RIOT/rrx/basic05.rdf b/jena-arq/testing/RIOT/rrx11/basic05.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/basic05.rdf rename to jena-arq/testing/RIOT/rrx11/basic05.rdf diff --git a/jena-arq/testing/RIOT/rrx/basic06.rdf b/jena-arq/testing/RIOT/rrx11/basic06.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/basic06.rdf rename to jena-arq/testing/RIOT/rrx11/basic06.rdf diff --git a/jena-arq/testing/RIOT/rrx/basic07.rdf b/jena-arq/testing/RIOT/rrx11/basic07.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/basic07.rdf rename to jena-arq/testing/RIOT/rrx11/basic07.rdf diff --git a/jena-arq/testing/RIOT/rrx/basic08.rdf b/jena-arq/testing/RIOT/rrx11/basic08.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/basic08.rdf rename to jena-arq/testing/RIOT/rrx11/basic08.rdf diff --git a/jena-arq/testing/RIOT/rrx/blankNodeIds01.rdf b/jena-arq/testing/RIOT/rrx11/blankNodeIds01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/blankNodeIds01.rdf rename to jena-arq/testing/RIOT/rrx11/blankNodeIds01.rdf diff --git a/jena-arq/testing/RIOT/rrx/blankNodeIds02.rdf b/jena-arq/testing/RIOT/rrx11/blankNodeIds02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/blankNodeIds02.rdf rename to jena-arq/testing/RIOT/rrx11/blankNodeIds02.rdf diff --git a/jena-arq/testing/RIOT/rrx/blankNodeIds03.rdf b/jena-arq/testing/RIOT/rrx11/blankNodeIds03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/blankNodeIds03.rdf rename to jena-arq/testing/RIOT/rrx11/blankNodeIds03.rdf diff --git a/jena-arq/testing/RIOT/rrx/collections01.rdf b/jena-arq/testing/RIOT/rrx11/collections01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/collections01.rdf rename to jena-arq/testing/RIOT/rrx11/collections01.rdf diff --git a/jena-arq/testing/RIOT/rrx/collections02.rdf b/jena-arq/testing/RIOT/rrx11/collections02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/collections02.rdf rename to jena-arq/testing/RIOT/rrx11/collections02.rdf diff --git a/jena-arq/testing/RIOT/rrx/collections03.rdf b/jena-arq/testing/RIOT/rrx11/collections03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/collections03.rdf rename to jena-arq/testing/RIOT/rrx11/collections03.rdf diff --git a/jena-arq/testing/RIOT/rrx/collections04.rdf b/jena-arq/testing/RIOT/rrx11/collections04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/collections04.rdf rename to jena-arq/testing/RIOT/rrx11/collections04.rdf diff --git a/jena-arq/testing/RIOT/rrx/collections05.rdf b/jena-arq/testing/RIOT/rrx11/collections05.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/collections05.rdf rename to jena-arq/testing/RIOT/rrx11/collections05.rdf diff --git a/jena-arq/testing/RIOT/rrx/collections06.rdf b/jena-arq/testing/RIOT/rrx11/collections06.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/collections06.rdf rename to jena-arq/testing/RIOT/rrx11/collections06.rdf diff --git a/jena-arq/testing/RIOT/rrx/comments01.rdf b/jena-arq/testing/RIOT/rrx11/comments01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/comments01.rdf rename to jena-arq/testing/RIOT/rrx11/comments01.rdf diff --git a/jena-arq/testing/RIOT/rrx/comments02.rdf b/jena-arq/testing/RIOT/rrx11/comments02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/comments02.rdf rename to jena-arq/testing/RIOT/rrx11/comments02.rdf diff --git a/jena-arq/testing/RIOT/rrx/containers01.rdf b/jena-arq/testing/RIOT/rrx11/containers01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/containers01.rdf rename to jena-arq/testing/RIOT/rrx11/containers01.rdf diff --git a/jena-arq/testing/RIOT/rrx/containers02.rdf b/jena-arq/testing/RIOT/rrx11/containers02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/containers02.rdf rename to jena-arq/testing/RIOT/rrx11/containers02.rdf diff --git a/jena-arq/testing/RIOT/rrx/containers03.rdf b/jena-arq/testing/RIOT/rrx11/containers03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/containers03.rdf rename to jena-arq/testing/RIOT/rrx11/containers03.rdf diff --git a/jena-arq/testing/RIOT/rrx/containers04.rdf b/jena-arq/testing/RIOT/rrx11/containers04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/containers04.rdf rename to jena-arq/testing/RIOT/rrx11/containers04.rdf diff --git a/jena-arq/testing/RIOT/rrx/datatype01.rdf b/jena-arq/testing/RIOT/rrx11/datatype01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/datatype01.rdf rename to jena-arq/testing/RIOT/rrx11/datatype01.rdf diff --git a/jena-arq/testing/RIOT/rrx/datatype02.rdf b/jena-arq/testing/RIOT/rrx11/datatype02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/datatype02.rdf rename to jena-arq/testing/RIOT/rrx11/datatype02.rdf diff --git a/jena-arq/testing/RIOT/rrx/empty1.rdf b/jena-arq/testing/RIOT/rrx11/empty1.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/empty1.rdf rename to jena-arq/testing/RIOT/rrx11/empty1.rdf diff --git a/jena-arq/testing/RIOT/rrx/empty2.rdf b/jena-arq/testing/RIOT/rrx11/empty2.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/empty2.rdf rename to jena-arq/testing/RIOT/rrx11/empty2.rdf diff --git a/jena-arq/testing/RIOT/rrx/empty3.rdf b/jena-arq/testing/RIOT/rrx11/empty3.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/empty3.rdf rename to jena-arq/testing/RIOT/rrx11/empty3.rdf diff --git a/jena-arq/testing/RIOT/rrx/entities01.rdf b/jena-arq/testing/RIOT/rrx11/entities01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/entities01.rdf rename to jena-arq/testing/RIOT/rrx11/entities01.rdf diff --git a/jena-arq/testing/RIOT/rrx/entities02.rdf b/jena-arq/testing/RIOT/rrx11/entities02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/entities02.rdf rename to jena-arq/testing/RIOT/rrx11/entities02.rdf diff --git a/jena-arq/testing/RIOT/rrx/lang01.rdf b/jena-arq/testing/RIOT/rrx11/lang01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/lang01.rdf rename to jena-arq/testing/RIOT/rrx11/lang01.rdf diff --git a/jena-arq/testing/RIOT/rrx/lang02.rdf b/jena-arq/testing/RIOT/rrx11/lang02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/lang02.rdf rename to jena-arq/testing/RIOT/rrx11/lang02.rdf diff --git a/jena-arq/testing/RIOT/rrx/lang03.rdf b/jena-arq/testing/RIOT/rrx11/lang03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/lang03.rdf rename to jena-arq/testing/RIOT/rrx11/lang03.rdf diff --git a/jena-arq/testing/RIOT/rrx/lang04.rdf b/jena-arq/testing/RIOT/rrx11/lang04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/lang04.rdf rename to jena-arq/testing/RIOT/rrx11/lang04.rdf diff --git a/jena-arq/testing/RIOT/rrx/objects01.rdf b/jena-arq/testing/RIOT/rrx11/objects01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/objects01.rdf rename to jena-arq/testing/RIOT/rrx11/objects01.rdf diff --git a/jena-arq/testing/RIOT/rrx/objects02.rdf b/jena-arq/testing/RIOT/rrx11/objects02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/objects02.rdf rename to jena-arq/testing/RIOT/rrx11/objects02.rdf diff --git a/jena-arq/testing/RIOT/rrx/reification01.rdf b/jena-arq/testing/RIOT/rrx11/reification01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/reification01.rdf rename to jena-arq/testing/RIOT/rrx11/reification01.rdf diff --git a/jena-arq/testing/RIOT/rrx/reification02.rdf b/jena-arq/testing/RIOT/rrx11/reification02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/reification02.rdf rename to jena-arq/testing/RIOT/rrx11/reification02.rdf diff --git a/jena-arq/testing/RIOT/rrx/reification03.rdf b/jena-arq/testing/RIOT/rrx11/reification03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/reification03.rdf rename to jena-arq/testing/RIOT/rrx11/reification03.rdf diff --git a/jena-arq/testing/RIOT/rrx/reification04.rdf b/jena-arq/testing/RIOT/rrx11/reification04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/reification04.rdf rename to jena-arq/testing/RIOT/rrx11/reification04.rdf diff --git a/jena-arq/testing/RIOT/rrx/reification05.rdf b/jena-arq/testing/RIOT/rrx11/reification05.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/reification05.rdf rename to jena-arq/testing/RIOT/rrx11/reification05.rdf diff --git a/jena-arq/testing/RIOT/rrx/striped01.rdf b/jena-arq/testing/RIOT/rrx11/striped01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/striped01.rdf rename to jena-arq/testing/RIOT/rrx11/striped01.rdf diff --git a/jena-arq/testing/RIOT/rrx/striped02.rdf b/jena-arq/testing/RIOT/rrx11/striped02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/striped02.rdf rename to jena-arq/testing/RIOT/rrx11/striped02.rdf diff --git a/jena-arq/testing/RIOT/rrx/striped03.rdf b/jena-arq/testing/RIOT/rrx11/striped03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/striped03.rdf rename to jena-arq/testing/RIOT/rrx11/striped03.rdf diff --git a/jena-arq/testing/RIOT/rrx/striped04.rdf b/jena-arq/testing/RIOT/rrx11/striped04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/striped04.rdf rename to jena-arq/testing/RIOT/rrx11/striped04.rdf diff --git a/jena-arq/testing/RIOT/rrx/striped05.rdf b/jena-arq/testing/RIOT/rrx11/striped05.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/striped05.rdf rename to jena-arq/testing/RIOT/rrx11/striped05.rdf diff --git a/jena-arq/testing/RIOT/rrx/type01.rdf b/jena-arq/testing/RIOT/rrx11/type01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/type01.rdf rename to jena-arq/testing/RIOT/rrx11/type01.rdf diff --git a/jena-arq/testing/RIOT/rrx/type02.rdf b/jena-arq/testing/RIOT/rrx11/type02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/type02.rdf rename to jena-arq/testing/RIOT/rrx11/type02.rdf diff --git a/jena-arq/testing/RIOT/rrx/type03.rdf b/jena-arq/testing/RIOT/rrx11/type03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/type03.rdf rename to jena-arq/testing/RIOT/rrx11/type03.rdf diff --git a/jena-arq/testing/RIOT/rrx/xml.rdf b/jena-arq/testing/RIOT/rrx11/xml.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xml.rdf rename to jena-arq/testing/RIOT/rrx11/xml.rdf diff --git a/jena-arq/testing/RIOT/rrx/xml10.rdf b/jena-arq/testing/RIOT/rrx11/xml10.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xml10.rdf rename to jena-arq/testing/RIOT/rrx11/xml10.rdf diff --git a/jena-arq/testing/RIOT/rrx/xml11.rdf b/jena-arq/testing/RIOT/rrx11/xml11.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xml11.rdf rename to jena-arq/testing/RIOT/rrx11/xml11.rdf diff --git a/jena-arq/testing/RIOT/rrx/xmlliteral01.rdf b/jena-arq/testing/RIOT/rrx11/xmlliteral01.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xmlliteral01.rdf rename to jena-arq/testing/RIOT/rrx11/xmlliteral01.rdf diff --git a/jena-arq/testing/RIOT/rrx/xmlliteral02.rdf b/jena-arq/testing/RIOT/rrx11/xmlliteral02.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xmlliteral02.rdf rename to jena-arq/testing/RIOT/rrx11/xmlliteral02.rdf diff --git a/jena-arq/testing/RIOT/rrx/xmlliteral03.rdf b/jena-arq/testing/RIOT/rrx11/xmlliteral03.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xmlliteral03.rdf rename to jena-arq/testing/RIOT/rrx11/xmlliteral03.rdf diff --git a/jena-arq/testing/RIOT/rrx/xmlliteral04.rdf b/jena-arq/testing/RIOT/rrx11/xmlliteral04.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xmlliteral04.rdf rename to jena-arq/testing/RIOT/rrx11/xmlliteral04.rdf diff --git a/jena-arq/testing/RIOT/rrx/xmlliteral05.rdf b/jena-arq/testing/RIOT/rrx11/xmlliteral05.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xmlliteral05.rdf rename to jena-arq/testing/RIOT/rrx11/xmlliteral05.rdf diff --git a/jena-arq/testing/RIOT/rrx/xmlliteral06.rdf b/jena-arq/testing/RIOT/rrx11/xmlliteral06.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xmlliteral06.rdf rename to jena-arq/testing/RIOT/rrx11/xmlliteral06.rdf diff --git a/jena-arq/testing/RIOT/rrx/xmlliteral07.rdf b/jena-arq/testing/RIOT/rrx11/xmlliteral07.rdf similarity index 100% rename from jena-arq/testing/RIOT/rrx/xmlliteral07.rdf rename to jena-arq/testing/RIOT/rrx11/xmlliteral07.rdf
