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 6d455c022730b4fa8eb57485a3c546b3a0e50636
Author: Andy Seaborne <[email protected]>
AuthorDate: Tue Mar 10 11:52:19 2026 +0000

    Add new RRX RDF 1.1 tests
---
 .../rrx11-2/error-propertyattr-and-content-1.rdf   |   8 ++
 .../rrx11-2/error-propertyattr-and-content-2.rdf   |   7 +
 .../error-top-attr-illegal.rdf}                    |   2 +-
 .../error-top-attr-unknown.rdf}                    |   0
 jena-arq/testing/RIOT/rrx11-2/manifest.ttl         | 142 +++++++++++++++++++++
 .../testing/RIOT/rrx11-2/property-resource-1.nt    |   1 +
 .../testing/RIOT/rrx11-2/property-resource-1.rdf   |   6 +
 .../testing/RIOT/rrx11-2/property-resource-2.nt    |   2 +
 .../testing/RIOT/rrx11-2/property-resource-2.rdf   |   6 +
 .../RIOT/rrx11-2/propertyattr-no-content-1.nt      |   2 +
 .../RIOT/rrx11-2/propertyattr-no-content-1.rdf     |   6 +
 .../RIOT/rrx11-2/propertyattr-no-content-2.nt      |   2 +
 .../RIOT/rrx11-2/propertyattr-no-content-2.rdf     |   6 +
 .../reif11-collection-empty.nt}                    |   0
 .../reif11-collection-empty.rdf}                   |   1 -
 .../reif11-collection-one-compound.nt}             |   0
 .../reif11-collection-one-compound.rdf}            |   0
 .../reif11-propertyattr-1.nt}                      |   0
 .../reif11-propertyattr-1.rdf}                     |   1 -
 .../reif11-propertyattr-2.nt}                      |   9 +-
 .../reif11-propertyattr-2.rdf}                     |   5 +-
 .../reif11-resource.nt}                            |   0
 .../reif11-resource.rdf}                           |   0
 jena-arq/testing/RIOT/rrx11-2/xml-lang-1.nt        |   1 +
 .../xml-lang-1.rdf}                                |   8 +-
 jena-arq/testing/RIOT/rrx11-2/xml-lang-2.nt        |   3 +
 jena-arq/testing/RIOT/rrx11-2/xml-lang-2.rdf       |  13 ++
 jena-arq/testing/RIOT/rrx12/misc/manifest.ttl      |  56 --------
 28 files changed, 217 insertions(+), 70 deletions(-)

diff --git a/jena-arq/testing/RIOT/rrx11-2/error-propertyattr-and-content-1.rdf 
b/jena-arq/testing/RIOT/rrx11-2/error-propertyattr-and-content-1.rdf
new file mode 100644
index 0000000000..16815485f6
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/error-propertyattr-and-content-1.rdf
@@ -0,0 +1,8 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+         xmlns:ex="http://example/";>
+  <rdf:Description rdf:about="http://example/s";>
+    <ex:p ex:attr="attrVal">
+      <ex:q>Fred</ex:q>
+    </ex:p>
+  </rdf:Description>
+</rdf:RDF>
diff --git a/jena-arq/testing/RIOT/rrx11-2/error-propertyattr-and-content-2.rdf 
b/jena-arq/testing/RIOT/rrx11-2/error-propertyattr-and-content-2.rdf
new file mode 100644
index 0000000000..5fb0fe4b49
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/error-propertyattr-and-content-2.rdf
@@ -0,0 +1,7 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+         xmlns:ex="http://example/";>
+  <rdf:Description rdf:about="http://example/s";>
+    <!-- Whitespace not allowed -->
+    <ex:p ex:attr="attrVal"> </ex:p>
+  </rdf:Description>
+</rdf:RDF>
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-unknown-top-attr.rdf 
b/jena-arq/testing/RIOT/rrx11-2/error-top-attr-illegal.rdf
similarity index 85%
copy from jena-arq/testing/RIOT/rrx12/misc/rrx-unknown-top-attr.rdf
copy to jena-arq/testing/RIOT/rrx11-2/error-top-attr-illegal.rdf
index 40bf52a788..db6ed78b31 100644
--- a/jena-arq/testing/RIOT/rrx12/misc/rrx-unknown-top-attr.rdf
+++ b/jena-arq/testing/RIOT/rrx11-2/error-top-attr-illegal.rdf
@@ -2,7 +2,7 @@
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
          xmlns:ex="http://example.org/";
          xml:lang="en"
-         ex:unknown="XXX"
+         rdf:about="http://example/top";
          >
   <rdf:Description rdf:about="http://example.org/subj"; ex:prop="obj"/>
 </rdf:RDF>
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-unknown-top-attr.rdf 
b/jena-arq/testing/RIOT/rrx11-2/error-top-attr-unknown.rdf
similarity index 100%
rename from jena-arq/testing/RIOT/rrx12/misc/rrx-unknown-top-attr.rdf
rename to jena-arq/testing/RIOT/rrx11-2/error-top-attr-unknown.rdf
diff --git a/jena-arq/testing/RIOT/rrx11-2/manifest.ttl 
b/jena-arq/testing/RIOT/rrx11-2/manifest.ttl
new file mode 100644
index 0000000000..a8793ca9bd
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/manifest.ttl
@@ -0,0 +1,142 @@
+##  Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs:   <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#>
+PREFIX test:   <http://www.w3.org/2001/sw/DataAccess/tests/>
+PREFIX rdft:   <http://www.w3.org/ns/rdftest#>
+PREFIX tr:     <https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-xml/eval#>
+PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
+
+tr:manifest rdf:type mf:Manifest ;
+  rdfs:label "Apache Jena RRX Tests (Extra)" ;
+  mf:assumedTestBase <https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-xml/eval/> 
;
+  mf:entries
+  (
+      tr:rrx-xml-lang-1
+      tr:rrx-xml-lang-2
+      
+      tr:rrx-property-resource-1
+      tr:rrx-property-resource-2
+      tr:rrx-propertyattr-no-content-1
+      tr:rrx-propertyattr-no-content-2
+      tr:rrx-property-resource-1
+      tr:rrx-property-resource-2
+
+      tr:rrx-error-top-attr-unknown
+      tr:rrx-error-top-attr-illgeal
+      tr:rrx-error-propertyattr-and-content-1
+      tr:rrx-error-propertyattr-and-content-2
+      
+      tr:rrx-reif11-propertyattr-1
+      tr:rrx-reif11-propertyattr-2
+      tr:rrx-reif11-collection-empty
+      tr:rrx-reif11-collection-one-compound
+      tr:rrx-reif11-resource
+  ).
+
+tr:rrx-xml-lang-1 rdf:type rdft:TestXMLEval ;
+  mf:name "xml-lang-1.rdf" ;
+  mf:comment "xml:lang (1)" ;
+  mf:action <xml-lang-1.rdf> ;
+  mf:result <xml-lang-1.nt> ;
+  .
+                      
+tr:rrx-xml-lang-2 rdf:type rdft:TestXMLEval ;
+  mf:name "xml-lang-2.rdf" ;
+  mf:comment "xml:lang (2)" ;
+  mf:action <xml-lang-2.rdf> ;
+  mf:result <xml-lang-2.nt> ;
+  .
+
+
+tr:rrx-property-resource-1 rdf:type rdft:TestXMLEval ;
+  mf:name "property-resource-1.rdf" ;
+  mf:comment "Content and also a property attribute (1)" ;
+  mf:action <property-resource-1.rdf> ;
+  mf:result <property-resource-1.nt> ;
+  .
+
+tr:rrx-property-resource-2 rdf:type rdft:TestXMLEval ;
+  mf:name "property-resource-2.rdf" ;
+  mf:comment "Content and also a property attribute (2)" ;
+  mf:action <property-resource-2.rdf> ;
+  mf:result <property-resource-2.nt> ;
+  .
+
+tr:rrx-propertyattr-no-content-1 rdf:type rdft:TestXMLEval ;
+  mf:name "propertyattr-no-content-1.rdf" ;
+  mf:comment "Content and also a property attribute (1)" ;
+  mf:action <propertyattr-no-content-1.rdf> ;
+  mf:result <propertyattr-no-content-1.nt> ;
+  .
+
+tr:rrx-propertyattr-no-content-2 rdf:type rdft:TestXMLEval ;
+  mf:name "propertyattr-no-content-2.rdf" ;
+  mf:comment "Content and also a property attribute (2)" ;
+  mf:action <propertyattr-no-content-2.rdf> ;
+  mf:result <propertyattr-no-content-2.nt> ;
+  .
+
+tr:rrx-error-top-attr-unknown rdf:type rdft:TestXMLNegativeSyntax ;
+  mf:name "error-top-attr-unknown.rdf" ;
+  mf:comment "Unknown attribute on top node element";
+  mf:action <error-top-attr-unknown.rdf> ;
+  .
+
+tr:rrx-error-top-attr-illgeal rdf:type rdft:TestXMLNegativeSyntax ;
+  mf:name "error-top-attr-illegal.rdf" ;
+  mf:comment "Illegal rdf: attribute on top node element";
+  mf:action <error-top-attr-illegal.rdf> ;
+  .
+
+tr:rrx-error-propertyattr-and-content-1 rdf:type rdft:TestXMLNegativeSyntax ;
+  mf:name "error-propertyattr-and-content-1.rdf" ;
+  mf:comment "Content and also a property attribute (1)" ;
+  mf:action <error-propertyattr-and-content-1.rdf> ;
+  .
+
+tr:rrx-error-propertyattr-and-content-2 rdf:type rdft:TestXMLNegativeSyntax ;
+  mf:name "error-propertyattr-and-content-2.rdf" ;
+  mf:comment "Content and also a property attribute (2)" ;
+  mf:action <error-propertyattr-and-content-2.rdf> ;
+  .
+
+
+
+
+
+tr:rrx-reif11-propertyattr-1 rdf:type rdft:TestXMLEval ;
+  mf:name "reif11-propertyattr-1.rdf" ;
+  mf:comment "RDF 1.1 Reification of property attribute";
+  mf:action <reif11-propertyattr-1.rdf> ;
+  mf:result <reif11-propertyattr-1.nt> ;
+  .
+
+tr:rrx-reif11-propertyattr-2 rdf:type rdft:TestXMLEval ;
+  mf:name "reif11-propertyattr-2.rdf" ;
+  mf:comment "RDF 1.1 Reification of property attribute (typed node)";
+  mf:action <reif11-propertyattr-2.rdf> ;
+  mf:result <reif11-propertyattr-2.nt> ;
+  .
+
+tr:rrx-reif11-collection-empty rdf:type rdft:TestXMLEval ;
+  mf:name "reif11-collection-empty.rdf" ;
+  mf:comment "RDF 1.1 Reification of an empty collction";
+  mf:action <reif11-collection-empty.rdf> ;
+  mf:result <reif11-collection-empty.nt> ;
+  .
+
+tr:rrx-reif11-collection-one-compound rdf:type rdft:TestXMLEval ;
+  mf:name "reif11-collection-one-compound.rdf" ;
+  mf:comment "RDF 1.1 Reification of a collection of one rdf:Description 
element";
+  mf:action <reif11-collection-one-compound.rdf> ;
+  mf:result <reif11-collection-one-compound.nt> ;
+  .
+
+tr:rrx-reif11-resource rdf:type rdft:TestXMLEval ;
+  mf:name "reif11-resource.rdf" ;
+  mf:comment "RDF 1.1 Reification and rdf:resource";
+  mf:action <reif11-resource.rdf> ;
+  mf:result <reif11-resource.nt> ;
+  .
diff --git a/jena-arq/testing/RIOT/rrx11-2/property-resource-1.nt 
b/jena-arq/testing/RIOT/rrx11-2/property-resource-1.nt
new file mode 100644
index 0000000000..d1259cc467
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/property-resource-1.nt
@@ -0,0 +1 @@
+<http://example/s> <http://example/p> <http://example/obj> .
diff --git a/jena-arq/testing/RIOT/rrx11-2/property-resource-1.rdf 
b/jena-arq/testing/RIOT/rrx11-2/property-resource-1.rdf
new file mode 100644
index 0000000000..3b1e7f0e44
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/property-resource-1.rdf
@@ -0,0 +1,6 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+         xmlns:ex="http://example/";>
+  <rdf:Description rdf:about="http://example/s";>
+    <ex:p rdf:resource="http://example/obj"/>
+  </rdf:Description>
+</rdf:RDF>
diff --git a/jena-arq/testing/RIOT/rrx11-2/property-resource-2.nt 
b/jena-arq/testing/RIOT/rrx11-2/property-resource-2.nt
new file mode 100644
index 0000000000..7f14c99555
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/property-resource-2.nt
@@ -0,0 +1,2 @@
+<http://example/obj> <http://example/attr> "AttrVal" .
+<http://example/s> <http://example/p> <http://example/obj> .
diff --git a/jena-arq/testing/RIOT/rrx11-2/property-resource-2.rdf 
b/jena-arq/testing/RIOT/rrx11-2/property-resource-2.rdf
new file mode 100644
index 0000000000..bf6f36565e
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/property-resource-2.rdf
@@ -0,0 +1,6 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+         xmlns:ex="http://example/";>
+  <rdf:Description rdf:about="http://example/s";>
+    <ex:p rdf:resource="http://example/obj"; ex:attr="AttrVal"/>
+  </rdf:Description>
+</rdf:RDF>
diff --git a/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-1.nt 
b/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-1.nt
new file mode 100644
index 0000000000..d1b0c40034
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-1.nt
@@ -0,0 +1,2 @@
+_:B0b3a9f111f518729ba3eb74e37faef0e <http://example/attr> "attrVal" .
+<http://example/s> <http://example/p> _:B0b3a9f111f518729ba3eb74e37faef0e .
diff --git a/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-1.rdf 
b/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-1.rdf
new file mode 100644
index 0000000000..3a2eabbae8
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-1.rdf
@@ -0,0 +1,6 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+         xmlns:ex="http://example/";>
+  <rdf:Description rdf:about="http://example/s";>
+    <ex:p ex:attr="attrVal"></ex:p>
+  </rdf:Description>
+</rdf:RDF>
diff --git a/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-2.nt 
b/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-2.nt
new file mode 100644
index 0000000000..42b641ef8d
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-2.nt
@@ -0,0 +1,2 @@
+_:Bbc37eca6dc17685306191d844ec82e4d <http://example/attr> "attrVal" .
+<http://example/s> <http://example/p> _:Bbc37eca6dc17685306191d844ec82e4d .
diff --git a/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-2.rdf 
b/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-2.rdf
new file mode 100644
index 0000000000..c0c7bae19b
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/propertyattr-no-content-2.rdf
@@ -0,0 +1,6 @@
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+         xmlns:ex="http://example/";>
+  <rdf:Description rdf:about="http://example/s";>
+    <ex:p ex:attr="attrVal"/>
+  </rdf:Description>
+</rdf:RDF>
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-empty.nt 
b/jena-arq/testing/RIOT/rrx11-2/reif11-collection-empty.nt
similarity index 100%
rename from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-empty.nt
rename to jena-arq/testing/RIOT/rrx11-2/reif11-collection-empty.nt
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-empty.rdf 
b/jena-arq/testing/RIOT/rrx11-2/reif11-collection-empty.rdf
similarity index 86%
rename from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-empty.rdf
rename to jena-arq/testing/RIOT/rrx11-2/reif11-collection-empty.rdf
index 9faeeba104..e537b1b5a8 100644
--- a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-empty.rdf
+++ b/jena-arq/testing/RIOT/rrx11-2/reif11-collection-empty.rdf
@@ -1,4 +1,3 @@
-<!-- xmlReifPropertyParseTypeCollection -->
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
          xmlns:ex="http://example.org/";
          xml:base="http://example/base#";>
diff --git 
a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-one-compound.nt 
b/jena-arq/testing/RIOT/rrx11-2/reif11-collection-one-compound.nt
similarity index 100%
rename from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-one-compound.nt
rename to jena-arq/testing/RIOT/rrx11-2/reif11-collection-one-compound.nt
diff --git 
a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-one-compound.rdf 
b/jena-arq/testing/RIOT/rrx11-2/reif11-collection-one-compound.rdf
similarity index 100%
rename from 
jena-arq/testing/RIOT/rrx12/misc/rrx-reif-collection-one-compound.rdf
rename to jena-arq/testing/RIOT/rrx11-2/reif11-collection-one-compound.rdf
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.nt 
b/jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-1.nt
similarity index 100%
copy from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.nt
copy to jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-1.nt
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf 
b/jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-1.rdf
similarity index 89%
copy from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf
copy to jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-1.rdf
index 0ae3e4db77..73f197c6b2 100644
--- a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf
+++ b/jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-1.rdf
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!-- xmlReifPropertyAttribute -->
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
          xmlns:ex="http://example.org/";
          xml:base="http://example/base#";>
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.nt 
b/jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-2.nt
similarity index 57%
rename from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.nt
rename to jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-2.nt
index e946201b42..d75d6698f0 100644
--- a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.nt
+++ b/jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-2.nt
@@ -1,6 +1,7 @@
-_:Bec6fa6e70ce5de1dffc2123f1e522831 <http://example.org/object> "OBJ" .
-<http://example/subject> <http://example.org/property> 
_:Bec6fa6e70ce5de1dffc2123f1e522831 .
+<http://example/subject> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> 
<http://example.org/Type> .
+_:B8fcb7ebd2f82990d4b530f8c87f1fe56 <http://example.org/object> "OBJ" .
+<http://example/subject> <http://example.org/property> 
_:B8fcb7ebd2f82990d4b530f8c87f1fe56 .
 <http://example/base#reif> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> 
<http://www.w3.org/1999/02/22-rdf-syntax-ns#Statement> .
-<http://example/base#reif> 
<http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example/subject> .
+<http://example/base#reif> <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> 
_:B8fcb7ebd2f82990d4b530f8c87f1fe56 .
 <http://example/base#reif> 
<http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate> 
<http://example.org/property> .
-<http://example/base#reif> <http://www.w3.org/1999/02/22-rdf-syntax-ns#object> 
_:Bec6fa6e70ce5de1dffc2123f1e522831 .
+<http://example/base#reif> 
<http://www.w3.org/1999/02/22-rdf-syntax-ns#subject> <http://example/subject> .
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf 
b/jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-2.rdf
similarity index 67%
copy from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf
copy to jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-2.rdf
index 0ae3e4db77..da7cc47ef0 100644
--- a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf
+++ b/jena-arq/testing/RIOT/rrx11-2/reif11-propertyattr-2.rdf
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
-<!-- xmlReifPropertyAttribute -->
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
          xmlns:ex="http://example.org/";
          xml:base="http://example/base#";>
-  <rdf:Description rdf:about="http://example/subject";>
+  <ex:Type rdf:about="http://example/subject";>
     <ex:property rdf:ID="reif" ex:object="OBJ"/>
-  </rdf:Description>
+  </ex:Type>
 </rdf:RDF>
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-resource.nt 
b/jena-arq/testing/RIOT/rrx11-2/reif11-resource.nt
similarity index 100%
rename from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-resource.nt
rename to jena-arq/testing/RIOT/rrx11-2/reif11-resource.nt
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-resource.rdf 
b/jena-arq/testing/RIOT/rrx11-2/reif11-resource.rdf
similarity index 100%
rename from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-resource.rdf
rename to jena-arq/testing/RIOT/rrx11-2/reif11-resource.rdf
diff --git a/jena-arq/testing/RIOT/rrx11-2/xml-lang-1.nt 
b/jena-arq/testing/RIOT/rrx11-2/xml-lang-1.nt
new file mode 100644
index 0000000000..1922d6258e
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/xml-lang-1.nt
@@ -0,0 +1 @@
+<http://example/subject> <http://example.org/property> "ABC"@en .
diff --git a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf 
b/jena-arq/testing/RIOT/rrx11-2/xml-lang-1.rdf
similarity index 59%
rename from jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf
rename to jena-arq/testing/RIOT/rrx11-2/xml-lang-1.rdf
index 0ae3e4db77..f583959454 100644
--- a/jena-arq/testing/RIOT/rrx12/misc/rrx-reif-propertyattr.rdf
+++ b/jena-arq/testing/RIOT/rrx11-2/xml-lang-1.rdf
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<!-- xmlReifPropertyAttribute -->
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
          xmlns:ex="http://example.org/";
-         xml:base="http://example/base#";>
+         xml:base="http://example/base#";
+         xml:lang="en">
   <rdf:Description rdf:about="http://example/subject";>
-    <ex:property rdf:ID="reif" ex:object="OBJ"/>
+    <ex:property>ABC</ex:property>
   </rdf:Description>
-</rdf:RDF>
+</rdf:RDF>
\ No newline at end of file
diff --git a/jena-arq/testing/RIOT/rrx11-2/xml-lang-2.nt 
b/jena-arq/testing/RIOT/rrx11-2/xml-lang-2.nt
new file mode 100644
index 0000000000..dc40e9ac23
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/xml-lang-2.nt
@@ -0,0 +1,3 @@
+<http://example/subject> <http://example.org/property> "ABC"@fr .
+<http://example/subjecto> <http://example.org/property1> "ABC"@fr .
+<http://example/subjecto> <http://example.org/property2> "XYZ"@de .
diff --git a/jena-arq/testing/RIOT/rrx11-2/xml-lang-2.rdf 
b/jena-arq/testing/RIOT/rrx11-2/xml-lang-2.rdf
new file mode 100644
index 0000000000..03aecab962
--- /dev/null
+++ b/jena-arq/testing/RIOT/rrx11-2/xml-lang-2.rdf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+         xmlns:ex="http://example.org/";
+         xml:base="http://example/base#";
+         xml:lang="en">
+  <rdf:Description xml:lang="fr" rdf:about="http://example/subject";>
+    <ex:property>ABC</ex:property>
+  </rdf:Description>
+  <rdf:Description xml:lang="fr" rdf:about="http://example/subjecto";>
+    <ex:property1>ABC</ex:property1>
+    <ex:property2 xml:lang="de">XYZ</ex:property2>
+  </rdf:Description>
+</rdf:RDF>
\ No newline at end of file
diff --git a/jena-arq/testing/RIOT/rrx12/misc/manifest.ttl 
b/jena-arq/testing/RIOT/rrx12/misc/manifest.ttl
deleted file mode 100644
index 6d9b11f03d..0000000000
--- a/jena-arq/testing/RIOT/rrx12/misc/manifest.ttl
+++ /dev/null
@@ -1,56 +0,0 @@
-##  Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX rdfs:   <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#>
-PREFIX test:   <http://www.w3.org/2001/sw/DataAccess/tests/>
-PREFIX rdft:   <http://www.w3.org/ns/rdftest#>
-PREFIX tr:     <https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-xml/eval#>
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-tr:manifest rdf:type mf:Manifest ;
-  rdfs:label "Apache Jena RRX Tests (Extra)" ;
-  mf:assumedTestBase <https://w3c.github.io/rdf-tests/rdf/rdf12/rdf-xml/eval/> 
;
-  mf:entries
-  (
-      tr:rrx-unknown-top-attr
-      tr:rrx-reif-propertyattr
-      tr:rrx-reif-collection-empty
-      tr:rrx-reif-collection-one-compound
-      tr:rrx-reif-resource
-  ) .
-
-tr:rrx-unknown-top-attr rdf:type rdft:TestXMLNegativeSyntax ;
-  mf:name "rrx-unknown-top-attr.rdf" ;
-  mf:comment "Unnwon attribute on top node element";
-  mf:action <rrx-unknown-top-attr.rdf> ;
-  ##mf:result <rrx-unknown-top-attr.nt> ;
-  .
-
-tr:rrx-reif-propertyattr rdf:type rdft:TestXMLEval ;
-  mf:name "rrx-reif-propertyattr.rdf" ;
-  mf:comment "RDF 1.1 Reification of property attribute";
-  mf:action <rrx-reif-propertyattr.rdf> ;
-  mf:result <rrx-reif-propertyattr.nt> ;
-  .
-
-tr:rrx-reif-collection-empty rdf:type rdft:TestXMLEval ;
-  mf:name "rrx-reif-collection-empty.rdf" ;
-  mf:comment "RDF 1.1 Reification of an empty collction";
-  mf:action <rrx-reif-collection-empty.rdf> ;
-  mf:result <rrx-reif-collection-empty.nt> ;
-  .
-
-tr:rrx-reif-collection-one-compound rdf:type rdft:TestXMLEval ;
-  mf:name "rrx-reif-collection-one-compound.rdf" ;
-  mf:comment "RDF 1.1 Reification of a collection of one rdf:Description 
element";
-  mf:action <rrx-reif-collection-one-compound.rdf> ;
-  mf:result <rrx-reif-collection-one-compound.nt> ;
-  .
-
-tr:rrx-reif-resource rdf:type rdft:TestXMLEval ;
-  mf:name "rrx-reif-resource.rdf" ;
-  mf:comment "RDF 1.1 Reification and rdf:resource";
-  mf:action <rrx-reif-resource.rdf> ;
-  mf:result <rrx-reif-resource.nt> ;
-  .

Reply via email to