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 678cf4aac6e39753bd5fdfdf57b239c020d1cb8f Author: Andy Seaborne <[email protected]> AuthorDate: Tue Jun 3 10:07:24 2025 +0100 GH-3237: Change test graph to same-term for non-Model tests --- jena-core/src/main/java/org/apache/jena/util/MonitorGraph.java | 1 - .../test/java/org/apache/jena/graph/test/AbstractTestGraph.java | 4 ---- .../src/test/java/org/apache/jena/graph/test/TestReifier.java | 2 +- .../src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java | 2 +- .../org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngine.java | 3 +-- .../apache/jena/reasoner/rulesys/impl/TestLPBRuleEngineLeak.java | 3 +-- .../apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java | 3 +-- .../test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java | 3 +-- .../org/apache/jena/reasoner/rulesys/test/TestBackchainer.java | 5 ++--- .../java/org/apache/jena/reasoner/rulesys/test/TestBasicLP.java | 3 +-- .../java/org/apache/jena/reasoner/rulesys/test/TestBasics.java | 3 +-- .../java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java | 3 +-- .../org/apache/jena/reasoner/rulesys/test/TestGenericRules.java | 3 +-- .../org/apache/jena/reasoner/rulesys/test/TestLPDerivation.java | 3 +-- .../java/org/apache/jena/reasoner/rulesys/test/TestRDFS9.java | 3 +-- .../test/java/org/apache/jena/reasoner/rulesys/test/TestRETE.java | 3 +-- .../test/java/org/apache/jena/reasoner/test/TestReasoners.java | 3 +-- jena-core/src/test/java/org/apache/jena/util/TestMonitors.java | 8 ++++++-- 18 files changed, 22 insertions(+), 36 deletions(-) diff --git a/jena-core/src/main/java/org/apache/jena/util/MonitorGraph.java b/jena-core/src/main/java/org/apache/jena/util/MonitorGraph.java index a3320f475d..8e0afb54c3 100644 --- a/jena-core/src/main/java/org/apache/jena/util/MonitorGraph.java +++ b/jena-core/src/main/java/org/apache/jena/util/MonitorGraph.java @@ -34,7 +34,6 @@ import org.apache.jena.graph.impl.* ; * @deprecated Do not use - to be removed. */ @Deprecated(forRemoval = true) - public class MonitorGraph extends WrappedGraph { /** The last known snapshot, a set of triples */ diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java index 2840aa6903..db5b3ba08e 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java @@ -62,10 +62,6 @@ public abstract class AbstractTestGraph extends GraphTestBase assertTrue( "closed Graph should be isClosed()", g.isClosed() ); } - /** - This test case was generated by Ian and was caused by GraphMem - not keeping up with changes to the find interface. - */ public void testFindAndContains() { Graph g = getNewGraph(); diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java index 3ad461e61c..6c24cc7d72 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java @@ -26,7 +26,7 @@ import org.apache.jena.mem2.GraphMem2Fast; import org.apache.jena.shared.JenaException ; /** - This class tests the reifiers of ordinary GraphMem graphs. + This class tests the reifiers of ordinary graphs. Old test suite - kept to ensure compatibility for the one and only Standard mode */ public class TestReifier extends AbstractTestReifier diff --git a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java index 75797fb17e..c40cb5730d 100644 --- a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java +++ b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java @@ -37,7 +37,7 @@ import org.apache.jena.util.iterator.ExtendedIterator ; import org.junit.Test; /** - * Tests of {@link GraphMem} based on (Java object) value handling. + * Tests of a graph which has support for (Java object) value handling. * <p> * This is used by the Model API. * <p> diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngine.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngine.java index 08f01c3d4e..ac6b957c5a 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngine.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngine.java @@ -44,9 +44,8 @@ public class TestLPBRuleEngine extends TestCase { protected Node C2 = NodeFactory.createURI("C2"); protected Node ty = RDF.Nodes.type; - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } public FBRuleReasoner createReasoner(List<Rule> rules) { diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngineLeak.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngineLeak.java index 91e448b20a..aa8578f0be 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngineLeak.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestLPBRuleEngineLeak.java @@ -52,9 +52,8 @@ public class TestLPBRuleEngineLeak extends TestCase { protected Node C2 = NodeFactory.createURI("C2"); protected Node ty = RDF.Nodes.type; - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } public FBRuleReasoner createReasoner(List<Rule> rules) { diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java index 1fcae8481e..ce62d54338 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java @@ -43,9 +43,8 @@ public class TestRestartableLBRule extends TestCase { return new TestSuite(TestRestartableLBRule.class); } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } Resource Senator = ResourceFactory.createResource("http://example.com/ns/Senator";); diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java index 1a31916a53..1a0b648661 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/DebugOWL.java @@ -82,9 +82,8 @@ public class DebugOWL { /** reasoner config: LP RDFS exp */ public static final int RDFSLPExpt = 7; - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBackchainer.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBackchainer.java index 271495e6a7..5ef11d95cd 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBackchainer.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBackchainer.java @@ -104,9 +104,8 @@ public class TestBackchainer extends TestCase { // return suite; } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** @@ -607,7 +606,7 @@ public class TestBackchainer extends TestCase { // * Test multiheaded rule. // */ // public void testMutliHead() { -// Graph data = new GraphMem(); +// Graph data = createGraphForTest(); // data.add(Triple.create(a, p, b)); // data.add(Triple.create(b, r, c)); // List<Rule> rules = Rule.parseRules( diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasicLP.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasicLP.java index ab9d2922d3..3a54204a43 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasicLP.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasicLP.java @@ -94,9 +94,8 @@ public class TestBasicLP extends TestCase { return suite; } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java index 2bf2e8e458..6170ffeada 100755 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java @@ -98,9 +98,8 @@ public class TestBasics extends TestCase { return new TestSuite( TestBasics.class ); } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java index 13748152e8..20387a91a6 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java @@ -116,9 +116,8 @@ public class TestFBRules extends TestCase { // return suite; } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestGenericRules.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestGenericRules.java index 35d551811d..24642914a4 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestGenericRules.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestGenericRules.java @@ -89,9 +89,8 @@ public class TestGenericRules extends TestCase { // return suite; } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestLPDerivation.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestLPDerivation.java index 1ce8a6f539..3b5efb935b 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestLPDerivation.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestLPDerivation.java @@ -54,9 +54,8 @@ public class TestLPDerivation extends TestCase { return new TestSuite( TestLPDerivation.class ); } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } // Useful constants diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRDFS9.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRDFS9.java index 3c2c79d5d3..9d3cabc532 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRDFS9.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRDFS9.java @@ -49,9 +49,8 @@ public class TestRDFS9 extends TestCase { return new TestSuite(TestRDFS9.class); } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRETE.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRETE.java index 5be4b6d269..b23e38afd4 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRETE.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRETE.java @@ -67,9 +67,8 @@ public class TestRETE extends TestCase { // return suite; } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestReasoners.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestReasoners.java index 7bc743e975..bc75001d17 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestReasoners.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestReasoners.java @@ -76,9 +76,8 @@ public class TestReasoners extends TestCase { return new TestSuite(TestReasoners.class); } - @SuppressWarnings("removal") private static Graph createGraphForTest() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-core/src/test/java/org/apache/jena/util/TestMonitors.java b/jena-core/src/test/java/org/apache/jena/util/TestMonitors.java index 0b3f68a9c8..e2d1d56f9b 100644 --- a/jena-core/src/test/java/org/apache/jena/util/TestMonitors.java +++ b/jena-core/src/test/java/org/apache/jena/util/TestMonitors.java @@ -49,6 +49,10 @@ public class TestMonitors extends TestCase { return new TestSuite( TestMonitors.class ); } + private static Graph createGraphForTest() { + return GraphMemFactory.createDefaultGraph(); + } + // constants used in the tests String NS = "http://jena.hpl.hp.com/test#";; Node a = NodeCreateUtils.create(NS + "a"); @@ -64,7 +68,7 @@ public class TestMonitors extends TestCase { * Basic graph level test, no monitoring */ public void testBasics() { - Graph base = GraphMemFactory.createGraphMem(); + Graph base = createGraphForTest(); MonitorGraph monitor = new MonitorGraph(base); // base data @@ -97,7 +101,7 @@ public class TestMonitors extends TestCase { * Monitoring test. */ public void testListener() { - Graph base = GraphMemFactory.createGraphMem(); + Graph base = createGraphForTest(); MonitorGraph monitor = new MonitorGraph(base); RecordingListener listener = new RecordingListener(); monitor.getEventManager().register(listener);
