You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2026/03/21 12:02:02 UTC
(jena) 01/03: Complete the test types for RDF/XML
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 ff3f8f2b237a7422b7b4dafde562d6b1a004f9fd
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Mar 19 14:15:37 2026 +0000
Complete the test types for RDF/XML
---
.../org/apache/jena/arq/junit/riot/RiotTests.java | 47 +++++++++++++---------
.../jena/arq/junit/riot/RiotTestsConfig.java | 2 +-
.../apache/jena/arq/junit/riot/VocabLangRDF.java | 9 +++--
3 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTests.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTests.java
index 044a7da7f7..73672b8699 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTests.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTests.java
@@ -96,24 +96,10 @@ public class RiotTests
if ( equalsType(testType, VocabLangRDF.TestNegativeSyntaxNQ) )
return new RiotSyntaxTest(entry, RDFLanguages.NQUADS, false);
- // RDF/XML - W3C test suite
- // This suite has eval tests (positive and warning - they have "warn" in the filename) and negative syntax tests.
- if ( equalsType(testType, VocabLangRDF.TestPositiveRDFXML) ) {
- if ( entryContainsSubstring(entry, "#xml-canon-test") ) {
- // Alternative location.
- // "rdf-tests-cg/rdf/rdf11/rdf-xml/xml-canon/" --> "RIOT/Lang/rdf-xml/xml-canon/"
- String actionURI = action.getURI().replaceAll("/rdf-tests-cg/rdf/rdf11/rdf-xml/xml-canon/", "/RIOT/Lang/rdf-xml/xml-canon/");
- String resultURI = result.getURI().replaceAll("/rdf-tests-cg/rdf/rdf11/rdf-xml/xml-canon/", "/RIOT/Lang/rdf-xml/xml-canon/");
- Node action2 = NodeFactory.createURI(actionURI);
- Node result2 = NodeFactory.createURI(resultURI);
- entry = ManifestEntry.alter(entry, testType, action2, result2);
- }
- String fn = entry.getAction().getURI();
- // Adjust to changes in rdf-tests-cg layout.
- String base = fn.replaceAll("^.*/rdf-xml/", "https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-xml/");
- return new RiotEvalTest(entry, base, RDFLanguages.RDFXML, true);
- }
- if ( equalsType(testType, VocabLangRDF.TestNegativeRDFXML) )
+ // RDF/XML
+ if ( equalsType(testType, VocabLangRDF.TestPositiveSyntaxRDFXML) )
+ return new RiotSyntaxTest(entry, RDFLanguages.RDFXML, true);
+ if ( equalsType(testType, VocabLangRDF.TestNegativeSyntaxRDFXML) )
return new RiotSyntaxTest(entry, RDFLanguages.RDFXML, false);
// Other: RDF/JSON
@@ -163,6 +149,31 @@ public class RiotTests
// return new RiotEvalTest(entry, base, RDFLanguages.RDFJSON, false);
// }
+ // RDF/XML - W3C test suite
+ // This suite has eval tests (positive and warning - they have "warn" in the filename) and negative syntax tests.
+ if ( equalsType(testType, VocabLangRDF.TestEvalRDFXML) ) {
+ if ( entryContainsSubstring(entry, "#xml-canon-test") ) {
+ // Alternative location.
+ // "rdf-tests-cg/rdf/rdf11/rdf-xml/xml-canon/" --> "RIOT/Lang/rdf-xml/xml-canon/"
+ String actionURI = action.getURI().replaceAll("/rdf-tests-cg/rdf/rdf11/rdf-xml/xml-canon/", "/RIOT/Lang/rdf-xml/xml-canon/");
+ String resultURI = result.getURI().replaceAll("/rdf-tests-cg/rdf/rdf11/rdf-xml/xml-canon/", "/RIOT/Lang/rdf-xml/xml-canon/");
+ Node action2 = NodeFactory.createURI(actionURI);
+ Node result2 = NodeFactory.createURI(resultURI);
+ entry = ManifestEntry.alter(entry, testType, action2, result2);
+ }
+ String fn = entry.getAction().getURI();
+ // Adjust to changes in rdf-tests-cg layout.
+ String base = fn.replaceAll("^.*/rdf-xml/", "https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-xml/");
+ return new RiotEvalTest(entry, base, RDFLanguages.RDFXML, true);
+ }
+
+ if ( equalsType(testType, VocabLangRDF.TestNegativeEvalRDFXML) ) {
+ String fn = entry.getAction().getURI();
+ // Adjust to changes in rdf-tests-cg layout.
+ String base = fn.replaceAll("^.*/rdf-xml/", "https://w3c.github.io/rdf-tests/rdf/rdf11/rdf-xml/");
+ return new RiotEvalTest(entry, base, RDFLanguages.RDFXML, false);
+ }
+
// Canonicalization tests
if ( equalsType(testType, VocabLangRDF.TestNTriplesPositiveC14N) ) {
String base = rebase(input, assumedBase);
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTestsConfig.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTestsConfig.java
index 5b22ad1a10..81909ad1a8 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTestsConfig.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTestsConfig.java
@@ -34,7 +34,7 @@ public class RiotTestsConfig {
*/
/*package*/ static boolean allowWarnings(ManifestEntry testEntry) {
- if ( RiotTests.equalsType(testEntry.getTestType(), VocabLangRDF.TestPositiveRDFXML) ) {
+ if ( RiotTests.equalsType(testEntry.getTestType(), VocabLangRDF.TestEvalRDFXML) ) {
// RDF/XML
// Various warnings in eval tests.
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/VocabLangRDF.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/VocabLangRDF.java
index 7a6b68eb5b..8bb6fadf3e 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/VocabLangRDF.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/VocabLangRDF.java
@@ -50,10 +50,9 @@ public class VocabLangRDF
public static final Resource TestPositiveSyntaxNT = m_model.createResource( NS+"TestNTriplesPositiveSyntax" );
public static final Resource TestNegativeSyntaxNT = m_model.createResource( NS+"TestNTriplesNegativeSyntax" );
public static final Resource TestEvalNT = m_model.createResource( NS+"TestNTriplesEval" );
-
public static final Resource TestNegativeEvalNT = m_model.createResource( NS+"TestNTriplesNegativeEval" );
- public static final Resource TestPositiveSyntaxRJ = m_model.createResource( NS+"TestRDFJSONPositiveSyntax" );
+ public static final Resource TestPositiveSyntaxRJ = m_model.createResource( NS+"TestRDFJSONPositiveSyntax" );
public static final Resource TestNegativeSyntaxRJ = m_model.createResource( NS+"TestRDFJSONNegativeSyntax" );
public static final Resource TestEvalRJ = m_model.createResource( NS+"TestRDFJSONEval" );
public static final Resource TestNegativeEvalRJ = m_model.createResource( NS+"TestRDFJSONNegativeEval" );
@@ -68,8 +67,10 @@ public class VocabLangRDF
public static final Resource TestEvalTriG = m_model.createResource( NS+"TestTrigEval" );
public static final Resource TestNegativeEvalTriG = m_model.createResource( NS+"TestTrigNegativeEval" );
- public static final Resource TestPositiveRDFXML = m_model.createResource( NS+"TestXMLEval" );
- public static final Resource TestNegativeRDFXML = m_model.createResource( NS+"TestXMLNegativeSyntax" );
+ public static final Resource TestPositiveSyntaxRDFXML = m_model.createResource( NS+"TestXMLPositiveSyntax" );
+ public static final Resource TestNegativeSyntaxRDFXML = m_model.createResource( NS+"TestXMLNegativeSyntax" );
+ public static final Resource TestEvalRDFXML = m_model.createResource( NS+"TestXMLEval" );
+ public static final Resource TestNegativeEvalRDFXML = m_model.createResource( NS+"TestXMLNegativeEval" );
// Canonicalization tests
public static final Resource TestNTriplesPositiveC14N = m_model.createResource( NS+"TestNTriplesPositiveC14N" );