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
The following commit(s) were added to refs/heads/main by this push:
new bd2d36dfdb GH-4009: Check tests. Reorganise test grouping.
bd2d36dfdb is described below
commit bd2d36dfdb06dca5b3249866c4e844a98d1db450
Author: Andy Seaborne <[email protected]>
AuthorDate: Sun Jun 21 09:59:29 2026 +0100
GH-4009: Check tests. Reorganise test grouping.
---
.../java/org/apache/jena/arq/ARQTestSuite.java | 37 +++++-----
.../test/java/org/apache/jena/rdf12/TS_RDF12.java | 21 ++++--
.../rdf12/{parse => }/TestNQuadsTripleTerms.java | 2 +-
.../rdf12/{parse => }/TestNTriplesTripleTerms.java | 2 +-
...LangSyntax.java => TestRDF12LangDirSyntax.java} | 2 +-
.../org/apache/jena/rdf12/TestSPARQL12Results.java | 2 +-
...QL12Parse.java => TestSPARQL12TripleTerms.java} | 4 +-
.../{parse => }/TestTrigParseTripleTerms.java | 2 +-
...rParse.java => TestTurtleTripleTermsParse.java} | 4 +-
.../jena/riot/{TC_Riot.java => TC_RIOT.java} | 10 ++-
.../java/org/apache/jena/riot/lang/TS_Lang.java | 3 -
.../rdfxml/{TM_RRX11.java => Scripts_RRX11.java} | 3 +-
.../rdfxml/{TM_RRX12.java => Scripts_RRX12.java} | 2 +-
.../jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java | 63 ----------------
.../lang/rdfxml/rrx/ErrorHandlerCollector.java | 76 +++++++++++++++++++
.../jena/riot/lang/rdfxml/rrx/RunTestRDFXML11.java | 85 +++++-----------------
.../apache/jena/riot/lang/rdfxml/rrx/TS_RRX.java | 9 ++-
.../jena/riot/lang/rdfxml/rrx/TestExtraRRX11.java | 1 -
.../test/java/org/apache/jena/sparql/TC_ARQ.java | 23 +-----
.../TC_System.java} | 40 +++++++---
20 files changed, 188 insertions(+), 203 deletions(-)
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/ARQTestSuite.java
b/jena-arq/src/test/java/org/apache/jena/arq/ARQTestSuite.java
index 73f7bbfcff..b191875723 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/ARQTestSuite.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/ARQTestSuite.java
@@ -29,48 +29,49 @@ import org.junit.platform.suite.api.Suite;
import org.apache.jena.atlas.TC_Atlas_ARQ;
import org.apache.jena.atlas.legacy.BaseTest2;
-import org.apache.jena.http.auth.TS_HttpAuth;
-import org.apache.jena.rdfs.TS_InfRdfs;
import org.apache.jena.riot.*;
+import org.apache.jena.riot.lang.rdfxml.Scripts_ARP1_RDFXML;
+import org.apache.jena.riot.lang.rdfxml.Scripts_RRX11;
+import org.apache.jena.riot.lang.rdfxml.Scripts_RRX12;
+import org.apache.jena.riot.lang.rdfxml.Scripts_RRX_RDFXML;
import org.apache.jena.sparql.*;
import org.apache.jena.sparql.expr.E_Function;
import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sys.JenaSystem;
-import org.apache.jena.system.TS_System;
-import org.apache.jena.system.buffering.TS_Buffering;
-import org.apache.jena.util.TS_UtilsARQ;
+import org.apache.jena.system.TC_System;
/**
- * All the ARQ tests
+ * All the ARQ tests, group by TC.
*/
@Suite
@SelectClasses({
- TC_Atlas_ARQ.class,
-
- TS_UtilsARQ.class,
+ // All TC_*.
+ // Should cover all TS_*
+ // Should not have any TS here (if in doubt, put in TC_System
- TC_Riot.class,
+ TC_System.class,
- TS_System.class,
- TS_Buffering.class,
-
- TS_InfRdfs.class,
- TS_HttpAuth.class,
+ TC_Atlas_ARQ.class,
+ TC_RIOT.class,
// Main ARQ java tests
TC_ARQ.class,
- // All scripted tests.
-
+ // All Scripts_*
// RIOT
// rdf-tests CG - RDF language tests
Scripts_RIOT_rdf_tests_std.class,
Scripts_RIOT_extra.class,
Scripts_AltTurtle.class,
- Scripts_C14N.class,
+ // RDF/XML
+ Scripts_ARP1_RDFXML.class,
+ Scripts_RRX_RDFXML.class,
+ Scripts_RRX11.class,
+ Scripts_RRX12.class,
+ Scripts_C14N.class,
// ARQ, SPARQL 1.0, SPARQL 1.1, SPARQL 1.2 - main engine, default
in-memory dataset.
Scripts_SPARQL.class,
Scripts_RefEngine.class,
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/TS_RDF12.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TS_RDF12.java
index 80c1170a30..6e3ec03094 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/TS_RDF12.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TS_RDF12.java
@@ -24,18 +24,23 @@ package org.apache.jena.rdf12;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;
-import org.apache.jena.rdf12.parse.TS_RDFStar_Parse;
-
-// Currently, RDF1.2 and SPARQL 1.2 specific tests.
-// Split sometime / replace with scripted tests.
+/**
+ * Basic testing of RDF 1.2 features to test the machinery.
+ *
+ * The rdf-tests should do full coverage so the tests here
+ * are a precursor, with more focused error reporting.
+ */
@Suite
@SelectClasses({
- TS_RDFStar_Parse.class,
+ TestNQuadsTripleTerms.class,
+ TestNTriplesTripleTerms.class,
+ TestTrigParseTripleTerms.class,
+ TestTurtleTripleTermsParse.class,
+ TestSPARQL12TripleTerms.class,
- TestRDF12LangSyntax.class,
+ TestRDF12LangDirSyntax.class,
TestSPARQL12Syntax.class,
TestSPARQL12Eval.class,
TestSPARQL12Results.class
})
-public class TS_RDF12 {
-}
+public class TS_RDF12 {}
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsTripleTerms.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestNQuadsTripleTerms.java
similarity index 98%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsTripleTerms.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/TestNQuadsTripleTerms.java
index 2ada75c6f3..da5fb81e91 100644
---
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNQuadsTripleTerms.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestNQuadsTripleTerms.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.rdf12.parse;
+package org.apache.jena.rdf12;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesTripleTerms.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestNTriplesTripleTerms.java
similarity index 98%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesTripleTerms.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/TestNTriplesTripleTerms.java
index 6adc48f0e6..8efb05d06e 100644
---
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestNTriplesTripleTerms.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestNTriplesTripleTerms.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.rdf12.parse;
+package org.apache.jena.rdf12;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangDirSyntax.java
similarity index 99%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangDirSyntax.java
index 294195290e..7dc41a08c4 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangDirSyntax.java
@@ -45,7 +45,7 @@ import org.apache.jena.sparql.util.IsoMatcher;
* Testing of RDF 1.2 parsing.
* Also - compare the output of Lang.TRURLE and TurtleJCC.TTL.JCC.
*/
-public class TestRDF12LangSyntax {
+public class TestRDF12LangDirSyntax {
// -- The tests
// Details of a test entry - it may contain information relevant to only
some kinds of test.
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
index 7c7ab3694d..15014f9c07 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
@@ -43,7 +43,7 @@ public class TestSPARQL12Results {
ResultSetFormatter.consume(rs);
}
- // Believed Stardog format JSON results.
+ // Believed to be Stardog format JSON results.
// It uses "s", "p" and "o" for the RDF term results.
// It uses "statement" for "triple".
@Test public void parse_alt_2() {
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestSPARQL12Parse.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12TripleTerms.java
similarity index 98%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestSPARQL12Parse.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12TripleTerms.java
index 0e05443786..0a2083aa95 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestSPARQL12Parse.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12TripleTerms.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.rdf12.parse;
+package org.apache.jena.rdf12;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -45,7 +45,7 @@ import org.apache.jena.sparql.core.BasicPattern;
import org.apache.jena.sys.JenaSystem;
import org.apache.jena.vocabulary.RDF;
-public class TestSPARQL12Parse {
+public class TestSPARQL12TripleTerms {
static { JenaSystem.init(); }
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigParseTripleTerms.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestTrigParseTripleTerms.java
similarity index 98%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigParseTripleTerms.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/TestTrigParseTripleTerms.java
index 3020ae2346..f4b87fc162 100644
---
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTrigParseTripleTerms.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestTrigParseTripleTerms.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.rdf12.parse;
+package org.apache.jena.rdf12;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestTurtleTripleTermsParse.java
similarity index 97%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java
rename to
jena-arq/src/test/java/org/apache/jena/rdf12/TestTurtleTripleTermsParse.java
index 2bb4c09d92..37eb3a3e67 100644
---
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TestTurtleStarParse.java
+++
b/jena-arq/src/test/java/org/apache/jena/rdf12/TestTurtleTripleTermsParse.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.rdf12.parse;
+package org.apache.jena.rdf12;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -37,7 +37,7 @@ import org.apache.jena.riot.system.StreamRDFLib;
/**
* Test parsing of occurrences and triple terms in Turtle.
*/
-public class TestTurtleStarParse {
+public class TestTurtleTripleTermsParse {
private ErrorHandler silent =
ErrorHandlerFactory.errorHandlerStrictNoLogging;
private static StreamRDF sink = StreamRDFLib.sinkNull();
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
b/jena-arq/src/test/java/org/apache/jena/riot/TC_RIOT.java
similarity index 88%
rename from jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
rename to jena-arq/src/test/java/org/apache/jena/riot/TC_RIOT.java
index 57cc8ac7e6..3c7707e44b 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TC_RIOT.java
@@ -26,6 +26,8 @@ import org.junit.platform.suite.api.Suite;
import org.apache.jena.riot.adapters.TS_RIOTAdapters;
import org.apache.jena.riot.lang.TS_Lang;
+import org.apache.jena.riot.lang.rdfxml.converted_legacy.TS_ConvertedARP1;
+import org.apache.jena.riot.lang.rdfxml.rrx.TS_RRX;
import org.apache.jena.riot.out.TS_Out;
import org.apache.jena.riot.process.TS_Process;
import org.apache.jena.riot.protobuf.TS_RDFProtobuf;
@@ -51,7 +53,6 @@ import org.apache.jena.riot.writer.TS_RiotWriter;
, TS_RIOTAdapters.class
, TS_Process.class
, TS_RiotWriter.class
- , TS_RiotSystem.class
, TS_IRIxProviders.class
, TS_RiotWeb.class
, TS_ResultSetRIOT.class
@@ -59,8 +60,13 @@ import org.apache.jena.riot.writer.TS_RiotWriter;
, TS_RDFThrift.class
, TS_RowSetRIOT.class
+ // Local tests, extensions and error reports.
+ , TS_RRX.class
+ // jena-core legacy test (RDF 1.0)
+ , TS_ConvertedARP1.class
+
// Scripted parser tests in ARQTestSuite.
})
-public class TC_Riot
+public class TC_RIOT
{ }
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java
index 33e1f96d5c..ace25c62b6 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java
@@ -27,7 +27,6 @@ import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;
import org.apache.jena.atlas.legacy.BaseTest2;
-import org.apache.jena.riot.lang.rdfxml.TC_RIOT_RDFXML;
@Suite
@SelectClasses({
@@ -55,8 +54,6 @@ import org.apache.jena.riot.lang.rdfxml.TC_RIOT_RDFXML;
// Thrift is done in the "thrift" package
, TestParserFactory.class
, TestCollectorStream.class
-
- , TC_RIOT_RDFXML.class
})
public class TS_Lang
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TM_RRX11.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX11.java
similarity index 96%
rename from
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TM_RRX11.java
rename to
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX11.java
index af6150fea5..a631c01371 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TM_RRX11.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX11.java
@@ -34,7 +34,8 @@ import
org.apache.jena.riot.lang.rdfxml.rrx_stax_sr.ReaderRDFXML_StAX_SR;
/** Non-RDF1.2 tests */
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class TM_RRX11 {
+public class Scripts_RRX11 {
+ // Manifest driven RDF 1.1 tests of RRX
private static String DIR = "testing/RIOT/rrx11-2";
private static String MANIFEST_MISC_RDFXML = DIR+"/manifest.ttl";
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TM_RRX12.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX12.java
similarity index 98%
rename from
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TM_RRX12.java
rename to
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX12.java
index 9a6456c1cc..966983e737 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TM_RRX12.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX12.java
@@ -34,7 +34,7 @@ import
org.apache.jena.riot.lang.rdfxml.rrx_stax_sr.ReaderRDFXML_StAX_SR;
// RDF 1.2 tests
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class TM_RRX12 {
+public class Scripts_RRX12 {
//private static String DIR = "testing/RIOT/rrx12";
private static String DIR = "testing/RIOT/rrx12";
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java
deleted file mode 100644
index e38178cfaa..0000000000
---
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.apache.jena.riot.lang.rdfxml;
-
-import org.junit.platform.suite.api.SelectClasses;
-import org.junit.platform.suite.api.Suite;
-
-import org.apache.jena.riot.lang.rdfxml.converted_legacy.TS_ConvertedARP1;
-import org.apache.jena.riot.lang.rdfxml.rrx.TS_RRX;
-
-@Suite
-@SelectClasses({
- // Local tests, extensions and error reports.
- TS_RRX.class,
-
- // jena-core legacy test (RDF 1.0)
- TS_ConvertedARP1.class,
-
- TM_RRX11.class,
- TM_RRX12.class
-})
-
-/**
- * RIOT test suites for RDFXML.
- * <p>
- * {@linkplain TS_ConvertedARP1} runs the ARP (final) tests
- * converted to run as RIOT tests.
- * <p>
- * {@linkplain TS_RRX} runs local RRX tests by comparing the different RRX
parsers
- * to ARP1. These test check for the same number of warning as well.
- * The {@code TestRDFXML_RRX_*} are running on extra local files. The
- * TestRDFXML_W3C_* are running on the RDF 1.0 test suite that ARP1 has used.
- * <p>
- * {@linkplain Scripts_RRX_RDFXML} runs the RRX and APR parsers on the
rdf-tests maintained
- * test suite. These are RDF1.1 and RDF 1.2 tests.
- * <p>
- * ARP1 is ARP is the RDFXML parser using IRIx in Jena4 from Jena 4.7.0.
- * RRX SAX is the default RDF/XML parser since Jena 5.0.0.
- * <p>
- * TM_RRX11 - more RDF 1.1 tests (from RRX 1.2 development) in "RIOT/rrx11-2"
- * TM_RRX12 - RDF 1.2 tests in "RIOT/rrx12"
- *
- */
-public class TC_RIOT_RDFXML {}
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/ErrorHandlerCollector.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/ErrorHandlerCollector.java
new file mode 100644
index 0000000000..1e6f2bfcc4
--- /dev/null
+++
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/ErrorHandlerCollector.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.apache.jena.riot.lang.rdfxml.rrx;
+
+import static java.lang.String.format;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.jena.riot.RiotException;
+import org.apache.jena.riot.system.ErrorHandler;
+
+class ErrorHandlerCollector implements ErrorHandler {
+ List<String> warnings = new ArrayList<>();
+ List<String> errors = new ArrayList<>();
+ List<String> fatals = new ArrayList<>();
+
+ @Override
+ public void warning(String message, long line, long col) {
+ warnings.add(message);
+ }
+
+ @Override
+ public void error(String message, long line, long col) {
+ errors.add(message);
+ throw new RiotException(message);
+ }
+
+ @Override
+ public void fatal(String message, long line, long col) {
+ fatals.add(message);
+ throw new RiotException(message);
+ }
+
+ public boolean anySet() {
+ return ! ( warnings.isEmpty() && errors.isEmpty() && fatals.isEmpty()
);
+ }
+
+ public void reset() {
+ warnings.clear();
+ errors.clear();
+ fatals.clear();
+ }
+
+ public String summary() {
+ if ( fatals.isEmpty() )
+ return format("E:%d W:%d", errors.size(), warnings.size());
+ return format("E:%d W:%d F:%d", errors.size(), warnings.size(),
fatals.size());
+ }
+
+ public void print(PrintStream out) {
+ warnings.forEach(s -> out.println("W: " + s));
+ errors.forEach(s -> out.println("E: " + s));
+ fatals.forEach(s -> out.println("F: " + s));
+ }
+}
\ No newline at end of file
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML11.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML11.java
index 2853947404..02bcb40d2f 100644
---
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML11.java
+++
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML11.java
@@ -31,7 +31,6 @@ import java.io.InputStream;
import java.io.PrintStream;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -57,13 +56,13 @@ public class RunTestRDFXML11 {
* These are also run from {@link
org.apache.jena.riot.lang.rdfxml.Scripts_RRX_RDFXML}.
* Here, the exact warnings and errors are checked.
*/
- static List<String> w3cTestFiles() {
+ public static List<String> w3cTestFiles() {
Path DIR = Path.of("testing/rdf-tests-cg/rdf/rdf11/rdf-xml");
List<String> files = allTestFiles(DIR);
return files;
}
- static List<String> allTestFiles(Path directory) {
+ private static List<String> allTestFiles(Path directory) {
if ( !Files.exists(directory) ) {
System.err.println("No such directory: "+directory);
return List.of();
@@ -92,7 +91,7 @@ public class RunTestRDFXML11 {
*
* Check the files on disk agree with the built-in order list.
*/
- static List<String> localTestFiles() {
+ public static List<String> localTestFiles() {
Path LOCAL_DIR = Path.of("testing/RIOT/rrx11/");
Set<String> found;
try {
@@ -224,57 +223,12 @@ public class RunTestRDFXML11 {
}
- static List<RRX_TestFileArgs> makeTestSetup(String label,
ReaderRIOTFactory rdfxmlFactory, List<String> testfiles) {
+ public static List<RRX_TestFileArgs> makeTestSetup(String label,
ReaderRIOTFactory rdfxmlFactory, List<String> testfiles) {
return testfiles.stream()
.map(fn->new RRX_TestFileArgs(label, fn, rdfxmlFactory))
.toList();
}
- static class ErrorHandlerCollector implements ErrorHandler {
- List<String> warnings = new ArrayList<>();
- List<String> errors = new ArrayList<>();
- List<String> fatals = new ArrayList<>();
-
- @Override
- public void warning(String message, long line, long col) {
- warnings.add(message);
- }
-
- @Override
- public void error(String message, long line, long col) {
- errors.add(message);
- throw new RiotException(message);
- }
-
- @Override
- public void fatal(String message, long line, long col) {
- fatals.add(message);
- throw new RiotException(message);
- }
-
- public boolean anySet() {
- return ! ( warnings.isEmpty() && errors.isEmpty() &&
fatals.isEmpty() );
- }
-
- public void reset() {
- warnings.clear();
- errors.clear();
- fatals.clear();
- }
-
- public String summary() {
- if ( fatals.isEmpty() )
- return format("E:%d W:%d", errors.size(), warnings.size());
- return format("E:%d W:%d F:%d", errors.size(), warnings.size(),
fatals.size());
- }
-
- public void print(PrintStream out) {
- warnings.forEach(s -> out.println("W: " + s));
- errors.forEach(s -> out.println("E: " + s));
- fatals.forEach(s -> out.println("F: " + s));
- }
- }
-
// If true, print if there were any warnings/errors. If false, print only
if different counts.
static boolean PrintAll = false;
static PrintStream output = System.out;
@@ -322,15 +276,6 @@ public class RunTestRDFXML11 {
parseFile(testSubjectFactory, errorHandlerReference, filename);
}
- /**
- * Run a test, expecting a graph as the result.
- */
- static void runTestExpectGraph(String testLabel,
- ReaderRIOTFactory testSubjectFactory,
String subjectLabel,
- Graph expectedGraph, String filename) {
- runTestExpectGraph(testLabel, testSubjectFactory, subjectLabel,
expectedGraph, filename, null);
- }
-
/** Run a test expecting a RiotException. */
static void runTestExpectFailure(String testLabel,
ReaderRIOTFactory testSubjectFactory,
String subjectLabel,
@@ -355,6 +300,15 @@ public class RunTestRDFXML11 {
checkErrorHandler(testLabel, actualErrorHandler, numWarnings, 0, 0);
}
+ /**
+ * Run a test, expecting a graph as the result.
+ */
+ static void unused_runTestExpectGraph(String testLabel,
+ ReaderRIOTFactory testSubjectFactory,
String subjectLabel,
+ Graph expectedGraph, String filename) {
+ runTestExpectGraph(testLabel, testSubjectFactory, subjectLabel,
expectedGraph, filename, null);
+ }
+
/**
* Run a test, expecting a graph as the result.
* Compare with the expected error handler if that argument is not null.
@@ -363,9 +317,9 @@ public class RunTestRDFXML11 {
ReaderRIOTFactory
testSubjectFactory, String subjectLabel,
Graph expectedGraph, String
filename,
ErrorHandlerCollector
expectedErrorHandler) {
- ErrorHandlerCollector errorHandlerTest = new ErrorHandlerCollector();
+ ErrorHandlerCollector actualErrorHandler = new ErrorHandlerCollector();
try {
- Graph actualGraph = parseFile(testSubjectFactory,
errorHandlerTest, filename);
+ Graph actualGraph = parseFile(testSubjectFactory,
actualErrorHandler, filename);
// "same" graph output?
if ( ! expectedGraph.isIsomorphicWith(actualGraph) ) {
output.println("---- "+testLabel+" : "+filename);
@@ -378,7 +332,7 @@ public class RunTestRDFXML11 {
fail("Graph1 not isomorphic to graph2");
}
if ( expectedErrorHandler != null )
- checkErrorHandler(testLabel, expectedErrorHandler,
errorHandlerTest);
+ checkErrorHandler(testLabel, expectedErrorHandler,
actualErrorHandler);
return;
} catch (RiotException ex) {
// output.println("## "+testLabel);
@@ -395,11 +349,11 @@ public class RunTestRDFXML11 {
ReaderRIOTFactory
testSubjectFactory, String subjectLabel,
String filename,
ErrorHandlerCollector
expectedErrorHandler) {
- ErrorHandlerCollector errorHandlerTest = new ErrorHandlerCollector();
+ ErrorHandlerCollector actualErrorHandler = new ErrorHandlerCollector();
try {
- Graph actualGraph = parseFile(testSubjectFactory,
errorHandlerTest, filename);
+ Graph actualGraph = parseFile(testSubjectFactory,
actualErrorHandler, filename);
if ( expectedErrorHandler != null )
- checkErrorHandler(testLabel, expectedErrorHandler,
errorHandlerTest);
+ checkErrorHandler(testLabel, expectedErrorHandler,
actualErrorHandler);
return;
} catch(RiotException ex) {
output.println("## "+testLabel);
@@ -408,7 +362,6 @@ public class RunTestRDFXML11 {
}
}
-
/** Run a test expecting a RiotException. Check the error handler. */
private static void runTestExpectFailure(String testLabel,
ReaderRIOTFactory
testSubjectFactory, String subjectLabel,
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TS_RRX.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TS_RRX.java
index 02d6c937d9..5573362395 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TS_RRX.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TS_RRX.java
@@ -26,6 +26,10 @@ import org.junit.platform.suite.api.Suite;
/**
* Detailed RRX tests, not manifest driven.
+ * TS_RRX runs local RRX tests by comparing the different RRX parsers
+ * to ARP1. These test check for the same number of warning as well.
+ * The TestRDFXML_RRX_* are running on extra local files. The
+ * TestExtraRRX11 is running on the RDF 1.0 test suite that ARP1 has used.
*/
@Suite
@SelectClasses( {
@@ -34,13 +38,14 @@ import org.junit.platform.suite.api.Suite;
Test_RRX_Local_StAXev.class,
Test_RRX_Local_StAXsr.class,
// RDF 1.1 test suite as detailed tests.
- // See Scripts_RIOT_
Test_RRX_W3C_SAX.class,
Test_RRX_W3C_StAXev.class,
Test_RRX_W3C_StAXsr.class,
- // Additional RRX specific tests. "rrx11-files"
+ // Additional RRX specific tests. Uses "rrx11-files"
TestExtraRRX11.class
+
+ // See also Scripts_RIOT_
})
public class TS_RRX {}
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX11.java
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX11.java
index d568deeae6..76911d5e14 100644
---
a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX11.java
+++
b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/TestExtraRRX11.java
@@ -43,7 +43,6 @@ 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.RunTestRDFXML11.ErrorHandlerCollector;
import org.apache.jena.riot.system.ParserProfile;
import org.apache.jena.riot.system.RiotLib;
import org.apache.jena.riot.system.StreamRDF;
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/TC_ARQ.java
b/jena-arq/src/test/java/org/apache/jena/sparql/TC_ARQ.java
index ca1b80634b..6b28a0a5bb 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/TC_ARQ.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/TC_ARQ.java
@@ -23,6 +23,8 @@ package org.apache.jena.sparql;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
import org.apache.jena.query.TS_Query;
import org.apache.jena.rdf12.TS_RDF12;
@@ -44,7 +46,6 @@ import org.apache.jena.sparql.expr.TS_Expr;
import org.apache.jena.sparql.function.library.TS_LibraryFunctions;
import org.apache.jena.sparql.function.scripting.TS_FunctionScripting;
import org.apache.jena.sparql.function.user.TS_UserFunctions;
-import org.apache.jena.sparql.graph.TS_Graph;
import org.apache.jena.sparql.lang.TS_LangSPARQL;
import org.apache.jena.sparql.lib.TS_SparqlLib;
import org.apache.jena.sparql.modify.TS_Update;
@@ -53,27 +54,10 @@ import org.apache.jena.sparql.path.TS_Path;
import org.apache.jena.sparql.pfunction.library.TS_PFunction;
import org.apache.jena.sparql.resultset.TS_ResultSet;
import org.apache.jena.sparql.solver.TS_Solver;
-import org.apache.jena.sparql.sse.TS_SSE;
import org.apache.jena.sparql.syntax.TS_Syntax;
-import org.apache.jena.sparql.transaction.TS_Transaction;
-import org.apache.jena.sparql.util.TS_DyadicDatasetGraphs;
-import org.apache.jena.sparql.util.TS_Util;
-import org.apache.jena.sparql.util.compose.TS_DatasetCollectors;
-import org.apache.jena.sparql.util.iso.TS_Iso;
-
-import org.junit.platform.suite.api.SelectClasses;
-import org.junit.platform.suite.api.Suite;
@Suite
@SelectClasses({
-
- TS_SSE.class
- , TS_LangSPARQL.class
-
- , TS_Graph.class
- , TS_DyadicDatasetGraphs.class
- , TS_DatasetCollectors.class
- , TS_Util.class
- , TS_Iso.class
+ TS_LangSPARQL.class
, TS_Expr.class
, TS_LibraryFunctions.class
@@ -99,7 +83,6 @@ import org.junit.platform.suite.api.Suite;
, TS_DatasetTxnMem.class
, TS_Path.class
, TS_Update.class
- , TS_Transaction.class
, TS_SparqlLib.class
// Outside org.apache.jena.sparql
diff --git
a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TS_RDFStar_Parse.java
b/jena-arq/src/test/java/org/apache/jena/system/TC_System.java
similarity index 51%
rename from
jena-arq/src/test/java/org/apache/jena/rdf12/parse/TS_RDFStar_Parse.java
rename to jena-arq/src/test/java/org/apache/jena/system/TC_System.java
index 95b391767b..51bd69f35b 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf12/parse/TS_RDFStar_Parse.java
+++ b/jena-arq/src/test/java/org/apache/jena/system/TC_System.java
@@ -19,19 +19,41 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.rdf12.parse;
+package org.apache.jena.system;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;
+import org.apache.jena.http.auth.TS_HttpAuth;
+import org.apache.jena.rdfs.TS_InfRdfs;
+import org.apache.jena.sparql.graph.TS_Graph;
+import org.apache.jena.sparql.sse.TS_SSE;
+import org.apache.jena.sparql.transaction.TS_Transaction;
+import org.apache.jena.sparql.util.TS_DyadicDatasetGraphs;
+import org.apache.jena.sparql.util.TS_Util;
+import org.apache.jena.sparql.util.compose.TS_DatasetCollectors;
+import org.apache.jena.sparql.util.iso.TS_Iso;
+import org.apache.jena.system.buffering.TS_Buffering;
+import org.apache.jena.util.TS_UtilsARQ;
+
@Suite
@SelectClasses({
- // ** To be removed?
- TestNQuadsTripleTerms.class,
- TestNTriplesTripleTerms.class,
- TestTrigParseTripleTerms.class,
- TestTurtleStarParse.class,
- TestSPARQL12Parse.class
+ TS_System.class
+ , TS_SSE.class
+ , TS_Graph.class
+ , TS_DyadicDatasetGraphs.class
+ , TS_DatasetCollectors.class
+ , TS_Util.class
+ , TS_Iso.class
+ , TS_Transaction.class
+
+ , TS_UtilsARQ.class
+ , TS_System.class
+ , TS_Buffering.class
+
+ , TS_InfRdfs.class
+ , TS_HttpAuth.class
})
-public class TS_RDFStar_Parse {
-}
+
+public class TC_System {}
+
