You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2025/10/21 08:37:12 UTC
(jena) 02/02: Simplify dependencies in testing
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 4284fe2f03d5b487fc4a01961ba612a8aab8119b
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Oct 18 08:38:38 2025 +0100
Simplify dependencies in testing
---
jena-arq/pom.xml | 16 ------
.../org/apache/jena/atlas/junit/AssertExtra.java | 0
.../org/apache/jena/atlas/legacy/BaseTest2.java | 63 ++++++++++------------
.../test/java/org/apache/jena/system/GTest.java | 60 +++++++++------------
jena-cmds/pom.xml | 33 +-----------
jena-cmds/src/main/java/arq/cmdline/ModEngine.java | 2 +
jena-core/pom.xml | 8 ---
jena-fuseki2/jena-fuseki-main/pom.xml | 8 ---
.../org/apache/jena/fuseki/test/FusekiTest.java | 0
.../java/org/apache/jena/fuseki/test/HttpTest.java | 0
jena-fuseki2/jena-fuseki-webapp/pom.xml | 8 ---
.../org/apache/jena/fuseki/test/FusekiTest.java | 0
.../java/org/apache/jena/fuseki/test/HttpTest.java | 0
jena-integration-tests/pom.xml | 2 +-
jena-rdfconnection/pom.xml | 8 ---
jena-shacl/pom.xml | 9 ----
jena-tdb1/pom.xml | 16 ------
jena-tdb2/pom.xml | 8 ---
jena-text/pom.xml | 11 +---
19 files changed, 60 insertions(+), 192 deletions(-)
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index 885a7c41b1..ddd8b8d077 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -42,22 +42,6 @@
<version>5.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <classifier>tests</classifier>
- <version>5.7.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-base</artifactId>
- <classifier>tests</classifier>
- <version>5.7.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/junit/AssertExtra.java b/jena-arq/src/test/java/org/apache/jena/atlas/junit/AssertExtra.java
similarity index 100%
rename from jena-base/src/test/java/org/apache/jena/atlas/junit/AssertExtra.java
rename to jena-arq/src/test/java/org/apache/jena/atlas/junit/AssertExtra.java
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/legacy/BaseTest2.java b/jena-arq/src/test/java/org/apache/jena/atlas/legacy/BaseTest2.java
index de1409fe72..afe3bd0375 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/legacy/BaseTest2.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/legacy/BaseTest2.java
@@ -18,43 +18,38 @@
package org.apache.jena.atlas.legacy;
-import java.util.ArrayDeque ;
-import java.util.Deque ;
+import java.util.ArrayDeque;
+import java.util.Deque;
-import org.apache.jena.atlas.junit.AssertExtra ;
-import org.apache.jena.atlas.logging.Log ;
-import org.apache.jena.riot.system.ErrorHandler ;
-import org.apache.jena.riot.system.ErrorHandlerFactory ;
+import org.apache.jena.atlas.junit.AssertExtra;
+import org.apache.jena.atlas.logging.Log;
+import org.apache.jena.riot.system.ErrorHandler;
+import org.apache.jena.riot.system.ErrorHandlerFactory;
public class BaseTest2 {
// Should go elsewhere?
- private static Deque<ErrorHandler> errorHandlers = new ArrayDeque<>() ;
-
- static public void setTestLogging(ErrorHandler errorhandler)
- {
- errorHandlers.push(ErrorHandlerFactory.getDefaultErrorHandler()) ;
- ErrorHandlerFactory.setDefaultErrorHandler(errorhandler) ;
- }
-
- static public void setTestLogging()
- {
-// if ( errorHandlers.size() != 0 )
-// Log.warn(BaseTest.class, "ErrorHandler already set for testing") ;
- setTestLogging(ErrorHandlerFactory.errorHandlerNoLogging) ;
- }
-
- static public void unsetTestLogging()
- {
- if ( errorHandlers.size() == 0 )
- {
- Log.warn(AssertExtra.class, "ErrorHandler not set for testing") ;
- ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerStd) ; // Panic measures
- return ;
- }
- ErrorHandler errHandler = errorHandlers.pop();
- ErrorHandlerFactory.setDefaultErrorHandler(errHandler) ;
- }
-
+ private static Deque<ErrorHandler> errorHandlers = new ArrayDeque<>();
+
+ public static void setTestLogging(ErrorHandler errorhandler) {
+ errorHandlers.push(ErrorHandlerFactory.getDefaultErrorHandler());
+ ErrorHandlerFactory.setDefaultErrorHandler(errorhandler);
+ }
+
+ public static void setTestLogging() {
+ // if ( errorHandlers.size() != 0 )
+ // Log.warn(BaseTest.class, "ErrorHandler already set for testing");
+ setTestLogging(ErrorHandlerFactory.errorHandlerNoLogging);
+ }
+
+ public static void unsetTestLogging() {
+ if ( errorHandlers.size() == 0 ) {
+ Log.warn(AssertExtra.class, "ErrorHandler not set for testing");
+ // Panic measures
+ ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerStd);
+ return;
+ }
+ ErrorHandler errHandler = errorHandlers.pop();
+ ErrorHandlerFactory.setDefaultErrorHandler(errHandler);
+ }
}
-
diff --git a/jena-arq/src/test/java/org/apache/jena/system/GTest.java b/jena-arq/src/test/java/org/apache/jena/system/GTest.java
index 2d8fab26e3..d340b7a518 100644
--- a/jena-arq/src/test/java/org/apache/jena/system/GTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/system/GTest.java
@@ -18,17 +18,18 @@
package org.apache.jena.system;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import org.junit.jupiter.api.Test;
import org.apache.jena.atlas.lib.Copyable;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.Triple;
import org.apache.jena.mem.GraphMem;
import org.apache.jena.mem2.GraphMem2Fast;
+import org.apache.jena.sparql.sse.SSE;
-@SuppressWarnings("deprecation")
public class GTest {
@Test
@@ -36,47 +37,38 @@ public class GTest {
// Test graph which implements Copyable<>
{
var graphImplementingCopyable = new GraphMem2Fast();
-
- graphImplementingCopyable.add(triple("s1 p1 o1"));
- graphImplementingCopyable.add(triple("s1 p2 o1"));
- graphImplementingCopyable.add(triple("s2 p1 o1"));
- graphImplementingCopyable.add(triple("s2 p1 o2"));
- graphImplementingCopyable.add(triple("s2 p1 o2"));
-
- var copy = G.copy(graphImplementingCopyable);
-
- assertEquals(graphImplementingCopyable.size(), copy.size());
-
- copy.delete(triple("s1 p1 o1"));
- assertEquals(graphImplementingCopyable.size() - 1, copy.size());
-
- copy.add(triple("s3 p3 o3"));
- copy.add(triple("s4 p4 o4"));
- assertEquals(graphImplementingCopyable.size() + 1, copy.size());
+ test(graphImplementingCopyable);
}
// Test graph which does not implement Copyable<>
{
+ @SuppressWarnings("deprecation")
GraphMem notCopyableGraph = new GraphMem();
-
assertFalse(notCopyableGraph instanceof Copyable<?>);
+ test(notCopyableGraph);
+ }
+ }
- notCopyableGraph.add(triple("s1 p1 o1"));
- notCopyableGraph.add(triple("s1 p2 o1"));
- notCopyableGraph.add(triple("s2 p1 o1"));
- notCopyableGraph.add(triple("s2 p1 o2"));
- notCopyableGraph.add(triple("s2 p1 o2"));
+ private void test(Graph graph) {
+ graph.add(triple("(:s1 :p1 :o1)"));
+ graph.add(triple("(:s1 :p2 :o1)"));
+ graph.add(triple("(:s2 :p1 :o1)"));
+ graph.add(triple("(:s2 :p1 :o2)"));
+ graph.add(triple("(:s2 :p1 :o2)"));
- var copy = G.copy(notCopyableGraph);
+ var copy = G.copy(graph);
- assertEquals(notCopyableGraph.size(), copy.size());
+ assertEquals(graph.size(), copy.size());
- copy.delete(triple("s1 p1 o1"));
- assertEquals(notCopyableGraph.size() - 1, copy.size());
+ copy.delete(triple("(:s1 :p1 :o1)"));
+ assertEquals(graph.size() - 1, copy.size());
- copy.add(triple("s3 p3 o3"));
- copy.add(triple("s4 p4 o4"));
- assertEquals(notCopyableGraph.size() + 1, copy.size());
- }
+ copy.add(triple("(:s3 :p3 :o3)"));
+ copy.add(triple("(:s4 :p4 :o4)"));
+ assertEquals(graph.size() + 1, copy.size());
+ }
+
+ private Triple triple(String str) {
+ return SSE.parseTriple(str);
}
-}
\ No newline at end of file
+}
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index bcf9448155..f758710348 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -49,23 +49,6 @@
</properties>
<dependencies>
-
- <!--
- Does not work.
- Breaks javadoc production in modules like jena-text
- This makes the downstream brittle because it requires
- downstream to adapt.
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-libs</artifactId>
- <version>VERSION</version>
- <type>pom</type>
- </dependency>
- -->
- <!--
- Places with commands.
- Avoids depending on apache-jena-libs with its <type>pom</type>
- -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
@@ -127,21 +110,7 @@
<groupId>commons-cli</groupId>
</dependency>
- <!-- Pull test code into scope -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-base</artifactId>
- <version>5.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>5.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <optional>true</optional>
- </dependency>
+ <!-- Pull in test code from other modules -->
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModEngine.java b/jena-cmds/src/main/java/arq/cmdline/ModEngine.java
index bb6b4b6028..94097a3cfb 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModEngine.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModEngine.java
@@ -43,6 +43,8 @@ public class ModEngine extends ModBase
private boolean timing = false ;
+ public ModEngine() {}
+
@Override
public void registerWith(CmdGeneral cmdLine) {
cmdLine.getUsage().startCategory("Query Engine");
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index ee602f721b..4102550495 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -43,14 +43,6 @@
<version>5.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-base</artifactId>
- <version>5.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-iri3986</artifactId>
diff --git a/jena-fuseki2/jena-fuseki-main/pom.xml b/jena-fuseki2/jena-fuseki-main/pom.xml
index 4f169fd7c4..2d23cc4e79 100644
--- a/jena-fuseki2/jena-fuseki-main/pom.xml
+++ b/jena-fuseki2/jena-fuseki-main/pom.xml
@@ -42,14 +42,6 @@
<version>5.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-core</artifactId>
- <version>5.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki-access</artifactId>
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java
similarity index 100%
copy from jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java
copy to jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java b/jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
similarity index 100%
copy from jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
copy to jena-fuseki2/jena-fuseki-main/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
diff --git a/jena-fuseki2/jena-fuseki-webapp/pom.xml b/jena-fuseki2/jena-fuseki-webapp/pom.xml
index 26f506b3f9..b96f88003c 100644
--- a/jena-fuseki2/jena-fuseki-webapp/pom.xml
+++ b/jena-fuseki2/jena-fuseki-webapp/pom.xml
@@ -40,14 +40,6 @@
<version>5.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-core</artifactId>
- <version>5.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java
similarity index 100%
rename from jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java
rename to jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/test/FusekiTest.java
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
similarity index 100%
rename from jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
rename to jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/test/HttpTest.java
diff --git a/jena-integration-tests/pom.xml b/jena-integration-tests/pom.xml
index f254bb164b..57a5f294de 100644
--- a/jena-integration-tests/pom.xml
+++ b/jena-integration-tests/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-fuseki-core</artifactId>
+ <artifactId>jena-fuseki-main</artifactId>
<version>5.7.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
diff --git a/jena-rdfconnection/pom.xml b/jena-rdfconnection/pom.xml
index c6a8b1ff38..2cc03ea768 100644
--- a/jena-rdfconnection/pom.xml
+++ b/jena-rdfconnection/pom.xml
@@ -50,14 +50,6 @@
<version>5.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-base</artifactId>
- <version>5.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
<!-- Testing -->
<!-- Tests is also done in jena-integration-tests -->
<dependency>
diff --git a/jena-shacl/pom.xml b/jena-shacl/pom.xml
index 6306bacb59..023c0a1d99 100644
--- a/jena-shacl/pom.xml
+++ b/jena-shacl/pom.xml
@@ -42,14 +42,6 @@
<version>5.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <classifier>tests</classifier>
- <version>5.7.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
@@ -87,7 +79,6 @@
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/jena-tdb1/pom.xml b/jena-tdb1/pom.xml
index 90c1a0cdea..ad2f2dd616 100644
--- a/jena-tdb1/pom.xml
+++ b/jena-tdb1/pom.xml
@@ -51,22 +51,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <classifier>tests</classifier>
- <version>5.7.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-base</artifactId>
- <classifier>tests</classifier>
- <version>5.7.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
diff --git a/jena-tdb2/pom.xml b/jena-tdb2/pom.xml
index 75d5b9b80d..d14e3c339c 100644
--- a/jena-tdb2/pom.xml
+++ b/jena-tdb2/pom.xml
@@ -44,14 +44,6 @@
<version>5.7.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>5.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-arq</artifactId>
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index e974640ac7..a58f5b2768 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -31,7 +31,7 @@
<!-- apache lucene emits warnings for native access and for the vector module for java version >= 21 -->
<profile><id>enable-native-and-incubator-vector</id>
<activation>
- <jdk>[21,22,23]</jdk>
+ <jdk>[21,22,23,24,25]</jdk>
</activation>
<properties>
<jena.text.test.argLine>--enable-native-access=ALL-UNNAMED --add-modules jdk.incubator.vector</jena.text.test.argLine>
@@ -70,15 +70,6 @@
<version>5.7.0-SNAPSHOT</version>
</dependency>
- <!-- Testing support -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-base</artifactId>
- <version>5.7.0-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
<!-- Lucene dependencies -->
<dependency>
<groupId>org.apache.lucene</groupId>