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 53c6f4d3a137e320ad8f378451b9f54c2f2be88a Author: Andy Seaborne <[email protected]> AuthorDate: Wed Aug 27 11:56:40 2025 +0100 Rename package 'junit5' as 'junit' --- .../apache/jena/arq/examples/Manifest_Examples.java | 2 +- .../apache/jena/arq/{junit5 => junit}/EarlReport.java | 2 +- .../org/apache/jena/arq/{junit5 => junit}/LibTest.java | 2 +- .../org/apache/jena/arq/{junit5 => junit}/Scripts.java | 14 +++++++------- .../apache/jena/arq/{junit5 => junit}/SkipTest.java | 6 +++--- .../jena/arq/{junit5 => junit}/SurpressedTest.java | 4 ++-- .../manifest/AbstractManifestTest.java | 2 +- .../arq/{junit5 => junit}/manifest/EarlReporter.java | 4 ++-- .../arq/{junit5 => junit}/manifest/EntryToTest.java | 2 +- .../jena/arq/{junit5 => junit}/manifest/Manifest.java | 2 +- .../arq/{junit5 => junit}/manifest/ManifestEntry.java | 2 +- .../{junit5 => junit}/manifest/ManifestProcessor.java | 2 +- .../{junit5 => junit}/manifest/RunnableTestMaker.java | 8 ++++---- .../{junit5 => junit}/manifest/TestSetupException.java | 2 +- .../arq/{junit5 => junit}/riot/ParsingStepForTest.java | 2 +- .../jena/arq/{junit5 => junit}/riot/RiotEvalTest.java | 8 ++++---- .../arq/{junit5 => junit}/riot/RiotSyntaxTest.java | 6 +++--- .../jena/arq/{junit5 => junit}/riot/RiotTests.java | 8 ++++---- .../arq/{junit5 => junit}/riot/RiotTestsConfig.java | 4 ++-- .../jena/arq/{junit5 => junit}/riot/VocabLangRDF.java | 2 +- .../jena/arq/{junit5 => junit}/sparql/SparqlTests.java | 10 +++++----- .../{junit5 => junit}/sparql/tests/QueryEvalTest.java | 10 +++++----- .../sparql/tests/QuerySyntaxTest.java | 8 ++++---- .../{junit5 => junit}/sparql/tests/QueryTestItem.java | 6 +++--- .../sparql/tests/SerializationTest.java | 6 +++--- .../{junit5 => junit}/sparql/tests/SparqlTestLib.java | 6 +++--- .../{junit5 => junit}/sparql/tests/UpdateEvalTest.java | 8 ++++---- .../sparql/tests/UpdateSyntaxTest.java | 6 +++--- .../{junit5 => junit}/textrunner/ManifestHolder.java | 4 ++-- .../textrunner/PrintExecutionListener.java | 2 +- .../{junit5 => junit}/textrunner/TextTestRunner5.java | 8 ++++---- .../java/org/apache/jena/riot/Scripts_AltTurtle.java | 4 ++-- .../java/org/apache/jena/riot/Scripts_LangSuite.java | 3 ++- .../org/apache/jena/riot/Scripts_RIOT_rdf_tests.java | 2 +- .../jena/riot/lang/rdfxml/Scripts_RRX_RDFXML.java | 4 ++-- .../java/org/apache/jena/sparql/Scripts_RefEngine.java | 2 +- .../java/org/apache/jena/sparql/Scripts_SPARQL.java | 4 ++-- .../org/apache/jena/sparql/Scripts_SPARQL_Dataset.java | 6 +++--- .../function/scripting/Manifest_SPARQL_Scripting.java | 2 +- jena-cmds/src/test/java/arq/rdftests.java | 18 +++++++++--------- .../java/org/apache/jena/fuseki/test/FusekiTest.java | 6 +++--- .../java/org/apache/jena/fuseki/test/HttpTest.java | 8 +++----- .../test/java/org/apache/jena/tdb1/Scripts_TDB1.java | 6 +++--- .../test/java/org/apache/jena/tdb2/Scripts_TDB2.java | 6 +++--- 44 files changed, 114 insertions(+), 115 deletions(-) diff --git a/jena-arq/src/test/java/org/apache/jena/arq/examples/Manifest_Examples.java b/jena-arq/src/test/java/org/apache/jena/arq/examples/Manifest_Examples.java index 2e016414cb..4651b12d77 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/examples/Manifest_Examples.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/examples/Manifest_Examples.java @@ -22,7 +22,7 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; +import org.apache.jena.arq.junit.Scripts; import org.apache.jena.sparql.expr.E_Function; import org.apache.jena.sparql.expr.NodeValue; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/EarlReport.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/EarlReport.java similarity index 99% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/EarlReport.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/EarlReport.java index 3a8711ea72..99d6f9eb69 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/EarlReport.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/EarlReport.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5; +package org.apache.jena.arq.junit; import org.apache.jena.atlas.lib.DateTimeUtils; import org.apache.jena.datatypes.xsd.XSDDatatype; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/LibTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/LibTest.java similarity index 97% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/LibTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/LibTest.java index 063dfd9953..06ec2b567f 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/LibTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/LibTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5; +package org.apache.jena.arq.junit; import org.apache.jena.atlas.io.IO; import org.apache.jena.atlas.lib.IRILib; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/Scripts.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/Scripts.java similarity index 91% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/Scripts.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/Scripts.java index cd114ebe8b..e4c1c40795 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/Scripts.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/Scripts.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5; +package org.apache.jena.arq.junit; import java.util.function.Function; import java.util.stream.Stream; @@ -24,12 +24,12 @@ import java.util.stream.Stream; import org.junit.jupiter.api.DynamicNode; import org.junit.jupiter.api.function.Executable; -import org.apache.jena.arq.junit5.manifest.EntryToTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.manifest.ManifestProcessor; -import org.apache.jena.arq.junit5.manifest.RunnableTestMaker; -import org.apache.jena.arq.junit5.riot.RiotTests; -import org.apache.jena.arq.junit5.sparql.SparqlTests; +import org.apache.jena.arq.junit.manifest.EntryToTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.ManifestProcessor; +import org.apache.jena.arq.junit.manifest.RunnableTestMaker; +import org.apache.jena.arq.junit.riot.RiotTests; +import org.apache.jena.arq.junit.sparql.SparqlTests; import org.apache.jena.atlas.lib.StreamOps; import org.apache.jena.sparql.ARQException; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/SkipTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/SkipTest.java similarity index 87% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/SkipTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/SkipTest.java index 73e1c9c6b3..af929c1afc 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/SkipTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/SkipTest.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5; +package org.apache.jena.arq.junit; -import org.apache.jena.arq.junit5.manifest.AbstractManifestTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.AbstractManifestTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; /** Ignore a test */ public class SkipTest extends AbstractManifestTest implements Runnable { diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/SurpressedTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/SurpressedTest.java similarity index 93% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/SurpressedTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/SurpressedTest.java index fdde724a73..f1f179a329 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/SurpressedTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/SurpressedTest.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5; +package org.apache.jena.arq.junit; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.ManifestEntry; public class SurpressedTest extends SkipTest { public final boolean verbose; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/AbstractManifestTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/AbstractManifestTest.java similarity index 97% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/AbstractManifestTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/AbstractManifestTest.java index 7538f2ef46..81049b0480 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/AbstractManifestTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/AbstractManifestTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.manifest; +package org.apache.jena.arq.junit.manifest; public abstract class AbstractManifestTest implements Runnable { diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/EarlReporter.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/EarlReporter.java similarity index 94% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/EarlReporter.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/EarlReporter.java index 1d37c11183..34533910e0 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/EarlReporter.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/EarlReporter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.manifest; +package org.apache.jena.arq.junit.manifest; -import org.apache.jena.arq.junit5.EarlReport; +import org.apache.jena.arq.junit.EarlReport; public class EarlReporter { // Only one earl test report at a time. diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/EntryToTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/EntryToTest.java similarity index 94% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/EntryToTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/EntryToTest.java index 66fc772810..209a308bfc 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/EntryToTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/EntryToTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.manifest; +package org.apache.jena.arq.junit.manifest; import java.util.function.Function; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/Manifest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java similarity index 99% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/Manifest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java index 3cecd34625..a58e0eaeb1 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/Manifest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/Manifest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.manifest; +package org.apache.jena.arq.junit.manifest; import java.util.ArrayList; import java.util.Iterator; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/ManifestEntry.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/ManifestEntry.java similarity index 97% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/ManifestEntry.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/ManifestEntry.java index 26013aebc3..cf8a91b360 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/ManifestEntry.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/ManifestEntry.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.manifest; +package org.apache.jena.arq.junit.manifest; import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/ManifestProcessor.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/ManifestProcessor.java similarity index 99% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/ManifestProcessor.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/ManifestProcessor.java index 0b0e6bca2c..59286e943e 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/ManifestProcessor.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/ManifestProcessor.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.manifest; +package org.apache.jena.arq.junit.manifest; import java.util.*; import java.util.function.Function; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/RunnableTestMaker.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/RunnableTestMaker.java similarity index 92% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/RunnableTestMaker.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/RunnableTestMaker.java index b1c7e1b3ba..37385d8adc 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/RunnableTestMaker.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/RunnableTestMaker.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.manifest; +package org.apache.jena.arq.junit.manifest; import java.util.ArrayList; import java.util.List; import java.util.function.Function; -import org.apache.jena.arq.junit5.SurpressedTest; -import org.apache.jena.arq.junit5.riot.RiotTests; -import org.apache.jena.arq.junit5.sparql.SparqlTests; +import org.apache.jena.arq.junit.SurpressedTest; +import org.apache.jena.arq.junit.riot.RiotTests; +import org.apache.jena.arq.junit.sparql.SparqlTests; import org.apache.jena.graph.Node; /** diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/TestSetupException.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/TestSetupException.java similarity index 96% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/TestSetupException.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/TestSetupException.java index d750fb19a4..7f8d1db468 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/manifest/TestSetupException.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/manifest/TestSetupException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.manifest; +package org.apache.jena.arq.junit.manifest; public class TestSetupException extends RuntimeException { public TestSetupException() { super() ; } diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/ParsingStepForTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/ParsingStepForTest.java similarity index 98% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/ParsingStepForTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/riot/ParsingStepForTest.java index b34e110a30..e3b3e5c098 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/ParsingStepForTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/ParsingStepForTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.riot; +package org.apache.jena.arq.junit.riot; import java.io.InputStream; import java.util.Map; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotEvalTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotEvalTest.java similarity index 96% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotEvalTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotEvalTest.java index e52cc3b893..5968a5e12b 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotEvalTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotEvalTest.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.riot; +package org.apache.jena.arq.junit.riot; -import static org.apache.jena.arq.junit5.riot.RiotTestsConfig.fragment; +import static org.apache.jena.arq.junit.riot.RiotTestsConfig.fragment; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import java.util.function.Consumer; -import org.apache.jena.arq.junit5.manifest.AbstractManifestTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.AbstractManifestTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; import org.apache.jena.graph.Graph; import org.apache.jena.riot.*; import org.apache.jena.riot.system.ErrorHandlerFactory; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotSyntaxTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotSyntaxTest.java similarity index 95% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotSyntaxTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotSyntaxTest.java index 0b936dae4d..09c442951b 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotSyntaxTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotSyntaxTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.riot; +package org.apache.jena.arq.junit.riot; import static org.junit.jupiter.api.Assertions.fail; import java.util.function.Consumer; -import org.apache.jena.arq.junit5.manifest.AbstractManifestTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.AbstractManifestTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; import org.apache.jena.atlas.io.IO; import org.apache.jena.atlas.lib.FileOps; import org.apache.jena.atlas.lib.IRILib; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotTests.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTests.java similarity index 97% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotTests.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTests.java index db980a69a5..839958ebb7 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotTests.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTests.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.riot; +package org.apache.jena.arq.junit.riot; import java.util.Objects; -import org.apache.jena.arq.junit5.SkipTest; -import org.apache.jena.arq.junit5.SurpressedTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.SkipTest; +import org.apache.jena.arq.junit.SurpressedTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; import org.apache.jena.rdf.model.Resource; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotTestsConfig.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTestsConfig.java similarity index 97% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotTestsConfig.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTestsConfig.java index d60f6a2359..4346615d79 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/RiotTestsConfig.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/RiotTestsConfig.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.riot; +package org.apache.jena.arq.junit.riot; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.ManifestEntry; /** * Tuning for RIOT tests. diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/VocabLangRDF.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/VocabLangRDF.java similarity index 99% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/VocabLangRDF.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/riot/VocabLangRDF.java index 46a6e452ff..b2543bdcd9 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/riot/VocabLangRDF.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/riot/VocabLangRDF.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.riot; +package org.apache.jena.arq.junit.riot; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/SparqlTests.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/SparqlTests.java similarity index 96% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/SparqlTests.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/SparqlTests.java index 176b595448..dedc061899 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/SparqlTests.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/SparqlTests.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.sparql; +package org.apache.jena.arq.junit.sparql; -import org.apache.jena.arq.junit5.SurpressedTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.manifest.TestSetupException; -import org.apache.jena.arq.junit5.sparql.tests.*; +import org.apache.jena.arq.junit.SurpressedTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.TestSetupException; +import org.apache.jena.arq.junit.sparql.tests.*; import org.apache.jena.atlas.lib.Creator; import org.apache.jena.atlas.logging.Log; import org.apache.jena.graph.Node; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QueryEvalTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QueryEvalTest.java similarity index 98% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QueryEvalTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QueryEvalTest.java index 2e9f0064ca..3ca205ebc3 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QueryEvalTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QueryEvalTest.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.sparql.tests; +package org.apache.jena.arq.junit.sparql.tests; -import static org.apache.jena.arq.junit5.sparql.tests.SparqlTestLib.setupFailure; +import static org.apache.jena.arq.junit.sparql.tests.SparqlTestLib.setupFailure; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -30,9 +30,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.jena.arq.junit5.manifest.AbstractManifestTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.manifest.TestSetupException; +import org.apache.jena.arq.junit.manifest.AbstractManifestTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.TestSetupException; import org.apache.jena.atlas.lib.Creator; import org.apache.jena.atlas.logging.Log; import org.apache.jena.graph.Node; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QuerySyntaxTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QuerySyntaxTest.java similarity index 90% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QuerySyntaxTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QuerySyntaxTest.java index 020ac573fd..47716a6ee0 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QuerySyntaxTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QuerySyntaxTest.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.sparql.tests; +package org.apache.jena.arq.junit.sparql.tests; import static org.junit.jupiter.api.Assertions.fail; -import org.apache.jena.arq.junit5.LibTest; -import org.apache.jena.arq.junit5.manifest.AbstractManifestTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.LibTest; +import org.apache.jena.arq.junit.manifest.AbstractManifestTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; import org.apache.jena.query.Query; //import java.io.IOException; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QueryTestItem.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QueryTestItem.java similarity index 98% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QueryTestItem.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QueryTestItem.java index f5e4b633b2..1784ecec5d 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/QueryTestItem.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QueryTestItem.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.sparql.tests ; +package org.apache.jena.arq.junit.sparql.tests ; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.manifest.TestSetupException; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.TestSetupException; import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; import org.apache.jena.query.Dataset; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/SerializationTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SerializationTest.java similarity index 93% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/SerializationTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SerializationTest.java index 6fa1545071..9ab68be1e1 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/SerializationTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SerializationTest.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.sparql.tests; +package org.apache.jena.arq.junit.sparql.tests; -import org.apache.jena.arq.junit5.manifest.AbstractManifestTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.AbstractManifestTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; import org.apache.jena.atlas.io.IndentedLineBuffer ; import org.apache.jena.query.Query ; import org.apache.jena.query.Syntax ; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/SparqlTestLib.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java similarity index 97% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/SparqlTestLib.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java index e217158f3c..640aeb2f31 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/SparqlTestLib.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.sparql.tests; +package org.apache.jena.arq.junit.sparql.tests; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.manifest.TestSetupException; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.TestSetupException; import org.apache.jena.graph.Graph; import org.apache.jena.graph.Node; import org.apache.jena.query.Query; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/UpdateEvalTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/UpdateEvalTest.java similarity index 96% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/UpdateEvalTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/UpdateEvalTest.java index c73c49e5d5..e41f0130a1 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/UpdateEvalTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/UpdateEvalTest.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.sparql.tests; +package org.apache.jena.arq.junit.sparql.tests; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList ; import java.util.List ; -import org.apache.jena.arq.junit5.manifest.AbstractManifestTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.manifest.TestSetupException; +import org.apache.jena.arq.junit.manifest.AbstractManifestTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.TestSetupException; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.lib.Creator; import org.apache.jena.graph.Graph; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/UpdateSyntaxTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/UpdateSyntaxTest.java similarity index 91% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/UpdateSyntaxTest.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/UpdateSyntaxTest.java index 6ddda9a58d..643890db9f 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/sparql/tests/UpdateSyntaxTest.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/UpdateSyntaxTest.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.sparql.tests; +package org.apache.jena.arq.junit.sparql.tests; import static org.junit.jupiter.api.Assertions.fail; -import org.apache.jena.arq.junit5.manifest.AbstractManifestTest; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.manifest.AbstractManifestTest; +import org.apache.jena.arq.junit.manifest.ManifestEntry; import org.apache.jena.query.QueryException ; import org.apache.jena.query.Syntax; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/ManifestHolder.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/ManifestHolder.java similarity index 96% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/ManifestHolder.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/ManifestHolder.java index b1614fb4a0..7fa66f8001 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/ManifestHolder.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/ManifestHolder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.textrunner; +package org.apache.jena.arq.junit.textrunner; import java.util.stream.Stream; @@ -26,7 +26,7 @@ import org.junit.jupiter.api.TestFactory; import org.junit.platform.launcher.LauncherDiscoveryListener; import org.junit.platform.launcher.LauncherDiscoveryRequest; -import org.apache.jena.arq.junit5.Scripts; +import org.apache.jena.arq.junit.Scripts; import org.apache.jena.shared.JenaException; // This class DOES NOT run on its own. It is used by TextTestRunner. diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/PrintExecutionListener.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/PrintExecutionListener.java similarity index 98% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/PrintExecutionListener.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/PrintExecutionListener.java index 90171bf46a..d99f4237b3 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/PrintExecutionListener.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/PrintExecutionListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.textrunner; +package org.apache.jena.arq.junit.textrunner; import org.junit.platform.engine.TestExecutionResult; import org.junit.platform.launcher.TestExecutionListener; diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/TextTestRunner5.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/TextTestRunner5.java similarity index 95% rename from jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/TextTestRunner5.java rename to jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/TextTestRunner5.java index cb232a601f..e6d109991c 100644 --- a/jena-arq/src/test/java/org/apache/jena/arq/junit5/textrunner/TextTestRunner5.java +++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/textrunner/TextTestRunner5.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.arq.junit5.textrunner; +package org.apache.jena.arq.junit.textrunner; import java.util.function.Function; @@ -27,9 +27,9 @@ import org.junit.platform.launcher.core.LauncherFactory; import org.junit.platform.launcher.listeners.LoggingListener; import org.junit.platform.launcher.listeners.SummaryGeneratingListener; -import org.apache.jena.arq.junit5.EarlReport; -import org.apache.jena.arq.junit5.manifest.EarlReporter; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; +import org.apache.jena.arq.junit.EarlReport; +import org.apache.jena.arq.junit.manifest.EarlReporter; +import org.apache.jena.arq.junit.manifest.ManifestEntry; import org.apache.jena.atlas.io.IndentedWriter; public class TextTestRunner5 { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java index 58f11411ad..5c0c501297 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java @@ -22,8 +22,8 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; -import org.apache.jena.arq.junit5.riot.ParsingStepForTest; +import org.apache.jena.arq.junit.Scripts; +import org.apache.jena.arq.junit.riot.ParsingStepForTest; import org.apache.jena.riot.lang.extra.TurtleJCC; import org.apache.jena.sys.JenaSystem; diff --git a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_LangSuite.java b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_LangSuite.java index 32579bec9e..15f11184f6 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_LangSuite.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_LangSuite.java @@ -23,7 +23,8 @@ import java.util.stream.Stream; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DynamicNode; import org.junit.jupiter.api.TestFactory; -import org.apache.jena.arq.junit5.Scripts; + +import org.apache.jena.arq.junit.Scripts; /** The RIOT test suites - these are driven by a manifest file and use external files for tests */ public class Scripts_LangSuite { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_RIOT_rdf_tests.java b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_RIOT_rdf_tests.java index 07a026ae6c..84722bbe03 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_RIOT_rdf_tests.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_RIOT_rdf_tests.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DynamicNode; import org.junit.jupiter.api.TestFactory; -import org.apache.jena.arq.junit5.Scripts; +import org.apache.jena.arq.junit.Scripts; /** rdf-tests-cg, RDF languages. See testing/README.md for any modifications. */ public class Scripts_RIOT_rdf_tests { diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX_RDFXML.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX_RDFXML.java index 524d3dd85f..68223fa8c3 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX_RDFXML.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/Scripts_RRX_RDFXML.java @@ -22,8 +22,8 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; -import org.apache.jena.arq.junit5.riot.ParsingStepForTest; +import org.apache.jena.arq.junit.Scripts; +import org.apache.jena.arq.junit.riot.ParsingStepForTest; import org.apache.jena.riot.Lang; import org.apache.jena.riot.ReaderRIOTFactory; import org.apache.jena.riot.lang.rdfxml.rrx.ReaderRDFXML_SAX; diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_RefEngine.java b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_RefEngine.java index 575c9cbf23..21ec50a88a 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_RefEngine.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_RefEngine.java @@ -22,7 +22,7 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; +import org.apache.jena.arq.junit.Scripts; import org.apache.jena.sparql.engine.ref.QueryEngineRef; import org.apache.jena.sparql.expr.E_Function; import org.apache.jena.sparql.expr.NodeValue; diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL.java b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL.java index 6731b84d88..14a575322c 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL.java @@ -22,8 +22,8 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; -import org.apache.jena.arq.junit5.sparql.SparqlTests; +import org.apache.jena.arq.junit.Scripts; +import org.apache.jena.arq.junit.sparql.SparqlTests; import org.apache.jena.sparql.expr.E_Function; import org.apache.jena.sparql.expr.NodeValue; diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL_Dataset.java b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL_Dataset.java index bd0d3a4d2d..0189003fd9 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL_Dataset.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_SPARQL_Dataset.java @@ -23,9 +23,9 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.sparql.SparqlTests; +import org.apache.jena.arq.junit.Scripts; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.sparql.SparqlTests; import org.apache.jena.atlas.lib.Creator; import org.apache.jena.query.Dataset; import org.apache.jena.query.DatasetFactory; diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/function/scripting/Manifest_SPARQL_Scripting.java b/jena-arq/src/test/java/org/apache/jena/sparql/function/scripting/Manifest_SPARQL_Scripting.java index 6a8708f5bd..5151bd0d21 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/function/scripting/Manifest_SPARQL_Scripting.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/function/scripting/Manifest_SPARQL_Scripting.java @@ -22,7 +22,7 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; +import org.apache.jena.arq.junit.Scripts; import org.apache.jena.query.ARQ; import org.apache.jena.sparql.util.Context; diff --git a/jena-cmds/src/test/java/arq/rdftests.java b/jena-cmds/src/test/java/arq/rdftests.java index c315208b0c..487444d9af 100644 --- a/jena-cmds/src/test/java/arq/rdftests.java +++ b/jena-cmds/src/test/java/arq/rdftests.java @@ -25,15 +25,15 @@ import java.util.function.Function; import arq.cmdline.ModContext; import org.apache.jena.Jena; -import org.apache.jena.arq.junit5.EarlReport; -import org.apache.jena.arq.junit5.Scripts; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.riot.ParsingStepForTest; -import org.apache.jena.arq.junit5.riot.RiotTests; -import org.apache.jena.arq.junit5.riot.VocabLangRDF; -import org.apache.jena.arq.junit5.sparql.SparqlTests; -import org.apache.jena.arq.junit5.sparql.tests.QueryEvalTest; -import org.apache.jena.arq.junit5.textrunner.TextTestRunner5; +import org.apache.jena.arq.junit.EarlReport; +import org.apache.jena.arq.junit.Scripts; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.riot.ParsingStepForTest; +import org.apache.jena.arq.junit.riot.RiotTests; +import org.apache.jena.arq.junit.riot.VocabLangRDF; +import org.apache.jena.arq.junit.sparql.SparqlTests; +import org.apache.jena.arq.junit.sparql.tests.QueryEvalTest; +import org.apache.jena.arq.junit.textrunner.TextTestRunner5; import org.apache.jena.atlas.legacy.BaseTest2; import org.apache.jena.atlas.lib.Lib; import org.apache.jena.atlas.logging.LogCtl; diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java index 7a37c5e763..7d26a5e7fc 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java @@ -20,7 +20,7 @@ package org.apache.jena.fuseki.test; import java.util.Objects; -import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.*; public class FusekiTest { @@ -29,10 +29,10 @@ public class FusekiTest { str = str.replace(" ", ""); String[] x = str.split(","); for ( String ex : expected ) { - Assertions.assertTrue(containsStr(ex, x), "Got: "+str+" - Does not contain "+ex); + assertTrue(containsStr(ex, x), "Got: "+str+" - Does not contain "+ex); } for ( String s : x ) { - Assertions.assertTrue(containsStr(s, expected), "Got: "+str+" - Not expected "+s); + assertTrue(containsStr(s, expected), "Got: "+str+" - Not expected "+s); } } diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java index ccfeab878e..3ea177a721 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java @@ -21,8 +21,6 @@ package org.apache.jena.fuseki.test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import org.junit.jupiter.api.Assertions; - import org.apache.jena.atlas.web.HttpException; import org.apache.jena.sparql.engine.http.QueryExceptionHTTP; import org.apache.jena.web.HttpSC; @@ -32,14 +30,14 @@ public class HttpTest { public static void expect4xx(Runnable action) { try { action.run(); - Assertions.fail("Expected HttpException"); + fail("Expected HttpException"); } catch (QueryExceptionHTTP ex) { if ( ex.getStatusCode() < 400 || ex.getStatusCode() > 499 ) - Assertions.fail(ex.getMessage()); + fail(ex.getMessage()); } catch (HttpException ex) { // -1 : any status code in HttpException if ( ex.getStatusCode() < 400 || ex.getStatusCode() > 499 ) - Assertions.fail(ex.getMessage()); + fail(ex.getMessage()); } } diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/Scripts_TDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/Scripts_TDB1.java index c2f8e51d24..ecdbb53efe 100644 --- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/Scripts_TDB1.java +++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/Scripts_TDB1.java @@ -23,9 +23,9 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.sparql.SparqlTests; +import org.apache.jena.arq.junit.Scripts; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.sparql.SparqlTests; import org.apache.jena.atlas.lib.Creator; import org.apache.jena.query.ARQ; import org.apache.jena.query.Dataset; diff --git a/jena-tdb2/src/test/java/org/apache/jena/tdb2/Scripts_TDB2.java b/jena-tdb2/src/test/java/org/apache/jena/tdb2/Scripts_TDB2.java index 9e6db1d037..b9b34dd85b 100644 --- a/jena-tdb2/src/test/java/org/apache/jena/tdb2/Scripts_TDB2.java +++ b/jena-tdb2/src/test/java/org/apache/jena/tdb2/Scripts_TDB2.java @@ -23,9 +23,9 @@ import java.util.stream.Stream; import org.junit.jupiter.api.*; -import org.apache.jena.arq.junit5.Scripts; -import org.apache.jena.arq.junit5.manifest.ManifestEntry; -import org.apache.jena.arq.junit5.sparql.SparqlTests; +import org.apache.jena.arq.junit.Scripts; +import org.apache.jena.arq.junit.manifest.ManifestEntry; +import org.apache.jena.arq.junit.sparql.SparqlTests; import org.apache.jena.atlas.lib.Creator; import org.apache.jena.query.ARQ; import org.apache.jena.query.Dataset;
