This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 45d15d1b3d2894e36ed8d80ef34268f760232ffe Author: Andy Seaborne <[email protected]> AuthorDate: Thu Sep 3 19:28:06 2026 +0100 Remove JenaTestBase in jena-core --- .../apache/jena/assembler/AssemblerTestBase.java | 4 +-- .../java/org/apache/jena/enhanced/TS3_enh.java | 4 +-- .../org/apache/jena/graph/AbstractTestGraph.java | 4 +-- .../org/apache/jena/graph/TestCoreGraphUtil.java | 3 +- .../java/org/apache/jena/graph/TestFactory.java | 3 +- .../org/apache/jena/graph/TestFindLiterals.java | 4 +-- .../test/java/org/apache/jena/graph/TestGraph.java | 4 +-- .../apache/jena/graph/TestGraphBaseToString.java | 4 +-- .../org/apache/jena/graph/TestGraphEvents.java | 4 +-- .../jena/graph/TestGraphMatchWithInference.java | 3 +- .../apache/jena/graph/TestGraphPrefixMapping.java | 4 +-- .../org/apache/jena/graph/TestLiteralLabels.java | 4 +-- .../test/java/org/apache/jena/graph/TestNode.java | 4 +-- .../jena/graph/TestRegisterGraphListener.java | 4 +-- .../java/org/apache/jena/graph/TestReifier.java | 4 +-- .../java/org/apache/jena/graph/TestTriple.java | 4 +-- .../org/apache/jena/graph/TestTripleField.java | 4 +-- .../graph/compose/AbstractTestPrefixMapping.java | 4 +-- .../jena/graph/compose/TestMultiUnionReifier.java | 4 +-- .../java/org/apache/jena/rdf/model/TestAnonID.java | 4 +-- .../apache/jena/rdf/model/TestDefaultModel.java | 4 +-- .../apache/jena/rdf/model/TestRDFWriterMap.java | 4 +-- .../apache/jena/rdf/model/helpers/ModelHelper.java | 6 ++-- .../rulesys/test/TestConfigVocabulary.java | 4 +-- .../test/TestRestrictionsDontNeedTyping.java | 4 +-- .../jena/reasoner/rulesys/test/TestSetRules.java | 4 +-- .../jena/reasoner/test/TestCurrentRDFWG.java | 3 +- .../jena/reasoner/test/TestInfPrefixMapping.java | 4 +-- .../jena/reasoner/test/TestRDFSReasoners.java | 3 +- .../java/org/apache/jena/test/JenaTestBase.java | 38 ---------------------- 30 files changed, 54 insertions(+), 97 deletions(-) diff --git a/jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestBase.java b/jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestBase.java index b6986ea675..20e531d19c 100644 --- a/jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestBase.java +++ b/jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestBase.java @@ -21,6 +21,7 @@ package org.apache.jena.assembler; +import junit.framework.TestCase; import org.apache.jena.assembler.assemblers.AssemblerBase; import org.apache.jena.assembler.exceptions.CannotConstructException; import org.apache.jena.rdf.model.Model; @@ -29,7 +30,6 @@ import org.apache.jena.rdf.model.Property; import org.apache.jena.rdf.model.Resource; import org.apache.jena.shared.BrokenException; import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.vocabulary.LocationMappingVocab; import org.apache.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDFS; @@ -40,7 +40,7 @@ import org.apache.jena.vocabulary.RDFS; * in subclasses to control the parser that is used to construct models and the * prefixes added to the model (these features added for Eyeball). */ -public class AssemblerTestBase extends JenaTestBase { +public class AssemblerTestBase extends TestCase { protected Class<? extends Assembler> getAssemblerClass() { throw new BrokenException("this class must define getAssemblerClass"); diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/TS3_enh.java b/jena-core/src/test/java/org/apache/jena/enhanced/TS3_enh.java index d968c0d9fd..fa31bd2c8b 100644 --- a/jena-core/src/test/java/org/apache/jena/enhanced/TS3_enh.java +++ b/jena-core/src/test/java/org/apache/jena/enhanced/TS3_enh.java @@ -27,12 +27,12 @@ package org.apache.jena.enhanced; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.graph.*; import org.apache.jena.junit.NodeCreateUtils; import org.apache.jena.rdf.model.*; import org.apache.jena.shared.JenaException; -import org.apache.jena.test.JenaTestBase; /** * These tests give a small version of a model-like interface @@ -52,7 +52,7 @@ import org.apache.jena.test.JenaTestBase; *These tests only test EnhNode polymorphism and not EnhGraph polymorphism. *EnhGraph polymorphism currently will not work. */ -public class TS3_enh extends JenaTestBase { +public class TS3_enh extends TestCase { static final private Personality<RDFNode> split = new Personality<>(); diff --git a/jena-core/src/test/java/org/apache/jena/graph/AbstractTestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/AbstractTestGraph.java index d9d55e15d2..3fcb6600a0 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/AbstractTestGraph.java +++ b/jena-core/src/test/java/org/apache/jena/graph/AbstractTestGraph.java @@ -24,13 +24,13 @@ package org.apache.jena.graph; import java.io.InputStream; import java.util.*; +import junit.framework.TestCase; import org.apache.jena.junit.NodeCreateUtils; import org.apache.jena.memvalue.TrackingTripleIterator; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.impl.ReifierStd; import org.apache.jena.shared.JenaException; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.test.JenaTestLib; import org.apache.jena.util.CollectionFactory; import org.apache.jena.util.iterator.ClosableIterator; @@ -41,7 +41,7 @@ import org.apache.jena.util.iterator.ExtendedIterator; * be a Graph. The abstract method getGraph must be overridden in subclasses to * deliver a Graph of interest. */ -public abstract class AbstractTestGraph extends JenaTestBase { +public abstract class AbstractTestGraph extends TestCase { public AbstractTestGraph(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestCoreGraphUtil.java b/jena-core/src/test/java/org/apache/jena/graph/TestCoreGraphUtil.java index 76c3d947fe..d31aed767f 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestCoreGraphUtil.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestCoreGraphUtil.java @@ -23,10 +23,9 @@ package org.apache.jena.graph; import junit.framework.*; import org.apache.jena.graph.impl.*; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.util.iterator.*; -public class TestCoreGraphUtil extends JenaTestBase +public class TestCoreGraphUtil extends TestCase { public TestCoreGraphUtil(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestFactory.java b/jena-core/src/test/java/org/apache/jena/graph/TestFactory.java index 0501865e83..077a99b904 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestFactory.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestFactory.java @@ -22,9 +22,8 @@ package org.apache.jena.graph; import junit.framework.*; -import org.apache.jena.test.JenaTestBase; -public class TestFactory extends JenaTestBase { +public class TestFactory extends TestCase { public TestFactory(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestFindLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/TestFindLiterals.java index 51ba8fb0da..2d2b2001db 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestFindLiterals.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestFindLiterals.java @@ -23,13 +23,13 @@ package org.apache.jena.graph; import java.util.Set; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.atlas.iterator.Iter; import org.apache.jena.graph.impl.LiteralLabelFactory; import org.apache.jena.junit.NodeCreateUtils; -import org.apache.jena.test.JenaTestBase; -public class TestFindLiterals extends JenaTestBase { +public class TestFindLiterals extends TestCase { public TestFindLiterals(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraph.java index b17e2540d8..16bbccdd27 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestGraph.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraph.java @@ -27,16 +27,16 @@ package org.apache.jena.graph; */ import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.graph.impl.WrappedGraph; import org.apache.jena.mem.GraphMemFast; import org.apache.jena.mem.GraphMemLegacy; import org.apache.jena.mem.GraphMemRoaring; import org.apache.jena.memvalue.GraphMemValue; -import org.apache.jena.test.JenaTestBase; @SuppressWarnings("deprecation") -public class TestGraph extends JenaTestBase { +public class TestGraph extends TestCase { public TestGraph(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestGraphBaseToString.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphBaseToString.java index fb5e3c2bda..dce640669e 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestGraphBaseToString.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphBaseToString.java @@ -26,16 +26,16 @@ import static org.apache.jena.graph.impl.GraphBase.TOSTRING_TRIPLE_LIMIT; import java.util.*; +import junit.framework.TestCase; import org.apache.jena.graph.impl.GraphBase; import org.apache.jena.junit.NodeCreateUtils; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.util.iterator.*; /** * Tests for the revisions to GraphBase.toString() to see that it's compact, ie * outputs no more than LIMIT triples. */ -public class TestGraphBaseToString extends JenaTestBase { +public class TestGraphBaseToString extends TestCase { private static final class LittleGraphBase extends GraphBase { Set<Triple> triples = new HashSet<>(); diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestGraphEvents.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphEvents.java index ea860a46f6..fbdb1b3294 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestGraphEvents.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphEvents.java @@ -21,10 +21,10 @@ package org.apache.jena.graph; +import junit.framework.TestCase; import org.apache.jena.junit.NodeCreateUtils; -import org.apache.jena.test.JenaTestBase; -public class TestGraphEvents extends JenaTestBase { +public class TestGraphEvents extends TestCase { public TestGraphEvents(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestGraphMatchWithInference.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphMatchWithInference.java index 34c641bd79..891cca4c60 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestGraphMatchWithInference.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphMatchWithInference.java @@ -23,13 +23,12 @@ package org.apache.jena.graph; import junit.framework.*; import org.apache.jena.rdf.model.*; -import org.apache.jena.test.JenaTestBase; /** * Test that an inferred graph and an identical concrete graph compare as equal. */ -public class TestGraphMatchWithInference extends JenaTestBase { +public class TestGraphMatchWithInference extends TestCase { public TestGraphMatchWithInference(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestGraphPrefixMapping.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphPrefixMapping.java index b0273af2f9..328f7ca854 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestGraphPrefixMapping.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphPrefixMapping.java @@ -21,12 +21,12 @@ package org.apache.jena.graph; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.graph.compose.AbstractTestPrefixMapping; import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.test.JenaTestBase; -public class TestGraphPrefixMapping extends JenaTestBase { +public class TestGraphPrefixMapping extends TestCase { public TestGraphPrefixMapping(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabels.java b/jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabels.java index d2b6882273..5e062e43a4 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabels.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabels.java @@ -22,15 +22,15 @@ package org.apache.jena.graph; import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.datatypes.BaseDatatype; import org.apache.jena.datatypes.RDFDatatype; import org.apache.jena.graph.impl.LiteralLabel; import org.apache.jena.graph.impl.LiteralLabelFactory; -import org.apache.jena.test.JenaTestBase; // See also TestLiteralLabelSameValueAs, TestTypedLiterals -public class TestLiteralLabels extends JenaTestBase { +public class TestLiteralLabels extends TestCase { public TestLiteralLabels(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestNode.java b/jena-core/src/test/java/org/apache/jena/graph/TestNode.java index b4b1d9e060..f7d6779f18 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestNode.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestNode.java @@ -21,6 +21,7 @@ package org.apache.jena.graph; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.atlas.lib.Creator; import org.apache.jena.datatypes.RDFDatatype; @@ -31,7 +32,6 @@ import org.apache.jena.graph.impl.LiteralLabelFactory; import org.apache.jena.junit.NodeCreateUtils; import org.apache.jena.shared.JenaException; import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.test.JenaTestLib; import org.apache.jena.util.SplitIRI; import org.apache.jena.vocabulary.DC; @@ -44,7 +44,7 @@ import org.apache.jena.vocabulary.VCARD; * Exercise nodes. Make sure that the different node types do not overlap and that * the test predicates work properly on the different node kinds. */ -public class TestNode extends JenaTestBase { +public class TestNode extends TestCase { public TestNode(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestRegisterGraphListener.java b/jena-core/src/test/java/org/apache/jena/graph/TestRegisterGraphListener.java index 9f45d2953d..aa60a6304f 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestRegisterGraphListener.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestRegisterGraphListener.java @@ -24,13 +24,13 @@ package org.apache.jena.graph; import java.util.Iterator; import java.util.List; -import org.apache.jena.test.JenaTestBase; +import junit.framework.TestCase; /** * These tests are for listeners that add or delete other listeners. It motivates the * use of, e.g. CopyOnWriteArrayList for storing listeners. */ -public class TestRegisterGraphListener extends JenaTestBase { +public class TestRegisterGraphListener extends TestCase { private ComeAndGoListener all[]; private Graph graph; diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestReifier.java b/jena-core/src/test/java/org/apache/jena/graph/TestReifier.java index 49b896370e..3d17fe0302 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestReifier.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestReifier.java @@ -23,6 +23,7 @@ package org.apache.jena.graph; import java.lang.reflect.Constructor; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.atlas.iterator.Iter; import org.apache.jena.junit.NodeCreateUtils; @@ -31,7 +32,6 @@ import org.apache.jena.rdf.model.impl.ReifierStd; import org.apache.jena.shared.AlreadyReifiedException; import org.apache.jena.shared.CannotReifyException; import org.apache.jena.shared.JenaException; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.test.JenaTestLib; import org.apache.jena.vocabulary.RDF; @@ -39,7 +39,7 @@ import org.apache.jena.vocabulary.RDF; * 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 JenaTestBase { +public class TestReifier extends TestCase { protected final Class<? extends Graph> graphClass; public TestReifier(String name) { diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestTriple.java b/jena-core/src/test/java/org/apache/jena/graph/TestTriple.java index 59a29c9f61..1ac3d42dfa 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestTriple.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestTriple.java @@ -23,16 +23,16 @@ package org.apache.jena.graph; import java.util.function.Function; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.graph.impl.LiteralLabel; import org.apache.jena.graph.impl.LiteralLabelFactory; import org.apache.jena.junit.NodeCreateUtils; import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.test.JenaTestLib; -public class TestTriple extends JenaTestBase { +public class TestTriple extends TestCase { public TestTriple(String name) { super(name); diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestTripleField.java b/jena-core/src/test/java/org/apache/jena/graph/TestTripleField.java index cbd8a83f57..678ac316fc 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/TestTripleField.java +++ b/jena-core/src/test/java/org/apache/jena/graph/TestTripleField.java @@ -21,12 +21,12 @@ package org.apache.jena.graph; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.graph.Triple.*; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.test.JenaTestLib; -public class TestTripleField extends JenaTestBase { +public class TestTripleField extends TestCase { public TestTripleField(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/AbstractTestPrefixMapping.java b/jena-core/src/test/java/org/apache/jena/graph/compose/AbstractTestPrefixMapping.java index eaf0927ad3..32d874b061 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/compose/AbstractTestPrefixMapping.java +++ b/jena-core/src/test/java/org/apache/jena/graph/compose/AbstractTestPrefixMapping.java @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import junit.framework.TestCase; import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.test.JenaTestLib; /** @@ -34,7 +34,7 @@ import org.apache.jena.test.JenaTestLib; * prefixMapping to be tested. */ -public abstract class AbstractTestPrefixMapping extends JenaTestBase { +public abstract class AbstractTestPrefixMapping extends TestCase { public AbstractTestPrefixMapping(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnionReifier.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnionReifier.java index 01219276a3..69073fce77 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnionReifier.java +++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnionReifier.java @@ -21,16 +21,16 @@ package org.apache.jena.graph.compose; +import junit.framework.TestCase; import org.apache.jena.graph.*; import org.apache.jena.junit.NodeCreateUtils; import org.apache.jena.rdf.model.impl.ReifierStd; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.util.iterator.ExtendedIterator; /** Test the reifier for multi-unions. */ -public class TestMultiUnionReifier extends JenaTestBase { +public class TestMultiUnionReifier extends TestCase { public TestMultiUnionReifier(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/TestAnonID.java b/jena-core/src/test/java/org/apache/jena/rdf/model/TestAnonID.java index 16cbf2271d..bd75ad08d1 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/TestAnonID.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/TestAnonID.java @@ -22,17 +22,17 @@ package org.apache.jena.rdf.model; import org.apache.jena.shared.impl.JenaParameters; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.test.JenaTestLib; import org.junit.Assert; +import junit.framework.TestCase; import junit.framework.TestSuite; /** * Test for anonID generation. (Originally test for the debugging hack that switches * off anonID generation.) */ -public class TestAnonID extends JenaTestBase { +public class TestAnonID extends TestCase { /** * Boilerplate for junit. This is its own test suite diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/TestDefaultModel.java b/jena-core/src/test/java/org/apache/jena/rdf/model/TestDefaultModel.java index 85034fb3e6..e24b578dd5 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/TestDefaultModel.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/TestDefaultModel.java @@ -21,6 +21,7 @@ package org.apache.jena.rdf.model; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.graph.GraphTestLib; import org.apache.jena.graph.Node; @@ -28,10 +29,9 @@ import org.apache.jena.graph.Triple; import org.apache.jena.junit.NodeCreateUtils; import org.apache.jena.rdf.model.impl.ModelCom; import org.apache.jena.shared.PropertyNotFoundException; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.test.JenaTestLib; -public class TestDefaultModel extends JenaTestBase { +public class TestDefaultModel extends TestCase { public TestDefaultModel(String name) { super(name); diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/TestRDFWriterMap.java b/jena-core/src/test/java/org/apache/jena/rdf/model/TestRDFWriterMap.java index 73bae7f6e3..8d0d1a6914 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/TestRDFWriterMap.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/TestRDFWriterMap.java @@ -24,17 +24,17 @@ package org.apache.jena.rdf.model; import java.util.HashMap; import java.util.Map; +import junit.framework.TestCase; import org.apache.jena.Jena; import org.apache.jena.rdf.model.impl.NTripleWriter; import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev; import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Basic; import org.apache.jena.shared.JenaException; import org.apache.jena.shared.NoWriterForLangException; -import org.apache.jena.test.JenaTestBase; import org.junit.Assert; -public class TestRDFWriterMap extends JenaTestBase { +public class TestRDFWriterMap extends TestCase { public static class RDFWriterMap implements RDFWriterF { protected final Map<String, Class<RDFWriterI>> map = new HashMap<>(); diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/helpers/ModelHelper.java b/jena-core/src/test/java/org/apache/jena/rdf/model/helpers/ModelHelper.java index a847d4ada3..9422088c30 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/helpers/ModelHelper.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/helpers/ModelHelper.java @@ -23,6 +23,7 @@ package org.apache.jena.rdf.model.helpers; import java.util.*; +import junit.framework.TestCase; import org.junit.Ignore; import org.apache.jena.graph.GraphTestLib; @@ -30,20 +31,19 @@ import org.apache.jena.graph.Node; import org.apache.jena.junit.NodeCreateUtils; import org.apache.jena.rdf.model.*; import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.util.CollectionFactory; /** provides useful functionality for testing models, eg building small models from strings, testing equality, etc. - Currently this class extends JenaTestBase and thus TestCase. + Currently this class extends TestCase. TODO: Refactoring should remove the TestCase dependency in future. */ @Ignore // ignore this class as a test case. -public class ModelHelper extends JenaTestBase +public class ModelHelper extends TestCase { private ModelHelper(String name) { super(name); } diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestConfigVocabulary.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestConfigVocabulary.java index a0a59ebf74..644f7f107d 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestConfigVocabulary.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestConfigVocabulary.java @@ -21,10 +21,10 @@ package org.apache.jena.reasoner.rulesys.test; +import junit.framework.TestCase; import org.apache.jena.rdf.model.Property; import org.apache.jena.rdf.model.Resource; import org.apache.jena.reasoner.ReasonerRegistry; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.vocabulary.RDF; import org.apache.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.ReasonerVocabulary; @@ -32,7 +32,7 @@ import org.apache.jena.vocabulary.ReasonerVocabulary; /** Tests for configuration vocabulary added as part of ModelSpec removal */ -public class TestConfigVocabulary extends JenaTestBase +public class TestConfigVocabulary extends TestCase { public TestConfigVocabulary( String name ) { super( name ); } diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRestrictionsDontNeedTyping.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRestrictionsDontNeedTyping.java index c3b3028e70..9e2fbbf5db 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRestrictionsDontNeedTyping.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRestrictionsDontNeedTyping.java @@ -21,6 +21,7 @@ package org.apache.jena.reasoner.rulesys.test; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.ontology.OntModel; import org.apache.jena.ontology.OntModelSpec; @@ -29,7 +30,6 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ModelTestLib; import org.apache.jena.rdf.model.Property; import org.apache.jena.shared.PrefixMapping; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.vocabulary.RDF; /** @@ -38,7 +38,7 @@ import org.apache.jena.vocabulary.RDF; layering problem). */ @SuppressWarnings("removal") -public class TestRestrictionsDontNeedTyping extends JenaTestBase +public class TestRestrictionsDontNeedTyping extends TestCase { public static TestSuite suite() { diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestSetRules.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestSetRules.java index 3ff5ef0ff2..1eb2930c8e 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestSetRules.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestSetRules.java @@ -23,17 +23,17 @@ package org.apache.jena.reasoner.rulesys.test; import java.util.*; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.rdf.model.*; import org.apache.jena.reasoner.*; import org.apache.jena.reasoner.rulesys.*; import org.apache.jena.reasoner.rulesys.impl.WrappedReasonerFactory; -import org.apache.jena.test.JenaTestBase; /** TestSetRules - tests to bring setRules into existence on RuleReasonerFactory. */ -public class TestSetRules extends JenaTestBase +public class TestSetRules extends TestCase { public TestSetRules( String name ) diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestCurrentRDFWG.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestCurrentRDFWG.java index eb0ef6154e..1029277429 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestCurrentRDFWG.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestCurrentRDFWG.java @@ -31,7 +31,6 @@ import org.apache.jena.rdf.model.Resource; import org.apache.jena.reasoner.ReasonerFactory; import org.apache.jena.reasoner.rulesys.RDFSRuleReasonerFactory; import org.apache.jena.shared.impl.JenaParameters; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.vocabulary.OWLResults; import org.apache.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.ReasonerVocabulary; @@ -41,7 +40,7 @@ import org.slf4j.LoggerFactory; /** * Test the default RDFS reasoner against the current set of working group tests */ -public class TestCurrentRDFWG extends JenaTestBase { +public class TestCurrentRDFWG extends TestCase { /** Location of the test file directory */ public static final String TEST_DIR = "testing/wg20031010/"; diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestInfPrefixMapping.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestInfPrefixMapping.java index 4874862275..38a887f267 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestInfPrefixMapping.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestInfPrefixMapping.java @@ -21,17 +21,17 @@ package org.apache.jena.reasoner.test; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.reasoner.InfGraph; -import org.apache.jena.test.JenaTestBase; /** Needs extending; relys on knowing that the only InfGraph currently used is the Jena-provided base. Needs to be made into an abstract test and parametrised with the InfGraph being tested (hence getInfGraph). */ -public class TestInfPrefixMapping extends JenaTestBase +public class TestInfPrefixMapping extends TestCase { public TestInfPrefixMapping( String name ) { super( name ); } diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java index a9ed368213..e986a56c95 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestRDFSReasoners.java @@ -38,7 +38,6 @@ import org.apache.jena.reasoner.ValidityReport; import org.apache.jena.reasoner.ValidityReport.Report; import org.apache.jena.reasoner.rulesys.RDFSFBRuleReasonerFactory; import org.apache.jena.reasoner.rulesys.RDFSRuleReasonerFactory; -import org.apache.jena.test.JenaTestBase; import org.apache.jena.vocabulary.RDFS; import org.apache.jena.vocabulary.ReasonerVocabulary; import org.slf4j.Logger; @@ -47,7 +46,7 @@ import org.slf4j.LoggerFactory; /** * Test the set of admissable RDFS reasoners. */ -public class TestRDFSReasoners extends JenaTestBase { +public class TestRDFSReasoners extends TestCase { /** Base URI for the test names */ public static final String NAMESPACE = "http://www.hpl.hp.com/semweb/2003/query_tester/";; diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaTestBase.java b/jena-core/src/test/java/org/apache/jena/test/JenaTestBase.java deleted file mode 100644 index a86ad6d85a..0000000000 --- a/jena-core/src/test/java/org/apache/jena/test/JenaTestBase.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.apache.jena.test; - -import junit.framework.TestCase; -import org.apache.jena.sys.JenaSystem; - -/** - * A basis for Jena test cases. - * See {@link JenaTestLib} for helper functions e.g. assertFalse and assertDiffer. - */ -public class JenaTestBase extends TestCase -{ - static { JenaSystem.init(); } - - public JenaTestBase(String name) { - super(name); - } -}
