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 00b7f7bf783e588423b30eff3fd75c5d35066e4f Author: Andy Seaborne <[email protected]> AuthorDate: Tue May 6 18:24:03 2025 +0100 GH-3172: Fix test suite for mixed JUnit4/JUnit5 usage --- .../java/org/apache/jena/arq/ARQTestSuite.java | 36 +++++++++++++++++----- .../test/java/org/apache/jena/sparql/TC_ARQ.java | 20 ++++++------ 2 files changed, 39 insertions(+), 17 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 bf59b20ea0..d1d023f2d9 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 @@ -18,10 +18,30 @@ package org.apache.jena.arq; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; + +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.AfterAll; + + +// JUnit 4 +//import org.junit.AfterClass; +//import org.junit.BeforeClass; +//import org.junit.runner.RunWith; +//import org.junit.runners.Suite; +//@RunWith(Suite.class) +//@Suite.SuiteClasses( { + +//JUnit 5 +//import org.junit.platform.suite.api.SelectClasses; +//import org.junit.platform.suite.api.Suite; +//import org.junit.jupiter.api.BeforeAll; +//import org.junit.jupiter.api.AfterAll; +// +//@Suite +//@SelectClasses({ import org.apache.jena.atlas.TC_Atlas_ARQ; import org.apache.jena.atlas.legacy.BaseTest2; @@ -44,8 +64,8 @@ import org.apache.jena.util.TS_UtilsARQ; * All the ARQ tests */ -@RunWith(Suite.class) [email protected]( { +@Suite +@SelectClasses({ TC_Atlas_ARQ.class, TS_UtilsARQ.class, @@ -94,14 +114,14 @@ public class ARQTestSuite { public static final String log4jPropertiesResourceName = "log4j2.properties"; - @BeforeClass + @BeforeAll public static void beforeClass() { NodeValue.VerboseWarnings = false; E_Function.WarnOnUnknownFunction = false; BaseTest2.setTestLogging(); } - @AfterClass + @AfterAll public static void afterClass() { BaseTest2.unsetTestLogging(); } 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 6ef2916344..0ef65932c8 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 @@ -18,6 +18,11 @@ 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; import org.apache.jena.sparql.algebra.TS_Algebra ; @@ -52,15 +57,12 @@ 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.iso.TS_Iso ; import org.apache.jena.sparql.util.compose.TS_DatasetCollectors; -import org.junit.AfterClass ; -import org.junit.BeforeClass ; -import org.junit.runner.RunWith ; -import org.junit.runners.Suite ; +import org.apache.jena.sparql.util.iso.TS_Iso ; + +@Suite +@SelectClasses({ -@RunWith(Suite.class) [email protected]( { TS_SSE.class , TS_LangSPARQL.class @@ -110,7 +112,7 @@ public class TC_ARQ private static boolean bVerboseWarnings; private static boolean bWarnOnUnknownFunction; - @BeforeClass + @BeforeAll public static void beforeClass() { bVerboseWarnings = NodeValue.VerboseWarnings; bWarnOnUnknownFunction = E_Function.WarnOnUnknownFunction; @@ -118,7 +120,7 @@ public class TC_ARQ E_Function.WarnOnUnknownFunction = false; } - @AfterClass + @AfterAll public static void afterClass() { NodeValue.VerboseWarnings = bVerboseWarnings; E_Function.WarnOnUnknownFunction = bWarnOnUnknownFunction;
