This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 0d7bbca5bf7c41d03f67d1405ac7f9cbb322fb78 Author: Andy Seaborne <[email protected]> AuthorDate: Sat Jun 27 16:22:09 2026 +0100 rdf-tests: Make negative eval tests into negative syntax tests --- .../org/apache/jena/arq/junit/riot/RiotTests.java | 31 +++++++++++++++------- .../apache/jena/arq/junit/riot/VocabLangRDF.java | 2 ++ 2 files changed, 24 insertions(+), 9 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 73672b8699..8e64d5587c 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 @@ -39,6 +39,7 @@ import org.apache.jena.vocabulary.TestManifest; public class RiotTests { /** Create a RIOT language test - or return null for "unrecognized" */ + @SuppressWarnings("deprecation") public static Runnable makeRIOTTest(ManifestEntry entry) { //Resource manifest = entry.getManifest(); Node item = entry.getEntry(); @@ -76,6 +77,11 @@ public class RiotTests if ( equalsType(testType, VocabLangRDF.TestNegativeSyntaxTTL) ) return new RiotSyntaxTest(entry, RDFLanguages.TURTLE, false); + // XXX Remove of rdf-test update + // These are parse errors + if ( equalsType(testType, VocabLangRDF.TestNegativeEvalTTL) ) + return new RiotSyntaxTest(entry, RDFLanguages.TURTLE, false); + // TRIG if ( equalsType(testType, VocabLangRDF.TestPositiveSyntaxTriG) ) { String base = rebase(input, assumedBase); @@ -84,6 +90,10 @@ public class RiotTests if ( equalsType(testType, VocabLangRDF.TestNegativeSyntaxTriG) ) return new RiotSyntaxTest(entry, RDFLanguages.TRIG, false); + // XXX Remove of rdf-test update + if ( equalsType(testType, VocabLangRDF.TestNegativeEvalTriG) ) + return new RiotSyntaxTest(entry, RDFLanguages.TURTLE, false); + // NT if ( equalsType(testType, VocabLangRDF.TestPositiveSyntaxNT) ) return new RiotSyntaxTest(entry, RDFLanguages.NTRIPLES, true); @@ -117,19 +127,22 @@ public class RiotTests String base = rebase(input, assumedBase); return new RiotEvalTest(entry, base, RDFLanguages.TURTLE, true); } - if ( equalsType(testType, VocabLangRDF.TestNegativeEvalTTL) ) { - String base = rebase(input, assumedBase); - return new RiotEvalTest(entry, base, RDFLanguages.TURTLE, false); - } - if ( equalsType(testType, VocabLangRDF.TestEvalTriG) ) { String base = rebase(input, assumedBase); return new RiotEvalTest(entry, base, RDFLanguages.TRIG, true); } - if ( equalsType(testType, VocabLangRDF.TestNegativeEvalTriG) ) { - String base = rebase(input, assumedBase); - return new RiotEvalTest(entry, base, RDFLanguages.TRIG, false); - } + +// // XXX Remove of rdf-test update +// if ( equalsType(testType, VocabLangRDF.TestNegativeEvalTTL) ) { +// String base = rebase(input, assumedBase); +// return new RiotEvalTest(entry, base, RDFLanguages.TURTLE, false); +// } + +// // XXX Remove of rdf-test update +// if ( equalsType(testType, VocabLangRDF.TestNegativeEvalTriG) ) { +// String base = rebase(input, assumedBase); +// return new RiotEvalTest(entry, base, RDFLanguages.TRIG, false); +// } if ( equalsType(testType, VocabLangRDF.TestEvalNT) ) { String base = entry.getAction().getURI();//rebase(input, assumedRootURI); 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 0704260fe6..f65f8a5439 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 @@ -47,6 +47,7 @@ public class VocabLangRDF public static final Resource TestPositiveSyntaxTTL = m_model.createResource( NS+"TestTurtlePositiveSyntax" ); public static final Resource TestNegativeSyntaxTTL = m_model.createResource( NS+"TestTurtleNegativeSyntax" ); public static final Resource TestEvalTTL = m_model.createResource( NS+"TestTurtleEval" ); + @Deprecated public static final Resource TestNegativeEvalTTL = m_model.createResource( NS+"TestTurtleNegativeEval" ); public static final Resource TestPositiveSyntaxNT = m_model.createResource( NS+"TestNTriplesPositiveSyntax" ); @@ -67,6 +68,7 @@ public class VocabLangRDF public static final Resource TestPositiveSyntaxTriG = m_model.createResource( NS+"TestTrigPositiveSyntax" ); public static final Resource TestNegativeSyntaxTriG = m_model.createResource( NS+"TestTrigNegativeSyntax" ); public static final Resource TestEvalTriG = m_model.createResource( NS+"TestTrigEval" ); + @Deprecated public static final Resource TestNegativeEvalTriG = m_model.createResource( NS+"TestTrigNegativeEval" ); public static final Resource TestPositiveSyntaxRDFXML = m_model.createResource( NS+"TestXMLPositiveSyntax" );
