This is an automated email from the ASF dual-hosted git repository.
andy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
from 66f86d6e6c Bump the npm-patch-group group
add 73e2c1cd8b Use @BeforeSuite/@AfterSuite
add c593e963e5 JUnit5
add c62e693ed1 Rename oaj.arq.junit as junit4. Add package junit5
add c4947e1b9f Code tidy
add 5f7862c5d5 Convert RIOT scripted tests to JUnit5
add 68febf3c41 Convert SPARQL scripted tests to JUnit5
No new revisions were added by this update.
Summary of changes:
jena-arq/pom.xml | 9 +-
.../java/org/apache/jena/sparql/expr/Unstable.java | 2 +-
.../jena/sparql/vocabulary/TestManifest_12.java | 5 +
.../java/org/apache/jena/arq/ARQTestSuite.java | 23 +--
...nifest_Examples.java => Manifest_Examples.java} | 31 ++--
.../apache/jena/arq/junit/runners/RunnerRIOT.java | 39 ----
.../apache/jena/arq/{junit => junit4}/LibTest.java | 2 +-
.../jena/arq/{junit => junit4}/LibTestSetup.java | 4 +-
.../jena/arq/{junit => junit4}/SkipTest.java | 4 +-
.../jena/arq/{junit => junit4}/SurpressedTest.java | 4 +-
.../jena/arq/{junit => junit4}/TextTestRunner.java | 10 +-
.../{junit => junit4}/manifest/ExTestSetup.java | 2 +-
.../arq/{junit => junit4}/manifest/Manifest.java | 2 +-
.../{junit => junit4}/manifest/ManifestEntry.java | 2 +-
.../arq/{junit => junit4}/manifest/Manifests.java | 2 +-
.../arq/{junit => junit4}/manifest/Prefix.java | 2 +-
.../arq/{junit => junit4}/riot/ParseForTest.java | 2 +-
.../arq/{junit => junit4}/riot/RiotEvalTest.java | 4 +-
.../arq/{junit => junit4}/riot/RiotSyntaxTest.java | 4 +-
.../jena/arq/{junit => junit4}/riot/RiotTests.java | 10 +-
.../arq/{junit => junit4}/riot/VocabLangRDF.java | 2 +-
.../runners/AbstractRunnerOfTests.java | 6 +-
.../arq/{junit => junit4}/runners/Directories.java | 2 +-
.../jena/arq/{junit => junit4}/runners/Label.java | 2 +-
.../runners/RunnerOneManifest.java | 5 +-
.../{junit => junit4}/runners/RunnerOneTest.java | 2 +-
.../{junit => junit4}/runners/RunnerSPARQL.java | 5 +-
.../{junit => junit4}/runners/SetupManifests.java | 10 +-
.../arq/{junit => junit4}/sparql/SparqlTests.java | 8 +-
.../sparql/tests/QueryEvalTest.java | 6 +-
.../sparql/tests/QuerySyntaxTest.java | 6 +-
.../sparql/tests/QueryTestItem.java | 5 +-
.../sparql/tests/SerializationTest.java | 4 +-
.../sparql/tests/SparqlTestLib.java | 6 +-
.../sparql/tests/UpdateEvalTest.java | 4 +-
.../sparql/tests/UpdateSyntaxTest.java | 4 +-
.../org/apache/jena/arq/junit5/EarlReport.java | 114 ++++++++++++
.../apache/jena/arq/{junit => junit5}/LibTest.java | 2 +-
.../java/org/apache/jena/arq/junit5/Scripts.java | 102 +++++++++++
.../jena/arq/{junit => junit5}/SkipTest.java | 17 +-
.../jena/arq/{junit => junit5}/SurpressedTest.java | 12 +-
.../manifest/AbstractManifestTest.java} | 39 ++--
.../manifest/EarlReporter.java} | 38 ++--
.../manifest/EntryToTest.java} | 17 +-
.../apache/jena/arq/junit5/manifest/Manifest.java | 200 +++++++++++++++++++++
.../{junit => junit5}/manifest/ManifestEntry.java | 33 ++--
.../arq/junit5/manifest/ManifestProcessor.java | 171 ++++++++++++++++++
.../arq/junit5/manifest/RunnableTestMaker.java | 72 ++++++++
.../manifest/TestSetupException.java} | 21 +--
.../riot/ParsingStepForTest.java} | 57 +++---
.../arq/{junit => junit5}/riot/RiotEvalTest.java | 43 +++--
.../arq/{junit => junit5}/riot/RiotSyntaxTest.java | 37 ++--
.../jena/arq/{junit => junit5}/riot/RiotTests.java | 156 ++++++++--------
.../arq/{junit => junit5}/riot/VocabLangRDF.java | 2 +-
.../arq/{junit => junit5}/sparql/SparqlTests.java | 81 +++++----
.../sparql/tests/QueryEvalTest.java | 28 +--
.../sparql/tests/QuerySyntaxTest.java | 18 +-
.../sparql/tests/QueryTestItem.java | 175 ++++++++----------
.../sparql/tests/SerializationTest.java | 19 +-
.../sparql/tests/SparqlTestLib.java | 79 +++++---
.../sparql/tests/UpdateEvalTest.java | 67 ++++---
.../sparql/tests/UpdateSyntaxTest.java | 14 +-
.../org/apache/jena/external/Scripts_SPARQL11.java | 49 -----
.../apache/jena/external/Scripts_SPARQLCDTs.java | 50 ------
.../org/apache/jena/riot/Scripts_AltTurtle.java | 53 +++---
.../org/apache/jena/riot/Scripts_LangSuite.java | 26 +--
.../Scripts_RIOT_rdf_tests.java} | 27 +--
.../test/java/org/apache/jena/riot/TC_Riot.java | 3 +-
.../jena/riot/lang/rdfxml/Scripts_RRX_RDFXML.java | 84 +++++++++
.../jena/riot/lang/rdfxml/TC_RIOT_RDFXML.java | 9 +-
.../rdfxml/manifest_rdf11/Manifest_RDF11_ARP1.java | 54 ------
.../manifest_rdf11/Manifest_RDF11_RRX_SAX.java | 53 ------
.../manifest_rdf11/Manifest_RDF11_RRX_StAXev.java | 54 ------
.../manifest_rdf11/Manifest_RDF11_RRX_StAXsr.java | 54 ------
.../rdfxml/manifest_rdf11/Scripts_RRX_RDFXML.java | 37 ----
.../jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java | 2 +-
.../apache/jena/riot/lang/rdfxml/rrx/TS_RRX.java | 13 +-
.../java/org/apache/jena/sparql/Scripts_ARQ.java | 58 ------
.../java/org/apache/jena/sparql/Scripts_DAWG.java | 69 -------
.../org/apache/jena/sparql/Scripts_DatasetMap.java | 54 ------
.../apache/jena/sparql/Scripts_DatasetMapLink.java | 56 ------
.../org/apache/jena/sparql/Scripts_RefEngine.java | 30 ++--
.../org/apache/jena/sparql/Scripts_SPARQL.java | 93 ++++++++++
.../apache/jena/sparql/Scripts_SPARQL_Dataset.java | 90 ++++++++++
.../java/org/apache/jena/sparql/Scripts_TIM.java | 54 ------
.../core/AbstractDatasetGraphFindPatterns.java | 32 ++--
...ripting.java => Manifest_SPARQL_Scripting.java} | 35 ++--
.../function/scripting/TS_FunctionScripting.java | 10 +-
.../sparql/function/user/TS_UserFunctions.java | 8 +-
.../jena/sparql/junit/QueryTestException.java | 6 +-
.../jena/sparql/junit/RunnerSPARQL_DatasetMap.java | 46 -----
.../sparql/junit/RunnerSPARQL_DatasetMapLink.java | 46 -----
.../apache/jena/sparql/junit/RunnerSPARQL_TIM.java | 46 -----
.../testing/rdf12-wg/Syntax-SPARQL_12/manifest.ttl | 7 +-
.../java/org/apache/jena/atlas/lib/StreamOps.java | 18 +-
.../org/apache/jena/atlas/junit/AssertExtra.java | 18 +-
jena-cmds/src/test/java/arq/rdftests.java | 16 +-
.../java/org/apache/jena/graph/TextDirection.java | 10 +-
.../apache/jena/assembler/test/TS3_Assembler.java | 3 +-
jena-fuseki2/jena-fuseki-core/pom.xml | 6 -
jena-fuseki2/jena-fuseki-main/pom.xml | 7 -
.../apache/jena/fuseki/main/TestAuthQuery_JDK.java | 19 +-
.../jena/fuseki/main/TestAuthUpdate_JDK.java | 6 +-
.../apache/jena/fuseki/main/TestFusekiMainCmd.java | 7 +-
.../jena/fuseki/mod/admin/FusekiServerPerTest.java | 2 +-
.../fuseki/mod/admin/FusekiServerPerTestClass.java | 2 +-
.../fuseki/mod/admin/TestAdminDatabaseOps.java | 26 +--
jena-fuseki2/jena-fuseki-mod-geosparql/pom.xml | 7 -
.../org/apache/jena/fuseki/TestWebappAdmin.java | 22 ++-
.../TestWebappAdminAddDeleteDatasetFile.java | 29 ++-
.../org/apache/jena/shex/TestShexPrintShexC.java | 4 +-
.../java/org/apache/jena/shex/TestShexSyntax.java | 4 +-
.../org/apache/jena/shex/TestShexSyntaxBad.java | 4 +-
.../org/apache/jena/shex/TestShexValidation.java | 4 +-
.../jena/shex/runner/AbstractRunnerFiles.java | 4 +-
.../jena/shex/runner/RunnerShexValidation.java | 3 +-
.../org/apache/jena/shex/runner/ShexTests.java | 9 +-
.../jena/shex/runner/ShexValidationTest.java | 3 +-
.../java/org/apache/jena/tdb1/Scripts_TDB1.java | 6 +-
.../apache/jena/tdb1/junit/RunnerSPARQL_TDB1.java | 6 +-
.../java/org/apache/jena/tdb2/Scripts_TDB2.java | 45 +++--
.../apache/jena/tdb2/junit/RunnerSPARQL_TDB2.java | 6 +-
122 files changed, 1820 insertions(+), 1638 deletions(-)
rename
jena-arq/src/test/java/org/apache/jena/arq/examples/{TestManifest_Examples.java
=> Manifest_Examples.java} (77%)
delete mode 100644
jena-arq/src/test/java/org/apache/jena/arq/junit/runners/RunnerRIOT.java
copy jena-arq/src/test/java/org/apache/jena/arq/{junit => junit4}/LibTest.java
(97%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/LibTestSetup.java (97%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/SkipTest.java (91%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/SurpressedTest.java (93%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/TextTestRunner.java (89%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/manifest/ExTestSetup.java (96%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/manifest/Manifest.java (99%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/manifest/ManifestEntry.java (97%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/manifest/Manifests.java (95%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/manifest/Prefix.java (95%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/riot/ParseForTest.java (98%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/riot/RiotEvalTest.java (98%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/riot/RiotSyntaxTest.java (96%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/riot/RiotTests.java (97%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/riot/VocabLangRDF.java (99%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/runners/AbstractRunnerOfTests.java (98%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/runners/Directories.java (95%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/runners/Label.java (95%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/runners/RunnerOneManifest.java (95%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/runners/RunnerOneTest.java (98%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/runners/RunnerSPARQL.java (93%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/runners/SetupManifests.java (95%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/sparql/SparqlTests.java (97%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/sparql/tests/QueryEvalTest.java (98%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/sparql/tests/QuerySyntaxTest.java (93%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/sparql/tests/QueryTestItem.java (98%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/sparql/tests/SerializationTest.java (96%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/sparql/tests/SparqlTestLib.java (96%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/sparql/tests/UpdateEvalTest.java (98%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit4}/sparql/tests/UpdateSyntaxTest.java (94%)
create mode 100644
jena-arq/src/test/java/org/apache/jena/arq/junit5/EarlReport.java
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/LibTest.java (97%)
create mode 100644
jena-arq/src/test/java/org/apache/jena/arq/junit5/Scripts.java
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/SkipTest.java (73%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/SurpressedTest.java (80%)
copy jena-arq/src/test/java/org/apache/jena/arq/{junit/SurpressedTest.java =>
junit5/manifest/AbstractManifestTest.java} (51%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit/SurpressedTest.java
=> junit5/manifest/EarlReporter.java} (50%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit/runners/Label.java =>
junit5/manifest/EntryToTest.java} (76%)
create mode 100644
jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/Manifest.java
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/manifest/ManifestEntry.java (66%)
create mode 100644
jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/ManifestProcessor.java
create mode 100644
jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/RunnableTestMaker.java
rename jena-arq/src/test/java/org/apache/jena/arq/{junit/SkipTest.java =>
junit5/manifest/TestSetupException.java} (68%)
rename
jena-arq/src/test/java/org/apache/jena/arq/{junit/riot/ParseForTest.java =>
junit5/riot/ParsingStepForTest.java} (56%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/riot/RiotEvalTest.java (82%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/riot/RiotSyntaxTest.java (75%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/riot/RiotTests.java (63%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/riot/VocabLangRDF.java (99%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/sparql/SparqlTests.java (63%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/sparql/tests/QueryEvalTest.java (95%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/sparql/tests/QuerySyntaxTest.java (78%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/sparql/tests/QueryTestItem.java (55%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/sparql/tests/SerializationTest.java (81%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/sparql/tests/SparqlTestLib.java (60%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/sparql/tests/UpdateEvalTest.java (68%)
rename jena-arq/src/test/java/org/apache/jena/arq/{junit =>
junit5}/sparql/tests/UpdateSyntaxTest.java (82%)
delete mode 100644
jena-arq/src/test/java/org/apache/jena/external/Scripts_SPARQL11.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/external/Scripts_SPARQLCDTs.java
rename
jena-arq/src/test/java/org/apache/jena/{external/Scripts_LangSuiteCG.java =>
riot/Scripts_RIOT_rdf_tests.java} (65%)
create mode 100644
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX_RDFXML.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Manifest_RDF11_ARP1.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Manifest_RDF11_RRX_SAX.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Manifest_RDF11_RRX_StAXev.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Manifest_RDF11_RRX_StAXsr.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/manifest_rdf11/Scripts_RRX_RDFXML.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/Scripts_ARQ.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DAWG.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DatasetMap.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DatasetMapLink.java
create mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL.java
create mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL_Dataset.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/Scripts_TIM.java
rename
jena-arq/src/test/java/org/apache/jena/sparql/function/scripting/{TestSPARQL_Scripting.java
=> Manifest_SPARQL_Scripting.java} (76%)
delete mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_DatasetMap.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_DatasetMapLink.java
delete mode 100644
jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_TIM.java