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 2026/06/12 12:03:56 UTC
(jena) branch main updated (5a53de40b6 -> da0fb4e681)
This is an automated email from the ASF dual-hosted git repository.
afs pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
from 5a53de40b6 GH-3969: Native stream() implementations for DatasetGraph
new 99e200e1b4 Remove test class with no tests
new a7a95565cd Add dependency JUnit Jupiter to core
new bf05680511 GH-3236: Split tests in JUnit6 and JUnit4. Convert some packages to JUnit6.
new da0fb4e681 GH-3236: Convert 'mem' tests to JUnit6
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
jena-core/pom.xml | 41 +-
.../assembler/{test => }/AssemblerTestBase.java | 28 +-
...ssemblerTestBase.java => AssemblerTestLib.java} | 78 ++--
.../assembler/{test => }/MockTransactionModel.java | 7 +-
.../jena/assembler/{test => }/TS3_Assembler.java | 2 +-
.../assembler/{test => }/TestAssemblerGroup.java | 33 +-
.../{test => }/TestAssemblerGroupTracing.java | 11 +-
.../assembler/{test => }/TestAssemblerHelp.java | 55 +--
.../{test => }/TestAssemblerVocabulary.java | 3 +-
.../{test => }/TestBuiltinAssemblerGroup.java | 30 +-
.../assembler/{test => }/TestContentAssembler.java | 33 +-
.../{test => }/TestDefaultModelAssembler.java | 4 +-
.../{test => }/TestDocumentManagerAssembler.java | 20 +-
.../assembler/{test => }/TestImportManager.java | 29 +-
.../{test => }/TestInfModelAssembler.java | 12 +-
.../{test => }/TestMemoryModelAssembler.java | 4 +-
.../apache/jena/assembler/{test => }/TestMode.java | 3 +-
.../assembler/{test => }/TestModelAssembler.java | 7 +-
.../assembler/{test => }/TestModelContent.java | 16 +-
.../assembler/{test => }/TestModelExpansion.java | 28 +-
.../{test => }/TestOntModelAcceptance.java | 4 +-
.../{test => }/TestOntModelAssembler.java | 18 +-
.../{test => }/TestOntModelSpecAssembler.java | 14 +-
.../{test => }/TestPrefixMappingAssembler.java | 6 +-
.../{test => }/TestReasonerFactoryAssembler.java | 39 +-
.../jena/assembler/{test => }/TestRuleSet.java | 8 +-
.../assembler/{test => }/TestRuleSetAssembler.java | 7 +-
.../{test => }/TestUnionModelAssembler.java | 26 +-
.../jena/datatypes/{TS3_dt.java => TS6_dt.java} | 17 +-
.../apache/jena/datatypes/TestDatatypeValues.java | 31 +-
.../org/apache/jena/datatypes/TestDatatypes.java | 26 +-
.../apache/jena/datatypes/TestRDFXMLiteral.java | 14 +-
.../apache/jena/enhanced/{test => }/TS3_enh.java | 25 +-
.../jena/enhanced/{test => }/TestAllImpl.java | 3 +-
.../jena/enhanced/{test => }/TestCommonImpl.java | 3 +-
.../apache/jena/enhanced/{test => }/TestModel.java | 2 +-
.../jena/enhanced/{test => }/TestModelImpl.java | 3 +-
.../apache/jena/enhanced/{test => }/TestNode.java | 2 +-
.../jena/enhanced/{test => }/TestObject.java | 2 +-
.../jena/enhanced/{test => }/TestObjectImpl.java | 5 +-
.../jena/enhanced/{test => }/TestProperty.java | 2 +-
.../jena/enhanced/{test => }/TestPropertyImpl.java | 3 +-
.../jena/enhanced/{test => }/TestSubject.java | 2 +-
.../jena/enhanced/{test => }/TestSubjectImpl.java | 3 +-
.../jena/graph/{test => }/AbstractTestGraph.java | 304 ++++++-------
...stractTestGraph.java => BaseTestGraph_JU6.java} | 478 +++++++++++---------
.../{test/GraphTestBase.java => GraphTestLib.java} | 85 ++--
.../jena/graph/{test => }/MetaTestGraph.java | 19 +-
.../apache/jena/graph/RecordingGraphListener.java | 2 +-
.../jena/graph/{test => }/RecordingListener.java | 5 +-
.../apache/jena/graph/{test => }/TS3_graph.java | 5 +-
.../jena/graph/{test => }/TestCoreGraphUtil.java | 6 +-
.../apache/jena/graph/{test => }/TestDateTime.java | 2 +-
.../apache/jena/graph/{test => }/TestFactory.java | 6 +-
.../jena/graph/{test => }/TestFindLiterals.java | 16 +-
.../apache/jena/graph/{test => }/TestGraph.java | 15 +-
.../graph/{test => }/TestGraphBaseToString.java | 7 +-
.../jena/graph/{test => }/TestGraphEvents.java | 9 +-
.../jena/graph/{test => }/TestGraphListener.java | 5 +-
.../{test => }/TestGraphMatchWithInference.java | 9 +-
.../jena/graph/{test => }/TestGraphPlain.java | 36 +-
.../graph/{test => }/TestGraphPrefixMapping.java | 9 +-
.../java/org/apache/jena/graph/TestGraphUtil.java | 3 +-
.../{test => }/TestLiteralLabelSameValueAs.java | 3 +-
.../jena/graph/{test => }/TestLiteralLabels.java | 21 +-
.../org/apache/jena/graph/{test => }/TestNode.java | 61 ++-
.../graph/{test => }/TestNodeCreateStrings.java | 4 +-
.../jena/graph/{test => }/TestNodeEdgeCases.java | 4 +-
.../jena/graph/{test => }/TestNodeExtras.java | 4 +-
.../graph/{test => }/TestRDFStringLiterals.java | 5 +-
.../{test => }/TestRegisterGraphListener.java | 12 +-
.../AbstractTestReifier.java => TestReifier.java} | 160 ++++---
.../apache/jena/graph/{test => }/TestTriple.java | 35 +-
.../org/apache/jena/graph/TestTripleField.java | 90 ++++
.../jena/graph/{test => }/TestTypedLiterals.java | 3 +-
.../compose}/AbstractTestPrefixMapping.java | 24 +-
.../jena/graph/compose/{test => }/TS3_compose.java | 70 +--
.../org/apache/jena/graph/compose/TestDelta.java | 188 ++++++++
.../apache/jena/graph/compose/TestDifference.java | 117 +++++
.../compose/{test => }/TestDisjointUnion.java | 52 +--
.../jena/graph/compose/{test => }/TestDyadic.java | 16 +-
.../jena/graph/compose/TestIntersection.java | 123 ++++++
.../graph/compose/{test => }/TestMultiUnion.java | 66 +--
.../compose/{test => }/TestMultiUnionReifier.java | 14 +-
.../{test => }/TestPolyadicPrefixMapping.java | 4 +-
.../org/apache/jena/graph/compose/TestUnion.java | 114 +++++
.../jena/graph/compose/test/TestCaseBasic.java | 49 --
.../apache/jena/graph/compose/test/TestDelta.java | 188 --------
.../jena/graph/compose/test/TestDifference.java | 117 -----
.../jena/graph/compose/test/TestIntersection.java | 123 ------
.../apache/jena/graph/compose/test/TestUnion.java | 114 -----
.../jena/graph/test/AbstractTestTripleStore.java | 125 ------
.../org/apache/jena/graph/test/TestReifier.java | 71 ---
.../apache/jena/graph/test/TestTripleField.java | 89 ----
.../apache/jena/irix/AbstractTestIRIx_3986.java | 31 +-
.../jena/irix/{TS_IRIx.java => TS6_IRIx2.java} | 14 +-
.../apache/jena/irix/TestIRIxAbsoluteRelative.java | 18 +-
.../org/apache/jena/irix/TestIRIxJenaSystem.java | 25 +-
.../org/apache/jena/irix/TestIRIxNormalize.java | 14 +-
.../java/org/apache/jena/irix/TestIRIxOther.java | 18 +-
.../org/apache/jena/irix/TestIRIxReference.java | 16 +-
.../org/apache/jena/irix/TestIRIxRelative.java | 14 +-
.../org/apache/jena/irix/TestIRIxRelativize.java | 16 +-
.../java/org/apache/jena/irix/TestIRIxResolve.java | 14 +-
.../apache/jena/irix/TestIRIxSyntaxRFC3986.java | 39 +-
.../AbstractRecordingListener.java | 2 +-
.../{testing_framework => junit}/GraphHelper.java | 8 +-
.../{graph/test => junit}/NodeCreateUtils.java | 2 +-
.../jena/{util => }/junit/TestException.java | 4 +-
.../test/java/org/apache/jena/junit/TestUtils.java | 221 +++++++++
.../TestUtils.java => junit/TestUtils4.java} | 163 +------
.../TS6_LangTagX.java} | 19 +-
.../java/org/apache/jena/langtagx/TS_LangTagX.java | 33 --
.../org/apache/jena/langtagx/TestLangTagX.java | 22 +-
.../org/apache/jena/mem/AbstractGraphMemTest.java | 18 +-
.../java/org/apache/jena/mem/GraphMemFastTest.java | 10 +-
.../apache/jena/mem/GraphMemIndexedSetTest.java | 42 +-
.../org/apache/jena/mem/GraphMemRoaringTest.java | 43 +-
.../java/org/apache/jena/mem/GraphMemTest.java | 19 +-
.../org/apache/jena/mem/IndexingStrategyTest.java | 11 +-
.../mem/{TS4_GraphMem.java => TS6_GraphMem.java} | 14 +-
.../mem/collection/AbstractJenaMapNodeTest.java | 12 +-
.../mem/collection/AbstractJenaSetTripleTest.java | 17 +-
.../jena/mem/collection/FastHashMapTest2.java | 13 +-
.../jena/mem/collection/FastHashSetTest.java | 6 +-
.../jena/mem/collection/FastHashSetTest2.java | 11 +-
.../jena/mem/collection/HashCommonMapTest.java | 6 +-
.../jena/mem/collection/HashCommonSetTest.java | 6 +-
.../jena/mem/iterator/IteratorOfJenaSetsTest.java | 19 +-
.../jena/mem/iterator/SparseArrayIteratorTest.java | 9 +-
.../jena/mem/pattern/PatternClassifierTest.java | 11 +-
.../jena/mem/spliterator/ArraySpliteratorTest.java | 18 +-
.../mem/spliterator/ArraySubSpliteratorTest.java | 18 +-
.../spliterator/SparseArraySpliteratorTest.java | 16 +-
.../spliterator/SparseArraySubSpliteratorTest.java | 16 +-
.../jena/mem/store/AbstractTripleStoreTest.java | 20 +-
.../jena/mem/store/fast/FastArrayBunchTest.java | 3 +-
.../mem/store/fast/FastHashedBunchMapTest.java | 9 +-
.../mem/store/fast/FastHashedTripleBunchTest.java | 12 +-
.../jena/mem/store/fast/FastTripleStoreTest.java | 16 +-
.../mem/store/indexed/IndexListIteratorTest.java | 23 +-
.../store/indexed/IndexListSpliteratorTest.java | 23 +-
.../jena/mem/store/indexed/IndexListTest.java | 7 +-
.../mem/store/indexed/IndexListsIteratorTest.java | 19 +-
.../store/indexed/IndexListsSpliteratorTest.java | 24 +-
.../store/indexed/IndexedSetTripleStoreTest.java | 45 +-
.../jena/mem/store/indexed/NodesToIndicesTest.java | 7 +-
.../jena/mem/store/indexed/TripleSetTest.java | 14 +-
.../jena/mem/store/legacy/ArrayBunchTest.java | 3 +-
.../jena/mem/store/legacy/FieldFilterTest.java | 11 +-
.../mem/store/legacy/HashedTripleBunchTest.java | 12 +-
.../mem/store/legacy/LegacyTripleStoreTest.java | 3 +-
.../mem/store/legacy/NodeToTriplesMapMemTest.java | 4 +-
.../roaring/RoaringBitmapTripleIteratorTest.java | 10 +-
.../mem/store/roaring/RoaringTripleStoreTest.java | 45 +-
.../jena/memvalue/AbstractTestTripleBunch.java | 156 +++++++
.../org/apache/jena/memvalue/FieldFilterTest.java | 37 +-
.../jena/memvalue/SparseArraySpliteratorTest.java | 9 +-
.../memvalue/SparseArraySubSpliteratorTest.java | 8 +-
...3_GraphMemValue.java => TS6_GraphMemValue.java} | 24 +-
.../apache/jena/memvalue/TestArrayTripleBunch.java | 12 +-
.../TestConcurrentModificationException.java | 79 ++--
.../apache/jena/memvalue/TestGraphMemModel.java | 121 +++--
.../jena/memvalue/TestGraphTripleStoreMem.java | 109 ++++-
.../org/apache/jena/memvalue/TestHashCommon.java | 33 +-
.../apache/jena/memvalue/TestHashedBunchMap.java | 28 +-
.../jena/memvalue/TestHashedTripleBunch.java | 193 ++++----
.../jena/memvalue/TestNodeToTriplesMapMem.java | 127 +++---
.../org/apache/jena/memvalue/TestTripleBunch.java | 160 -------
.../org/apache/jena/ontology/impl/TS3_ont.java | 1 -
.../org/apache/jena/ontology/impl/TestAxioms.java | 84 ----
.../apache/jena/ontology/impl/TestOntClass.java | 4 +-
.../apache/jena/ontology/impl/TestOntGraph.java | 8 +-
.../apache/jena/ontology/impl/TestOntModel.java | 23 +-
.../jena/ontology/impl/TestOntModelSpec.java | 4 +-
.../jena/ontology/makers/TS3_ModelMakers.java | 2 +-
.../makers/TestGraphMaker.java} | 32 +-
.../jena/ontology/makers/TestModelMakerImpl.java | 32 +-
.../jena/ontology/makers/TestSimpleGraphMaker.java | 40 --
.../model/{test => }/AbstractContainerMethods.java | 13 +-
.../model/{test => }/AbstractModelTestBase.java | 14 +-
.../rdf/model/{test => }/AbstractTestPackage.java | 86 +---
.../jena/rdf/model/{test => }/IsomorphicTests.java | 9 +-
.../{test/ModelTestBase.java => ModelTestLib.java} | 73 ++-
.../model/{test => }/RecordingModelListener.java | 6 +-
.../TestFactory.java => rdf/model/TS3_Model1.java} | 21 +-
.../rdf/model/{test => }/TestAddAndContains.java | 10 +-
.../jena/rdf/model/{test => }/TestAddModel.java | 10 +-
.../jena/rdf/model/{test => }/TestAltMethods.java | 7 +-
.../jena/rdf/model/{test => }/TestAnonID.java | 15 +-
.../jena/rdf/model/{test => }/TestBagMethods.java | 8 +-
.../jena/rdf/model/{test => }/TestConcurrency.java | 10 +-
.../{test => }/TestContainerConstructors.java | 12 +-
.../jena/rdf/model/{test => }/TestContainers.java | 10 +-
.../jena/rdf/model/{test => }/TestContains.java | 10 +-
.../rdf/model/{test => }/TestCopyInOutOfModel.java | 8 +-
...bstractTestModel.java => TestDefaultModel.java} | 139 +++---
.../{test/TestGet.java => TestGetFromModel.java} | 9 +-
.../rdf/model/{test => }/TestHiddenStatements.java | 11 +-
.../jena/rdf/model/{test => }/TestIterators.java | 7 +-
.../apache/jena/rdf/model/{test => }/TestList.java | 7 +-
.../rdf/model/{test => }/TestListStatements.java | 3 +-
.../rdf/model/{test => }/TestListSubjects.java | 18 +-
.../rdf/model/{test => }/TestListSubjectsEtc.java | 18 +-
.../jena/rdf/model/{test => }/TestLiteralImpl.java | 27 +-
.../jena/rdf/model/{test => }/TestLiterals.java | 19 +-
.../rdf/model/{test => }/TestLiteralsInModel.java | 12 +-
.../jena/rdf/model/{test => }/TestModel.java | 54 +--
.../rdf/model/{test => }/TestModelBulkUpdate.java | 11 +-
.../jena/rdf/model/{test => }/TestModelEvents.java | 15 +-
.../rdf/model/{test => }/TestModelFactory.java | 12 +-
.../model/{test => }/TestModelPolymorphism.java | 9 +-
.../jena/rdf/model/{test => }/TestModelRead.java | 13 +-
.../model/{test => }/TestModelSetOperations.java | 12 +-
.../jena/rdf/model/{test => }/TestNamespace.java | 12 +-
.../model/{test => }/TestObjectOfProperties.java | 8 +-
.../jena/rdf/model/{test => }/TestObjects.java | 9 +-
.../jena/rdf/model/{test => }/TestProperties.java | 3 +-
.../jena/rdf/model/{test => }/TestRDFNodes.java | 14 +-
.../rdf/model/{test => }/TestRDFWriterMap.java | 5 +-
.../rdf/model/{test => }/TestReaderEvents.java | 12 +-
.../jena/rdf/model/{test => }/TestReaders.java | 17 +-
.../jena/rdf/model/{test => }/TestRemoveSPO.java | 24 +-
.../rdf/model/{test => }/TestResourceFactory.java | 3 +-
.../rdf/model/{test => }/TestResourceImpl.java | 13 +-
.../rdf/model/{test => }/TestResourceMethods.java | 14 +-
.../jena/rdf/model/{test => }/TestResources.java | 13 +-
.../jena/rdf/model/{test => }/TestSeqMethods.java | 17 +-
.../model/{test => }/TestSimpleListStatements.java | 26 +-
.../model/{test => }/TestStatementCreation.java | 8 +-
.../rdf/model/{test => }/TestStatementMethods.java | 13 +-
.../rdf/model/{test => }/TestStatementTerms.java | 9 +-
.../jena/rdf/model/{test => }/TestStatements.java | 13 +-
.../model/helpers/ModelCreator.java} | 18 +-
.../rdf/model/{test => }/helpers/ModelHelper.java | 25 +-
.../{test => }/helpers/RecordingModelListener.java | 2 +-
.../org/apache/jena/rdf/model/test/TS3_Model1.java | 58 ---
.../rdf/model/test/TestConcurrencyNesting.java | 125 ------
.../rdf/model/test/TestConcurrencyParallel.java | 140 ------
.../model/test/helpers/TestingModelFactory.java | 55 ---
.../jena/rdfxml/arp1tests/TS3_xmlinput1.java | 16 +-
.../jena/rdfxml/xmloutput/BaseTestXMLFeatures.java | 492 +++++++++++++++++++++
.../jena/rdfxml/xmloutput/BaseTestXMLOutput.java | 221 +++++++++
.../jena/rdfxml/xmloutput/PrettyWriterTest.java | 116 -----
.../jena/rdfxml/xmloutput/TS3_xmloutput.java | 54 ---
...igAbbrevTestPackage.java => TS6_xmloutput.java} | 31 +-
.../jena/rdfxml/xmloutput/TestEntityOutput.java | 54 ++-
.../jena/rdfxml/xmloutput/TestLiteralEncoding.java | 74 ++--
.../jena/rdfxml/xmloutput/TestPrettyWriter.java | 104 +++++
.../jena/rdfxml/xmloutput/TestWriterAndReader.java | 434 ------------------
.../jena/rdfxml/xmloutput/TestWriterFeatures.java | 20 +-
.../jena/rdfxml/xmloutput/TestWriterInterface.java | 85 ----
.../rdfxml/xmloutput/TestWriterURIExceptions.java | 16 +-
.../jena/rdfxml/xmloutput/TestXMLAbbrev.java | 60 ++-
.../jena/rdfxml/xmloutput/TestXMLFeatures.java | 469 --------------------
...kage.java => TestXMLFeatures_CoreNTriples.java} | 17 +-
...ackage.java => TestXMLFeatures_XML_Abbrev.java} | 15 +-
...Package.java => TestXMLFeatures_XML_Basic.java} | 15 +-
.../jena/rdfxml/xmloutput/XMLOutputTestBase.java | 219 ---------
.../reasoner/rulesys/impl/TestLPBRuleCloseBug.java | 11 +-
.../reasoner/rulesys/impl/TestLPBRuleEngine.java | 8 +-
.../rulesys/impl/TestLPBRuleEngineLeak.java | 14 +-
.../rulesys/impl/TestRestartableLBRule.java | 10 +-
.../rulesys/test/TestConfigVocabulary.java | 13 +-
.../test/TestGenericRuleReasonerConfig.java | 2 +-
.../jena/reasoner/rulesys/test/TestLPRDFS.java | 66 +--
.../test/TestRestrictionsDontNeedTyping.java | 22 +-
.../jena/reasoner/rulesys/test/TestSetRules.java | 30 +-
...{ReasonerTestBase.java => ReasonerTestLib.java} | 20 +-
.../jena/reasoner/test/TestCurrentRDFWG.java | 5 +-
.../apache/jena/reasoner/test/TestInfGraph.java | 2 +-
.../jena/reasoner/test/TestInfPrefixMapping.java | 6 +-
.../jena/reasoner/test/TestRDFSReasoners.java | 125 +++---
.../apache/jena/reasoner/test/TestReasoners.java | 28 +-
.../org/apache/jena/regression/TestCaseBasic.java | 81 ----
...efixMapping.java => BaseTestPrefixMapping.java} | 163 +++----
.../jena/shared/RandomizedTestCaseBasic.java | 44 --
...S_SharedPackage.java => TS6_SharedPackage.java} | 16 +-
.../org/apache/jena/shared/TestJenaException.java | 32 +-
.../org/apache/jena/shared/TestLockMRPlusSW.java | 91 ++--
.../org/apache/jena/shared/TestPrefixMapping.java | 71 ++-
...naCoreTestAll.java => JenaCoreTestAll_JU4.java} | 53 +--
.../org/apache/jena/test/JenaCoreTestAll_JU6.java | 65 +++
.../java/org/apache/jena/test/JenaTestBase.java | 171 +------
.../test/{JenaTestBase.java => JenaTestLib.java} | 42 +-
.../java/org/apache/jena/test/TestSystemSetup.java | 5 +-
.../jena/testing_framework/NodeCreateUtils.java | 182 --------
.../java/org/apache/jena/ttl_test/ManifestOld.java | 3 +-
.../junit => ttl_test}/ManifestOldItemHandler.java | 2 +-
.../jena/ttl_test/TestFactoryManifestOld.java | 3 +-
.../ttl_test/test/turtle/TestTurtleInternal.java | 2 +-
.../ttl_test/test/turtle/TurtleTestFactory.java | 2 +-
.../util/{TS3_coreutil.java => TS6_coreutil.java} | 18 +-
.../apache/jena/util/TestCollectionFactory.java | 30 +-
.../java/org/apache/jena/util/TestFileManager.java | 63 +--
.../java/org/apache/jena/util/TestFileUtils.java | 66 ++-
.../org/apache/jena/util/TestLocationMapper.java | 69 ++-
.../java/org/apache/jena/util/TestLocators.java | 31 +-
.../org/apache/jena/util/TestOneToManyMap.java | 76 ++--
.../apache/jena/util/TestPrefixMappingUtils.java | 107 ++---
.../java/org/apache/jena/util/TestPrintUtil.java | 15 +-
.../org/apache/jena/util/TestSimpleTokenizer.java | 71 ++-
.../org/apache/jena/util/TestSplitIRI_Display.java | 40 +-
.../org/apache/jena/util/TestSplitIRI_TTL.java | 36 +-
.../org/apache/jena/util/TestSplitIRI_XML.java | 44 +-
.../{test => }/LoggingClosableIterator.java | 4 +-
.../{test/TS3_coreiter.java => TS6_coreiter.java} | 12 +-
.../jena/util/iterator/{test => }/TestAndThen.java | 65 +--
.../util/iterator/{test => }/TestAsCollection.java | 23 +-
.../jena/util/iterator/{test => }/TestFilters.java | 24 +-
.../util/iterator/{test => }/TestMapIterators.java | 14 +-
.../iterator/TestNullIterator.java} | 33 +-
.../iterator/{test => }/TestResourceUtils.java | 105 ++---
.../jena/util/iterator/TestWrappedIterator.java | 72 +++
.../jena/util/iterator/test/TestNullIterator.java | 56 ---
.../util/iterator/test/TestWrappedIterator.java | 75 ----
.../java/org/apache/jena/util/junit/TestUtils.java | 98 ----
.../TS_Vocabularies.java => TS6_Vocabularies.java} | 22 +-
.../vocabulary/{test => }/TestOWL2Vocabulary.java | 46 +-
.../org/apache/jena/vocabulary/TestVocabDC10.java | 46 ++
.../jena/vocabulary/{test => }/TestVocabRDF.java | 32 +-
.../jena/vocabulary/{test => }/TestVocabRDFS.java | 18 +-
.../jena/vocabulary/{test => }/TestVocabRSS.java | 36 +-
.../org/apache/jena/vocabulary/TestVocabVCARD.java | 87 ++++
.../{test/VocabTestBase.java => VocabTestLib.java} | 18 +-
.../apache/jena/vocabulary/test/TestVocabDC10.java | 54 ---
.../jena/vocabulary/test/TestVocabVCARD.java | 94 ----
327 files changed, 5649 insertions(+), 7787 deletions(-)
copy jena-core/src/test/java/org/apache/jena/assembler/{test => }/AssemblerTestBase.java (86%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test/AssemblerTestBase.java => AssemblerTestLib.java} (65%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/MockTransactionModel.java (93%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TS3_Assembler.java (97%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestAssemblerGroup.java (84%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestAssemblerGroupTracing.java (83%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestAssemblerHelp.java (78%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestAssemblerVocabulary.java (98%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestBuiltinAssemblerGroup.java (74%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestContentAssembler.java (89%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestDefaultModelAssembler.java (92%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestDocumentManagerAssembler.java (88%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestImportManager.java (82%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestInfModelAssembler.java (92%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestMemoryModelAssembler.java (92%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestMode.java (96%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestModelAssembler.java (93%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestModelContent.java (88%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestModelExpansion.java (76%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestOntModelAcceptance.java (95%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestOntModelAssembler.java (90%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestOntModelSpecAssembler.java (93%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestPrefixMappingAssembler.java (96%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestReasonerFactoryAssembler.java (86%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestRuleSet.java (94%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestRuleSetAssembler.java (96%)
rename jena-core/src/test/java/org/apache/jena/assembler/{test => }/TestUnionModelAssembler.java (84%)
copy jena-core/src/test/java/org/apache/jena/datatypes/{TS3_dt.java => TS6_dt.java} (75%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TS3_enh.java (97%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestAllImpl.java (97%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestCommonImpl.java (97%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestModel.java (96%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestModelImpl.java (96%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestNode.java (96%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestObject.java (97%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestObjectImpl.java (95%)
copy jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestProperty.java (96%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestPropertyImpl.java (96%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestSubject.java (96%)
rename jena-core/src/test/java/org/apache/jena/enhanced/{test => }/TestSubjectImpl.java (96%)
copy jena-core/src/test/java/org/apache/jena/graph/{test => }/AbstractTestGraph.java (69%)
rename jena-core/src/test/java/org/apache/jena/graph/{test/AbstractTestGraph.java => BaseTestGraph_JU6.java} (59%)
rename jena-core/src/test/java/org/apache/jena/graph/{test/GraphTestBase.java => GraphTestLib.java} (90%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/MetaTestGraph.java (85%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/RecordingListener.java (96%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TS3_graph.java (92%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestCoreGraphUtil.java (93%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestDateTime.java (99%)
copy jena-core/src/test/java/org/apache/jena/graph/{test => }/TestFactory.java (90%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestFindLiterals.java (93%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestGraph.java (90%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestGraphBaseToString.java (94%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestGraphEvents.java (87%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestGraphListener.java (96%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestGraphMatchWithInference.java (83%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestGraphPlain.java (78%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestGraphPrefixMapping.java (86%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestLiteralLabelSameValueAs.java (98%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestLiteralLabels.java (79%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestNode.java (94%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestNodeCreateStrings.java (96%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestNodeEdgeCases.java (94%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestNodeExtras.java (98%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestRDFStringLiterals.java (97%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestRegisterGraphListener.java (94%)
rename jena-core/src/test/java/org/apache/jena/graph/{test/AbstractTestReifier.java => TestReifier.java} (54%)
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestTriple.java (89%)
create mode 100644 jena-core/src/test/java/org/apache/jena/graph/TestTripleField.java
rename jena-core/src/test/java/org/apache/jena/graph/{test => }/TestTypedLiterals.java (99%)
copy jena-core/src/test/java/org/apache/jena/{shared => graph/compose}/AbstractTestPrefixMapping.java (96%)
rename jena-core/src/test/java/org/apache/jena/graph/compose/{test => }/TS3_compose.java (54%)
mode change 100755 => 100644
create mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/TestDelta.java
create mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/TestDifference.java
rename jena-core/src/test/java/org/apache/jena/graph/compose/{test => }/TestDisjointUnion.java (57%)
rename jena-core/src/test/java/org/apache/jena/graph/compose/{test => }/TestDyadic.java (88%)
create mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/TestIntersection.java
rename jena-core/src/test/java/org/apache/jena/graph/compose/{test => }/TestMultiUnion.java (78%)
rename jena-core/src/test/java/org/apache/jena/graph/compose/{test => }/TestMultiUnionReifier.java (85%)
rename jena-core/src/test/java/org/apache/jena/graph/compose/{test => }/TestPolyadicPrefixMapping.java (97%)
create mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/TestUnion.java
delete mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/test/TestCaseBasic.java
delete mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDelta.java
delete mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDifference.java
delete mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/test/TestIntersection.java
delete mode 100755 jena-core/src/test/java/org/apache/jena/graph/compose/test/TestUnion.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestTripleStore.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java
rename jena-core/src/test/java/org/apache/jena/irix/{TS_IRIx.java => TS6_IRIx2.java} (86%)
rename jena-core/src/test/java/org/apache/jena/{testing_framework => junit}/AbstractRecordingListener.java (99%)
rename jena-core/src/test/java/org/apache/jena/{testing_framework => junit}/GraphHelper.java (98%)
rename jena-core/src/test/java/org/apache/jena/{graph/test => junit}/NodeCreateUtils.java (99%)
rename jena-core/src/test/java/org/apache/jena/{util => }/junit/TestException.java (93%)
create mode 100644 jena-core/src/test/java/org/apache/jena/junit/TestUtils.java
rename jena-core/src/test/java/org/apache/jena/{testing_framework/TestUtils.java => junit/TestUtils4.java} (55%)
rename jena-core/src/test/java/org/apache/jena/{enhanced/test/TestProperty.java => langtagx/TS6_LangTagX.java} (79%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java
rename jena-core/src/test/java/org/apache/jena/mem/{TS4_GraphMem.java => TS6_GraphMem.java} (93%)
create mode 100644 jena-core/src/test/java/org/apache/jena/memvalue/AbstractTestTripleBunch.java
rename jena-core/src/test/java/org/apache/jena/memvalue/{TS3_GraphMemValue.java => TS6_GraphMemValue.java} (71%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/memvalue/TestTripleBunch.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/ontology/impl/TestAxioms.java
rename jena-core/src/test/java/org/apache/jena/{graph/test/AbstractTestGraphMaker.java => ontology/makers/TestGraphMaker.java} (90%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/ontology/makers/TestSimpleGraphMaker.java
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/AbstractContainerMethods.java (93%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/AbstractModelTestBase.java (90%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/AbstractTestPackage.java (56%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/IsomorphicTests.java (97%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test/ModelTestBase.java => ModelTestLib.java} (74%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/RecordingModelListener.java (94%)
rename jena-core/src/test/java/org/apache/jena/{graph/test/TestFactory.java => rdf/model/TS3_Model1.java} (68%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestAddAndContains.java (93%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestAddModel.java (89%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestAltMethods.java (93%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestAnonID.java (89%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestBagMethods.java (80%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestConcurrency.java (96%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestContainerConstructors.java (88%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestContainers.java (80%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestContains.java (92%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestCopyInOutOfModel.java (94%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test/AbstractTestModel.java => TestDefaultModel.java} (57%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test/TestGet.java => TestGetFromModel.java} (91%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestHiddenStatements.java (86%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestIterators.java (97%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestList.java (99%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestListStatements.java (98%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestListSubjects.java (95%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestListSubjectsEtc.java (85%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestLiteralImpl.java (87%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestLiterals.java (92%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestLiteralsInModel.java (89%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestModel.java (85%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestModelBulkUpdate.java (90%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestModelEvents.java (96%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestModelFactory.java (89%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestModelPolymorphism.java (83%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestModelRead.java (84%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestModelSetOperations.java (91%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestNamespace.java (91%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestObjectOfProperties.java (98%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestObjects.java (95%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestProperties.java (97%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestRDFNodes.java (95%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestRDFWriterMap.java (97%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestReaderEvents.java (84%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestReaders.java (89%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestRemoveSPO.java (73%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestResourceFactory.java (98%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestResourceImpl.java (95%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestResourceMethods.java (91%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestResources.java (97%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestSeqMethods.java (98%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestSimpleListStatements.java (89%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestStatementCreation.java (95%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestStatementMethods.java (97%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestStatementTerms.java (93%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/TestStatements.java (91%)
rename jena-core/src/test/java/org/apache/jena/{datatypes/TS3_dt.java => rdf/model/helpers/ModelCreator.java} (70%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/helpers/ModelHelper.java (91%)
rename jena-core/src/test/java/org/apache/jena/rdf/model/{test => }/helpers/RecordingModelListener.java (99%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdf/model/test/TS3_Model1.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyNesting.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdf/model/test/TestConcurrencyParallel.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdf/model/test/helpers/TestingModelFactory.java
create mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/BaseTestXMLFeatures.java
create mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/BaseTestXMLOutput.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/PrettyWriterTest.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TS3_xmloutput.java
copy jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/{BigAbbrevTestPackage.java => TS6_xmloutput.java} (58%)
create mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestPrettyWriter.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestWriterAndReader.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestWriterInterface.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java
copy jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/{BigAbbrevTestPackage.java => TestXMLFeatures_CoreNTriples.java} (77%)
copy jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/{BigAbbrevTestPackage.java => TestXMLFeatures_XML_Abbrev.java} (80%)
rename jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/{BigAbbrevTestPackage.java => TestXMLFeatures_XML_Basic.java} (81%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/XMLOutputTestBase.java
rename jena-core/src/test/java/org/apache/jena/reasoner/test/{ReasonerTestBase.java => ReasonerTestLib.java} (77%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/regression/TestCaseBasic.java
rename jena-core/src/test/java/org/apache/jena/shared/{AbstractTestPrefixMapping.java => BaseTestPrefixMapping.java} (76%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/shared/RandomizedTestCaseBasic.java
rename jena-core/src/test/java/org/apache/jena/shared/{TS_SharedPackage.java => TS6_SharedPackage.java} (75%)
rename jena-core/src/test/java/org/apache/jena/test/{JenaCoreTestAll.java => JenaCoreTestAll_JU4.java} (60%)
create mode 100644 jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java
copy jena-core/src/test/java/org/apache/jena/test/{JenaTestBase.java => JenaTestLib.java} (86%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/testing_framework/NodeCreateUtils.java
rename jena-core/src/test/java/org/apache/jena/{util/junit => ttl_test}/ManifestOldItemHandler.java (96%)
rename jena-core/src/test/java/org/apache/jena/util/{TS3_coreutil.java => TS6_coreutil.java} (79%)
rename jena-core/src/test/java/org/apache/jena/util/iterator/{test => }/LoggingClosableIterator.java (94%)
rename jena-core/src/test/java/org/apache/jena/util/iterator/{test/TS3_coreiter.java => TS6_coreiter.java} (84%)
rename jena-core/src/test/java/org/apache/jena/util/iterator/{test => }/TestAndThen.java (69%)
rename jena-core/src/test/java/org/apache/jena/util/iterator/{test => }/TestAsCollection.java (80%)
rename jena-core/src/test/java/org/apache/jena/util/iterator/{test => }/TestFilters.java (69%)
rename jena-core/src/test/java/org/apache/jena/util/iterator/{test => }/TestMapIterators.java (76%)
rename jena-core/src/test/java/org/apache/jena/{rdf/model/test/TS3_StandardModels.java => util/iterator/TestNullIterator.java} (59%)
rename jena-core/src/test/java/org/apache/jena/util/iterator/{test => }/TestResourceUtils.java (66%)
create mode 100644 jena-core/src/test/java/org/apache/jena/util/iterator/TestWrappedIterator.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/util/iterator/test/TestNullIterator.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/util/iterator/test/TestWrappedIterator.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/util/junit/TestUtils.java
rename jena-core/src/test/java/org/apache/jena/vocabulary/{test/TS_Vocabularies.java => TS6_Vocabularies.java} (73%)
rename jena-core/src/test/java/org/apache/jena/vocabulary/{test => }/TestOWL2Vocabulary.java (93%)
create mode 100644 jena-core/src/test/java/org/apache/jena/vocabulary/TestVocabDC10.java
rename jena-core/src/test/java/org/apache/jena/vocabulary/{test => }/TestVocabRDF.java (77%)
rename jena-core/src/test/java/org/apache/jena/vocabulary/{test => }/TestVocabRDFS.java (89%)
rename jena-core/src/test/java/org/apache/jena/vocabulary/{test => }/TestVocabRSS.java (53%)
create mode 100644 jena-core/src/test/java/org/apache/jena/vocabulary/TestVocabVCARD.java
rename jena-core/src/test/java/org/apache/jena/vocabulary/{test/VocabTestBase.java => VocabTestLib.java} (72%)
delete mode 100644 jena-core/src/test/java/org/apache/jena/vocabulary/test/TestVocabDC10.java
delete mode 100644 jena-core/src/test/java/org/apache/jena/vocabulary/test/TestVocabVCARD.java
(jena) 03/04: GH-3236: Split tests in JUnit6 and JUnit4. Convert some packages to JUnit6.
Posted by an...@apache.org.
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 bf0568051158edb28f66cd551e16c0e583c102ff
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu May 21 11:46:10 2026 +0100
GH-3236: Split tests in JUnit6 and JUnit4. Convert some packages to JUnit6.
---
jena-core/pom.xml | 29 +-
.../assembler/{test => }/AssemblerTestBase.java | 28 +-
...ssemblerTestBase.java => AssemblerTestLib.java} | 78 ++--
.../assembler/{test => }/MockTransactionModel.java | 7 +-
.../jena/assembler/{test => }/TS3_Assembler.java | 2 +-
.../assembler/{test => }/TestAssemblerGroup.java | 33 +-
.../{test => }/TestAssemblerGroupTracing.java | 11 +-
.../assembler/{test => }/TestAssemblerHelp.java | 55 +--
.../{test => }/TestAssemblerVocabulary.java | 3 +-
.../{test => }/TestBuiltinAssemblerGroup.java | 30 +-
.../assembler/{test => }/TestContentAssembler.java | 33 +-
.../{test => }/TestDefaultModelAssembler.java | 4 +-
.../{test => }/TestDocumentManagerAssembler.java | 20 +-
.../assembler/{test => }/TestImportManager.java | 29 +-
.../{test => }/TestInfModelAssembler.java | 12 +-
.../{test => }/TestMemoryModelAssembler.java | 4 +-
.../apache/jena/assembler/{test => }/TestMode.java | 3 +-
.../assembler/{test => }/TestModelAssembler.java | 7 +-
.../assembler/{test => }/TestModelContent.java | 16 +-
.../assembler/{test => }/TestModelExpansion.java | 28 +-
.../{test => }/TestOntModelAcceptance.java | 4 +-
.../{test => }/TestOntModelAssembler.java | 18 +-
.../{test => }/TestOntModelSpecAssembler.java | 14 +-
.../{test => }/TestPrefixMappingAssembler.java | 6 +-
.../{test => }/TestReasonerFactoryAssembler.java | 39 +-
.../jena/assembler/{test => }/TestRuleSet.java | 8 +-
.../assembler/{test => }/TestRuleSetAssembler.java | 7 +-
.../{test => }/TestUnionModelAssembler.java | 26 +-
.../jena/datatypes/{TS3_dt.java => TS6_dt.java} | 17 +-
.../apache/jena/datatypes/TestDatatypeValues.java | 31 +-
.../org/apache/jena/datatypes/TestDatatypes.java | 26 +-
.../apache/jena/datatypes/TestRDFXMLiteral.java | 14 +-
.../apache/jena/enhanced/{test => }/TS3_enh.java | 25 +-
.../jena/enhanced/{test => }/TestAllImpl.java | 3 +-
.../jena/enhanced/{test => }/TestCommonImpl.java | 3 +-
.../apache/jena/enhanced/{test => }/TestModel.java | 2 +-
.../jena/enhanced/{test => }/TestModelImpl.java | 3 +-
.../apache/jena/enhanced/{test => }/TestNode.java | 2 +-
.../jena/enhanced/{test => }/TestObject.java | 2 +-
.../jena/enhanced/{test => }/TestObjectImpl.java | 5 +-
.../jena/enhanced/{test => }/TestProperty.java | 2 +-
.../jena/enhanced/{test => }/TestPropertyImpl.java | 3 +-
.../jena/enhanced/{test => }/TestSubject.java | 2 +-
.../jena/enhanced/{test => }/TestSubjectImpl.java | 3 +-
.../jena/graph/{test => }/AbstractTestGraph.java | 304 ++++++-------
...stractTestGraph.java => BaseTestGraph_JU6.java} | 478 +++++++++++---------
.../{test/GraphTestBase.java => GraphTestLib.java} | 85 ++--
.../jena/graph/{test => }/MetaTestGraph.java | 19 +-
.../apache/jena/graph/RecordingGraphListener.java | 2 +-
.../jena/graph/{test => }/RecordingListener.java | 5 +-
.../apache/jena/graph/{test => }/TS3_graph.java | 5 +-
.../jena/graph/{test => }/TestCoreGraphUtil.java | 6 +-
.../apache/jena/graph/{test => }/TestDateTime.java | 2 +-
.../apache/jena/graph/{test => }/TestFactory.java | 6 +-
.../jena/graph/{test => }/TestFindLiterals.java | 16 +-
.../apache/jena/graph/{test => }/TestGraph.java | 15 +-
.../graph/{test => }/TestGraphBaseToString.java | 7 +-
.../jena/graph/{test => }/TestGraphEvents.java | 9 +-
.../jena/graph/{test => }/TestGraphListener.java | 5 +-
.../{test => }/TestGraphMatchWithInference.java | 9 +-
.../jena/graph/{test => }/TestGraphPlain.java | 36 +-
.../graph/{test => }/TestGraphPrefixMapping.java | 9 +-
.../java/org/apache/jena/graph/TestGraphUtil.java | 3 +-
.../{test => }/TestLiteralLabelSameValueAs.java | 3 +-
.../jena/graph/{test => }/TestLiteralLabels.java | 21 +-
.../org/apache/jena/graph/{test => }/TestNode.java | 61 ++-
.../graph/{test => }/TestNodeCreateStrings.java | 4 +-
.../jena/graph/{test => }/TestNodeEdgeCases.java | 4 +-
.../jena/graph/{test => }/TestNodeExtras.java | 4 +-
.../graph/{test => }/TestRDFStringLiterals.java | 5 +-
.../{test => }/TestRegisterGraphListener.java | 12 +-
.../AbstractTestReifier.java => TestReifier.java} | 160 ++++---
.../apache/jena/graph/{test => }/TestTriple.java | 35 +-
.../org/apache/jena/graph/TestTripleField.java | 90 ++++
.../jena/graph/{test => }/TestTypedLiterals.java | 3 +-
.../compose}/AbstractTestPrefixMapping.java | 24 +-
.../jena/graph/compose/{test => }/TS3_compose.java | 70 +--
.../org/apache/jena/graph/compose/TestDelta.java | 188 ++++++++
.../apache/jena/graph/compose/TestDifference.java | 117 +++++
.../compose/{test => }/TestDisjointUnion.java | 52 +--
.../jena/graph/compose/{test => }/TestDyadic.java | 16 +-
.../jena/graph/compose/TestIntersection.java | 123 ++++++
.../graph/compose/{test => }/TestMultiUnion.java | 66 +--
.../compose/{test => }/TestMultiUnionReifier.java | 14 +-
.../{test => }/TestPolyadicPrefixMapping.java | 4 +-
.../org/apache/jena/graph/compose/TestUnion.java | 114 +++++
.../jena/graph/compose/test/TestCaseBasic.java | 49 --
.../apache/jena/graph/compose/test/TestDelta.java | 188 --------
.../jena/graph/compose/test/TestDifference.java | 117 -----
.../jena/graph/compose/test/TestIntersection.java | 123 ------
.../apache/jena/graph/compose/test/TestUnion.java | 114 -----
.../jena/graph/test/AbstractTestTripleStore.java | 125 ------
.../org/apache/jena/graph/test/TestReifier.java | 71 ---
.../apache/jena/graph/test/TestTripleField.java | 89 ----
.../apache/jena/irix/AbstractTestIRIx_3986.java | 31 +-
.../jena/irix/{TS_IRIx.java => TS6_IRIx2.java} | 14 +-
.../apache/jena/irix/TestIRIxAbsoluteRelative.java | 18 +-
.../org/apache/jena/irix/TestIRIxJenaSystem.java | 25 +-
.../org/apache/jena/irix/TestIRIxNormalize.java | 14 +-
.../java/org/apache/jena/irix/TestIRIxOther.java | 18 +-
.../org/apache/jena/irix/TestIRIxReference.java | 16 +-
.../org/apache/jena/irix/TestIRIxRelative.java | 14 +-
.../org/apache/jena/irix/TestIRIxRelativize.java | 16 +-
.../java/org/apache/jena/irix/TestIRIxResolve.java | 14 +-
.../apache/jena/irix/TestIRIxSyntaxRFC3986.java | 39 +-
.../AbstractRecordingListener.java | 2 +-
.../{testing_framework => junit}/GraphHelper.java | 8 +-
.../{graph/test => junit}/NodeCreateUtils.java | 2 +-
.../jena/{util => }/junit/TestException.java | 4 +-
.../test/java/org/apache/jena/junit/TestUtils.java | 221 +++++++++
.../TestUtils.java => junit/TestUtils4.java} | 163 +------
.../TS6_LangTagX.java} | 19 +-
.../java/org/apache/jena/langtagx/TS_LangTagX.java | 33 --
.../org/apache/jena/langtagx/TestLangTagX.java | 22 +-
.../org/apache/jena/mem/AbstractGraphMemTest.java | 4 +-
.../java/org/apache/jena/mem/GraphMemFastTest.java | 2 +-
.../apache/jena/mem/GraphMemIndexedSetTest.java | 2 +-
.../org/apache/jena/mem/GraphMemRoaringTest.java | 2 +-
.../java/org/apache/jena/mem/GraphMemTest.java | 4 +-
.../org/apache/jena/mem/IndexingStrategyTest.java | 2 +-
.../mem/collection/AbstractJenaMapNodeTest.java | 2 +-
.../mem/collection/AbstractJenaSetTripleTest.java | 7 +-
.../jena/mem/collection/FastHashMapTest2.java | 2 +-
.../jena/mem/collection/FastHashSetTest2.java | 2 +-
.../jena/mem/collection/HashCommonMapTest.java | 2 +-
.../jena/mem/collection/HashCommonSetTest.java | 2 +-
.../jena/mem/pattern/PatternClassifierTest.java | 4 +-
.../jena/mem/store/AbstractTripleStoreTest.java | 4 +-
.../mem/store/fast/FastHashedBunchMapTest.java | 4 +-
.../mem/store/fast/FastHashedTripleBunchTest.java | 2 +-
.../jena/mem/store/fast/FastTripleStoreTest.java | 2 +-
.../mem/store/indexed/IndexListIteratorTest.java | 2 +-
.../store/indexed/IndexListSpliteratorTest.java | 2 +-
.../mem/store/indexed/IndexListsIteratorTest.java | 2 +-
.../store/indexed/IndexListsSpliteratorTest.java | 2 +-
.../store/indexed/IndexedSetTripleStoreTest.java | 2 +-
.../jena/mem/store/indexed/NodesToIndicesTest.java | 2 +-
.../jena/mem/store/indexed/TripleSetTest.java | 2 +-
.../jena/mem/store/legacy/FieldFilterTest.java | 4 +-
.../mem/store/legacy/HashedTripleBunchTest.java | 2 +-
.../roaring/RoaringBitmapTripleIteratorTest.java | 2 +-
.../mem/store/roaring/RoaringTripleStoreTest.java | 2 +-
.../jena/memvalue/AbstractTestTripleBunch.java | 156 +++++++
.../org/apache/jena/memvalue/FieldFilterTest.java | 37 +-
.../jena/memvalue/SparseArraySpliteratorTest.java | 9 +-
.../memvalue/SparseArraySubSpliteratorTest.java | 8 +-
...3_GraphMemValue.java => TS6_GraphMemValue.java} | 24 +-
.../apache/jena/memvalue/TestArrayTripleBunch.java | 12 +-
.../TestConcurrentModificationException.java | 79 ++--
.../apache/jena/memvalue/TestGraphMemModel.java | 121 +++--
.../jena/memvalue/TestGraphTripleStoreMem.java | 109 ++++-
.../org/apache/jena/memvalue/TestHashCommon.java | 33 +-
.../apache/jena/memvalue/TestHashedBunchMap.java | 28 +-
.../jena/memvalue/TestHashedTripleBunch.java | 193 ++++----
.../jena/memvalue/TestNodeToTriplesMapMem.java | 127 +++---
.../org/apache/jena/memvalue/TestTripleBunch.java | 160 -------
.../apache/jena/ontology/impl/TestOntClass.java | 4 +-
.../apache/jena/ontology/impl/TestOntGraph.java | 8 +-
.../apache/jena/ontology/impl/TestOntModel.java | 23 +-
.../jena/ontology/impl/TestOntModelSpec.java | 4 +-
.../jena/ontology/makers/TS3_ModelMakers.java | 2 +-
.../makers/TestGraphMaker.java} | 32 +-
.../jena/ontology/makers/TestModelMakerImpl.java | 32 +-
.../jena/ontology/makers/TestSimpleGraphMaker.java | 40 --
.../model/{test => }/AbstractContainerMethods.java | 13 +-
.../model/{test => }/AbstractModelTestBase.java | 14 +-
.../rdf/model/{test => }/AbstractTestPackage.java | 86 +---
.../jena/rdf/model/{test => }/IsomorphicTests.java | 9 +-
.../{test/ModelTestBase.java => ModelTestLib.java} | 73 ++-
.../model/{test => }/RecordingModelListener.java | 6 +-
.../TestFactory.java => rdf/model/TS3_Model1.java} | 21 +-
.../rdf/model/{test => }/TestAddAndContains.java | 10 +-
.../jena/rdf/model/{test => }/TestAddModel.java | 10 +-
.../jena/rdf/model/{test => }/TestAltMethods.java | 7 +-
.../jena/rdf/model/{test => }/TestAnonID.java | 15 +-
.../jena/rdf/model/{test => }/TestBagMethods.java | 8 +-
.../jena/rdf/model/{test => }/TestConcurrency.java | 10 +-
.../{test => }/TestContainerConstructors.java | 12 +-
.../jena/rdf/model/{test => }/TestContainers.java | 10 +-
.../jena/rdf/model/{test => }/TestContains.java | 10 +-
.../rdf/model/{test => }/TestCopyInOutOfModel.java | 8 +-
...bstractTestModel.java => TestDefaultModel.java} | 139 +++---
.../{test/TestGet.java => TestGetFromModel.java} | 9 +-
.../rdf/model/{test => }/TestHiddenStatements.java | 11 +-
.../jena/rdf/model/{test => }/TestIterators.java | 7 +-
.../apache/jena/rdf/model/{test => }/TestList.java | 7 +-
.../rdf/model/{test => }/TestListStatements.java | 3 +-
.../rdf/model/{test => }/TestListSubjects.java | 18 +-
.../rdf/model/{test => }/TestListSubjectsEtc.java | 18 +-
.../jena/rdf/model/{test => }/TestLiteralImpl.java | 27 +-
.../jena/rdf/model/{test => }/TestLiterals.java | 19 +-
.../rdf/model/{test => }/TestLiteralsInModel.java | 12 +-
.../jena/rdf/model/{test => }/TestModel.java | 54 +--
.../rdf/model/{test => }/TestModelBulkUpdate.java | 11 +-
.../jena/rdf/model/{test => }/TestModelEvents.java | 15 +-
.../rdf/model/{test => }/TestModelFactory.java | 12 +-
.../model/{test => }/TestModelPolymorphism.java | 9 +-
.../jena/rdf/model/{test => }/TestModelRead.java | 13 +-
.../model/{test => }/TestModelSetOperations.java | 12 +-
.../jena/rdf/model/{test => }/TestNamespace.java | 12 +-
.../model/{test => }/TestObjectOfProperties.java | 8 +-
.../jena/rdf/model/{test => }/TestObjects.java | 9 +-
.../jena/rdf/model/{test => }/TestProperties.java | 3 +-
.../jena/rdf/model/{test => }/TestRDFNodes.java | 14 +-
.../rdf/model/{test => }/TestRDFWriterMap.java | 5 +-
.../rdf/model/{test => }/TestReaderEvents.java | 12 +-
.../jena/rdf/model/{test => }/TestReaders.java | 17 +-
.../jena/rdf/model/{test => }/TestRemoveSPO.java | 24 +-
.../rdf/model/{test => }/TestResourceFactory.java | 3 +-
.../rdf/model/{test => }/TestResourceImpl.java | 13 +-
.../rdf/model/{test => }/TestResourceMethods.java | 14 +-
.../jena/rdf/model/{test => }/TestResources.java | 13 +-
.../jena/rdf/model/{test => }/TestSeqMethods.java | 17 +-
.../model/{test => }/TestSimpleListStatements.java | 26 +-
.../model/{test => }/TestStatementCreation.java | 8 +-
.../rdf/model/{test => }/TestStatementMethods.java | 13 +-
.../rdf/model/{test => }/TestStatementTerms.java | 9 +-
.../jena/rdf/model/{test => }/TestStatements.java | 13 +-
.../model/helpers/ModelCreator.java} | 18 +-
.../rdf/model/{test => }/helpers/ModelHelper.java | 25 +-
.../{test => }/helpers/RecordingModelListener.java | 2 +-
.../org/apache/jena/rdf/model/test/TS3_Model1.java | 58 ---
.../rdf/model/test/TestConcurrencyNesting.java | 125 ------
.../rdf/model/test/TestConcurrencyParallel.java | 140 ------
.../model/test/helpers/TestingModelFactory.java | 55 ---
.../jena/rdfxml/arp1tests/TS3_xmlinput1.java | 16 +-
.../jena/rdfxml/xmloutput/BaseTestXMLFeatures.java | 492 +++++++++++++++++++++
.../jena/rdfxml/xmloutput/BaseTestXMLOutput.java | 221 +++++++++
.../jena/rdfxml/xmloutput/PrettyWriterTest.java | 116 -----
.../jena/rdfxml/xmloutput/TS3_xmloutput.java | 54 ---
...igAbbrevTestPackage.java => TS6_xmloutput.java} | 31 +-
.../jena/rdfxml/xmloutput/TestEntityOutput.java | 54 ++-
.../jena/rdfxml/xmloutput/TestLiteralEncoding.java | 74 ++--
.../jena/rdfxml/xmloutput/TestPrettyWriter.java | 104 +++++
.../jena/rdfxml/xmloutput/TestWriterAndReader.java | 434 ------------------
.../jena/rdfxml/xmloutput/TestWriterFeatures.java | 20 +-
.../jena/rdfxml/xmloutput/TestWriterInterface.java | 85 ----
.../rdfxml/xmloutput/TestWriterURIExceptions.java | 16 +-
.../jena/rdfxml/xmloutput/TestXMLAbbrev.java | 60 ++-
.../jena/rdfxml/xmloutput/TestXMLFeatures.java | 469 --------------------
...kage.java => TestXMLFeatures_CoreNTriples.java} | 17 +-
...ackage.java => TestXMLFeatures_XML_Abbrev.java} | 15 +-
...Package.java => TestXMLFeatures_XML_Basic.java} | 15 +-
.../jena/rdfxml/xmloutput/XMLOutputTestBase.java | 219 ---------
.../reasoner/rulesys/impl/TestLPBRuleCloseBug.java | 11 +-
.../reasoner/rulesys/impl/TestLPBRuleEngine.java | 8 +-
.../rulesys/impl/TestLPBRuleEngineLeak.java | 14 +-
.../rulesys/impl/TestRestartableLBRule.java | 10 +-
.../rulesys/test/TestConfigVocabulary.java | 13 +-
.../test/TestGenericRuleReasonerConfig.java | 2 +-
.../jena/reasoner/rulesys/test/TestLPRDFS.java | 66 +--
.../test/TestRestrictionsDontNeedTyping.java | 22 +-
.../jena/reasoner/rulesys/test/TestSetRules.java | 30 +-
...{ReasonerTestBase.java => ReasonerTestLib.java} | 20 +-
.../jena/reasoner/test/TestCurrentRDFWG.java | 5 +-
.../apache/jena/reasoner/test/TestInfGraph.java | 2 +-
.../jena/reasoner/test/TestInfPrefixMapping.java | 6 +-
.../jena/reasoner/test/TestRDFSReasoners.java | 125 +++---
.../apache/jena/reasoner/test/TestReasoners.java | 28 +-
.../org/apache/jena/regression/TestCaseBasic.java | 81 ----
...efixMapping.java => BaseTestPrefixMapping.java} | 163 +++----
.../jena/shared/RandomizedTestCaseBasic.java | 44 --
...S_SharedPackage.java => TS6_SharedPackage.java} | 16 +-
.../org/apache/jena/shared/TestJenaException.java | 32 +-
.../org/apache/jena/shared/TestLockMRPlusSW.java | 91 ++--
.../org/apache/jena/shared/TestPrefixMapping.java | 71 ++-
...naCoreTestAll.java => JenaCoreTestAll_JU4.java} | 52 +--
.../org/apache/jena/test/JenaCoreTestAll_JU6.java | 62 +++
.../java/org/apache/jena/test/JenaTestBase.java | 171 +------
.../test/{JenaTestBase.java => JenaTestLib.java} | 42 +-
.../java/org/apache/jena/test/TestSystemSetup.java | 5 +-
.../jena/testing_framework/NodeCreateUtils.java | 182 --------
.../java/org/apache/jena/ttl_test/ManifestOld.java | 3 +-
.../junit => ttl_test}/ManifestOldItemHandler.java | 2 +-
.../jena/ttl_test/TestFactoryManifestOld.java | 3 +-
.../ttl_test/test/turtle/TestTurtleInternal.java | 2 +-
.../ttl_test/test/turtle/TurtleTestFactory.java | 2 +-
.../util/{TS3_coreutil.java => TS6_coreutil.java} | 18 +-
.../apache/jena/util/TestCollectionFactory.java | 30 +-
.../java/org/apache/jena/util/TestFileManager.java | 63 +--
.../java/org/apache/jena/util/TestFileUtils.java | 66 ++-
.../org/apache/jena/util/TestLocationMapper.java | 69 ++-
.../java/org/apache/jena/util/TestLocators.java | 31 +-
.../org/apache/jena/util/TestOneToManyMap.java | 76 ++--
.../apache/jena/util/TestPrefixMappingUtils.java | 107 ++---
.../java/org/apache/jena/util/TestPrintUtil.java | 15 +-
.../org/apache/jena/util/TestSimpleTokenizer.java | 71 ++-
.../org/apache/jena/util/TestSplitIRI_Display.java | 40 +-
.../org/apache/jena/util/TestSplitIRI_TTL.java | 36 +-
.../org/apache/jena/util/TestSplitIRI_XML.java | 44 +-
.../{test => }/LoggingClosableIterator.java | 4 +-
.../{test/TS3_coreiter.java => TS6_coreiter.java} | 12 +-
.../jena/util/iterator/{test => }/TestAndThen.java | 65 +--
.../util/iterator/{test => }/TestAsCollection.java | 23 +-
.../jena/util/iterator/{test => }/TestFilters.java | 24 +-
.../util/iterator/{test => }/TestMapIterators.java | 14 +-
.../iterator/TestNullIterator.java} | 33 +-
.../iterator/{test => }/TestResourceUtils.java | 105 ++---
.../jena/util/iterator/TestWrappedIterator.java | 72 +++
.../jena/util/iterator/test/TestNullIterator.java | 56 ---
.../util/iterator/test/TestWrappedIterator.java | 75 ----
.../java/org/apache/jena/util/junit/TestUtils.java | 98 ----
.../TS_Vocabularies.java => TS6_Vocabularies.java} | 22 +-
.../vocabulary/{test => }/TestOWL2Vocabulary.java | 46 +-
.../org/apache/jena/vocabulary/TestVocabDC10.java | 46 ++
.../jena/vocabulary/{test => }/TestVocabRDF.java | 32 +-
.../jena/vocabulary/{test => }/TestVocabRDFS.java | 18 +-
.../jena/vocabulary/{test => }/TestVocabRSS.java | 36 +-
.../org/apache/jena/vocabulary/TestVocabVCARD.java | 87 ++++
.../{test/VocabTestBase.java => VocabTestLib.java} | 18 +-
.../apache/jena/vocabulary/test/TestVocabDC10.java | 54 ---
.../jena/vocabulary/test/TestVocabVCARD.java | 94 ----
312 files changed, 5319 insertions(+), 7444 deletions(-)
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index 3cddb97965..951c6126fe 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -81,6 +81,14 @@
<scope>test</scope>
</dependency>
+ <!--
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ -->
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -111,13 +119,6 @@
<resources>
- <!-- Legacy -->
- <resource>
- <directory>etc</directory>
- <targetPath>etc</targetPath>
- <filtering>false</filtering>
- </resource>
-
<resource>
<filtering>false</filtering>
<directory>src/main/resources</directory>
@@ -140,17 +141,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!--
- Choose the provider if necessary.
- Necessary if surefire is not reporting during test runs.
- -->
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>${ver.plugin.surefire}</version>
- </dependency>
- </dependencies>
<configuration>
<!-- One possibility
<argLine>-javaagent:${org.mockito:mockito-core:jar} -Xshare:off</argLine>
@@ -158,7 +148,8 @@
<!-- Without needing ${org.mockito:mockito-core:jar} -->
<argLine>-XX:+EnableDynamicAgentLoading -Xshare:off</argLine>
<includes>
- <include>org/apache/jena/test/JenaCoreTestAll.java</include>
+ <include>org/apache/jena/test/JenaCoreTestAll_JU6.java</include>
+ <include>org/apache/jena/test/JenaCoreTestAll_JU4.java</include>
</includes>
</configuration>
</plugin>
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/AssemblerTestBase.java b/jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestBase.java
similarity index 86%
copy from jena-core/src/test/java/org/apache/jena/assembler/test/AssemblerTestBase.java
copy to jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestBase.java
index 9860c0c98a..b6986ea675 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/AssemblerTestBase.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestBase.java
@@ -19,15 +19,20 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.AssemblerBase;
import org.apache.jena.assembler.exceptions.CannotConstructException;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.rdf.model.test.ModelTestBase;
-import org.apache.jena.shared.*;
-import org.apache.jena.vocabulary.*;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelTestLib;
+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;
/**
* A convenient base class for Assembler tests. The instance methods
@@ -35,7 +40,8 @@ import org.apache.jena.vocabulary.*;
* 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 ModelTestBase {
+public class AssemblerTestBase extends JenaTestBase {
+
protected Class<? extends Assembler> getAssemblerClass() {
throw new BrokenException("this class must define getAssemblerClass");
}
@@ -88,7 +94,7 @@ public class AssemblerTestBase extends ModelTestBase {
}
protected Model model(String string) {
- Model result = createModel();
+ Model result = ModelTestLib.createModel();
setRequiredPrefixes(result);
return modelAddFacts(result, string);
}
@@ -101,7 +107,7 @@ public class AssemblerTestBase extends ModelTestBase {
* Subclasses may override to use their choice of string-to-model parsers.
*/
protected Model modelAddFacts(Model result, String string) {
- return modelAdd(result, string);
+ return ModelTestLib.modelAdd(result, string);
}
/**
@@ -115,7 +121,7 @@ public class AssemblerTestBase extends ModelTestBase {
protected Resource resourceInModel(String string) {
Model m = model(string);
- Resource r = resource(m, string.substring(0, string.indexOf(' ')));
+ Resource r = ModelTestLib.resource(m, string.substring(0, string.indexOf(' ')));
return r.inModel(m);
}
@@ -126,7 +132,7 @@ public class AssemblerTestBase extends ModelTestBase {
} catch (CannotConstructException e) {
assertEquals(getAssemblerClass(), e.getAssemblerClass());
assertEquals(type, e.getType());
- assertEquals(resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/AssemblerTestBase.java b/jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestLib.java
similarity index 65%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/AssemblerTestBase.java
rename to jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestLib.java
index 9860c0c98a..45492b4351 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/AssemblerTestBase.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/AssemblerTestLib.java
@@ -19,31 +19,46 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.AssemblerBase;
import org.apache.jena.assembler.exceptions.CannotConstructException;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.rdf.model.test.ModelTestBase;
-import org.apache.jena.shared.*;
-import org.apache.jena.vocabulary.*;
-
-/**
- * A convenient base class for Assembler tests. The instance methods
- * <code>modelAddFacts</code> and <code>setRequiredPrefixes</code> may be over-ridden
- * 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 ModelTestBase {
- protected Class<? extends Assembler> getAssemblerClass() {
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.impl.RDFReaderFImpl;
+import org.apache.jena.rdf.model.impl.RDFWriterFImpl;
+import org.apache.jena.shared.BrokenException;
+import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.sys.JenaSystem;
+import org.apache.jena.test.X_RDFReaderF;
+import org.apache.jena.test.X_RDFWriterF;
+import org.apache.jena.vocabulary.LocationMappingVocab;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.RDFS;
+
+import static org.apache.jena.rdf.model.ModelTestLib.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class AssemblerTestLib {
+
+ static { JenaSystem.init();
+ JenaSystem.init();
+ // Include parsers and writers needed for the tests.
+ // These are not up-to-date but enough to work with the test suite.
+ RDFReaderFImpl.alternative(new X_RDFReaderF());
+ RDFWriterFImpl.alternative(new X_RDFWriterF());
+ }
+
+ /*package*/ static Class<? extends Assembler> getAssemblerClass() {
throw new BrokenException("this class must define getAssemblerClass");
}
/**
* An assembler that always returns the same fixed object.
*/
- protected static final class FixedObjectAssembler extends AssemblerBase {
+ /*package*/ static final class FixedObjectAssembler extends AssemblerBase {
private final Object x;
protected FixedObjectAssembler(Object x) {
@@ -60,7 +75,7 @@ public class AssemblerTestBase extends ModelTestBase {
* An assembler that insists on being called on a given name, and always returns
* the same fixed object.
*/
- protected static class NamedObjectAssembler extends AssemblerBase {
+ /*package*/ static class NamedObjectAssembler extends AssemblerBase {
final Resource name;
final Object result;
@@ -81,45 +96,41 @@ public class AssemblerTestBase extends ModelTestBase {
}
}
- protected static final Model schema = JA.getSchema();
+ /*package*/ static final Model schema = JA.getSchema();
- public AssemblerTestBase(String name) {
- super(name);
- }
-
- protected Model model(String string) {
+ /*package*/ static Model model(String string) {
Model result = createModel();
setRequiredPrefixes(result);
return modelAddFacts(result, string);
}
- protected Model model() {
+ /*package*/ static Model model() {
return model("");
}
/**
* Subclasses may override to use their choice of string-to-model parsers.
*/
- protected Model modelAddFacts(Model result, String string) {
+ /*package*/ static Model modelAddFacts(Model result, String string) {
return modelAdd(result, string);
}
/**
* Subclasses may extend to get their choice of defined prefixes.
*/
- protected Model setRequiredPrefixes(Model m) {
+ /*package*/ static Model setRequiredPrefixes(Model m) {
m.setNsPrefix("ja", JA.getURI());
m.setNsPrefix("lm", LocationMappingVocab.getURI());
return m;
}
- protected Resource resourceInModel(String string) {
+ /*package*/ static Resource resourceInModel(String string) {
Model m = model(string);
Resource r = resource(m, string.substring(0, string.indexOf(' ')));
return r.inModel(m);
}
- protected void testDemandsMinimalType(Assembler a, Resource type) {
+ /*package*/ static void testDemandsMinimalType(Assembler a, Resource type) {
try {
a.open(resourceInModel("x rdf:type rdf:Resource"));
fail("should trap insufficient type");
@@ -130,7 +141,7 @@ public class AssemblerTestBase extends ModelTestBase {
}
}
- protected void assertSamePrefixMapping(PrefixMapping wanted, PrefixMapping got) {
+ /*package*/ static void assertSamePrefixMapping(PrefixMapping wanted, PrefixMapping got) {
if ( !wanted.samePrefixMappingAs(got) )
fail("wanted: " + wanted + " but got: " + got);
}
@@ -139,7 +150,7 @@ public class AssemblerTestBase extends ModelTestBase {
* assert that the property <code>p</code> has <code>domain</code> as its
* rdfs:domain.
*/
- protected void assertDomain(Resource domain, Property p) {
+ /*package*/ static void assertDomain(Resource domain, Property p) {
if ( !schema.contains(p, RDFS.domain, domain) )
fail(p + " was expected to have domain " + domain);
}
@@ -148,7 +159,7 @@ public class AssemblerTestBase extends ModelTestBase {
* assert that the property <code>p</code> has <code>range</code> as its
* rdfs:range.
*/
- protected void assertRange(Resource range, Property p) {
+ /*package*/ static void assertRange(Resource range, Property p) {
if ( !schema.contains(p, RDFS.range, range) )
fail(p + " was expected to have range " + range);
}
@@ -157,7 +168,7 @@ public class AssemblerTestBase extends ModelTestBase {
* assert that <code>expectedSub</code> is an rdfs:subClassOf
* <code>expectedSuper</code>.
*/
- protected void assertSubclassOf(Resource expectedSub, Resource expectedSuper) {
+ /*package*/ static void assertSubclassOf(Resource expectedSub, Resource expectedSuper) {
if ( !schema.contains(expectedSub, RDFS.subClassOf, expectedSuper) )
fail(expectedSub + " should be a subclass of " + expectedSuper);
}
@@ -165,8 +176,9 @@ public class AssemblerTestBase extends ModelTestBase {
/**
* assert that <code>instance</code> has rdf:type <code>type</code>.
*/
- protected void assertType(Resource type, Resource instance) {
+ /*package*/ static void assertType(Resource type, Resource instance) {
if ( !schema.contains(instance, RDF.type, type) )
fail(instance + " should have rdf:type " + type);
}
+
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/MockTransactionModel.java b/jena-core/src/test/java/org/apache/jena/assembler/MockTransactionModel.java
similarity index 93%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/MockTransactionModel.java
rename to jena-core/src/test/java/org/apache/jena/assembler/MockTransactionModel.java
index 0a9a319681..c65f8a17c5 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/MockTransactionModel.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/MockTransactionModel.java
@@ -19,16 +19,15 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.List;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.ModelAssembler;
import org.apache.jena.graph.GraphMemFactory;
import org.apache.jena.rdf.model.*;
import org.apache.jena.rdf.model.impl.ModelCom;
-import org.apache.jena.rdf.model.test.ModelTestBase;
+
import org.junit.Assert;
/**
@@ -77,7 +76,7 @@ final class MockTransactionModel extends ModelAssembler {
@Override
public Model commit() {
- ModelTestBase.assertIsoModels(expected, this);
+ ModelTestLib.assertIsoModels(expected, this);
history.add("commit");
return this;
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TS3_Assembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TS3_Assembler.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TS3_Assembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TS3_Assembler.java
index 360321fb88..174aba1e4a 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TS3_Assembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TS3_Assembler.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java b/jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerGroup.java
similarity index 84%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerGroup.java
index d07bb2eabb..265377cecc 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerGroup.java
@@ -19,11 +19,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.Assembler;
-import org.apache.jena.assembler.JA;
-import org.apache.jena.assembler.Mode;
import org.apache.jena.assembler.assemblers.AssemblerBase;
import org.apache.jena.assembler.assemblers.AssemblerGroup;
import org.apache.jena.assembler.assemblers.AssemblerGroup.ExpandingAssemblerGroup;
@@ -33,7 +30,9 @@ import org.apache.jena.graph.Graph;
import org.apache.jena.graph.impl.GraphBase;
import org.apache.jena.rdf.model.InfModel;
import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelTestLib;
import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.test.JenaTestLib;
import org.apache.jena.vocabulary.RDFS;
public class TestAssemblerGroup extends AssemblerTestBase {
@@ -48,8 +47,8 @@ public class TestAssemblerGroup extends AssemblerTestBase {
public void testEmptyAssemblerGroup() {
AssemblerGroup a = AssemblerGroup.create();
- assertInstanceOf(AssemblerGroup.class, a);
- assertEquals(null, a.assemblerFor(resource("ja:Anything")));
+ JenaTestLib.assertInstanceOf(AssemblerGroup.class, a);
+ assertEquals(null, a.assemblerFor(ModelTestLib.resource("ja:Anything")));
checkFailsType(a, "rdf:Resource");
}
@@ -58,7 +57,7 @@ public class TestAssemblerGroup extends AssemblerTestBase {
a.open(resourceInModel("x rdf:type " + type));
fail("should trap missing implementation");
} catch (NoSpecificTypeException e) {
- assertEquals(resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
}
}
@@ -73,7 +72,7 @@ public class TestAssemblerGroup extends AssemblerTestBase {
public void testLoadsClasses() {
AssemblerGroup a = AssemblerGroup.create();
- a.implementWith(resource("T"), new MockAssembler());
+ a.implementWith(ModelTestLib.resource("T"), new MockAssembler());
Resource root = resourceInModel("x rdf:type T; _c ja:loadClass '" + TestAssemblerGroup.class.getName() + "$Trivial'");
// In case already loaded.
loaded = false;
@@ -100,7 +99,7 @@ public class TestAssemblerGroup extends AssemblerTestBase {
AssemblerGroup a = AssemblerGroup.create();
assertSame(a, a.implementWith(JA.InfModel, Assembler.infModel));
assertSame(a, a.implementWith(JA.MemoryModel, Assembler.memoryModel));
- assertInstanceOf(InfModel.class, a.openModel(resourceInModel("x rdf:type ja:InfModel")));
+ JenaTestLib.assertInstanceOf(InfModel.class, a.openModel(resourceInModel("x rdf:type ja:InfModel")));
assertFalse(a.openModel(resourceInModel("y rdf:type ja:MemoryModel")) instanceof InfModel);
checkFailsType(a, "js:DefaultModel");
}
@@ -109,14 +108,14 @@ public class TestAssemblerGroup extends AssemblerTestBase {
AssemblerGroup a = AssemblerGroup.create();
Resource root = resourceInModel("x ja:reasoner y");
Object expected = new Object();
- a.implementWith(JA.InfModel, new NamedObjectAssembler(resource("x"), expected));
+ a.implementWith(JA.InfModel, new NamedObjectAssembler(ModelTestLib.resource("x"), expected));
assertSame(expected, a.open(root));
}
public void testBuiltinGroup() {
AssemblerGroup g = Assembler.general();
- assertInstanceOf(Model.class, g.open(resourceInModel("x rdf:type ja:DefaultModel")));
- assertInstanceOf(InfModel.class, g.open(resourceInModel("x rdf:type ja:InfModel")));
+ JenaTestLib.assertInstanceOf(Model.class, g.open(resourceInModel("x rdf:type ja:DefaultModel")));
+ JenaTestLib.assertInstanceOf(InfModel.class, g.open(resourceInModel("x rdf:type ja:InfModel")));
assertMemoryModel(g.open(resourceInModel("x rdf:type ja:MemoryModel")));
}
@@ -136,7 +135,7 @@ public class TestAssemblerGroup extends AssemblerTestBase {
}
};
Resource root = resourceInModel("root rdf:type typeA");
- Resource typeA = resource("typeA"), typeB = resource("typeB");
+ Resource typeA = ModelTestLib.resource("typeA"), typeB = ModelTestLib.resource("typeB");
g.implementWith(typeA, mockAssembler);
g.implementWith(typeB, mockAssembler);
g.open(root);
@@ -146,7 +145,7 @@ public class TestAssemblerGroup extends AssemblerTestBase {
public static class ImplementsSPOO {
public static void whenRequiredByAssembler(AssemblerGroup g) {
- g.implementWith(resource("SPOO"), mockAssembler);
+ g.implementWith(ModelTestLib.resource("SPOO"), mockAssembler);
}
}
@@ -154,15 +153,15 @@ public class TestAssemblerGroup extends AssemblerTestBase {
String className = ImplementsSPOO.class.getName();
Resource root = resourceInModel("_root rdf:type ja:MemoryModel; _x ja:loadClass '" + className + "'");
ExpandingAssemblerGroup g = new AssemblerGroup.ExpandingAssemblerGroup();
- g.implementWith(resource("ja:MemoryModel"), mockAssembler);
+ g.implementWith(ModelTestLib.resource("ja:MemoryModel"), mockAssembler);
g.open(root);
- assertEquals(resourceSet("SPOO ja:MemoryModel"), g.implementsTypes());
+ assertEquals(ModelTestLib.resourceSet("SPOO ja:MemoryModel"), g.implementsTypes());
}
protected void assertMemoryModel(Object object) {
if ( object instanceof Model ) {
Graph g = ((Model)object).getGraph();
- assertInstanceOf(GraphBase.class, g);
+ JenaTestLib.assertInstanceOf(GraphBase.class, g);
} else
fail("expected a Model, but got a " + object.getClass());
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroupTracing.java b/jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerGroupTracing.java
similarity index 83%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroupTracing.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerGroupTracing.java
index 4250e87268..ba2da9f15d 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroupTracing.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerGroupTracing.java
@@ -19,13 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.*;
import org.apache.jena.assembler.exceptions.AssemblerException;
+import org.apache.jena.rdf.model.ModelTestLib;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.shared.JenaException;
+import org.apache.jena.test.JenaTestLib;
public class TestAssemblerGroupTracing extends AssemblerTestBase {
public TestAssemblerGroupTracing(String name) {
@@ -35,13 +36,13 @@ public class TestAssemblerGroupTracing extends AssemblerTestBase {
public void testFail() {
Resource root = resourceInModel("x rdf:type A");
AssemblerGroup g = AssemblerGroup.create();
- g.implementWith(resource("A"), new ShantAssemble());
+ g.implementWith(ModelTestLib.resource("A"), new ShantAssemble());
try {
g.open(root);
fail("shouldn't get past exception");
} catch (AssemblerException e) {
- AssemblerGroup.Frame frame = new AssemblerGroup.Frame(resource("x"), resource("A"), ShantAssemble.class);
- assertEquals(listOfOne(frame), e.getDoing());
+ AssemblerGroup.Frame frame = new AssemblerGroup.Frame(ModelTestLib.resource("x"), ModelTestLib.resource("A"), ShantAssemble.class);
+ assertEquals(JenaTestLib.listOfOne(frame), e.getDoing());
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java b/jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerHelp.java
similarity index 78%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerHelp.java
index 9f6c2eb080..7641471a0f 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerHelp.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerHelp.java
@@ -19,15 +19,15 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.*;
import org.apache.jena.assembler.exceptions.*;
import org.apache.jena.rdf.model.*;
import org.apache.jena.shared.*;
+import org.apache.jena.test.JenaTestLib;
import org.apache.jena.vocabulary.RDF;
public class TestAssemblerHelp extends AssemblerTestBase {
@@ -53,7 +53,7 @@ public class TestAssemblerHelp extends AssemblerTestBase {
Model original = model("").add(root.getModel());
Resource expanded = AssemblerHelp.withFullModel(root);
assertSame(root, expanded);
- assertIsoModels(original, expanded.getModel());
+ ModelTestLib.assertIsoModels(original, expanded.getModel());
}
public void testSpecificType() {
@@ -72,8 +72,8 @@ public class TestAssemblerHelp extends AssemblerTestBase {
private void testFindSpecificTypes(String expectedString, String model, String baseString) {
Resource root = resourceInModel(model);
- Resource baseType = resource(baseString);
- Set<Resource> expected = resourceSet(expectedString);
+ Resource baseType = ModelTestLib.resource(baseString);
+ Set<Resource> expected = ModelTestLib.resourceSet(expectedString);
Set<Resource> answer = AssemblerHelp.findSpecificTypes(root, baseType);
assertEquals(expected, answer);
}
@@ -81,25 +81,25 @@ public class TestAssemblerHelp extends AssemblerTestBase {
public void testFindRootByExplicitType() {
Model model = model("x rdf:type ja:Object; y rdf:type Irrelevant");
Set<Resource> roots = AssemblerHelp.findAssemblerRoots(model);
- assertEquals(resourceSet("x"), roots);
+ assertEquals(ModelTestLib.resourceSet("x"), roots);
}
public void testFindRootByImplicitType() {
Model model = model("x ja:reificationMode ja:Standard");
Set<Resource> roots = AssemblerHelp.findAssemblerRoots(model);
- assertEquals(resourceSet("x"), roots);
+ assertEquals(ModelTestLib.resourceSet("x"), roots);
}
public void testFindMultipleRoots() {
Model model = model("x rdf:type ja:Object; y ja:reificationMode ja:Minimal");
Set<Resource> roots = AssemblerHelp.findAssemblerRoots(model);
- assertEquals(resourceSet("y x"), roots);
+ assertEquals(ModelTestLib.resourceSet("y x"), roots);
}
public void testFindRootsWithSpecifiedType() {
Model model = model("x rdf:type ja:Model; y rdf:type ja:Object");
Set<Resource> roots = AssemblerHelp.findAssemblerRoots(model, JA.Model);
- assertEquals(resourceSet("x"), roots);
+ assertEquals(ModelTestLib.resourceSet("x"), roots);
}
public void testThrowsIfNoRoots() {
@@ -107,7 +107,7 @@ public class TestAssemblerHelp extends AssemblerTestBase {
AssemblerHelp.singleModelRoot(model(""));
fail("should trap if no roots");
} catch (BadDescriptionNoRootException e) {
- pass();
+ JenaTestLib.pass();
}
}
@@ -116,13 +116,13 @@ public class TestAssemblerHelp extends AssemblerTestBase {
AssemblerHelp.singleModelRoot(model("a rdf:type ja:Model; b rdf:type ja:Model"));
fail("should trap if many roots");
} catch (BadDescriptionMultipleRootsException e) {
- pass();
+ JenaTestLib.pass();
}
}
public void testExtractsSingleRoot() {
Resource it = AssemblerHelp.singleModelRoot(model("a rdf:type ja:Model"));
- assertEquals(resource("a"), it);
+ assertEquals(ModelTestLib.resource("a"), it);
}
public void testSpecificTypeFails() {
@@ -130,34 +130,25 @@ public class TestAssemblerHelp extends AssemblerTestBase {
testSpecificType("xxx", "x rdf:type ja:Model; x rdf:type ja:PrefixMapping");
fail("should trap multiple types");
} catch (AmbiguousSpecificTypeException e) {
- assertEquals(resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
assertEquals(resources(e.getRoot(), "ja:Model ja:PrefixMapping"), new HashSet<>(e.getTypes()));
}
}
private Set<Resource> resources(Resource root, String items) {
- List<String> L = listOfStrings(items);
+ List<String> L = JenaTestLib.listOfStrings(items);
Set<Resource> result = new HashSet<>();
for ( String aL : L ) {
- result.add(resource(root.getModel(), aL));
+ result.add(ModelTestLib.resource(root.getModel(), aL));
}
return result;
}
- private void testSpecificType(String expected, String specification) { // TODO
- // relies
- // on
- // fullModel,
- // would
- // be nice
- // to
- // remove
- // this
- // dependency
+ private void testSpecificType(String expected, String specification) {
Resource root = resourceInModel(specification);
Resource rooted = root.inModel(AssemblerHelp.fullModel(root.getModel()));
Resource mst = AssemblerHelp.findSpecificType(rooted);
- assertEquals(resource(root.getModel(), expected), mst);
+ assertEquals(ModelTestLib.resource(root.getModel(), expected), mst);
}
public static boolean impIsLoaded = false;
@@ -179,7 +170,7 @@ public class TestAssemblerHelp extends AssemblerTestBase {
}
}
- static Model gremlinModel = modelWithStatements("eh:Wossname ja:assembler 'org.apache.jena.assembler.test.TestAssemblerHelp$Gremlin'");
+ static Model gremlinModel = ModelTestLib.modelWithStatements("eh:Wossname ja:assembler 'org.apache.jena.assembler.TestAssemblerHelp$Gremlin'");
static boolean gremlinInvoked = false;
@@ -189,8 +180,8 @@ public class TestAssemblerHelp extends AssemblerTestBase {
}
public Gremlin(Resource root) {
- assertEquals(resource("eh:Wossname"), root);
- assertIsoModels(gremlinModel, root.getModel());
+ assertEquals(ModelTestLib.resource("eh:Wossname"), root);
+ ModelTestLib.assertIsoModels(gremlinModel, root.getModel());
gremlinInvoked = true;
}
@@ -201,7 +192,7 @@ public class TestAssemblerHelp extends AssemblerTestBase {
}
public void testClassAssociation() {
- String className = "org.apache.jena.assembler.test.TestAssemblerHelp$Imp";
+ String className = "org.apache.jena.assembler.TestAssemblerHelp$Imp";
AssemblerGroup group = AssemblerGroup.create();
// In case already loaded.
impIsLoaded = false;
@@ -210,12 +201,12 @@ public class TestAssemblerHelp extends AssemblerTestBase {
AssemblerHelp.loadAssemblerClasses(group, m);
assertEquals(true, impIsLoaded);
assertEquals(true, impIsConstructed);
- assertEquals(className, group.assemblerFor(resource("eh:Wossname")).getClass().getName());
+ assertEquals(className, group.assemblerFor(ModelTestLib.resource("eh:Wossname")).getClass().getName());
}
public void testClassResourceConstructor() {
AssemblerGroup group = AssemblerGroup.create();
- Model m = model("eh:Wossname ja:assembler 'org.apache.jena.assembler.test.TestAssemblerHelp$Gremlin'");
+ Model m = model("eh:Wossname ja:assembler 'org.apache.jena.assembler.TestAssemblerHelp$Gremlin'");
assertEquals(false, gremlinInvoked);
AssemblerHelp.loadAssemblerClasses(group, m);
assertEquals(true, gremlinInvoked);
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerVocabulary.java b/jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerVocabulary.java
similarity index 98%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerVocabulary.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerVocabulary.java
index 38685f220a..f42cdc421f 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerVocabulary.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestAssemblerVocabulary.java
@@ -19,9 +19,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.*;
import org.apache.jena.rdf.model.*;
public class TestAssemblerVocabulary extends AssemblerTestBase {
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestBuiltinAssemblerGroup.java b/jena-core/src/test/java/org/apache/jena/assembler/TestBuiltinAssemblerGroup.java
similarity index 74%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestBuiltinAssemblerGroup.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestBuiltinAssemblerGroup.java
index 03cdfa3243..80679c36bd 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestBuiltinAssemblerGroup.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestBuiltinAssemblerGroup.java
@@ -19,12 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.*;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.test.JenaTestLib;
public class TestBuiltinAssemblerGroup extends AssemblerTestBase {
public TestBuiltinAssemblerGroup(String name) {
@@ -55,17 +55,17 @@ public class TestBuiltinAssemblerGroup extends AssemblerTestBase {
@SuppressWarnings("removal")
public void testVariables() {
- assertInstanceOf(DefaultModelAssembler.class, Assembler.defaultModel);
- assertInstanceOf(PrefixMappingAssembler.class, Assembler.prefixMapping);
- assertInstanceOf(OntModelAssembler.class, Assembler.ontModel);
- assertInstanceOf(OntModelSpecAssembler.class, Assembler.ontModelSpec);
- assertInstanceOf(ContentAssembler.class, Assembler.content);
- assertInstanceOf(ReasonerFactoryAssembler.class, Assembler.reasonerFactory);
- assertInstanceOf(InfModelAssembler.class, Assembler.infModel);
- assertInstanceOf(MemoryModelAssembler.class, Assembler.memoryModel);
- assertInstanceOf(RuleSetAssembler.class, Assembler.ruleSet);
- assertInstanceOf(DocumentManagerAssembler.class, Assembler.documentManager);
- assertInstanceOf(UnionModelAssembler.class, Assembler.unionModel);
+ JenaTestLib.assertInstanceOf(DefaultModelAssembler.class, Assembler.defaultModel);
+ JenaTestLib.assertInstanceOf(PrefixMappingAssembler.class, Assembler.prefixMapping);
+ JenaTestLib.assertInstanceOf(OntModelAssembler.class, Assembler.ontModel);
+ JenaTestLib.assertInstanceOf(OntModelSpecAssembler.class, Assembler.ontModelSpec);
+ JenaTestLib.assertInstanceOf(ContentAssembler.class, Assembler.content);
+ JenaTestLib.assertInstanceOf(ReasonerFactoryAssembler.class, Assembler.reasonerFactory);
+ JenaTestLib.assertInstanceOf(InfModelAssembler.class, Assembler.infModel);
+ JenaTestLib.assertInstanceOf(MemoryModelAssembler.class, Assembler.memoryModel);
+ JenaTestLib.assertInstanceOf(RuleSetAssembler.class, Assembler.ruleSet);
+ JenaTestLib.assertInstanceOf(DocumentManagerAssembler.class, Assembler.documentManager);
+ JenaTestLib.assertInstanceOf(UnionModelAssembler.class, Assembler.unionModel);
}
public void testRecognisesAndAssemblesSinglePrefixMapping() {
@@ -82,12 +82,12 @@ public class TestBuiltinAssemblerGroup extends AssemblerTestBase {
public static void assertEquals(PrefixMapping wanted, Object got) {
if ( got instanceof PrefixMapping && wanted.samePrefixMappingAs((PrefixMapping)got) )
- pass();
+ JenaTestLib.pass();
else
fail("expected " + wanted + " but was: " + got);
}
private void assertAssemblerClass(Resource type, Class<? > C) {
- assertInstanceOf(C, Assembler.general().assemblerFor(type));
+ JenaTestLib.assertInstanceOf(C, Assembler.general().assemblerFor(type));
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestContentAssembler.java
similarity index 89%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestContentAssembler.java
index 3e2c518137..7deb02116a 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestContentAssembler.java
@@ -19,9 +19,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.ContentAssembler;
import org.apache.jena.assembler.exceptions.UnknownEncodingException;
import org.apache.jena.rdf.model.*;
@@ -65,7 +64,7 @@ public class TestContentAssembler extends AssemblerTestBase {
Resource root = resourceInModel("x rdf:type ja:Content; x rdf:type ja:LiteralContent; x ja:literalContent '" + A
+ "'; x ja:literalContent '" + B + "'");
Content C = (Content)a.open(root);
- assertIsoModels(model("Type rdf:type rdfs:Class; A rdf:type Type"), C.fill(model("")));
+ ModelTestLib.assertIsoModels(model("Type rdf:type rdfs:Class; A rdf:type Type"), C.fill(model("")));
}
public void testN3StringContentSingleTriples() {
@@ -87,7 +86,7 @@ public class TestContentAssembler extends AssemblerTestBase {
Resource root = resourceInModel("x rdf:type ja:Content; x rdf:type ja:LiteralContent; x ja:literalContent '" + Stuff
+ "'; x ja:contentEncoding 'RDF/XML'");
Content c = (Content)a.open(root);
- assertIsoModels(model("_x rdf:type owl:Class"), c.fill(model("")));
+ ModelTestLib.assertIsoModels(model("_x rdf:type owl:Class"), c.fill(model("")));
}
public void testSingleExternalContent() {
@@ -95,7 +94,7 @@ public class TestContentAssembler extends AssemblerTestBase {
String source = Testing + "/schema.n3";
Resource root = resourceInModel("x rdf:type ja:Content; x rdf:type ja:ExternalContent; x ja:externalContent file:" + source);
Content c = (Content)a.open(root);
- assertIsoModels(FileManager.getInternal().loadModelInternal("file:" + source), c.fill(model("")));
+ ModelTestLib.assertIsoModels(FileManager.getInternal().loadModelInternal("file:" + source), c.fill(model("")));
}
public void testMultipleExternalContent() {
@@ -107,7 +106,7 @@ public class TestContentAssembler extends AssemblerTestBase {
Content c = (Content)a.open(root);
Model wanted = FileManager.getInternal().loadModelInternal("file:" + sourceA)
.add(FileManager.getInternal().loadModelInternal("file:" + sourceB));
- assertIsoModels(wanted, c.fill(model("")));
+ ModelTestLib.assertIsoModels(wanted, c.fill(model("")));
}
public void testIndirectContent() {
@@ -116,7 +115,7 @@ public class TestContentAssembler extends AssemblerTestBase {
+ "; z rdf:type ja:Content; z ja:quotedContent A; A P B");
Content c = (Content)a.open(root);
Model wanted = model("A P B");
- assertIsoModels(wanted, c.fill(model("")));
+ ModelTestLib.assertIsoModels(wanted, c.fill(model("")));
}
public void testTrapsBadEncodings() {
@@ -127,7 +126,7 @@ public class TestContentAssembler extends AssemblerTestBase {
fail("should trap bad encoding");
} catch (UnknownEncodingException e) {
assertEquals("bogus", e.getEncoding());
- assertEquals(resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
}
}
@@ -148,8 +147,8 @@ public class TestContentAssembler extends AssemblerTestBase {
a.open(root);
fail("should trap bad content resource");
} catch (BadObjectException e) {
- assertEquals(resource("x"), e.getRoot());
- assertEquals(rdfNode(empty, value), e.getObject());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.rdfNode(ModelTestLib.empty, value), e.getObject());
}
}
@@ -161,14 +160,14 @@ public class TestContentAssembler extends AssemblerTestBase {
+ source);
Content c = (Content)a.open(root);
Model wanted = FileManager.getInternal().loadModelInternal("file:" + source).add(model("eggs rdf:type rdf:Property"));
- assertIsoModels(wanted, c.fill(model("")));
+ ModelTestLib.assertIsoModels(wanted, c.fill(model("")));
}
public void testSingleContentQuotation() {
Assembler a = new ContentAssembler();
Resource root = resourceInModel("c rdf:type ja:Content; c rdf:type ja:QuotedContent; c ja:quotedContent x; x P A; x Q B");
Content c = (Content)a.open(root);
- assertIsoModels(model("x P A; x Q B"), c.fill(model("")));
+ ModelTestLib.assertIsoModels(model("x P A; x Q B"), c.fill(model("")));
}
public void testMultipleContentQuotation() {
@@ -176,7 +175,7 @@ public class TestContentAssembler extends AssemblerTestBase {
Resource root = resourceInModel("c rdf:type ja:Content; c rdf:type ja:QuotedContent; c ja:quotedContent x"
+ "; c ja:quotedContent y; x P A; x Q B; y R C");
Content c = (Content)a.open(root);
- assertIsoModels(model("x P A; x Q B; y R C"), c.fill(model("")));
+ ModelTestLib.assertIsoModels(model("x P A; x Q B; y R C"), c.fill(model("")));
}
public void testContentLoadsPrefixMappings() {
@@ -196,7 +195,7 @@ public class TestContentAssembler extends AssemblerTestBase {
Content c = (Content)a.open(root);
Model m = ModelFactory.createDefaultModel();
c.fill(m);
- assertIsoModels(model(expected), m);
+ ModelTestLib.assertIsoModels(model(expected), m);
}
/* -- ContentAssembler FileManager tests ---------------------------------- */
@@ -224,7 +223,7 @@ public class TestContentAssembler extends AssemblerTestBase {
String source = Testing + "/schema.n3";
Resource root = resourceInModel("x rdf:type ja:Content; x rdf:type ja:ExternalContent; x ja:externalContent file:" + source);
Content c = (Content)a.open(root);
- assertIsoModels(FileManager.getInternal().loadModelInternal("file:" + source), c.fill(model("")));
+ ModelTestLib.assertIsoModels(FileManager.getInternal().loadModelInternal("file:" + source), c.fill(model("")));
assertTrue("the supplied file manager must have been used", used[0]);
}
@@ -232,13 +231,13 @@ public class TestContentAssembler extends AssemblerTestBase {
Model expected = model("a P b");
String fileName = "file:spoo";
FixedFileManager fm = new FixedFileManager(expected, fileName);
- NamedObjectAssembler noa = new NamedObjectAssembler(resource("F"), fm);
+ NamedObjectAssembler noa = new NamedObjectAssembler(ModelTestLib.resource("F"), fm);
Resource root = resourceInModel("x rdf:type ja:Content; x rdf:type ja:ExternalContent; x ja:externalContent <F>; x ja:fileManager F".replaceAll("<F>",
fileName));
Assembler a = new ContentAssembler();
Content c = (Content)a.open(noa, root);
assertTrue(fm.wasUsed());
- assertIsoModels(expected, c.fill(model()));
+ ModelTestLib.assertIsoModels(expected, c.fill(model()));
}
private final class FixedFileManager extends FileManagerImpl {
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestDefaultModelAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestDefaultModelAssembler.java
similarity index 92%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestDefaultModelAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestDefaultModelAssembler.java
index f4fa2d2123..31a803878c 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestDefaultModelAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestDefaultModelAssembler.java
@@ -19,10 +19,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.Assembler;
-import org.apache.jena.assembler.JA;
import org.apache.jena.assembler.assemblers.DefaultModelAssembler;
import org.apache.jena.rdf.model.Model;
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestDocumentManagerAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestDocumentManagerAssembler.java
similarity index 88%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestDocumentManagerAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestDocumentManagerAssembler.java
index 993cc744eb..345a387a16 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestDocumentManagerAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestDocumentManagerAssembler.java
@@ -19,14 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.DocumentManagerAssembler;
import org.apache.jena.ontology.OntDocumentManager;
import org.apache.jena.rdf.model.*;
+import org.apache.jena.test.JenaTestLib;
import org.apache.jena.util.FileManager;
public class TestDocumentManagerAssembler extends AssemblerTestBase {
@@ -54,7 +54,7 @@ public class TestDocumentManagerAssembler extends AssemblerTestBase {
Resource root = resourceInModel("x rdf:type ja:DocumentManager");
Assembler a = new DocumentManagerAssembler();
Object x = a.open(root);
- assertInstanceOf(OntDocumentManager.class, x);
+ JenaTestLib.assertInstanceOf(OntDocumentManager.class, x);
}
public void testUsesFileManager() {
@@ -62,9 +62,9 @@ public class TestDocumentManagerAssembler extends AssemblerTestBase {
Assembler a = new DocumentManagerAssembler();
@SuppressWarnings("deprecation")
FileManager fm = FileManager.create();
- Assembler mock = new NamedObjectAssembler(resource("f"), fm);
+ Assembler mock = new NamedObjectAssembler(ModelTestLib.resource("f"), fm);
Object x = a.open(mock, root);
- assertInstanceOf(OntDocumentManager.class, x);
+ JenaTestLib.assertInstanceOf(OntDocumentManager.class, x);
assertSame(fm, ((OntDocumentManager)x).getFileManager());
}
@@ -85,7 +85,7 @@ public class TestDocumentManagerAssembler extends AssemblerTestBase {
}
};
OntDocumentManager d = (OntDocumentManager)a.open(root);
- assertEquals(listOfOne("somePath"), history);
+ assertEquals(JenaTestLib.listOfOne("somePath"), history);
}
public void testTrapsPolicyPathNotString() {
@@ -102,8 +102,8 @@ public class TestDocumentManagerAssembler extends AssemblerTestBase {
a.open(root);
fail("should trap illegal policy path object " + path);
} catch (BadObjectException e) {
- assertEquals(resource("x"), e.getRoot());
- assertEquals(rdfNode(root.getModel(), path), e.getObject());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.rdfNode(root.getModel(), path), e.getObject());
}
}
@@ -118,7 +118,7 @@ public class TestDocumentManagerAssembler extends AssemblerTestBase {
return new OntDocumentManager("") {
@Override
public void processMetadata(Model m) {
- assertIsoModels(expected, m);
+ ModelTestLib.assertIsoModels(expected, m);
history.add("called");
super.processMetadata(m);
}
@@ -126,6 +126,6 @@ public class TestDocumentManagerAssembler extends AssemblerTestBase {
}
};
OntDocumentManager d = (OntDocumentManager)a.open(root);
- assertEquals(listOfOne("called"), history);
+ assertEquals(JenaTestLib.listOfOne("called"), history);
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestImportManager.java b/jena-core/src/test/java/org/apache/jena/assembler/TestImportManager.java
similarity index 82%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestImportManager.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestImportManager.java
index 2c5899ece5..88cf7b7305 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestImportManager.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestImportManager.java
@@ -19,13 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.graph.compose.MultiUnion;
import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelTestLib;
+import org.apache.jena.test.JenaTestLib;
import org.apache.jena.util.FileManager;
import org.apache.jena.util.FileManagerImpl;
@@ -56,8 +57,8 @@ public class TestImportManager extends AssemblerTestBase {
Model m = model("x ja:reasoner y; _x owl:imports eh:/loadMe");
FileManager fm = new FixedFileManager().add("eh:/loadMe", modelToLoad);
Model m2 = new ImportManager().withImports(fm, m);
- assertInstanceOf(MultiUnion.class, m2.getGraph());
- assertIsoModels(modelToLoad.union(m), m2);
+ JenaTestLib.assertInstanceOf(MultiUnion.class, m2.getGraph());
+ ModelTestLib.assertIsoModels(modelToLoad.union(m), m2);
}
public void testFollowJAImports() {
@@ -65,8 +66,8 @@ public class TestImportManager extends AssemblerTestBase {
Model m = model("x ja:reasoner y; _x ja:imports eh:/loadMe");
FileManager fm = new FixedFileManager().add("eh:/loadMe", modelToLoad);
Model m2 = new ImportManager().withImports(fm, m);
- assertInstanceOf(MultiUnion.class, m2.getGraph());
- assertIsoModels(modelToLoad.union(m), m2);
+ JenaTestLib.assertInstanceOf(MultiUnion.class, m2.getGraph());
+ ModelTestLib.assertIsoModels(modelToLoad.union(m), m2);
}
public void testImportMayBeLiteral() {
@@ -74,8 +75,8 @@ public class TestImportManager extends AssemblerTestBase {
Model m = model("x ja:reasoner y; _x ja:imports 'eh:/loadMe'");
FileManager fm = new FixedFileManager().add("eh:/loadMe", modelToLoad);
Model m2 = new ImportManager().withImports(fm, m);
- assertInstanceOf(MultiUnion.class, m2.getGraph());
- assertIsoModels(modelToLoad.union(m), m2);
+ JenaTestLib.assertInstanceOf(MultiUnion.class, m2.getGraph());
+ ModelTestLib.assertIsoModels(modelToLoad.union(m), m2);
}
public void testBadImportObjectFails() {
@@ -92,8 +93,8 @@ public class TestImportManager extends AssemblerTestBase {
new ImportManager().withImports(m);
fail("should trap bad import specification " + string);
} catch (BadObjectException e) {
- assertEquals(resource("x"), e.getRoot());
- assertEquals(rdfNode(m, object), e.getObject());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.rdfNode(m, object), e.getObject());
}
}
@@ -102,15 +103,15 @@ public class TestImportManager extends AssemblerTestBase {
Model m = model("x ja:reasoner y; _x owl:imports M1");
FileManager fm = new FixedFileManager().add("eh:/M1", m1).add("eh:/M2", m2);
Model result = new ImportManager().withImports(fm, m);
- assertInstanceOf(MultiUnion.class, result.getGraph());
- assertIsoModels(m1.union(m2).union(m), result);
+ JenaTestLib.assertInstanceOf(MultiUnion.class, result.getGraph());
+ ModelTestLib.assertIsoModels(m1.union(m2).union(m), result);
}
public void testCatchesCircularity() {
final Model m1 = model("this hasMarker Mx; _x owl:imports My"), m2 = model("this hasMarker My; _x owl:imports Mx");
FileManager fm = new FixedFileManager().add("eh:/Mx", m1).add("eh:/My", m2);
Model result = new ImportManager().withImports(fm, m1);
- assertIsoModels(m1.union(m2), result);
+ ModelTestLib.assertIsoModels(m1.union(m2), result);
}
public void testCacheModels() {
@@ -121,6 +122,6 @@ public class TestImportManager extends AssemblerTestBase {
Model A = im.withImports(withM1, spec);
FileManager none = new FixedFileManager();
Model B = im.withImports(none, spec);
- assertIsoModels(A, B);
+ ModelTestLib.assertIsoModels(A, B);
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestInfModelAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestInfModelAssembler.java
similarity index 92%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestInfModelAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestInfModelAssembler.java
index ca0a243086..586686b1d9 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestInfModelAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestInfModelAssembler.java
@@ -19,14 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.InfModelAssembler;
import org.apache.jena.assembler.exceptions.NotUniqueException;
import org.apache.jena.rdf.model.*;
import org.apache.jena.reasoner.*;
import org.apache.jena.reasoner.rulesys.GenericRuleReasonerFactory;
+import org.apache.jena.test.JenaTestLib;
public class TestInfModelAssembler extends AssemblerTestBase {
public TestInfModelAssembler(String name) {
@@ -50,7 +50,7 @@ public class TestInfModelAssembler extends AssemblerTestBase {
public void testInfModel() {
Assembler a = Assembler.infModel;
Model m = a.openModel(resourceInModel("x rdf:type ja:InfModel"));
- assertInstanceOf(InfModel.class, m);
+ JenaTestLib.assertInstanceOf(InfModel.class, m);
}
public void testInfModelType() {
@@ -88,7 +88,7 @@ public class TestInfModelAssembler extends AssemblerTestBase {
public void testGetsSpecifiedModel() {
Model base = ModelFactory.createDefaultModel();
Resource root = resourceInModel("x rdf:type ja:InfModel; x ja:baseModel M");
- Assembler mock = new NamedObjectAssembler(resource("M"), base);
+ Assembler mock = new NamedObjectAssembler(ModelTestLib.resource("M"), base);
InfModel inf = (InfModel)Assembler.infModel.open(mock, root);
assertSame(base.getGraph(), inf.getRawModel().getGraph());
}
@@ -102,7 +102,7 @@ public class TestInfModelAssembler extends AssemblerTestBase {
fail("should detect multiple baseModels");
} catch (NotUniqueException e) {
assertEquals(JA.baseModel, e.getProperty());
- assertEquals(resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
}
}
@@ -114,7 +114,7 @@ public class TestInfModelAssembler extends AssemblerTestBase {
fail("should detect multiple reasoners");
} catch (NotUniqueException e) {
assertEquals(JA.reasoner, e.getProperty());
- assertEquals(resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
}
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestMemoryModelAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestMemoryModelAssembler.java
similarity index 92%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestMemoryModelAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestMemoryModelAssembler.java
index 620b89243c..518cb765be 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestMemoryModelAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestMemoryModelAssembler.java
@@ -19,10 +19,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.Assembler;
-import org.apache.jena.assembler.JA;
import org.apache.jena.assembler.assemblers.MemoryModelAssembler;
import org.apache.jena.rdf.model.Model;
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestMode.java b/jena-core/src/test/java/org/apache/jena/assembler/TestMode.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestMode.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestMode.java
index b854000b12..78a18093f4 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestMode.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestMode.java
@@ -19,13 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.jena.assembler.Mode;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.rdf.model.ResourceFactory;
import org.junit.Test;
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestModelAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestModelAssembler.java
similarity index 93%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestModelAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestModelAssembler.java
index 1df7fdfbb3..70c840e842 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestModelAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestModelAssembler.java
@@ -19,14 +19,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.Assembler;
-import org.apache.jena.assembler.Mode;
import org.apache.jena.assembler.assemblers.ContentAssembler;
import org.apache.jena.assembler.assemblers.ModelAssembler;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.ModelTestLib;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.shared.PrefixMapping;
@@ -50,7 +49,7 @@ public class TestModelAssembler extends AssemblerTestBase {
public void testContent() {
Resource root = resourceInModel("x rdf:type ja:DefaultModel; x ja:initialContent c; c ja:quotedContent A; A P B");
Model m = (Model)new FakeModelAssembler().open(new ContentAssembler(), root, Mode.ANY);
- assertIsoModels(modelWithStatements("A P B"), m);
+ ModelTestLib.assertIsoModels(ModelTestLib.modelWithStatements("A P B"), m);
}
public void testGetsPrefixMappings() {
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestModelContent.java b/jena-core/src/test/java/org/apache/jena/assembler/TestModelContent.java
similarity index 88%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestModelContent.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestModelContent.java
index 87aa194069..86cb8218d3 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestModelContent.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestModelContent.java
@@ -19,12 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.rdf.model.*;
+import org.apache.jena.test.JenaTestLib;
public class TestModelContent extends AssemblerTestBase {
public TestModelContent(String name) {
@@ -72,8 +72,8 @@ public class TestModelContent extends AssemblerTestBase {
Assembler a = new MockTransactionModel(history, expected, true, false);
Resource root = resourceInModel("x rdf:type ja:Model; x ja:content y; y rdf:type ja:Content; y rdf:type ja:LiteralContent; y ja:literalContent '_:x\\srdf:value\\s17\\s.'");
Model m = (Model)a.open(Assembler.content, root);
- assertEquals(listOfStrings("supports[true] begin add commit"), history);
- assertIsoModels(expected, m);
+ assertEquals(JenaTestLib.listOfStrings("supports[true] begin add commit"), history);
+ ModelTestLib.assertIsoModels(expected, m);
}
public void testContentTransactionsAbort() {
@@ -87,8 +87,8 @@ public class TestModelContent extends AssemblerTestBase {
a.open(Assembler.content, root);
fail("should throw (wrapped) failing exception");
} catch (Exception e) {
- assertEquals(listOfStrings("supports[true] begin add abort"), history);
- assertIsoModels(expected, toDeliver);
+ assertEquals(JenaTestLib.listOfStrings("supports[true] begin add abort"), history);
+ ModelTestLib.assertIsoModels(expected, toDeliver);
}
}
@@ -96,7 +96,7 @@ public class TestModelContent extends AssemblerTestBase {
Resource root = resourceInModel("x rdf:type " + type + "; x ja:content y; y rdf:type ja:Content"
+ "; y rdf:type ja:LiteralContent; y ja:literalContent '_:x\\srdf:value\\s17\\s.'");
Model m = (Model)a.open(Assembler.content, root);
- assertIsoModels(model("_x rdf:value '17'xsd:integer"), m);
+ ModelTestLib.assertIsoModels(model("_x rdf:value '17'xsd:integer"), m);
}
protected void testModelLoadsMultipleContent(Assembler a, Resource type) {
@@ -104,6 +104,6 @@ public class TestModelContent extends AssemblerTestBase {
resourceInModel("x rdf:type " + type + "; x ja:content y; x ja:content z"
+ "; y rdf:type ja:Content; y rdf:type ja:LiteralContent; y ja:literalContent '_:x\\srdf:value\\s17\\s.'"
+ "; z rdf:type ja:Content; z rdf:type ja:LiteralContent; z ja:literalContent '_:x\\srdf:value\\s42\\s.'"));
- assertIsoModels(model("_x rdf:value '17'xsd:integer; _y rdf:value '42'xsd:integer"), m);
+ ModelTestLib.assertIsoModels(model("_x rdf:value '17'xsd:integer; _y rdf:value '42'xsd:integer"), m);
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestModelExpansion.java b/jena-core/src/test/java/org/apache/jena/assembler/TestModelExpansion.java
similarity index 76%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestModelExpansion.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestModelExpansion.java
index 056d086665..de32b13fc3 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestModelExpansion.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestModelExpansion.java
@@ -19,12 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.*;
-import org.apache.jena.assembler.ModelExpansion;
import org.apache.jena.rdf.model.*;
+import org.apache.jena.test.JenaTestLib;
public class TestModelExpansion extends AssemblerTestBase {
public TestModelExpansion(String name) {
@@ -35,28 +35,28 @@ public class TestModelExpansion extends AssemblerTestBase {
Model base = model("a R b");
Model schema = model("x rdfs:subClassOf y; y P z");
Model answer = ModelExpansion.withSchema(base, schema);
- assertIsoModels(model("a R b; x rdfs:subClassOf y"), answer);
+ ModelTestLib.assertIsoModels(model("a R b; x rdfs:subClassOf y"), answer);
}
public void testOmitsAnonynousSubclasses() {
Model base = model("a R b");
Model schema = model("x rdfs:subClassOf _y; z rdfs:subClassOf _a");
Model answer = ModelExpansion.withSchema(base, schema);
- assertIsoModels(model("a R b"), answer);
+ ModelTestLib.assertIsoModels(model("a R b"), answer);
}
public void testAddsDomainTypes() {
Model base = model("a R b");
Model schema = model("R rdfs:domain T");
Model answer = ModelExpansion.withSchema(base, schema);
- assertIsoModels(model("a R b; a rdf:type T"), answer);
+ ModelTestLib.assertIsoModels(model("a R b; a rdf:type T"), answer);
}
public void testAddsRangeTypes() {
Model base = model("a R b");
Model schema = model("R rdfs:range T");
Model answer = ModelExpansion.withSchema(base, schema);
- assertIsoModels(model("a R b; b rdf:type T"), answer);
+ ModelTestLib.assertIsoModels(model("a R b; b rdf:type T"), answer);
}
public void testLabelsDontCrashExpansion() {
@@ -76,7 +76,7 @@ public class TestModelExpansion extends AssemblerTestBase {
Model base = model(xTyped);
Model schema = intersectionModel("I", intersectionTypes);
Model answer = ModelExpansion.withSchema(base, schema);
- assertEquals("should [not] infer (x rdf:type I)", infers, answer.contains(statement("x rdf:type I")));
+ assertEquals("should [not] infer (x rdf:type I)", infers, answer.contains(ModelTestLib.statement("x rdf:type I")));
}
private Model intersectionModel(String inter, String types) {
@@ -85,7 +85,7 @@ public class TestModelExpansion extends AssemblerTestBase {
private String rdfList(String base, String types) {
StringBuilder result = new StringBuilder();
- List<String> L = listOfStrings(types);
+ List<String> L = JenaTestLib.listOfStrings(types);
String rest = "rdf:nil";
for ( int i = L.size() ; i > 0 ; i -= 1 ) {
String current = base + i;
@@ -100,39 +100,39 @@ public class TestModelExpansion extends AssemblerTestBase {
Model base = model("a rdf:type T; T rdfs:subClassOf U");
Model schema = model("T rdfs:subClassOf V");
Model answer = ModelExpansion.withSchema(base, schema);
- assertIsoModels(model("a rdf:type T; a rdf:type U; a rdf:type V; T rdfs:subClassOf U; T rdfs:subClassOf V"), answer);
+ ModelTestLib.assertIsoModels(model("a rdf:type T; a rdf:type U; a rdf:type V; T rdfs:subClassOf U; T rdfs:subClassOf V"), answer);
}
public void testSubclassClosureA() {
Model m = model("A rdfs:subClassOf B; B rdfs:subClassOf C");
subClassClosure(m);
- assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C"), m);
+ ModelTestLib.assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C"), m);
}
public void testSubclassClosureB() {
Model m = model("A rdfs:subClassOf B; B rdfs:subClassOf C; X rdfs:subClassOf C");
subClassClosure(m);
- assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C; X rdfs:subClassOf C"), m);
+ ModelTestLib.assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C; X rdfs:subClassOf C"), m);
}
public void testSubclassClosureC() {
Model m = model("A rdfs:subClassOf B; B rdfs:subClassOf C; X rdfs:subClassOf C; Y rdfs:subClassOf X");
subClassClosure(m);
- assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C; X rdfs:subClassOf C; Y rdfs:subClassOf X; Y rdfs:subClassOf C"),
+ ModelTestLib.assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C; X rdfs:subClassOf C; Y rdfs:subClassOf X; Y rdfs:subClassOf C"),
m);
}
public void testSubclassClosureD() {
Model m = model("A rdfs:subClassOf B; B rdfs:subClassOf C; X rdfs:subClassOf C; Y rdfs:subClassOf X; U rdfs:subClassOf A; U rdfs:subClassOf Y");
subClassClosure(m);
- assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C; X rdfs:subClassOf C; Y rdfs:subClassOf X; Y rdfs:subClassOf C; U rdfs:subClassOf A; U rdfs:subClassOf B; U rdfs:subClassOf C; U rdfs:subClassOf X; U rdfs:subClassOf Y"),
+ ModelTestLib.assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C; X rdfs:subClassOf C; Y rdfs:subClassOf X; Y rdfs:subClassOf C; U rdfs:subClassOf A; U rdfs:subClassOf B; U rdfs:subClassOf C; U rdfs:subClassOf X; U rdfs:subClassOf Y"),
m);
}
public void testSubclassClosureE() {
Model m = model("A rdfs:subClassOf B; B rdfs:subClassOf C");
subClassClosure(m);
- assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C"), m);
+ ModelTestLib.assertIsoModels(model("A rdfs:subClassOf B; B rdfs:subClassOf C; A rdfs:subClassOf C"), m);
}
protected void subClassClosure(Model m) {
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAcceptance.java b/jena-core/src/test/java/org/apache/jena/assembler/TestOntModelAcceptance.java
similarity index 95%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAcceptance.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestOntModelAcceptance.java
index 5c407f97d2..75dc384bdb 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAcceptance.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestOntModelAcceptance.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import org.apache.jena.ontology.*;
import org.apache.jena.rdf.model.*;
@@ -37,7 +37,7 @@ public class TestOntModelAcceptance extends AssemblerTestBase {
* suite works but belt-and-braces for now at least.
*/
public void test_ijd_01() {
- Model m = modelWithStatements("x ja:ontModelSpec _o"
+ Model m = ModelTestLib.modelWithStatements("x ja:ontModelSpec _o"
+ "; _o ja:reasonerFactory _f; _o ja:ontLanguage http://www.w3.org/2002/07/owl#"
+ "; _f ja:reasonerURL http://jena.hpl.hp.com/2003/OWLFBRuleReasoner");
OntModel om = (OntModel)ModelFactory.assembleModelFrom(m);
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestOntModelAssembler.java
similarity index 90%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestOntModelAssembler.java
index bbd291c5b7..658219a986 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestOntModelAssembler.java
@@ -19,16 +19,16 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.lang.reflect.Field;
import java.util.List;
import junit.framework.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.*;
import org.apache.jena.ontology.*;
import org.apache.jena.rdf.model.*;
+import org.apache.jena.test.JenaTestLib;
@SuppressWarnings("removal")
public class TestOntModelAssembler extends AssemblerTestBase {
@@ -73,7 +73,7 @@ public class TestOntModelAssembler extends AssemblerTestBase {
Assembler a = new OntModelAssembler();
Model m = (Model)a.open(new FixedObjectAssembler(spec),
resourceInModel("x rdf:type ja:OntModel; x ja:ontModelSpec ja:" + name));
- assertInstanceOf(OntModel.class, m);
+ JenaTestLib.assertInstanceOf(OntModel.class, m);
OntModel om = (OntModel)m;
assertSame(spec, om.getSpecification());
}
@@ -83,7 +83,7 @@ public class TestOntModelAssembler extends AssemblerTestBase {
public void testAllDefaults() {
Assembler a = new OntModelAssembler();
Model m = a.openModel(resourceInModel("x rdf:type ja:OntModel"));
- assertInstanceOf(OntModel.class, m);
+ JenaTestLib.assertInstanceOf(OntModel.class, m);
OntModel om = (OntModel)m;
assertSame(OntModelSpec.OWL_MEM_RDFS_INF, om.getSpecification());
}
@@ -94,12 +94,12 @@ public class TestOntModelAssembler extends AssemblerTestBase {
Assembler aa = new ModelAssembler() {
@Override
protected Model openEmptyModel(Assembler a, Resource root, Mode irrelevant) {
- assertEquals(resource("y"), root);
+ assertEquals(ModelTestLib.resource("y"), root);
return baseModel;
}
};
Object m = a.open(aa, resourceInModel("x rdf:type ja:OntModel; x ja:baseModel y"));
- assertInstanceOf(OntModel.class, m);
+ JenaTestLib.assertInstanceOf(OntModel.class, m);
OntModel om = (OntModel)m;
assertSame(baseModel.getGraph(), om.getBaseModel().getGraph());
}
@@ -110,12 +110,12 @@ public class TestOntModelAssembler extends AssemblerTestBase {
Assembler aa = new ModelAssembler() {
@Override
protected Model openEmptyModel(Assembler a, Resource root, Mode irrelevant) {
- assertEquals(resource("y"), root);
+ assertEquals(ModelTestLib.resource("y"), root);
return baseModel;
}
};
Object m = a.open(aa, resourceInModel("x rdf:type ja:OntModel; x ja:subModel y"));
- assertInstanceOf(OntModel.class, m);
+ JenaTestLib.assertInstanceOf(OntModel.class, m);
OntModel om = (OntModel)m;
List<OntModel> subModels = om.listSubModels().toList();
assertEquals(1, subModels.size());
@@ -133,7 +133,7 @@ public class TestOntModelAssembler extends AssemblerTestBase {
Assembler a = new OntModelAssembler();
Resource root = resourceInModel("x rdf:type ja:OntModel; x ja:ontModelSpec y");
OntModelSpec spec = new OntModelSpec(OntModelSpec.OWL_MEM);
- Assembler mock = new NamedObjectAssembler(resource("y"), spec);
+ Assembler mock = new NamedObjectAssembler(ModelTestLib.resource("y"), spec);
OntModel om = (OntModel)a.open(mock, root);
assertSame(spec, om.getSpecification());
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelSpecAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestOntModelSpecAssembler.java
similarity index 93%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelSpecAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestOntModelSpecAssembler.java
index a6167c7518..8dde8d41c0 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelSpecAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestOntModelSpecAssembler.java
@@ -19,12 +19,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.lang.reflect.Field;
import junit.framework.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.*;
import org.apache.jena.assembler.exceptions.ReasonerClashException;
import org.apache.jena.ontology.*;
@@ -33,6 +32,7 @@ import org.apache.jena.rdf.model.*;
import org.apache.jena.reasoner.*;
import org.apache.jena.reasoner.rulesys.*;
import org.apache.jena.shared.CannotCreateException;
+import org.apache.jena.test.JenaTestLib;
@SuppressWarnings("removal")
public class TestOntModelSpecAssembler extends AssemblerTestBase {
@@ -104,7 +104,7 @@ public class TestOntModelSpecAssembler extends AssemblerTestBase {
Assembler a = new OntModelSpecAssembler();
Resource root = resourceInModel("x rdf:type ja:OntModelSpec; x ja:documentManager y");
OntDocumentManager dm = new OntDocumentManager();
- NamedObjectAssembler mock = new NamedObjectAssembler(resource("y"), dm);
+ NamedObjectAssembler mock = new NamedObjectAssembler(ModelTestLib.resource("y"), dm);
OntModelSpec om = (OntModelSpec)a.open(mock, root);
assertSame(dm, om.getDocumentManager());
}
@@ -113,7 +113,7 @@ public class TestOntModelSpecAssembler extends AssemblerTestBase {
Assembler a = new OntModelSpecAssembler();
Resource root = resourceInModel("x rdf:type ja:OntModelSpec; x ja:reasonerFactory R");
ReasonerFactory rf = new FakeReasonerFactory();
- NamedObjectAssembler mock = new NamedObjectAssembler(resource("R"), rf);
+ NamedObjectAssembler mock = new NamedObjectAssembler(ModelTestLib.resource("R"), rf);
OntModelSpec om = (OntModelSpec)a.open(mock, root);
assertSame(rf, om.getReasonerFactory());
}
@@ -124,7 +124,7 @@ public class TestOntModelSpecAssembler extends AssemblerTestBase {
}
private void testUsedSpecifiedImpliedReasoner(String R) {
- ReasonerFactory rf = ReasonerFactoryAssembler.getReasonerFactoryByURL(resource("x"), resource(R));
+ ReasonerFactory rf = ReasonerFactoryAssembler.getReasonerFactoryByURL(ModelTestLib.resource("x"), ModelTestLib.resource(R));
Assembler a = new OntModelSpecAssembler();
Resource root = resourceInModel("x rdf:type ja:OntModelSpec; x ja:reasonerURL " + R);
Assembler mock = new FixedObjectAssembler("(should not be this string)");
@@ -140,7 +140,7 @@ public class TestOntModelSpecAssembler extends AssemblerTestBase {
a.open(mock, root);
fail("should detect reasoner clash");
} catch (ReasonerClashException e) {
- pass();
+ JenaTestLib.pass();
}
}
@@ -171,7 +171,7 @@ public class TestOntModelSpecAssembler extends AssemblerTestBase {
throw new CannotCreateException(URL);
}
};
- NamedObjectAssembler mock = new NamedObjectAssembler(resource("source"), getter);
+ NamedObjectAssembler mock = new NamedObjectAssembler(ModelTestLib.resource("source"), getter);
Resource root = resourceInModel("x rdf:type ja:OntModelSpec; x ja:importSource source");
OntModelSpec om = (OntModelSpec)a.open(mock, root);
assertSame(getter, om.getImportModelGetter());
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestPrefixMappingAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestPrefixMappingAssembler.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestPrefixMappingAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestPrefixMappingAssembler.java
index 3fa48911fb..8e3be099bc 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestPrefixMappingAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestPrefixMappingAssembler.java
@@ -19,12 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.PrefixMappingAssembler;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.test.JenaTestLib;
/**
* Tests for prefix-mapping assembler. Note that the basic atom is a <i>single</i>
@@ -59,7 +59,7 @@ public class TestPrefixMappingAssembler extends AssemblerTestBase {
Assembler a = new PrefixMappingAssembler();
Resource root = resourceInModel("pm rdf:type ja:PrefixMapping");
Object pm = a.open(root);
- assertInstanceOf(PrefixMapping.class, pm);
+ JenaTestLib.assertInstanceOf(PrefixMapping.class, pm);
}
public void testSimplePrefixMapping() {
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestReasonerFactoryAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestReasonerFactoryAssembler.java
similarity index 86%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestReasonerFactoryAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestReasonerFactoryAssembler.java
index 7d513cae1f..025aa88341 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestReasonerFactoryAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestReasonerFactoryAssembler.java
@@ -19,18 +19,23 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
-import org.apache.jena.assembler.*;
-import org.apache.jena.assembler.assemblers.*;
+import org.apache.jena.assembler.assemblers.AssemblerBase;
+import org.apache.jena.assembler.assemblers.ReasonerFactoryAssembler;
import org.apache.jena.assembler.exceptions.*;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.reasoner.*;
+import org.apache.jena.graph.GraphTestLib;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelTestLib;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.reasoner.Reasoner;
+import org.apache.jena.reasoner.ReasonerFactory;
import org.apache.jena.reasoner.rulesys.*;
-import org.apache.jena.reasoner.transitiveReasoner.*;
-
+import org.apache.jena.reasoner.transitiveReasoner.TransitiveReasonerFactory;
+import org.apache.jena.test.JenaTestLib;
public class TestReasonerFactoryAssembler extends AssemblerTestBase {
private final Assembler ASSEMBLER = new ReasonerFactoryAssembler();
@@ -49,7 +54,7 @@ public class TestReasonerFactoryAssembler extends AssemblerTestBase {
public void testCreateReasonerFactory() {
Resource root = resourceInModel("x rdf:type ja:ReasonerFactory");
- assertInstanceOf(GenericRuleReasonerFactory.class, ASSEMBLER.open(root));
+ JenaTestLib.assertInstanceOf(GenericRuleReasonerFactory.class, ASSEMBLER.open(root));
}
public void testStandardReasonerURLs() {
@@ -67,7 +72,7 @@ public class TestReasonerFactoryAssembler extends AssemblerTestBase {
ASSEMBLER.open(root);
fail("should detected unknown reasoner");
} catch (UnknownReasonerException e) {
- assertEquals(resource("bad:URL"), e.getURL());
+ assertEquals(ModelTestLib.resource("bad:URL"), e.getURL());
}
}
@@ -131,7 +136,7 @@ public class TestReasonerFactoryAssembler extends AssemblerTestBase {
String description = "x rdf:type ja:ReasonerFactory; x ja:reasonerClass java:";
String MockName = MockBase.class.getName();
Resource root = resourceInModel(description + MockName);
- assertInstanceOf(MockBase.class, ASSEMBLER.open(root));
+ JenaTestLib.assertInstanceOf(MockBase.class, ASSEMBLER.open(root));
assertNotSame(MockFactory.instance, ASSEMBLER.open(root));
}
@@ -160,10 +165,10 @@ public class TestReasonerFactoryAssembler extends AssemblerTestBase {
public void testSchema() {
Model schema = model("P rdf:type owl:ObjectProperty");
Resource root = resourceInModel("x rdf:type ja:ReasonerFactory; x ja:schema S");
- Assembler sub = new NamedObjectAssembler(resource("S"), schema);
+ Assembler sub = new NamedObjectAssembler(ModelTestLib.resource("S"), schema);
ReasonerFactory rf = (ReasonerFactory)ASSEMBLER.open(sub, root);
Reasoner r = rf.create(null);
- assertIsomorphic(schema.getGraph(), ((FBRuleReasoner)r).getBoundSchema());
+ GraphTestLib.assertIsomorphic(schema.getGraph(), ((FBRuleReasoner)r).getBoundSchema());
}
public void testSingleRules() {
@@ -173,7 +178,7 @@ public class TestReasonerFactoryAssembler extends AssemblerTestBase {
Assembler mock = new AssemblerBase() {
@Override
public Object open(Assembler a, Resource root, Mode irrelevant) {
- assertEquals(root, resource("S"));
+ assertEquals(root, ModelTestLib.resource("S"));
return rules;
}
};
@@ -191,9 +196,9 @@ public class TestReasonerFactoryAssembler extends AssemblerTestBase {
Assembler mock = new AssemblerBase() {
@Override
public Object open(Assembler a, Resource root, Mode irrelevant) {
- if ( root.equals(resource("S")) )
+ if ( root.equals(ModelTestLib.resource("S")) )
return rulesA;
- if ( root.equals(resource("T")) )
+ if ( root.equals(ModelTestLib.resource("T")) )
return rulesB;
throw new RuntimeException("unknown resource in mock: " + root);
}
@@ -209,6 +214,6 @@ public class TestReasonerFactoryAssembler extends AssemblerTestBase {
protected void testReasonerURL(Class<? > wanted, String string) {
Resource root = resourceInModel("x rdf:type ja:ReasonerFactory; x ja:reasonerURL " + string);
ReasonerFactory rf = (ReasonerFactory)ASSEMBLER.open(root);
- assertInstanceOf(wanted, rf);
+ JenaTestLib.assertInstanceOf(wanted, rf);
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestRuleSet.java b/jena-core/src/test/java/org/apache/jena/assembler/TestRuleSet.java
similarity index 94%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestRuleSet.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestRuleSet.java
index 7073bcf7fd..5ddea64a8c 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestRuleSet.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestRuleSet.java
@@ -19,13 +19,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.reasoner.rulesys.Rule;
import org.apache.jena.shared.BrokenException;
+import org.apache.jena.test.JenaTestLib;
public class TestRuleSet extends AssemblerTestBase {
public TestRuleSet(String name) {
@@ -50,7 +50,7 @@ public class TestRuleSet extends AssemblerTestBase {
public void testSingleRuleSet() {
Rule rule = Rule.parseRule("[(?a P b) -> (?a rdf:type T)]");
- List<Rule> list = listOfOne(rule);
+ List<Rule> list = JenaTestLib.listOfOne(rule);
RuleSet s = RuleSet.create(list);
assertEquals(list, s.getRules());
assertNotSame(list, s.getRules());
@@ -78,7 +78,7 @@ public class TestRuleSet extends AssemblerTestBase {
RuleSet rsB = RuleSet.create(B);
assertEquals(rsA.getRules(), rsA2.getRules());
assertEquals(rsA, rsA2);
- assertDiffer(rsA, rsB);
+ JenaTestLib.assertDiffer(rsA, rsB);
assertEquals(rsA.hashCode(), rsA2.hashCode());
assertFalse(rsA.hashCode() == rsB.hashCode());
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestRuleSetAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestRuleSetAssembler.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestRuleSetAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestRuleSetAssembler.java
index a5b26bd855..0f08877c6e 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestRuleSetAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestRuleSetAssembler.java
@@ -19,11 +19,10 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.RuleSetAssembler;
import org.apache.jena.rdf.model.*;
import org.apache.jena.reasoner.rulesys.Rule;
@@ -113,8 +112,8 @@ public class TestRuleSetAssembler extends AssemblerTestBase {
fail("should trap bad rules object " + value + " for property " + property);
} catch (BadObjectException e) {
Model m = e.getRoot().getModel();
- assertEquals(resource("x"), e.getRoot());
- assertEquals(rdfNode(m, value), e.getObject());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.rdfNode(m, value), e.getObject());
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestUnionModelAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/TestUnionModelAssembler.java
similarity index 84%
rename from jena-core/src/test/java/org/apache/jena/assembler/test/TestUnionModelAssembler.java
rename to jena-core/src/test/java/org/apache/jena/assembler/TestUnionModelAssembler.java
index c70a10469b..e86431f95c 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestUnionModelAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/TestUnionModelAssembler.java
@@ -19,16 +19,16 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.assembler.test;
+package org.apache.jena.assembler;
import java.util.*;
-import org.apache.jena.assembler.*;
import org.apache.jena.assembler.assemblers.*;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.compose.*;
import org.apache.jena.rdf.model.*;
import org.apache.jena.shared.AddDeniedException;
+import org.apache.jena.test.JenaTestLib;
public class TestUnionModelAssembler extends AssemblerTestBase {
public TestUnionModelAssembler(String name) {
@@ -56,16 +56,16 @@ public class TestUnionModelAssembler extends AssemblerTestBase {
Resource root = resourceInModel("x rdf:type ja:UnionModel");
Assembler a = new UnionModelAssembler();
Model m = a.openModel(root);
- assertInstanceOf(MultiUnion.class, m.getGraph());
+ JenaTestLib.assertInstanceOf(MultiUnion.class, m.getGraph());
checkImmutable(m);
}
private void checkImmutable(Model m) {
try {
- m.add(statement("S P O"));
+ m.add(ModelTestLib.statement("S P O"));
fail("should be immutable");
} catch (AddDeniedException e) {
- pass();
+ JenaTestLib.pass();
}
}
@@ -73,7 +73,7 @@ public class TestUnionModelAssembler extends AssemblerTestBase {
Map<Resource, Model> map = new HashMap<>();
public SmudgeAssembler add(String name, Model m) {
- map.put(resource(name), m);
+ map.put(ModelTestLib.resource(name), m);
return this;
}
@@ -97,7 +97,7 @@ public class TestUnionModelAssembler extends AssemblerTestBase {
expected.add(modelB.getGraph());
Assembler mock = new SmudgeAssembler().add("A", modelA).add("B", modelB);
Model m = (Model)a.open(mock, root);
- assertInstanceOf(MultiUnion.class, m.getGraph());
+ JenaTestLib.assertInstanceOf(MultiUnion.class, m.getGraph());
MultiUnion mu = (MultiUnion)m.getGraph();
List<Graph> L = mu.getSubGraphs();
assertEquals(expected, new HashSet<>(L));
@@ -111,8 +111,8 @@ public class TestUnionModelAssembler extends AssemblerTestBase {
a.open(root);
fail("should trap unsuitable object");
} catch (BadObjectException e) {
- assertEquals(resource("x"), e.getRoot());
- assertEquals(rdfNode(empty, "'A'"), e.getObject());
+ assertEquals(ModelTestLib.resource("x"), e.getRoot());
+ assertEquals(ModelTestLib.rdfNode(ModelTestLib.empty, "'A'"), e.getObject());
}
}
@@ -124,12 +124,12 @@ public class TestUnionModelAssembler extends AssemblerTestBase {
expected.add(modelA.getGraph());
Assembler mock = new SmudgeAssembler().add("A", modelA).add("B", modelB);
Model m = (Model)a.open(mock, root);
- assertInstanceOf(MultiUnion.class, m.getGraph());
+ JenaTestLib.assertInstanceOf(MultiUnion.class, m.getGraph());
//
MultiUnion mu = (MultiUnion)m.getGraph();
assertSame(modelB.getGraph(), mu.getBaseGraph());
- assertEquals(listOfOne(modelA.getGraph()), mu.getSubGraphs());
- m.add(statement("a P b"));
- assertIsoModels(model("a P b"), modelB);
+ assertEquals(JenaTestLib.listOfOne(modelA.getGraph()), mu.getSubGraphs());
+ m.add(ModelTestLib.statement("a P b"));
+ ModelTestLib.assertIsoModels(model("a P b"), modelB);
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/datatypes/TS3_dt.java b/jena-core/src/test/java/org/apache/jena/datatypes/TS6_dt.java
similarity index 75%
copy from jena-core/src/test/java/org/apache/jena/datatypes/TS3_dt.java
copy to jena-core/src/test/java/org/apache/jena/datatypes/TS6_dt.java
index d46fbd4899..8cdf13e38f 100644
--- a/jena-core/src/test/java/org/apache/jena/datatypes/TS3_dt.java
+++ b/jena-core/src/test/java/org/apache/jena/datatypes/TS6_dt.java
@@ -21,15 +21,22 @@
package org.apache.jena.datatypes;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.BeforeSuite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
-@RunWith(Suite.class)
-@Suite.SuiteClasses( {
+import org.apache.jena.test.JenaTestLib;
+
+@Suite
+@SelectClasses({
TestDatatypes.class,
TestDatatypeValues.class,
TestRDFXMLiteral.class
})
-public class TS3_dt {
+public class TS6_dt {
+ @BeforeSuite
+ public static void beforeSuite() {
+ JenaTestLib.setup();
+ }
}
diff --git a/jena-core/src/test/java/org/apache/jena/datatypes/TestDatatypeValues.java b/jena-core/src/test/java/org/apache/jena/datatypes/TestDatatypeValues.java
index 90159914f3..9e8639ab02 100644
--- a/jena-core/src/test/java/org/apache/jena/datatypes/TestDatatypeValues.java
+++ b/jena-core/src/test/java/org/apache/jena/datatypes/TestDatatypeValues.java
@@ -1,3 +1,13 @@
+package org.apache.jena.datatypes;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.datatypes.xsd.XSDDuration;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.junit.jupiter.api.Test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,20 +29,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.datatypes;
-
-import org.apache.jena.datatypes.xsd.XSDDatatype;
-import org.apache.jena.datatypes.xsd.XSDDuration;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.junit.Assert;
-import org.junit.Test;
-
-/** Tests on values */
public class TestDatatypeValues {
- // Duration.
-
@Test
public void duration_01() {
durationCompareTest(0, "PT1M", "PT1M");
@@ -109,13 +107,12 @@ public class TestDatatypeValues {
XSDDuration dur2 = (XSDDuration)d2.getLiteralValue();
int cmp = dur1.compare(dur2);
- Assert.assertEquals("Compare: " + lex1 + " and " + lex2, expected, cmp);
+ assertEquals(expected, cmp, "Compare: " + lex1 + " and " + lex2);
if ( cmp == 0 ) {
- Assert.assertEquals("Not hash compatible: " + lex1 + " and " + lex2, d1.getLiteral().getValueHashCode(),
- d2.getLiteral().getValueHashCode());
- Assert.assertTrue("Not equal: " + lex1 + " and " + lex2, d1.sameValueAs(d2));
+ assertEquals(d1.getLiteral().getValueHashCode(), d2.getLiteral().getValueHashCode(), "Not hash compatible: " + lex1 + " and " + lex2);
+ assertTrue(d1.sameValueAs(d2), "Not equal: " + lex1 + " and " + lex2);
} else {
- Assert.assertFalse("Equal: " + lex1 + " and " + lex2, d1.sameValueAs(d2));
+ assertFalse(d1.sameValueAs(d2), "Equal: " + lex1 + " and " + lex2);
}
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/datatypes/TestDatatypes.java b/jena-core/src/test/java/org/apache/jena/datatypes/TestDatatypes.java
index a159e7e3bd..041864c3f9 100644
--- a/jena-core/src/test/java/org/apache/jena/datatypes/TestDatatypes.java
+++ b/jena-core/src/test/java/org/apache/jena/datatypes/TestDatatypes.java
@@ -21,11 +21,7 @@
package org.apache.jena.datatypes;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
import java.math.BigDecimal;
import java.util.UUID;
@@ -36,7 +32,7 @@ import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.vocabulary.XSD;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestDatatypes {
@@ -72,8 +68,6 @@ public class TestDatatypes {
checkRegistration1("dayTimeDuration", XSD.dayTimeDuration);
}
- // xsd:dateTimeStamp
-
@Test
public void dateTimeStamp_01() {
valid(xsdDateTime, "2015-02-23T15:21:18Z");
@@ -110,7 +104,6 @@ public class TestDatatypes {
invalid(xsdDateTimeStamp, "2015-02-23T15:21:18.665+15:00");
}
- // xsd:yearMonthDuration
@Test
public void yearMonthDuration_01() {
valid(xsdDuration, "P1Y");
@@ -147,7 +140,6 @@ public class TestDatatypes {
invalid(xsdYearMonthDuration, "P1D");
}
- // xsd:dayTimeDuration
@Test
public void dayTimeDuration_01() {
valid(xsdDuration, "PT0S");
@@ -215,8 +207,6 @@ public class TestDatatypes {
@Test
public void language_04() {
- // non-ASCII characters are not allowed
- // (here: "goose" in Polish)
invalid(xsdLanguage, "gęś");
}
@@ -359,22 +349,22 @@ public class TestDatatypes {
private void testValueToLex(Object value, XSDDatatype datatype) {
Node node = NodeFactory.createLiteralByValue(value, datatype);
- assertTrue("Not valid lexical form " + value + " -> " + node, datatype.isValid(node.getLiteralLexicalForm()));
+ assertTrue(datatype.isValid(node.getLiteralLexicalForm()), "Not valid lexical form " + value + " -> " + node);
}
private void testLiteralIsCorrectType(Object value, XSDDatatype datatype) {
Node node = NodeFactory.createLiteralByValue(value, datatype);
- assertEquals("If passing object of type " + value.getClass().getSimpleName() + " as " + datatype.toString()
- + " it needs to be treated as " + datatype.getJavaClass().getSimpleName(), node.getLiteralValue().getClass(),
- datatype.getJavaClass());
+ assertEquals(datatype.getJavaClass(), node.getLiteralValue().getClass(),
+ "If passing object of type " + value.getClass().getSimpleName() + " as " + datatype.toString()
+ + " it needs to be treated as " + datatype.getJavaClass().getSimpleName());
}
private void valid(XSDDatatype xsddatatype, String string) {
- assertTrue("Expected valid: " + string, xsddatatype.isValid(string));
+ assertTrue(xsddatatype.isValid(string), "Expected valid: " + string);
}
private void invalid(XSDDatatype xsddatatype, String string) {
- assertFalse("Expected invalid: " + string, xsddatatype.isValid(string));
+ assertFalse(xsddatatype.isValid(string), "Expected invalid: " + string);
}
private void checkRegistration1(String localName, Resource r) {
diff --git a/jena-core/src/test/java/org/apache/jena/datatypes/TestRDFXMLiteral.java b/jena-core/src/test/java/org/apache/jena/datatypes/TestRDFXMLiteral.java
index 5645133af9..6cb34f1f66 100644
--- a/jena-core/src/test/java/org/apache/jena/datatypes/TestRDFXMLiteral.java
+++ b/jena-core/src/test/java/org/apache/jena/datatypes/TestRDFXMLiteral.java
@@ -21,42 +21,35 @@
package org.apache.jena.datatypes;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.vocabulary.RDF;
+import org.junit.jupiter.api.Test;
public class TestRDFXMLiteral {
- // Different RDF terms with the same value.
@Test
public void rdfxmlLiteral_1() {
- // Normalization -> different terms, same value
test("<x></x>", "<x/>", false, false, true);
}
@Test
public void rdfxmlLiteral_2() {
- // Normalization -> different terms, same value
test("<x b='8' a='123'></x>", "<x a='123' b='8'/>", false, false, true);
}
@Test
public void rdfxmlLiteral_3() {
- // Same term.
test("<x a:b='8' xmlns:a='http://ex/'></x>", "<x a:b='8' xmlns:a='http://ex/'></x>", true, true, true);
}
@Test
public void rdfxmlLiteral_4() {
- // Different term by trivial white space (removed by XML Node normalization)
test("<x b='8' xmlns:a='http://ex/'></x>", "<x b='8' xmlns:a='http://ex/' ></x>", false, false, true);
}
- // Lexical forms do not conform to the lexical space of legal XML fragments.
@Test
public void rdfxmlLiteral_illgeal_1() {
test("<x>", "<x>", true, true, true);
@@ -67,8 +60,6 @@ public class TestRDFXMLiteral {
test("<x>", "<y>", false, false, false);
}
- // ----
-
private static void test(String lex1, String lex2, boolean javaEquals, boolean sameTerm, boolean sameValue) {
Node n1 = NodeFactory.createLiteralDT(lex1, RDF.dtXMLLiteral);
Node n2 = NodeFactory.createLiteralDT(lex2, RDF.dtXMLLiteral);
@@ -76,5 +67,4 @@ public class TestRDFXMLiteral {
assertEquals(sameTerm, n1.sameTermAs(n2));
assertEquals(sameValue, n1.sameValueAs(n2));
}
-
}
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TS3_enh.java b/jena-core/src/test/java/org/apache/jena/enhanced/TS3_enh.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TS3_enh.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TS3_enh.java
index f2c382073a..d968c0d9fd 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TS3_enh.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TS3_enh.java
@@ -25,14 +25,14 @@
* Created on 27 November 2002, 04:53
*/
-package org.apache.jena.enhanced.test;
+package org.apache.jena.enhanced;
-import junit.framework.*;
-import org.apache.jena.enhanced.*;
+import junit.framework.TestSuite;
import org.apache.jena.graph.*;
-import org.apache.jena.graph.test.*;
+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,13 +52,12 @@ import org.apache.jena.shared.JenaException;
*These tests only test EnhNode polymorphism and not EnhGraph polymorphism.
*EnhGraph polymorphism currently will not work.
*/
-public class TS3_enh extends GraphTestBase {
+public class TS3_enh extends JenaTestBase {
static final private Personality<RDFNode> split = new Personality<>();
static final private Personality<RDFNode> combo = new Personality<>();
-
static final private GraphPersonality bitOfBoth = new GraphPersonality();
static final private GraphPersonality broken = new GraphPersonality();
@@ -151,7 +150,7 @@ public class TS3_enh extends GraphTestBase {
Graph g = graphToTest();
TestModel model = new TestModelImpl(g,p);
// create some data
- graphAdd( g, "x R y;" );
+ GraphTestLib.graphAdd( g, "x R y;" );
// The graph has three nodes, extract them as TestNode's,
// using the minimalist ModelAPI.
@@ -169,7 +168,7 @@ public class TS3_enh extends GraphTestBase {
new boolean[]{false,false,true}
});
- graphAdd(g,"y R x;" );
+ GraphTestLib.graphAdd(g,"y R x;" );
// The expected results are now different.
// (A node is appropriate for the TestSubject interface if it is
@@ -182,7 +181,7 @@ public class TS3_enh extends GraphTestBase {
new boolean[]{true,false,true}
});
- g.delete( triple( "x R y" ) );
+ g.delete( GraphTestLib.triple( "x R y" ) );
// The expected results are now different again.
// (A node is appropriate for the TestSubject interface if it is
@@ -247,7 +246,7 @@ public class TS3_enh extends GraphTestBase {
Graph g = graphToTest();
TestModel model = new TestModelImpl(g,p);
// create some data
- graphAdd( g, "a b c;" );
+ GraphTestLib.graphAdd( g, "a b c;" );
TestNode nodes[] = new TestNode[]{
model.aSubject(),
model.aProperty(),
@@ -262,7 +261,7 @@ public class TS3_enh extends GraphTestBase {
new boolean[]{false,false,true}
});
- graphAdd(g, "b a c;" );
+ GraphTestLib.graphAdd(g, "b a c;" );
// Again like in the basic test the triples have now changed,
// so different methods will now work.
@@ -273,7 +272,7 @@ public class TS3_enh extends GraphTestBase {
new boolean[]{false,false,true}
});
- g.delete(triple( "a b c" ) );
+ g.delete(GraphTestLib.triple( "a b c" ) );
// Again like in the basic test the triples have now changed,
@@ -318,7 +317,7 @@ public class TS3_enh extends GraphTestBase {
Graph g = graphToTest();
TestModel model = new TestModelImpl(g,bitOfBoth);
// create some data
- graphAdd( g, "a a a;" );
+ GraphTestLib.graphAdd( g, "a a a;" );
TestSubject testSubjectImpl = model.aSubject();
assertTrue("BitOfBoth makes subjects using TestSubjectImpl",
testSubjectImpl instanceof TestSubjectImpl);
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestAllImpl.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestAllImpl.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestAllImpl.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestAllImpl.java
index 8ed3d4c9e3..0ec843c748 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestAllImpl.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestAllImpl.java
@@ -19,8 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
-import org.apache.jena.enhanced.*;
+package org.apache.jena.enhanced;
import org.apache.jena.graph.*;
import org.apache.jena.rdf.model.*;
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestCommonImpl.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestCommonImpl.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestCommonImpl.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestCommonImpl.java
index b07fbb1082..104b9e3cbb 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestCommonImpl.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestCommonImpl.java
@@ -19,8 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
-import org.apache.jena.enhanced.*;
+package org.apache.jena.enhanced;
import org.apache.jena.graph.*;
import org.apache.jena.rdf.model.*;
import org.apache.jena.shared.JenaException;
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestModel.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestModel.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestModel.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestModel.java
index f98e10b519..ea1180e329 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestModel.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestModel.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
+package org.apache.jena.enhanced;
/**
* A minimalist model interface.
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestModelImpl.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestModelImpl.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestModelImpl.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestModelImpl.java
index 9737fad11d..9b94945e06 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestModelImpl.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestModelImpl.java
@@ -19,8 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
-import org.apache.jena.enhanced.*;
+package org.apache.jena.enhanced;
import org.apache.jena.graph.*;
import org.apache.jena.rdf.model.RDFNode;
import org.apache.jena.util.iterator.*;
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestNode.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestNode.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestNode.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestNode.java
index 0738b5e693..85be04acfc 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestNode.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestNode.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
+package org.apache.jena.enhanced;
public interface TestNode {
// Convenience routines for converting between different
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestObject.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestObject.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestObject.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestObject.java
index 5bd9758c7d..99324eb1b3 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestObject.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestObject.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
+package org.apache.jena.enhanced;
import org.apache.jena.rdf.model.RDFNode;
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestObjectImpl.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestObjectImpl.java
similarity index 95%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestObjectImpl.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestObjectImpl.java
index 36dc390c7f..9ca26342b1 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestObjectImpl.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestObjectImpl.java
@@ -19,8 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
-import org.apache.jena.enhanced.*;
+package org.apache.jena.enhanced;
import org.apache.jena.graph.*;
import org.apache.jena.rdf.model.RDFNode;
@@ -66,7 +65,7 @@ public class TestObjectImpl extends TestCommonImpl implements TestObject {
* (If the underlying graph has changed for the worse will
* users prefer an early and unambiguous exception at this point).
*
- * @see org.apache.jena.enhanced.test.TestObject#aSubject()
+ * @see org.apache.jena.enhanced.TestObject#aSubject()
*/
@Override
public TestSubject aSubject() {
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestProperty.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestProperty.java
similarity index 96%
copy from jena-core/src/test/java/org/apache/jena/enhanced/test/TestProperty.java
copy to jena-core/src/test/java/org/apache/jena/enhanced/TestProperty.java
index a03245b8b9..7b4ab3d4a1 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestProperty.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestProperty.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
+package org.apache.jena.enhanced;
import org.apache.jena.rdf.model.RDFNode;
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPropertyImpl.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestPropertyImpl.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestPropertyImpl.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestPropertyImpl.java
index f49af69b3c..c91d374147 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPropertyImpl.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestPropertyImpl.java
@@ -19,8 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
-import org.apache.jena.enhanced.*;
+package org.apache.jena.enhanced;
import org.apache.jena.graph.*;
import org.apache.jena.rdf.model.RDFNode;
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestSubject.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestSubject.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestSubject.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestSubject.java
index 855253149c..a59f608c82 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestSubject.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestSubject.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
+package org.apache.jena.enhanced;
import org.apache.jena.rdf.model.RDFNode;
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestSubjectImpl.java b/jena-core/src/test/java/org/apache/jena/enhanced/TestSubjectImpl.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestSubjectImpl.java
rename to jena-core/src/test/java/org/apache/jena/enhanced/TestSubjectImpl.java
index 3c346783ac..ea6131ee6c 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestSubjectImpl.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/TestSubjectImpl.java
@@ -19,9 +19,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
+package org.apache.jena.enhanced;
-import org.apache.jena.enhanced.*;
import org.apache.jena.graph.*;
import org.apache.jena.rdf.model.RDFNode;
/**
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/AbstractTestGraph.java
similarity index 69%
copy from jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java
copy to jena-core/src/test/java/org/apache/jena/graph/AbstractTestGraph.java
index 6285854891..d9d55e15d2 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/AbstractTestGraph.java
@@ -19,17 +19,19 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import java.io.InputStream;
import java.util.*;
-import org.apache.jena.graph.*;
+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;
import org.apache.jena.util.iterator.ExtendedIterator;
@@ -39,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 GraphTestBase {
+public abstract class AbstractTestGraph extends JenaTestBase {
public AbstractTestGraph(String name) {
super(name);
}
@@ -51,7 +53,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public Graph getGraphWith(String facts) {
Graph g = getNewGraph();
- graphAdd(g, facts);
+ GraphTestLib.graphAdd(g, facts);
return g;
}
@@ -72,56 +74,56 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testRepeatedSubjectDoesNotConceal() {
Graph g = getGraphWith("s P o; s Q r");
- assertTrue(g.contains(triple("s P o")));
- assertTrue(g.contains(triple("s Q r")));
- assertTrue(g.contains(triple("?? P o")));
- assertTrue(g.contains(triple("?? Q r")));
- assertTrue(g.contains(triple("?? P ??")));
- assertTrue(g.contains(triple("?? Q ??")));
+ assertTrue(g.contains(GraphTestLib.triple("s P o")));
+ assertTrue(g.contains(GraphTestLib.triple("s Q r")));
+ assertTrue(g.contains(GraphTestLib.triple("?? P o")));
+ assertTrue(g.contains(GraphTestLib.triple("?? Q r")));
+ assertTrue(g.contains(GraphTestLib.triple("?? P ??")));
+ assertTrue(g.contains(GraphTestLib.triple("?? Q ??")));
}
public void testFindByFluidTriple() {
Graph g = getGraphWith("x y z ");
- Set<Triple> expect = tripleSet("x y z");
- assertEquals(expect, g.find(triple("?? y z")).toSet());
- assertEquals(expect, g.find(triple("x ?? z")).toSet());
- assertEquals(expect, g.find(triple("x y ??")).toSet());
+ Set<Triple> expect = GraphTestLib.tripleSet("x y z");
+ assertEquals(expect, g.find(GraphTestLib.triple("?? y z")).toSet());
+ assertEquals(expect, g.find(GraphTestLib.triple("x ?? z")).toSet());
+ assertEquals(expect, g.find(GraphTestLib.triple("x y ??")).toSet());
}
public void testContainsConcrete() {
Graph g = getGraphWith("s P o; _x _R _y; x S 0");
- assertTrue(g.contains(triple("s P o")));
- assertTrue(g.contains(triple("_x _R _y")));
- assertTrue(g.contains(triple("x S 0")));
+ assertTrue(g.contains(GraphTestLib.triple("s P o")));
+ assertTrue(g.contains(GraphTestLib.triple("_x _R _y")));
+ assertTrue(g.contains(GraphTestLib.triple("x S 0")));
/* */
- assertFalse(g.contains(triple("s P Oh")));
- assertFalse(g.contains(triple("S P O")));
- assertFalse(g.contains(triple("s p o")));
- assertFalse(g.contains(triple("_x _r _y")));
- assertFalse(g.contains(triple("x S 1")));
+ assertFalse(g.contains(GraphTestLib.triple("s P Oh")));
+ assertFalse(g.contains(GraphTestLib.triple("S P O")));
+ assertFalse(g.contains(GraphTestLib.triple("s p o")));
+ assertFalse(g.contains(GraphTestLib.triple("_x _r _y")));
+ assertFalse(g.contains(GraphTestLib.triple("x S 1")));
}
public void testContainsFluid() {
Graph g = getGraphWith("x R y; a P b");
- assertTrue(g.contains(triple("?? R y")));
- assertTrue(g.contains(triple("x ?? y")));
- assertTrue(g.contains(triple("x R ??")));
- assertTrue(g.contains(triple("?? P b")));
- assertTrue(g.contains(triple("a ?? b")));
- assertTrue(g.contains(triple("a P ??")));
- assertTrue(g.contains(triple("?? R y")));
+ assertTrue(g.contains(GraphTestLib.triple("?? R y")));
+ assertTrue(g.contains(GraphTestLib.triple("x ?? y")));
+ assertTrue(g.contains(GraphTestLib.triple("x R ??")));
+ assertTrue(g.contains(GraphTestLib.triple("?? P b")));
+ assertTrue(g.contains(GraphTestLib.triple("a ?? b")));
+ assertTrue(g.contains(GraphTestLib.triple("a P ??")));
+ assertTrue(g.contains(GraphTestLib.triple("?? R y")));
/* */
- assertFalse(g.contains(triple("?? R b")));
- assertFalse(g.contains(triple("a ?? y")));
- assertFalse(g.contains(triple("x P ??")));
- assertFalse(g.contains(triple("?? R x")));
- assertFalse(g.contains(triple("x ?? R")));
- assertFalse(g.contains(triple("a S ??")));
+ assertFalse(g.contains(GraphTestLib.triple("?? R b")));
+ assertFalse(g.contains(GraphTestLib.triple("a ?? y")));
+ assertFalse(g.contains(GraphTestLib.triple("x P ??")));
+ assertFalse(g.contains(GraphTestLib.triple("?? R x")));
+ assertFalse(g.contains(GraphTestLib.triple("x ?? R")));
+ assertFalse(g.contains(GraphTestLib.triple("a S ??")));
}
public void testMatchLanguagedLiteralCaseInsensitive() {
- Graph m = graphWith("a p 'chat'en");
- Node chaten = node("'chat'en"), chatEN = node("'chat'EN");
+ Graph m = GraphTestLib.graphWith("a p 'chat'en");
+ Node chaten = GraphTestLib.node("'chat'en"), chatEN = GraphTestLib.node("'chat'EN");
// assertDiffer( chaten, chatEN ); // Up to Jena4.
assertEquals(chaten, chatEN); // Jena5 -- the nodes are now the same due to
// normalized langtags
@@ -132,8 +134,8 @@ public abstract class AbstractTestGraph extends GraphTestBase {
}
public void testMatchBothLanguagedLiteralsCaseInsensitive() {
- Graph m = graphWith("a p 'chat'en; a p 'chat'EN");
- Node chaten = node("'chat'en"), chatEN = node("'chat'EN");
+ Graph m = GraphTestLib.graphWith("a p 'chat'en; a p 'chat'EN");
+ Node chaten = GraphTestLib.node("'chat'en"), chatEN = GraphTestLib.node("'chat'EN");
// Jena5 -- the nodes are now the same due to normalized langtags
assertEquals(chaten, chatEN); // Jena5 -- the nodes are now the same due to
@@ -168,21 +170,21 @@ public abstract class AbstractTestGraph extends GraphTestBase {
String title = this.getClass().getName();
Graph g = getNewGraph();
int baseSize = g.size();
- graphAdd(g, "x R y; p S q; a T b");
+ GraphTestLib.graphAdd(g, "x R y; p S q; a T b");
/* */
- assertContainsAll(title + ": simple graph", g, "x R y; p S q; a T b");
+ GraphTestLib.assertContainsAll(title + ": simple graph", g, "x R y; p S q; a T b");
assertEquals(title + ": size", baseSize + 3, g.size());
- graphAdd(g, "spindizzies lift cities; Diracs communicate instantaneously");
+ GraphTestLib.graphAdd(g, "spindizzies lift cities; Diracs communicate instantaneously");
assertEquals(title + ": size after adding", baseSize + 5, g.size());
- g.delete(triple("x R y"));
- g.delete(triple("a T b"));
+ g.delete(GraphTestLib.triple("x R y"));
+ g.delete(GraphTestLib.triple("a T b"));
assertEquals(title + ": size after deleting", baseSize + 3, g.size());
- assertContainsAll(title + ": modified simple graph", g, "p S q; spindizzies lift cities; Diracs communicate instantaneously");
- assertOmitsAll(title + ": modified simple graph", g, "x R y; a T b");
+ GraphTestLib.assertContainsAll(title + ": modified simple graph", g, "p S q; spindizzies lift cities; Diracs communicate instantaneously");
+ GraphTestLib.assertOmitsAll(title + ": modified simple graph", g, "x R y; a T b");
/* */
- ClosableIterator<Triple> it = g.find(Node.ANY, node("lift"), Node.ANY);
+ ClosableIterator<Triple> it = g.find(Node.ANY, GraphTestLib.node("lift"), Node.ANY);
assertTrue(title + ": finds some triple(s)", it.hasNext());
- assertEquals(title + ": finds a 'lift' triple", triple("spindizzies lift cities"), it.next());
+ assertEquals(title + ": finds a 'lift' triple", GraphTestLib.triple("spindizzies lift cities"), it.next());
assertFalse(title + ": finds exactly one triple", it.hasNext());
it.close();
}
@@ -230,55 +232,55 @@ public abstract class AbstractTestGraph extends GraphTestBase {
} catch (JenaException x) {}
}
- static final Triple[] tripleArray = tripleArray("S P O; A R B; X Q Y");
+ static final Triple[] tripleArray = GraphTestLib.tripleArray("S P O; A R B; X Q Y");
- static final List<Triple> tripleList = Arrays.asList(tripleArray("i lt j; p equals q"));
+ static final List<Triple> tripleList = Arrays.asList(GraphTestLib.tripleArray("i lt j; p equals q"));
- static final Triple[] setTriples = tripleArray("scissors cut paper; paper wraps stone; stone breaks scissors");
+ static final Triple[] setTriples = GraphTestLib.tripleArray("scissors cut paper; paper wraps stone; stone breaks scissors");
static final Set<Triple> tripleSet = CollectionFactory.createHashedSet(Arrays.asList(setTriples));
public void testBulkUpdate() {
Graph g = getNewGraph();
- Graph items = graphWith("pigs might fly; dead can dance");
+ Graph items = GraphTestLib.graphWith("pigs might fly; dead can dance");
int initialSize = g.size();
/* */
GraphUtil.add(g, tripleArray);
- testContains(g, tripleArray);
- testOmits(g, tripleList);
+ GraphTestLib.testContains(g, tripleArray);
+ GraphTestLib.testOmits(g, tripleList);
/* */
GraphUtil.add(g, tripleList);
- testContains(g, tripleList);
- testContains(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testContains(g, tripleArray);
/* */
GraphUtil.add(g, tripleSet.iterator());
- testContains(g, tripleSet.iterator());
- testContains(g, tripleList);
- testContains(g, tripleArray);
+ GraphTestLib.testContains(g, tripleSet.iterator());
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testContains(g, tripleArray);
/* */
GraphUtil.addInto(g, items);
- testContains(g, items);
- testContains(g, tripleSet.iterator());
- testContains(g, tripleArray);
- testContains(g, tripleList);
+ GraphTestLib.testContains(g, items);
+ GraphTestLib.testContains(g, tripleSet.iterator());
+ GraphTestLib.testContains(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
/* */
GraphUtil.delete(g, tripleArray);
- testOmits(g, tripleArray);
- testContains(g, tripleList);
- testContains(g, tripleSet.iterator());
- testContains(g, items);
+ GraphTestLib.testOmits(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testContains(g, tripleSet.iterator());
+ GraphTestLib.testContains(g, items);
/* */
GraphUtil.delete(g, tripleSet.iterator());
- testOmits(g, tripleSet.iterator());
- testOmits(g, tripleArray);
- testContains(g, tripleList);
- testContains(g, items);
+ GraphTestLib.testOmits(g, tripleSet.iterator());
+ GraphTestLib.testOmits(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testContains(g, items);
/* */
GraphUtil.deleteFrom(g, items);
- testOmits(g, tripleSet.iterator());
- testOmits(g, tripleArray);
- testContains(g, tripleList);
- testOmits(g, items);
+ GraphTestLib.testOmits(g, tripleSet.iterator());
+ GraphTestLib.testOmits(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testOmits(g, items);
/* */
GraphUtil.delete(g, tripleList);
assertEquals("graph has original size", initialSize, g.size());
@@ -333,9 +335,9 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testFind() {
Graph g = getNewGraph();
- graphAdd(g, "S P O");
- assertDiffer(Set.of(), g.find(Node.ANY, Node.ANY, Node.ANY).toSet());
- assertDiffer(Set.of(), g.find(Triple.ANY).toSet());
+ GraphTestLib.graphAdd(g, "S P O");
+ JenaTestLib.assertDiffer(Set.of(), g.find(Node.ANY, Node.ANY, Node.ANY).toSet());
+ JenaTestLib.assertDiffer(Set.of(), g.find(Triple.ANY).toSet());
}
protected boolean canBeEmpty(Graph g) {
@@ -385,9 +387,9 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testListSubjects() {
Set<Node> emptySubjects = listSubjects(getGraphWith(""));
Graph g = getGraphWith("x P y; y Q z");
- assertEquals(nodeSet("x y"), remove(listSubjects(g), emptySubjects));
- g.delete(triple("x P y"));
- assertEquals(nodeSet("y"), remove(listSubjects(g), emptySubjects));
+ assertEquals(GraphTestLib.nodeSet("x y"), remove(listSubjects(g), emptySubjects));
+ g.delete(GraphTestLib.triple("x P y"));
+ assertEquals(GraphTestLib.nodeSet("y"), remove(listSubjects(g), emptySubjects));
}
protected Set<Node> listSubjects(Graph g) {
@@ -397,9 +399,9 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testListPredicates() {
Set<Node> emptyPredicates = listPredicates(getGraphWith(""));
Graph g = getGraphWith("x P y; y Q z");
- assertEquals(nodeSet("P Q"), remove(listPredicates(g), emptyPredicates));
- g.delete(triple("x P y"));
- assertEquals(nodeSet("Q"), remove(listPredicates(g), emptyPredicates));
+ assertEquals(GraphTestLib.nodeSet("P Q"), remove(listPredicates(g), emptyPredicates));
+ g.delete(GraphTestLib.triple("x P y"));
+ assertEquals(GraphTestLib.nodeSet("Q"), remove(listPredicates(g), emptyPredicates));
}
protected Set<Node> listPredicates(Graph g) {
@@ -409,9 +411,9 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testListObjects() {
Set<Node> emptyObjects = listObjects(getGraphWith(""));
Graph g = getGraphWith("x P y; y Q z");
- assertEquals(nodeSet("y z"), remove(listObjects(g), emptyObjects));
- g.delete(triple("x P y"));
- assertEquals(nodeSet("z"), remove(listObjects(g), emptyObjects));
+ assertEquals(GraphTestLib.nodeSet("y z"), remove(listObjects(g), emptyObjects));
+ g.delete(GraphTestLib.triple("x P y"));
+ assertEquals(GraphTestLib.nodeSet("z"), remove(listObjects(g), emptyObjects));
}
protected Set<Node> listObjects(Graph g) {
@@ -434,7 +436,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
*/
public void testEventDeleteByFind() {
Graph g = getAndRegister(L);
- Triple toRemove = triple("remove this triple");
+ Triple toRemove = GraphTestLib.triple("remove this triple");
g.add(toRemove);
try {
ExtendedIterator<Triple> rtr = g.find(toRemove);
@@ -484,42 +486,42 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testBulkAddArrayEvent() {
Graph g = getAndRegister(L);
- Triple[] triples = tripleArray("x R y; a P b");
+ Triple[] triples = GraphTestLib.tripleArray("x R y; a P b");
GraphUtil.add(g, triples);
L.assertHas(new Object[]{"add[]", g, triples});
}
public void testBulkAddList() {
Graph g = getAndRegister(L);
- List<Triple> elems = Arrays.asList(tripleArray("bells ring loudly; pigs might fly"));
+ List<Triple> elems = Arrays.asList(GraphTestLib.tripleArray("bells ring loudly; pigs might fly"));
GraphUtil.add(g, elems);
L.assertHas(new Object[]{"addList", g, elems});
}
public void testBulkDeleteArray() {
Graph g = getAndRegister(L);
- Triple[] triples = tripleArray("x R y; a P b");
+ Triple[] triples = GraphTestLib.tripleArray("x R y; a P b");
GraphUtil.delete(g, triples);
L.assertHas(new Object[]{"delete[]", g, triples});
}
public void testBulkDeleteList() {
Graph g = getAndRegister(L);
- List<Triple> elems = Arrays.asList(tripleArray("bells ring loudly; pigs might fly"));
+ List<Triple> elems = Arrays.asList(GraphTestLib.tripleArray("bells ring loudly; pigs might fly"));
GraphUtil.delete(g, elems);
L.assertHas(new Object[]{"deleteList", g, elems});
}
public void testBulkAddIterator() {
Graph g = getAndRegister(L);
- Triple[] triples = tripleArray("I wrote this; you read that; I wrote this");
+ Triple[] triples = GraphTestLib.tripleArray("I wrote this; you read that; I wrote this");
GraphUtil.add(g, asIterator(triples));
L.assertHas(new Object[]{"addIterator", g, Arrays.asList(triples)});
}
public void testBulkDeleteIterator() {
Graph g = getAndRegister(L);
- Triple[] triples = tripleArray("I wrote this; you read that; I wrote this");
+ Triple[] triples = GraphTestLib.tripleArray("I wrote this; you read that; I wrote this");
GraphUtil.delete(g, asIterator(triples));
L.assertHas(new Object[]{"deleteIterator", g, Arrays.asList(triples)});
}
@@ -530,46 +532,46 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testBulkAddGraph() {
Graph g = getAndRegister(L);
- Graph triples = graphWith("this type graph; I type slowly");
+ Graph triples = GraphTestLib.graphWith("this type graph; I type slowly");
GraphUtil.addInto(g, triples);
L.assertHas(new Object[]{"addGraph", g, triples});
- testContains(g, triples);
+ GraphTestLib.testContains(g, triples);
}
public void testBulkAddGraph1() {
- Graph g1 = graphWith("pigs might fly; dead can dance");
- Graph g2 = graphWith("this type graph");
+ Graph g1 = GraphTestLib.graphWith("pigs might fly; dead can dance");
+ Graph g2 = GraphTestLib.graphWith("this type graph");
GraphUtil.addInto(g1, g2);
- testContains(g1, g2);
+ GraphTestLib.testContains(g1, g2);
}
public void testBulkAddGraph2() {
- Graph g1 = graphWith("this type graph");
- Graph g2 = graphWith("pigs might fly; dead can dance");
+ Graph g1 = GraphTestLib.graphWith("this type graph");
+ Graph g2 = GraphTestLib.graphWith("pigs might fly; dead can dance");
GraphUtil.addInto(g1, g2);
- testContains(g1, g2);
+ GraphTestLib.testContains(g1, g2);
}
public void testBulkDeleteGraph() {
Graph g = getAndRegister(L);
- Graph triples = graphWith("this type graph; I type slowly");
+ Graph triples = GraphTestLib.graphWith("this type graph; I type slowly");
GraphUtil.deleteFrom(g, triples);
L.assertHas(new Object[]{"deleteGraph", g, triples});
- testOmits(g, triples);
+ GraphTestLib.testOmits(g, triples);
}
public void testBulkDeleteGraph1() {
- Graph g1 = graphWith("pigs might fly; dead can dance");
- Graph g2 = graphWith("pigs might fly");
+ Graph g1 = GraphTestLib.graphWith("pigs might fly; dead can dance");
+ Graph g2 = GraphTestLib.graphWith("pigs might fly");
GraphUtil.deleteFrom(g1, g2);
- testOmits(g1, g2);
+ GraphTestLib.testOmits(g1, g2);
}
public void testBulkDeleteGraph2() {
- Graph g1 = graphWith("pigs might fly");
- Graph g2 = graphWith("pigs might fly; dead can dance");
+ Graph g1 = GraphTestLib.graphWith("pigs might fly");
+ Graph g2 = GraphTestLib.graphWith("pigs might fly; dead can dance");
GraphUtil.deleteFrom(g1, g2);
- testOmits(g1, g2);
+ GraphTestLib.testOmits(g1, g2);
}
public void testGeneralEvent() {
@@ -587,7 +589,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testRemoveSomeEvent() {
Graph g = getAndRegister(L);
- Node S = node("S"), P = node("??"), O = node("??");
+ Node S = GraphTestLib.node("S"), P = GraphTestLib.node("??"), O = GraphTestLib.node("??");
g.remove(S, P, O);
Object event = GraphEvents.remove(S, P, O);
L.assertHas(new Object[]{"someEvent", g, event});
@@ -600,20 +602,20 @@ public abstract class AbstractTestGraph extends GraphTestBase {
*/
public void testContainsNode() {
Graph g = getNewGraph();
- graphAdd(g, "a P b; _c _Q _d; a 11 12");
- assertTrue(containsNode(g, node("a")));
- assertTrue(containsNode(g, node("P")));
- assertTrue(containsNode(g, node("b")));
- assertTrue(containsNode(g, node("_c")));
- assertTrue(containsNode(g, node("_Q")));
- assertTrue(containsNode(g, node("_d")));
+ GraphTestLib.graphAdd(g, "a P b; _c _Q _d; a 11 12");
+ assertTrue(containsNode(g, GraphTestLib.node("a")));
+ assertTrue(containsNode(g, GraphTestLib.node("P")));
+ assertTrue(containsNode(g, GraphTestLib.node("b")));
+ assertTrue(containsNode(g, GraphTestLib.node("_c")));
+ assertTrue(containsNode(g, GraphTestLib.node("_Q")));
+ assertTrue(containsNode(g, GraphTestLib.node("_d")));
// assertTrue( qh.containsNode( node( "10" ) ) );
- assertTrue(containsNode(g, node("11")));
- assertTrue(containsNode(g, node("12")));
+ assertTrue(containsNode(g, GraphTestLib.node("11")));
+ assertTrue(containsNode(g, GraphTestLib.node("12")));
/* */
- assertFalse(containsNode(g, node("x")));
- assertFalse(containsNode(g, node("_y")));
- assertFalse(containsNode(g, node("99")));
+ assertFalse(containsNode(g, GraphTestLib.node("x")));
+ assertFalse(containsNode(g, GraphTestLib.node("_y")));
+ assertFalse(containsNode(g, GraphTestLib.node("99")));
}
private boolean containsNode(Graph g, Node node) {
@@ -627,12 +629,12 @@ public abstract class AbstractTestGraph extends GraphTestBase {
Graph g = getGraphWith("a P b; a Q c; a P d; b P x; c Q y");
- testSubjects(g, B, Node.ANY, Node.ANY, node("a"), node("b"), node("c"));
- testSubjects(g, B, node("P"), Node.ANY, node("a"), node("b"));
- testSubjects(g, B, node("Q"), node("c"), node("a"));
- testSubjects(g, B, node("Q"), node("y"), node("c"));
- testSubjects(g, B, node("Q"), node("a"));
- testSubjects(g, B, node("Q"), node("z"));
+ testSubjects(g, B, Node.ANY, Node.ANY, GraphTestLib.node("a"), GraphTestLib.node("b"), GraphTestLib.node("c"));
+ testSubjects(g, B, GraphTestLib.node("P"), Node.ANY, GraphTestLib.node("a"), GraphTestLib.node("b"));
+ testSubjects(g, B, GraphTestLib.node("Q"), GraphTestLib.node("c"), GraphTestLib.node("a"));
+ testSubjects(g, B, GraphTestLib.node("Q"), GraphTestLib.node("y"), GraphTestLib.node("c"));
+ testSubjects(g, B, GraphTestLib.node("Q"), GraphTestLib.node("a"));
+ testSubjects(g, B, GraphTestLib.node("Q"), GraphTestLib.node("z"));
}
protected void testSubjects(Graph g, Collection<Node> exclude, Node p, Node o, Node...expected) {
@@ -666,7 +668,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
it.remove();
fail("listSubjects for " + g.getClass() + " should not support .remove()");
} catch (UnsupportedOperationException e) {
- pass();
+ JenaTestLib.pass();
}
}
@@ -676,12 +678,12 @@ public abstract class AbstractTestGraph extends GraphTestBase {
Set<Node> B = GraphUtil.listObjects(b, Node.ANY, Node.ANY).toSet();
Graph g = getGraphWith("b P a; c Q a; d P a; x P b; y Q c");
- testObjects(g, B, Node.ANY, Node.ANY, node("a"), node("b"), node("c"));
- testObjects(g, B, Node.ANY, node("P"), node("a"), node("b"));
- testObjects(g, B, node("c"), node("Q"), node("a"));
- testObjects(g, B, node("y"), node("Q"), node("c"));
- testObjects(g, B, node("a"), node("Q"));
- testObjects(g, B, node("z"), node("Q"));
+ testObjects(g, B, Node.ANY, Node.ANY, GraphTestLib.node("a"), GraphTestLib.node("b"), GraphTestLib.node("c"));
+ testObjects(g, B, Node.ANY, GraphTestLib.node("P"), GraphTestLib.node("a"), GraphTestLib.node("b"));
+ testObjects(g, B, GraphTestLib.node("c"), GraphTestLib.node("Q"), GraphTestLib.node("a"));
+ testObjects(g, B, GraphTestLib.node("y"), GraphTestLib.node("Q"), GraphTestLib.node("c"));
+ testObjects(g, B, GraphTestLib.node("a"), GraphTestLib.node("Q"));
+ testObjects(g, B, GraphTestLib.node("z"), GraphTestLib.node("Q"));
}
protected void testObjects(Graph g, Collection<Node> exclude, Node s, Node p, Node...expected) {
@@ -695,13 +697,13 @@ public abstract class AbstractTestGraph extends GraphTestBase {
Set<Node> B = GraphUtil.listPredicates(b, Node.ANY, Node.ANY).toSet();
Graph g = getGraphWith("a P b; z P b; c Q d; e R f; g P b; h Q i");
- testPredicates(g, B, Node.ANY, Node.ANY, node("P"), node("Q"), node("R"));
- testPredicates(g, B, Node.ANY, node("b"), node("P"));
- testPredicates(g, B, node("g"), Node.ANY, node("P"));
- testPredicates(g, B, node("c"), node("d"), node("Q"));
- testPredicates(g, B, node("e"), node("f"), node("R"));
- testPredicates(g, B, node("e"), node("a"));
- testPredicates(g, B, node("z"), node("y"));
+ testPredicates(g, B, Node.ANY, Node.ANY, GraphTestLib.node("P"), GraphTestLib.node("Q"), GraphTestLib.node("R"));
+ testPredicates(g, B, Node.ANY, GraphTestLib.node("b"), GraphTestLib.node("P"));
+ testPredicates(g, B, GraphTestLib.node("g"), Node.ANY, GraphTestLib.node("P"));
+ testPredicates(g, B, GraphTestLib.node("c"), GraphTestLib.node("d"), GraphTestLib.node("Q"));
+ testPredicates(g, B, GraphTestLib.node("e"), GraphTestLib.node("f"), GraphTestLib.node("R"));
+ testPredicates(g, B, GraphTestLib.node("e"), GraphTestLib.node("a"));
+ testPredicates(g, B, GraphTestLib.node("z"), GraphTestLib.node("y"));
}
protected void testPredicates(Graph g, Collection<Node> exclude, Node s, Node o, Node...expected) {
@@ -717,7 +719,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
it.remove();
fail("listObjects for " + g.getClass() + " should not support .remove()");
} catch (UnsupportedOperationException e) {
- pass();
+ JenaTestLib.pass();
}
}
@@ -729,7 +731,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
it.remove();
fail("listPredicates for " + g.getClass() + " should not support .remove()");
} catch (UnsupportedOperationException e) {
- pass();
+ JenaTestLib.pass();
}
}
@@ -741,14 +743,14 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testRemoveAll(String triples) {
Graph g = getNewGraph();
- graphAdd(g, triples);
+ GraphTestLib.graphAdd(g, triples);
g.clear();
assertTrue(g.isEmpty());
}
public void failingTestDoubleRemoveAll() {
final Graph g = getNewGraph();
- graphAdd(g, "c S d; e:ff GGG hhhh; _i J 27; Ell Em 'en'");
+ GraphTestLib.graphAdd(g, "c S d; e:ff GGG hhhh; _i J 27; Ell Em 'en'");
try {
Iterator<Triple> it = new TrackingTripleIterator(g.find(Triple.ANY)) {
@Override
@@ -789,12 +791,12 @@ public abstract class AbstractTestGraph extends GraphTestBase {
for ( int j = 0 ; j < 3 ; j += 1 ) {
Graph content = getNewGraph();
Graph baseContent = copy(content);
- graphAdd(content, aCase[0]);
- Triple remove = triple(aCase[1]);
- Graph expected = graphWith(aCase[2]);
+ GraphTestLib.graphAdd(content, aCase[0]);
+ Triple remove = GraphTestLib.triple(aCase[1]);
+ Graph expected = GraphTestLib.graphWith(aCase[2]);
content.remove(remove.getSubject(), remove.getPredicate(), remove.getObject());
Graph finalContent = remove(copy(content), baseContent);
- assertIsomorphic(aCase[1], expected, finalContent);
+ GraphTestLib.assertIsomorphic(aCase[1], expected, finalContent);
}
}
}
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/BaseTestGraph_JU6.java
similarity index 59%
rename from jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java
rename to jena-core/src/test/java/org/apache/jena/graph/BaseTestGraph_JU6.java
index 6285854891..a2a3682f33 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/BaseTestGraph_JU6.java
@@ -19,30 +19,28 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
+
+import static org.junit.jupiter.api.Assertions.*;
import java.io.InputStream;
import java.util.*;
-import org.apache.jena.graph.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+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.JenaTestLib;
import org.apache.jena.util.CollectionFactory;
import org.apache.jena.util.iterator.ClosableIterator;
import org.apache.jena.util.iterator.ExtendedIterator;
-/**
- * AbstractTestGraph provides a bunch of basic tests for something that purports to
- * be a Graph. The abstract method getGraph must be overridden in subclasses to
- * deliver a Graph of interest.
- */
-public abstract class AbstractTestGraph extends GraphTestBase {
- public AbstractTestGraph(String name) {
- super(name);
- }
+public abstract class BaseTestGraph_JU6 {
/**
* Returns a Graph to take part in the test. Must be overridden in a subclass.
@@ -51,17 +49,19 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public Graph getGraphWith(String facts) {
Graph g = getNewGraph();
- graphAdd(g, facts);
+ GraphTestLib.graphAdd(g, facts);
return g;
}
+ @Test
public void testCloseSetsIsClosed() {
Graph g = getNewGraph();
- assertFalse("unclosed Graph shouild not be isClosed()", g.isClosed());
+ Assertions.assertFalse(g.isClosed(), "unclosed Graph should not be isClosed()");
g.close();
- assertTrue("closed Graph should be isClosed()", g.isClosed());
+ Assertions.assertTrue(g.isClosed(), "closed Graph should be isClosed()");
}
+ @Test
public void testFindAndContains() {
Graph g = getNewGraph();
Node r = NodeCreateUtils.create("r"), s = NodeCreateUtils.create("s"), p = NodeCreateUtils.create("P");
@@ -70,58 +70,63 @@ public abstract class AbstractTestGraph extends GraphTestBase {
assertEquals(1, g.find(r, p, Node.ANY).toList().size());
}
+ @Test
public void testRepeatedSubjectDoesNotConceal() {
Graph g = getGraphWith("s P o; s Q r");
- assertTrue(g.contains(triple("s P o")));
- assertTrue(g.contains(triple("s Q r")));
- assertTrue(g.contains(triple("?? P o")));
- assertTrue(g.contains(triple("?? Q r")));
- assertTrue(g.contains(triple("?? P ??")));
- assertTrue(g.contains(triple("?? Q ??")));
+ assertTrue(g.contains(GraphTestLib.triple("s P o")));
+ assertTrue(g.contains(GraphTestLib.triple("s Q r")));
+ assertTrue(g.contains(GraphTestLib.triple("?? P o")));
+ assertTrue(g.contains(GraphTestLib.triple("?? Q r")));
+ assertTrue(g.contains(GraphTestLib.triple("?? P ??")));
+ assertTrue(g.contains(GraphTestLib.triple("?? Q ??")));
}
+ @Test
public void testFindByFluidTriple() {
Graph g = getGraphWith("x y z ");
- Set<Triple> expect = tripleSet("x y z");
- assertEquals(expect, g.find(triple("?? y z")).toSet());
- assertEquals(expect, g.find(triple("x ?? z")).toSet());
- assertEquals(expect, g.find(triple("x y ??")).toSet());
+ Set<Triple> expect = GraphTestLib.tripleSet("x y z");
+ assertEquals(expect, g.find(GraphTestLib.triple("?? y z")).toSet());
+ assertEquals(expect, g.find(GraphTestLib.triple("x ?? z")).toSet());
+ assertEquals(expect, g.find(GraphTestLib.triple("x y ??")).toSet());
}
+ @Test
public void testContainsConcrete() {
Graph g = getGraphWith("s P o; _x _R _y; x S 0");
- assertTrue(g.contains(triple("s P o")));
- assertTrue(g.contains(triple("_x _R _y")));
- assertTrue(g.contains(triple("x S 0")));
+ assertTrue(g.contains(GraphTestLib.triple("s P o")));
+ assertTrue(g.contains(GraphTestLib.triple("_x _R _y")));
+ assertTrue(g.contains(GraphTestLib.triple("x S 0")));
/* */
- assertFalse(g.contains(triple("s P Oh")));
- assertFalse(g.contains(triple("S P O")));
- assertFalse(g.contains(triple("s p o")));
- assertFalse(g.contains(triple("_x _r _y")));
- assertFalse(g.contains(triple("x S 1")));
+ assertFalse(g.contains(GraphTestLib.triple("s P Oh")));
+ assertFalse(g.contains(GraphTestLib.triple("S P O")));
+ assertFalse(g.contains(GraphTestLib.triple("s p o")));
+ assertFalse(g.contains(GraphTestLib.triple("_x _r _y")));
+ assertFalse(g.contains(GraphTestLib.triple("x S 1")));
}
+ @Test
public void testContainsFluid() {
Graph g = getGraphWith("x R y; a P b");
- assertTrue(g.contains(triple("?? R y")));
- assertTrue(g.contains(triple("x ?? y")));
- assertTrue(g.contains(triple("x R ??")));
- assertTrue(g.contains(triple("?? P b")));
- assertTrue(g.contains(triple("a ?? b")));
- assertTrue(g.contains(triple("a P ??")));
- assertTrue(g.contains(triple("?? R y")));
+ assertTrue(g.contains(GraphTestLib.triple("?? R y")));
+ assertTrue(g.contains(GraphTestLib.triple("x ?? y")));
+ assertTrue(g.contains(GraphTestLib.triple("x R ??")));
+ assertTrue(g.contains(GraphTestLib.triple("?? P b")));
+ assertTrue(g.contains(GraphTestLib.triple("a ?? b")));
+ assertTrue(g.contains(GraphTestLib.triple("a P ??")));
+ assertTrue(g.contains(GraphTestLib.triple("?? R y")));
/* */
- assertFalse(g.contains(triple("?? R b")));
- assertFalse(g.contains(triple("a ?? y")));
- assertFalse(g.contains(triple("x P ??")));
- assertFalse(g.contains(triple("?? R x")));
- assertFalse(g.contains(triple("x ?? R")));
- assertFalse(g.contains(triple("a S ??")));
+ assertFalse(g.contains(GraphTestLib.triple("?? R b")));
+ assertFalse(g.contains(GraphTestLib.triple("a ?? y")));
+ assertFalse(g.contains(GraphTestLib.triple("x P ??")));
+ assertFalse(g.contains(GraphTestLib.triple("?? R x")));
+ assertFalse(g.contains(GraphTestLib.triple("x ?? R")));
+ assertFalse(g.contains(GraphTestLib.triple("a S ??")));
}
+ @Test
public void testMatchLanguagedLiteralCaseInsensitive() {
- Graph m = graphWith("a p 'chat'en");
- Node chaten = node("'chat'en"), chatEN = node("'chat'EN");
+ Graph m = GraphTestLib.graphWith("a p 'chat'en");
+ Node chaten = GraphTestLib.node("'chat'en"), chatEN = GraphTestLib.node("'chat'EN");
// assertDiffer( chaten, chatEN ); // Up to Jena4.
assertEquals(chaten, chatEN); // Jena5 -- the nodes are now the same due to
// normalized langtags
@@ -131,9 +136,10 @@ public abstract class AbstractTestGraph extends GraphTestBase {
assertEquals(1, m.find(Node.ANY, Node.ANY, chatEN).toList().size());
}
+ @Test
public void testMatchBothLanguagedLiteralsCaseInsensitive() {
- Graph m = graphWith("a p 'chat'en; a p 'chat'EN");
- Node chaten = node("'chat'en"), chatEN = node("'chat'EN");
+ Graph m = GraphTestLib.graphWith("a p 'chat'en; a p 'chat'EN");
+ Node chaten = GraphTestLib.node("'chat'en"), chatEN = GraphTestLib.node("'chat'EN");
// Jena5 -- the nodes are now the same due to normalized langtags
assertEquals(chaten, chatEN); // Jena5 -- the nodes are now the same due to
@@ -147,9 +153,10 @@ public abstract class AbstractTestGraph extends GraphTestBase {
/**
* test isEmpty - moved from the QueryHandler code.
*/
+ @Test
public void testIsEmpty() {
Graph g = getNewGraph();
- if ( canBeEmpty(g) ) {
+ if (canBeEmpty(g)) {
assertTrue(g.isEmpty());
g.add(NodeCreateUtils.createTriple("S P O"));
assertFalse(g.isEmpty());
@@ -164,26 +171,27 @@ public abstract class AbstractTestGraph extends GraphTestBase {
}
}
+ @Test
public void testAGraph() {
String title = this.getClass().getName();
Graph g = getNewGraph();
int baseSize = g.size();
- graphAdd(g, "x R y; p S q; a T b");
+ GraphTestLib.graphAdd(g, "x R y; p S q; a T b");
/* */
- assertContainsAll(title + ": simple graph", g, "x R y; p S q; a T b");
- assertEquals(title + ": size", baseSize + 3, g.size());
- graphAdd(g, "spindizzies lift cities; Diracs communicate instantaneously");
- assertEquals(title + ": size after adding", baseSize + 5, g.size());
- g.delete(triple("x R y"));
- g.delete(triple("a T b"));
- assertEquals(title + ": size after deleting", baseSize + 3, g.size());
- assertContainsAll(title + ": modified simple graph", g, "p S q; spindizzies lift cities; Diracs communicate instantaneously");
- assertOmitsAll(title + ": modified simple graph", g, "x R y; a T b");
+ GraphTestLib.assertContainsAll(title + ": simple graph", g, "x R y; p S q; a T b");
+ Assertions.assertEquals(baseSize + 3, g.size(), title + ": size");
+ GraphTestLib.graphAdd(g, "spindizzies lift cities; Diracs communicate instantaneously");
+ Assertions.assertEquals(baseSize + 5, g.size(), title + ": size after adding");
+ g.delete(GraphTestLib.triple("x R y"));
+ g.delete(GraphTestLib.triple("a T b"));
+ Assertions.assertEquals(baseSize + 3, g.size(), title + ": size after deleting");
+ GraphTestLib.assertContainsAll(title + ": modified simple graph", g, "p S q; spindizzies lift cities; Diracs communicate instantaneously");
+ GraphTestLib.assertOmitsAll(title + ": modified simple graph", g, "x R y; a T b");
/* */
- ClosableIterator<Triple> it = g.find(Node.ANY, node("lift"), Node.ANY);
- assertTrue(title + ": finds some triple(s)", it.hasNext());
- assertEquals(title + ": finds a 'lift' triple", triple("spindizzies lift cities"), it.next());
- assertFalse(title + ": finds exactly one triple", it.hasNext());
+ ClosableIterator<Triple> it = g.find(Node.ANY, GraphTestLib.node("lift"), Node.ANY);
+ Assertions.assertTrue(it.hasNext(), title + ": finds some triple(s)");
+ Assertions.assertEquals(GraphTestLib.triple("spindizzies lift cities"), it.next(), title + ": finds a 'lift' triple");
+ Assertions.assertFalse(it.hasNext(), title + ": finds exactly one triple");
it.close();
}
@@ -191,25 +199,32 @@ public abstract class AbstractTestGraph extends GraphTestBase {
* Test that Graphs have transaction support methods, and that if they fail on
* some g they fail because they do not support the operation.
*/
+ @Test
public void testHasTransactions() {
Graph g = getNewGraph();
TransactionHandler th = g.getTransactionHandler();
th.transactionsSupported();
try {
th.begin();
- } catch (UnsupportedOperationException x) {}
+ } catch (UnsupportedOperationException x) {
+ }
try {
th.abort();
- } catch (UnsupportedOperationException x) {}
+ } catch (UnsupportedOperationException x) {
+ }
try {
th.begin();
th.commit();
- } catch (UnsupportedOperationException x) {}
+ } catch (UnsupportedOperationException x) {
+ }
try {
- th.execute(() -> {});
- } catch (UnsupportedOperationException x) {}
+ th.execute(() -> {
+ });
+ } catch (UnsupportedOperationException x) {
+ }
}
+ @Test
public void testExecuteInTransactionCatchesThrowable() {
Graph g = getNewGraph();
TransactionHandler th = g.getTransactionHandler();
@@ -217,9 +232,11 @@ public abstract class AbstractTestGraph extends GraphTestBase {
th.executeAlways(() -> {
throw new Error();
});
- } catch (JenaException x) {}
+ } catch (JenaException x) {
+ }
}
+ @Test
public void testCalculateInTransactionCatchesThrowable() {
Graph g = getNewGraph();
TransactionHandler th = g.getTransactionHandler();
@@ -227,63 +244,66 @@ public abstract class AbstractTestGraph extends GraphTestBase {
th.calculateAlways(() -> {
throw new Error();
});
- } catch (JenaException x) {}
+ } catch (JenaException x) {
+ }
}
- static final Triple[] tripleArray = tripleArray("S P O; A R B; X Q Y");
+ static final Triple[] tripleArray = GraphTestLib.tripleArray("S P O; A R B; X Q Y");
- static final List<Triple> tripleList = Arrays.asList(tripleArray("i lt j; p equals q"));
+ static final List<Triple> tripleList = Arrays.asList(GraphTestLib.tripleArray("i lt j; p equals q"));
- static final Triple[] setTriples = tripleArray("scissors cut paper; paper wraps stone; stone breaks scissors");
+ static final Triple[] setTriples = GraphTestLib.tripleArray("scissors cut paper; paper wraps stone; stone breaks scissors");
static final Set<Triple> tripleSet = CollectionFactory.createHashedSet(Arrays.asList(setTriples));
+ @Test
public void testBulkUpdate() {
Graph g = getNewGraph();
- Graph items = graphWith("pigs might fly; dead can dance");
+ Graph items = GraphTestLib.graphWith("pigs might fly; dead can dance");
int initialSize = g.size();
/* */
GraphUtil.add(g, tripleArray);
- testContains(g, tripleArray);
- testOmits(g, tripleList);
+ GraphTestLib.testContains(g, tripleArray);
+ GraphTestLib.testOmits(g, tripleList);
/* */
GraphUtil.add(g, tripleList);
- testContains(g, tripleList);
- testContains(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testContains(g, tripleArray);
/* */
GraphUtil.add(g, tripleSet.iterator());
- testContains(g, tripleSet.iterator());
- testContains(g, tripleList);
- testContains(g, tripleArray);
+ GraphTestLib.testContains(g, tripleSet.iterator());
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testContains(g, tripleArray);
/* */
GraphUtil.addInto(g, items);
- testContains(g, items);
- testContains(g, tripleSet.iterator());
- testContains(g, tripleArray);
- testContains(g, tripleList);
+ GraphTestLib.testContains(g, items);
+ GraphTestLib.testContains(g, tripleSet.iterator());
+ GraphTestLib.testContains(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
/* */
GraphUtil.delete(g, tripleArray);
- testOmits(g, tripleArray);
- testContains(g, tripleList);
- testContains(g, tripleSet.iterator());
- testContains(g, items);
+ GraphTestLib.testOmits(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testContains(g, tripleSet.iterator());
+ GraphTestLib.testContains(g, items);
/* */
GraphUtil.delete(g, tripleSet.iterator());
- testOmits(g, tripleSet.iterator());
- testOmits(g, tripleArray);
- testContains(g, tripleList);
- testContains(g, items);
+ GraphTestLib.testOmits(g, tripleSet.iterator());
+ GraphTestLib.testOmits(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testContains(g, items);
/* */
GraphUtil.deleteFrom(g, items);
- testOmits(g, tripleSet.iterator());
- testOmits(g, tripleArray);
- testContains(g, tripleList);
- testOmits(g, items);
+ GraphTestLib.testOmits(g, tripleSet.iterator());
+ GraphTestLib.testOmits(g, tripleArray);
+ GraphTestLib.testContains(g, tripleList);
+ GraphTestLib.testOmits(g, items);
/* */
GraphUtil.delete(g, tripleList);
- assertEquals("graph has original size", initialSize, g.size());
+ Assertions.assertEquals(initialSize, g.size(), "graph has original size");
}
+ @Test
public void testAddWithReificationPreamble() {
Graph g = getNewGraph();
xSPO(g);
@@ -303,6 +323,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
ReifierStd.reifyAs(g, NodeCreateUtils.create("x"), NodeCreateUtils.createTriple("S P O"));
}
+ @Test
public void testRemove() {
testRemove("?? ?? ??", "?? ?? ??");
testRemove("S ?? ??", "S ?? ??");
@@ -323,7 +344,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
it.next();
it.remove();
it.close();
- assertEquals("remove with " + findRemove + ":", 0, g.size());
+ Assertions.assertEquals(0, g.size(), "remove with " + findRemove + ":");
assertFalse(g.contains(NodeCreateUtils.createTriple(findCheck)));
} catch (UnsupportedOperationException e) {
// No iterator remove.
@@ -331,17 +352,19 @@ public abstract class AbstractTestGraph extends GraphTestBase {
}
}
+ @Test
public void testFind() {
Graph g = getNewGraph();
- graphAdd(g, "S P O");
- assertDiffer(Set.of(), g.find(Node.ANY, Node.ANY, Node.ANY).toSet());
- assertDiffer(Set.of(), g.find(Triple.ANY).toSet());
+ GraphTestLib.graphAdd(g, "S P O");
+ JenaTestLib.assertDiffer(Set.of(), g.find(Node.ANY, Node.ANY, Node.ANY).toSet());
+ JenaTestLib.assertDiffer(Set.of(), g.find(Triple.ANY).toSet());
}
protected boolean canBeEmpty(Graph g) {
return g.isEmpty();
}
+ @Test
public void testEventRegister() {
Graph g = getNewGraph();
GraphEventManager gem = g.getEventManager();
@@ -351,6 +374,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
/**
* Test that we can safely unregister a listener that isn't registered.
*/
+ @Test
public void testEventUnregister() {
getNewGraph().getEventManager().unregister(L);
}
@@ -370,48 +394,53 @@ public abstract class AbstractTestGraph extends GraphTestBase {
return g;
}
+ @Test
public void testAddTriple() {
Graph g = getAndRegister(L);
g.add(SPO);
- L.assertHas(new Object[]{"add", g, SPO});
+ L.assertHas(new Object[] {"add", g, SPO});
}
+ @Test
public void testDeleteTriple() {
Graph g = getAndRegister(L);
g.delete(SPO);
- L.assertHas(new Object[]{"delete", g, SPO});
+ L.assertHas(new Object[] {"delete", g, SPO});
}
+ @Test
public void testListSubjects() {
Set<Node> emptySubjects = listSubjects(getGraphWith(""));
Graph g = getGraphWith("x P y; y Q z");
- assertEquals(nodeSet("x y"), remove(listSubjects(g), emptySubjects));
- g.delete(triple("x P y"));
- assertEquals(nodeSet("y"), remove(listSubjects(g), emptySubjects));
+ assertEquals(GraphTestLib.nodeSet("x y"), remove(listSubjects(g), emptySubjects));
+ g.delete(GraphTestLib.triple("x P y"));
+ assertEquals(GraphTestLib.nodeSet("y"), remove(listSubjects(g), emptySubjects));
}
protected Set<Node> listSubjects(Graph g) {
return GraphUtil.listSubjects(g, Node.ANY, Node.ANY).toSet();
}
+ @Test
public void testListPredicates() {
Set<Node> emptyPredicates = listPredicates(getGraphWith(""));
Graph g = getGraphWith("x P y; y Q z");
- assertEquals(nodeSet("P Q"), remove(listPredicates(g), emptyPredicates));
- g.delete(triple("x P y"));
- assertEquals(nodeSet("Q"), remove(listPredicates(g), emptyPredicates));
+ assertEquals(GraphTestLib.nodeSet("P Q"), remove(listPredicates(g), emptyPredicates));
+ g.delete(GraphTestLib.triple("x P y"));
+ assertEquals(GraphTestLib.nodeSet("Q"), remove(listPredicates(g), emptyPredicates));
}
protected Set<Node> listPredicates(Graph g) {
return GraphUtil.listPredicates(g, Node.ANY, Node.ANY).toSet();
}
+ @Test
public void testListObjects() {
Set<Node> emptyObjects = listObjects(getGraphWith(""));
Graph g = getGraphWith("x P y; y Q z");
- assertEquals(nodeSet("y z"), remove(listObjects(g), emptyObjects));
- g.delete(triple("x P y"));
- assertEquals(nodeSet("z"), remove(listObjects(g), emptyObjects));
+ assertEquals(GraphTestLib.nodeSet("y z"), remove(listObjects(g), emptyObjects));
+ g.delete(GraphTestLib.triple("x P y"));
+ assertEquals(GraphTestLib.nodeSet("z"), remove(listObjects(g), emptyObjects));
}
protected Set<Node> listObjects(Graph g) {
@@ -432,23 +461,25 @@ public abstract class AbstractTestGraph extends GraphTestBase {
* Ensure that triples removed by calling .remove() on the iterator returned by a
* find() will generate deletion notifications.
*/
+ @Test
public void testEventDeleteByFind() {
Graph g = getAndRegister(L);
- Triple toRemove = triple("remove this triple");
+ Triple toRemove = GraphTestLib.triple("remove this triple");
g.add(toRemove);
try {
ExtendedIterator<Triple> rtr = g.find(toRemove);
- assertTrue("ensure a(t least) one triple", rtr.hasNext());
+ Assertions.assertTrue(rtr.hasNext(), "ensure at least one triple");
rtr.next();
rtr.remove();
rtr.close();
- L.assertHas(new Object[]{"add", g, toRemove, "delete", g, toRemove});
+ L.assertHas(new Object[] {"add", g, toRemove, "delete", g, toRemove});
} catch (UnsupportedOperationException ex) {
// No iterator remove
}
}
+ @Test
public void testTwoListeners() {
RecordingListener L1 = new RecordingListener();
RecordingListener L2 = new RecordingListener();
@@ -456,141 +487,159 @@ public abstract class AbstractTestGraph extends GraphTestBase {
GraphEventManager gem = g.getEventManager();
gem.register(L1).register(L2);
g.add(SPO);
- L2.assertHas(new Object[]{"add", g, SPO});
- L1.assertHas(new Object[]{"add", g, SPO});
+ L2.assertHas(new Object[] {"add", g, SPO});
+ L1.assertHas(new Object[] {"add", g, SPO});
}
+ @Test
public void testUnregisterWorks() {
Graph g = getNewGraph();
GraphEventManager gem = g.getEventManager();
gem.register(L).unregister(L);
g.add(SPO);
- L.assertHas(new Object[]{});
+ L.assertHas(new Object[] {});
}
+ @Test
public void testRegisterTwice() {
Graph g = getAndRegister(L);
g.getEventManager().register(L);
g.add(SPO);
- L.assertHas(new Object[]{"add", g, SPO, "add", g, SPO});
+ L.assertHas(new Object[] {"add", g, SPO, "add", g, SPO});
}
+ @Test
public void testUnregisterOnce() {
Graph g = getAndRegister(L);
g.getEventManager().register(L).unregister(L);
g.delete(SPO);
- L.assertHas(new Object[]{"delete", g, SPO});
+ L.assertHas(new Object[] {"delete", g, SPO});
}
+ @Test
public void testBulkAddArrayEvent() {
Graph g = getAndRegister(L);
- Triple[] triples = tripleArray("x R y; a P b");
+ Triple[] triples = GraphTestLib.tripleArray("x R y; a P b");
GraphUtil.add(g, triples);
- L.assertHas(new Object[]{"add[]", g, triples});
+ L.assertHas(new Object[] {"add[]", g, triples});
}
+ @Test
public void testBulkAddList() {
Graph g = getAndRegister(L);
- List<Triple> elems = Arrays.asList(tripleArray("bells ring loudly; pigs might fly"));
+ List<Triple> elems = Arrays.asList(GraphTestLib.tripleArray("bells ring loudly; pigs might fly"));
GraphUtil.add(g, elems);
- L.assertHas(new Object[]{"addList", g, elems});
+ L.assertHas(new Object[] {"addList", g, elems});
}
+ @Test
public void testBulkDeleteArray() {
Graph g = getAndRegister(L);
- Triple[] triples = tripleArray("x R y; a P b");
+ Triple[] triples = GraphTestLib.tripleArray("x R y; a P b");
GraphUtil.delete(g, triples);
- L.assertHas(new Object[]{"delete[]", g, triples});
+ L.assertHas(new Object[] {"delete[]", g, triples});
}
+ @Test
public void testBulkDeleteList() {
Graph g = getAndRegister(L);
- List<Triple> elems = Arrays.asList(tripleArray("bells ring loudly; pigs might fly"));
+ List<Triple> elems = Arrays.asList(GraphTestLib.tripleArray("bells ring loudly; pigs might fly"));
GraphUtil.delete(g, elems);
- L.assertHas(new Object[]{"deleteList", g, elems});
+ L.assertHas(new Object[] {"deleteList", g, elems});
}
+ @Test
public void testBulkAddIterator() {
Graph g = getAndRegister(L);
- Triple[] triples = tripleArray("I wrote this; you read that; I wrote this");
+ Triple[] triples = GraphTestLib.tripleArray("I wrote this; you read that; I wrote this");
GraphUtil.add(g, asIterator(triples));
- L.assertHas(new Object[]{"addIterator", g, Arrays.asList(triples)});
+ L.assertHas(new Object[] {"addIterator", g, Arrays.asList(triples)});
}
+ @Test
public void testBulkDeleteIterator() {
Graph g = getAndRegister(L);
- Triple[] triples = tripleArray("I wrote this; you read that; I wrote this");
+ Triple[] triples = GraphTestLib.tripleArray("I wrote this; you read that; I wrote this");
GraphUtil.delete(g, asIterator(triples));
- L.assertHas(new Object[]{"deleteIterator", g, Arrays.asList(triples)});
+ L.assertHas(new Object[] {"deleteIterator", g, Arrays.asList(triples)});
}
public Iterator<Triple> asIterator(Triple[] triples) {
return Arrays.asList(triples).iterator();
}
+ @Test
public void testBulkAddGraph() {
Graph g = getAndRegister(L);
- Graph triples = graphWith("this type graph; I type slowly");
+ Graph triples = GraphTestLib.graphWith("this type graph; I type slowly");
GraphUtil.addInto(g, triples);
- L.assertHas(new Object[]{"addGraph", g, triples});
- testContains(g, triples);
+ L.assertHas(new Object[] {"addGraph", g, triples});
+ GraphTestLib.testContains(g, triples);
}
+ @Test
public void testBulkAddGraph1() {
- Graph g1 = graphWith("pigs might fly; dead can dance");
- Graph g2 = graphWith("this type graph");
+ Graph g1 = GraphTestLib.graphWith("pigs might fly; dead can dance");
+ Graph g2 = GraphTestLib.graphWith("this type graph");
GraphUtil.addInto(g1, g2);
- testContains(g1, g2);
+ GraphTestLib.testContains(g1, g2);
}
+ @Test
public void testBulkAddGraph2() {
- Graph g1 = graphWith("this type graph");
- Graph g2 = graphWith("pigs might fly; dead can dance");
+ Graph g1 = GraphTestLib.graphWith("this type graph");
+ Graph g2 = GraphTestLib.graphWith("pigs might fly; dead can dance");
GraphUtil.addInto(g1, g2);
- testContains(g1, g2);
+ GraphTestLib.testContains(g1, g2);
}
+ @Test
public void testBulkDeleteGraph() {
Graph g = getAndRegister(L);
- Graph triples = graphWith("this type graph; I type slowly");
+ Graph triples = GraphTestLib.graphWith("this type graph; I type slowly");
GraphUtil.deleteFrom(g, triples);
- L.assertHas(new Object[]{"deleteGraph", g, triples});
- testOmits(g, triples);
+ L.assertHas(new Object[] {"deleteGraph", g, triples});
+ GraphTestLib.testOmits(g, triples);
}
+ @Test
public void testBulkDeleteGraph1() {
- Graph g1 = graphWith("pigs might fly; dead can dance");
- Graph g2 = graphWith("pigs might fly");
+ Graph g1 = GraphTestLib.graphWith("pigs might fly; dead can dance");
+ Graph g2 = GraphTestLib.graphWith("pigs might fly");
GraphUtil.deleteFrom(g1, g2);
- testOmits(g1, g2);
+ GraphTestLib.testOmits(g1, g2);
}
+ @Test
public void testBulkDeleteGraph2() {
- Graph g1 = graphWith("pigs might fly");
- Graph g2 = graphWith("pigs might fly; dead can dance");
+ Graph g1 = GraphTestLib.graphWith("pigs might fly");
+ Graph g2 = GraphTestLib.graphWith("pigs might fly; dead can dance");
GraphUtil.deleteFrom(g1, g2);
- testOmits(g1, g2);
+ GraphTestLib.testOmits(g1, g2);
}
+ @Test
public void testGeneralEvent() {
Graph g = getAndRegister(L);
- Object value = new int[]{};
+ Object value = new int[] {};
g.getEventManager().notifyEvent(g, value);
- L.assertHas(new Object[]{"someEvent", g, value});
+ L.assertHas(new Object[] {"someEvent", g, value});
}
+ @Test
public void testRemoveAllEvent() {
Graph g = getAndRegister(L);
g.clear();
- L.assertHas(new Object[]{"someEvent", g, GraphEvents.removeAll});
+ L.assertHas(new Object[] {"someEvent", g, GraphEvents.removeAll});
}
+ @Test
public void testRemoveSomeEvent() {
Graph g = getAndRegister(L);
- Node S = node("S"), P = node("??"), O = node("??");
+ Node S = GraphTestLib.node("S"), P = GraphTestLib.node("??"), O = GraphTestLib.node("??");
g.remove(S, P, O);
Object event = GraphEvents.remove(S, P, O);
- L.assertHas(new Object[]{"someEvent", g, event});
+ L.assertHas(new Object[] {"someEvent", g, event});
}
/**
@@ -598,28 +647,30 @@ public abstract class AbstractTestGraph extends GraphTestBase {
* literals in subject positions is suppressed at present to avoid problems with
* InfGraphs which try to prevent such constructs leaking out to the RDF layer.
*/
+ @Test
public void testContainsNode() {
Graph g = getNewGraph();
- graphAdd(g, "a P b; _c _Q _d; a 11 12");
- assertTrue(containsNode(g, node("a")));
- assertTrue(containsNode(g, node("P")));
- assertTrue(containsNode(g, node("b")));
- assertTrue(containsNode(g, node("_c")));
- assertTrue(containsNode(g, node("_Q")));
- assertTrue(containsNode(g, node("_d")));
+ GraphTestLib.graphAdd(g, "a P b; _c _Q _d; a 11 12");
+ assertTrue(containsNode(g, GraphTestLib.node("a")));
+ assertTrue(containsNode(g, GraphTestLib.node("P")));
+ assertTrue(containsNode(g, GraphTestLib.node("b")));
+ assertTrue(containsNode(g, GraphTestLib.node("_c")));
+ assertTrue(containsNode(g, GraphTestLib.node("_Q")));
+ assertTrue(containsNode(g, GraphTestLib.node("_d")));
// assertTrue( qh.containsNode( node( "10" ) ) );
- assertTrue(containsNode(g, node("11")));
- assertTrue(containsNode(g, node("12")));
+ assertTrue(containsNode(g, GraphTestLib.node("11")));
+ assertTrue(containsNode(g, GraphTestLib.node("12")));
/* */
- assertFalse(containsNode(g, node("x")));
- assertFalse(containsNode(g, node("_y")));
- assertFalse(containsNode(g, node("99")));
+ assertFalse(containsNode(g, GraphTestLib.node("x")));
+ assertFalse(containsNode(g, GraphTestLib.node("_y")));
+ assertFalse(containsNode(g, GraphTestLib.node("99")));
}
private boolean containsNode(Graph g, Node node) {
return GraphUtil.containsNode(g, node);
}
+ @Test
public void testSubjectsFor() {
// First get the answer from the empty graph (not empty for an inf graph)
Graph b = getGraphWith("");
@@ -627,15 +678,15 @@ public abstract class AbstractTestGraph extends GraphTestBase {
Graph g = getGraphWith("a P b; a Q c; a P d; b P x; c Q y");
- testSubjects(g, B, Node.ANY, Node.ANY, node("a"), node("b"), node("c"));
- testSubjects(g, B, node("P"), Node.ANY, node("a"), node("b"));
- testSubjects(g, B, node("Q"), node("c"), node("a"));
- testSubjects(g, B, node("Q"), node("y"), node("c"));
- testSubjects(g, B, node("Q"), node("a"));
- testSubjects(g, B, node("Q"), node("z"));
+ testSubjects(g, B, Node.ANY, Node.ANY, GraphTestLib.node("a"), GraphTestLib.node("b"), GraphTestLib.node("c"));
+ testSubjects(g, B, GraphTestLib.node("P"), Node.ANY, GraphTestLib.node("a"), GraphTestLib.node("b"));
+ testSubjects(g, B, GraphTestLib.node("Q"), GraphTestLib.node("c"), GraphTestLib.node("a"));
+ testSubjects(g, B, GraphTestLib.node("Q"), GraphTestLib.node("y"), GraphTestLib.node("c"));
+ testSubjects(g, B, GraphTestLib.node("Q"), GraphTestLib.node("a"));
+ testSubjects(g, B, GraphTestLib.node("Q"), GraphTestLib.node("z"));
}
- protected void testSubjects(Graph g, Collection<Node> exclude, Node p, Node o, Node...expected) {
+ protected void testSubjects(Graph g, Collection<Node> exclude, Node p, Node o, Node... expected) {
List<Node> R = GraphUtil.listSubjects(g, p, o).toList();
R.removeAll(exclude);
assertSameUnordered(R, exclude, expected);
@@ -658,6 +709,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
}
+ @Test
public void testListSubjectsNoRemove() {
Graph g = getGraphWith("a P b; b Q c; c R a");
Iterator<Node> it = GraphUtil.listSubjects(g, Node.ANY, Node.ANY);
@@ -666,49 +718,52 @@ public abstract class AbstractTestGraph extends GraphTestBase {
it.remove();
fail("listSubjects for " + g.getClass() + " should not support .remove()");
} catch (UnsupportedOperationException e) {
- pass();
+ JenaTestLib.pass();
}
}
+ @Test
public void testObjectsFor() {
// First get the answer from the empty graph (not empty for an inf graph)
Graph b = getGraphWith("");
Set<Node> B = GraphUtil.listObjects(b, Node.ANY, Node.ANY).toSet();
Graph g = getGraphWith("b P a; c Q a; d P a; x P b; y Q c");
- testObjects(g, B, Node.ANY, Node.ANY, node("a"), node("b"), node("c"));
- testObjects(g, B, Node.ANY, node("P"), node("a"), node("b"));
- testObjects(g, B, node("c"), node("Q"), node("a"));
- testObjects(g, B, node("y"), node("Q"), node("c"));
- testObjects(g, B, node("a"), node("Q"));
- testObjects(g, B, node("z"), node("Q"));
+ testObjects(g, B, Node.ANY, Node.ANY, GraphTestLib.node("a"), GraphTestLib.node("b"), GraphTestLib.node("c"));
+ testObjects(g, B, Node.ANY, GraphTestLib.node("P"), GraphTestLib.node("a"), GraphTestLib.node("b"));
+ testObjects(g, B, GraphTestLib.node("c"), GraphTestLib.node("Q"), GraphTestLib.node("a"));
+ testObjects(g, B, GraphTestLib.node("y"), GraphTestLib.node("Q"), GraphTestLib.node("c"));
+ testObjects(g, B, GraphTestLib.node("a"), GraphTestLib.node("Q"));
+ testObjects(g, B, GraphTestLib.node("z"), GraphTestLib.node("Q"));
}
- protected void testObjects(Graph g, Collection<Node> exclude, Node s, Node p, Node...expected) {
+ protected void testObjects(Graph g, Collection<Node> exclude, Node s, Node p, Node... expected) {
List<Node> X = GraphUtil.listObjects(g, s, p).toList();
assertSameUnordered(X, exclude, expected);
}
+ @Test
public void testPredicatesFor() {
// First get the answer from the empty graph (not empty for an inf graph)
Graph b = getGraphWith("");
Set<Node> B = GraphUtil.listPredicates(b, Node.ANY, Node.ANY).toSet();
Graph g = getGraphWith("a P b; z P b; c Q d; e R f; g P b; h Q i");
- testPredicates(g, B, Node.ANY, Node.ANY, node("P"), node("Q"), node("R"));
- testPredicates(g, B, Node.ANY, node("b"), node("P"));
- testPredicates(g, B, node("g"), Node.ANY, node("P"));
- testPredicates(g, B, node("c"), node("d"), node("Q"));
- testPredicates(g, B, node("e"), node("f"), node("R"));
- testPredicates(g, B, node("e"), node("a"));
- testPredicates(g, B, node("z"), node("y"));
+ testPredicates(g, B, Node.ANY, Node.ANY, GraphTestLib.node("P"), GraphTestLib.node("Q"), GraphTestLib.node("R"));
+ testPredicates(g, B, Node.ANY, GraphTestLib.node("b"), GraphTestLib.node("P"));
+ testPredicates(g, B, GraphTestLib.node("g"), Node.ANY, GraphTestLib.node("P"));
+ testPredicates(g, B, GraphTestLib.node("c"), GraphTestLib.node("d"), GraphTestLib.node("Q"));
+ testPredicates(g, B, GraphTestLib.node("e"), GraphTestLib.node("f"), GraphTestLib.node("R"));
+ testPredicates(g, B, GraphTestLib.node("e"), GraphTestLib.node("a"));
+ testPredicates(g, B, GraphTestLib.node("z"), GraphTestLib.node("y"));
}
- protected void testPredicates(Graph g, Collection<Node> exclude, Node s, Node o, Node...expected) {
+ protected void testPredicates(Graph g, Collection<Node> exclude, Node s, Node o, Node... expected) {
List<Node> X = GraphUtil.listPredicates(g, s, o).toList();
assertSameUnordered(X, exclude, expected);
}
+ @Test
public void testListObjectsNoRemove() {
Graph g = getGraphWith("a P b; b Q c; c R a");
Iterator<Node> it = GraphUtil.listObjects(g, Node.ANY, Node.ANY);
@@ -717,10 +772,11 @@ public abstract class AbstractTestGraph extends GraphTestBase {
it.remove();
fail("listObjects for " + g.getClass() + " should not support .remove()");
} catch (UnsupportedOperationException e) {
- pass();
+ JenaTestLib.pass();
}
}
+ @Test
public void testListPredicatesNoRemove() {
Graph g = getGraphWith("a P b; b Q c; c R a");
Iterator<Node> it = GraphUtil.listPredicates(g, Node.ANY, Node.ANY);
@@ -729,10 +785,11 @@ public abstract class AbstractTestGraph extends GraphTestBase {
it.remove();
fail("listPredicates for " + g.getClass() + " should not support .remove()");
} catch (UnsupportedOperationException e) {
- pass();
+ JenaTestLib.pass();
}
}
+ @Test
public void testRemoveAll() {
testRemoveAll("");
testRemoveAll("a R b");
@@ -741,14 +798,14 @@ public abstract class AbstractTestGraph extends GraphTestBase {
public void testRemoveAll(String triples) {
Graph g = getNewGraph();
- graphAdd(g, triples);
+ GraphTestLib.graphAdd(g, triples);
g.clear();
assertTrue(g.isEmpty());
}
public void failingTestDoubleRemoveAll() {
final Graph g = getNewGraph();
- graphAdd(g, "c S d; e:ff GGG hhhh; _i J 27; Ell Em 'en'");
+ GraphTestLib.graphAdd(g, "c S d; e:ff GGG hhhh; _i J 27; Ell Em 'en'");
try {
Iterator<Triple> it = new TrackingTripleIterator(g.find(Triple.ANY)) {
@Override
@@ -776,37 +833,39 @@ public abstract class AbstractTestGraph extends GraphTestBase {
* </ul>
*/
protected String[][] cases = {{"x R y", "x R y", ""}, {"x R y; a P b", "x R y", "a P b"}, {"x R y; a P b", "?? R y", "a P b"},
- {"x R y; a P b", "x R ??", "a P b"}, {"x R y; a P b", "x ?? y", "a P b"}, {"x R y; a P b", "?? ?? ??", ""},
- {"x R y; a P b; c P d", "?? P ??", "x R y"}, {"x R y; a P b; x S y", "x ?? ??", "a P b"},};
+ {"x R y; a P b", "x R ??", "a P b"}, {"x R y; a P b", "x ?? y", "a P b"}, {"x R y; a P b", "?? ?? ??", ""},
+ {"x R y; a P b; c P d", "?? P ??", "x R y"}, {"x R y; a P b; x S y", "x ?? ??", "a P b"},};
/**
* Test that remove(s, p, o) works, in the presence of inferencing graphs that
* mean emptyness isn't available. This is why we go round the houses and test
* that expected ~= initialContent + addedStuff - removed - initialContent.
*/
+ @Test
public void testRemoveSPO() {
- for ( String[] aCase : cases ) {
- for ( int j = 0 ; j < 3 ; j += 1 ) {
+ for (String[] aCase : cases) {
+ for (int j = 0; j < 3; j += 1) {
Graph content = getNewGraph();
Graph baseContent = copy(content);
- graphAdd(content, aCase[0]);
- Triple remove = triple(aCase[1]);
- Graph expected = graphWith(aCase[2]);
+ GraphTestLib.graphAdd(content, aCase[0]);
+ Triple remove = GraphTestLib.triple(aCase[1]);
+ Graph expected = GraphTestLib.graphWith(aCase[2]);
content.remove(remove.getSubject(), remove.getPredicate(), remove.getObject());
Graph finalContent = remove(copy(content), baseContent);
- assertIsomorphic(aCase[1], expected, finalContent);
+ GraphTestLib.assertIsomorphic(aCase[1], expected, finalContent);
}
}
}
/** testIsomorphism from file data */
+ @Test
public void testIsomorphismFile() {
testIsomorphismXMLFile(1, true);
testIsomorphismXMLFile(2, true);
testIsomorphismXMLFile(3, true);
-// testIsomorphismXMLFile(4,true); -- Uses daml:collection
+ // testIsomorphismXMLFile(4,true); -- Uses daml:collection
testIsomorphismXMLFile(5, false);
-// testIsomorphismXMLFile(6,false); -- Uses daml:collection
+ // testIsomorphismXMLFile(6,false); -- Uses daml:collection
testIsomorphismNTripleFile(7, true);
testIsomorphismNTripleFile(8, false);
@@ -822,7 +881,7 @@ public abstract class AbstractTestGraph extends GraphTestBase {
private InputStream getInputStream(int n, int n2, String suffix) {
String urlStr = String.format("regression/testModelEquals/%s-%s.%s", n, n2, suffix);
- return AbstractTestGraph.class.getClassLoader().getResourceAsStream(urlStr);
+ return BaseTestGraph_JU6.class.getClassLoader().getResourceAsStream(urlStr);
}
private void testIsomorphismFile(int n, String lang, String suffix, boolean result) {
@@ -838,13 +897,13 @@ public abstract class AbstractTestGraph extends GraphTestBase {
m2.read(getInputStream(n, 2, suffix), "http://www.example.org/", lang);
boolean rslt = g1.isIsomorphicWith(g2) == result;
- if ( !rslt ) {
+ if (!rslt) {
System.out.println("g1:");
m1.write(System.out, "N-TRIPLE");
System.out.println("g2:");
m2.write(System.out, "N-TRIPLE");
}
- assertTrue("Isomorphism test failed", rslt);
+ Assertions.assertTrue(rslt, "Isomorphism test failed");
}
protected void add(Graph toUpdate, Graph toAdd) {
@@ -867,4 +926,5 @@ public abstract class AbstractTestGraph extends GraphTestBase {
result.close();
return result;
}
+
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/GraphTestBase.java b/jena-core/src/test/java/org/apache/jena/graph/GraphTestLib.java
similarity index 90%
rename from jena-core/src/test/java/org/apache/jena/graph/test/GraphTestBase.java
rename to jena-core/src/test/java/org/apache/jena/graph/GraphTestLib.java
index 9fbc3c9d2f..b8f5c12567 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/GraphTestBase.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/GraphTestLib.java
@@ -19,11 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
-
-/**
- An extension of JenaTestBase (which see) with Graph-specific methods.
-*/
+package org.apache.jena.graph;
import java.io.FileNotFoundException;
import java.lang.reflect.Constructor;
@@ -31,16 +27,25 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.*;
-import org.apache.jena.graph.*;
+import org.apache.jena.junit.NodeCreateUtils;
import org.apache.jena.ontology.impl.TestListSyntaxCategories;
import org.apache.jena.shared.JenaException;
import org.apache.jena.shared.PrefixMapping;
-import org.apache.jena.test.JenaTestBase;
import org.apache.jena.util.CollectionFactory;
import org.apache.jena.util.iterator.ExtendedIterator;
-public class GraphTestBase extends JenaTestBase {
- protected static String getFileName(String fn) {
+import static junit.framework.TestCase.*;
+import static org.apache.jena.test.JenaTestLib.getConstructor;
+
+public class GraphTestLib {
+
+ /**
+ * A counter for new bnode strings; it starts at 1000 so as to make the bnode
+ * strings more uniform (at least for the first 9000 bnodes).
+ */
+ static int bnc = 1000;
+
+ public static String getFileName(String fn) {
URL u = TestListSyntaxCategories.class.getClassLoader().getResource(fn);
if ( u == null ) {
throw new RuntimeException(new FileNotFoundException(fn));
@@ -52,10 +57,6 @@ public class GraphTestBase extends JenaTestBase {
}
}
- public GraphTestBase(String name) {
- super(name);
- }
-
/**
* Answer a Node as described by <code>x</code>; a shorthand for
* <code>NodeCreateUtils.create(x)</code>, which see.
@@ -64,23 +65,11 @@ public class GraphTestBase extends JenaTestBase {
return NodeCreateUtils.create(x);
}
-// /**
-// Answer a set containing the elements from the iterator <code>it</code>.
-// */
-// public static <T> Set<T> Iter.toSet( Iterator<? extends T> it )
-// { return Iter.toSet( it ); }
-//
-// /**
-// Answer a list containing the elements from the iterator <code>it</code>.
-// */
-// public static <T> List<T> Iter.toList( Iterator<? extends T> it )
-// { return Iter.toList( it ); }
-
/**
* Answer a set of the nodes described (as per <code>node()</code>) by the
* space-separated substrings of <code>nodes</code>.
*/
- public Set<Node> nodeSet(String nodes) {
+ public static Set<Node> nodeSet(String nodes) {
Set<Node> result = CollectionFactory.createHashedSet();
StringTokenizer st = new StringTokenizer(nodes);
while (st.hasMoreTokens())
@@ -91,7 +80,7 @@ public class GraphTestBase extends JenaTestBase {
/**
* Answer a set of the elements of <code>A</code>.
*/
- public <T> Set<T> arrayToSet(T[] A) {
+ public static <T> Set<T> arrayToSet(T[] A) {
return CollectionFactory.createHashedSet(Arrays.asList(A));
}
@@ -227,26 +216,20 @@ public class GraphTestBase extends JenaTestBase {
* triple <code>t</code> on a new line, using (and updating) <code>bnodes</code>
* to supply "nice" strings for any blank nodes.
*/
- protected static void niceTriple(StringBuilder b, Map<Node, Object> bnodes, Triple t) {
+ public static void niceTriple(StringBuilder b, Map<Node, Object> bnodes, Triple t) {
b.append("\n ");
appendNode(b, bnodes, t.getSubject());
appendNode(b, bnodes, t.getPredicate());
appendNode(b, bnodes, t.getObject());
}
- /**
- * A counter for new bnode strings; it starts at 1000 so as to make the bnode
- * strings more uniform (at least for the first 9000 bnodes).
- */
- protected static int bnc = 1000;
-
/**
* Append to the string buffer <code>b</code> a space followed by the "nice"
* representation of the node <code>n</code>. If <code>n</code> is a bnode,
* re-use any existing string for it from <code>bnodes</code> or make a new one
* of the form <i>_bNNNN</i> with NNNN a new integer.
*/
- protected static void appendNode(StringBuilder b, Map<Node, Object> bnodes, Node n) {
+ public static void appendNode(StringBuilder b, Map<Node, Object> bnodes, Node n) {
b.append(' ');
if ( n.isBlank() ) {
Object already = bnodes.get(n);
@@ -261,7 +244,7 @@ public class GraphTestBase extends JenaTestBase {
* Answer the "nice" representation of this node, the string returned by
* <code>n.toString(PrefixMapping.Extended,true)</code>.
*/
- protected static String nice(Node n) {
+ public static String nice(Node n) {
return n.toString(PrefixMapping.Extended);
}
@@ -325,7 +308,7 @@ public class GraphTestBase extends JenaTestBase {
/**
* Assert that <code>g</code> contains every triple in <code>triples</code>.
*/
- public void testContains(Graph g, Triple[] triples) {
+ public static void testContains(Graph g, Triple[] triples) {
for ( Triple triple : triples ) {
assertTrue("contains " + triple, g.contains(triple));
}
@@ -334,7 +317,7 @@ public class GraphTestBase extends JenaTestBase {
/**
* Assert that <code>g</code> contains every triple in <code>triples</code>.
*/
- public void testContains(Graph g, List<Triple> triples) {
+ public static void testContains(Graph g, List<Triple> triples) {
for ( Triple triple : triples ) {
assertTrue(g.contains(triple));
}
@@ -343,7 +326,7 @@ public class GraphTestBase extends JenaTestBase {
/**
* Assert that <code>g</code> contains every triple in <code>it</code>.
*/
- public void testContains(Graph g, Iterator<Triple> it) {
+ public static void testContains(Graph g, Iterator<Triple> it) {
while (it.hasNext())
assertTrue(g.contains(it.next()));
}
@@ -351,7 +334,7 @@ public class GraphTestBase extends JenaTestBase {
/**
* Assert that <code>g</code> contains every triple in <code>other</code>.
*/
- public void testContains(Graph g, Graph other) {
+ public static void testContains(Graph g, Graph other) {
testContains(g, GraphUtil.findAll(other));
}
@@ -359,7 +342,7 @@ public class GraphTestBase extends JenaTestBase {
* Assert that <code>g</code> contains none of the triples in
* <code>triples</code>.
*/
- public void testOmits(Graph g, Triple[] triples) {
+ public static void testOmits(Graph g, Triple[] triples) {
for ( Triple triple : triples ) {
assertFalse("", g.contains(triple));
}
@@ -369,7 +352,7 @@ public class GraphTestBase extends JenaTestBase {
* Assert that <code>g</code> contains none of the triples in
* <code>triples</code>.
*/
- public void testOmits(Graph g, List<Triple> triples) {
+ public static void testOmits(Graph g, List<Triple> triples) {
for ( Triple triple : triples ) {
assertFalse("", g.contains(triple));
}
@@ -378,7 +361,7 @@ public class GraphTestBase extends JenaTestBase {
/**
* Assert that <code>g</code> contains none of the triples in <code>it</code>.
*/
- public void testOmits(Graph g, Iterator<Triple> it) {
+ public static void testOmits(Graph g, Iterator<Triple> it) {
while (it.hasNext())
assertFalse("", g.contains(it.next()));
}
@@ -386,7 +369,7 @@ public class GraphTestBase extends JenaTestBase {
/**
* Assert that <code>g</code> contains none of the triples in <code>other</code>.
*/
- public void testOmits(Graph g, Graph other) {
+ public static void testOmits(Graph g, Graph other) {
testOmits(g, GraphUtil.findAll(other));
}
@@ -420,4 +403,18 @@ public class GraphTestBase extends JenaTestBase {
throw new JenaException(e);
}
}
+
+ // /**
+ // Answer a set containing the elements from the iterator <code>it</code>.
+ // */
+ // public static <T> Set<T> Iter.toSet( Iterator<? extends T> it )
+ // { return Iter.toSet( it ); }
+ //
+ // /**
+ // Answer a list containing the elements from the iterator <code>it</code>.
+ // */
+ // public static <T> List<T> Iter.toList( Iterator<? extends T> it )
+ // { return Iter.toList( it ); }
+
+
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/MetaTestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/MetaTestGraph.java
similarity index 85%
rename from jena-core/src/test/java/org/apache/jena/graph/test/MetaTestGraph.java
rename to jena-core/src/test/java/org/apache/jena/graph/MetaTestGraph.java
index 2f5e2c3b56..67d537135d 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/MetaTestGraph.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/MetaTestGraph.java
@@ -19,13 +19,16 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
-import junit.framework.*;
-import org.apache.jena.graph.*;
-import org.apache.jena.shared.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.jena.shared.JenaException;
+import org.apache.jena.test.JenaTestLib;
/**
* MetaTestGraph
@@ -68,14 +71,14 @@ public class MetaTestGraph extends AbstractTestGraph {
public static void addTestMethods(TestSuite result, Class<? extends Test> testClass, Method[] methods,
Class<? extends Graph> graphClass) {
for ( Method method : methods ) {
- if ( isPublicTestMethod(method) ) {
+ if ( JenaTestLib.isPublicTestMethod(method) ) {
result.addTest(makeTest(testClass, graphClass, method.getName()));
}
}
}
public static TestCase makeTest(Class<? extends Test> testClass, Class<? extends Graph> graphClass, String name) {
- Constructor<? > cons = getConstructor(testClass, new Class[]{Class.class, String.class});
+ Constructor<? > cons = JenaTestLib.getConstructor(testClass, new Class[]{Class.class, String.class});
if ( cons == null )
throw new JenaException("cannot find MetaTestGraph constructor");
try {
@@ -87,7 +90,7 @@ public class MetaTestGraph extends AbstractTestGraph {
@Override
public Graph getNewGraph() {
- return getGraph(this, graphClass);
+ return GraphTestLib.getGraph(this, graphClass);
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/RecordingGraphListener.java b/jena-core/src/test/java/org/apache/jena/graph/RecordingGraphListener.java
index cdb212c2b2..289d7807af 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/RecordingGraphListener.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/RecordingGraphListener.java
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.jena.atlas.iterator.Iter;
-import org.apache.jena.testing_framework.AbstractRecordingListener;
+import org.apache.jena.junit.AbstractRecordingListener;
/**
* This testing listener records the event names and data, and provides a method for
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/RecordingListener.java b/jena-core/src/test/java/org/apache/jena/graph/RecordingListener.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/graph/test/RecordingListener.java
rename to jena-core/src/test/java/org/apache/jena/graph/RecordingListener.java
index 5cf0398bda..f6d8919167 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/RecordingListener.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/RecordingListener.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,9 +29,6 @@ import java.util.List;
import org.junit.Assert;
import org.apache.jena.atlas.iterator.Iter;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.GraphListener;
-import org.apache.jena.graph.Triple;
/**
* This testing listener records the event names and data, and provides a method for
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TS3_graph.java b/jena-core/src/test/java/org/apache/jena/graph/TS3_graph.java
similarity index 92%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TS3_graph.java
rename to jena-core/src/test/java/org/apache/jena/graph/TS3_graph.java
index cbe7d5e8ba..cb5e571506 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TS3_graph.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TS3_graph.java
@@ -19,13 +19,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.apache.jena.memvalue.TestNodeToTriplesMapMem;
-
@RunWith(Suite.class)
@Suite.SuiteClasses( {
TestFindLiterals.class,
@@ -35,7 +33,6 @@ import org.apache.jena.memvalue.TestNodeToTriplesMapMem;
TestNodeCreateStrings.class,
TestTriple.class,
TestTripleField.class,
- TestNodeToTriplesMapMem.class,
TestReifier.class,
TestTypedLiterals.class,
TestDateTime.class,
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestCoreGraphUtil.java b/jena-core/src/test/java/org/apache/jena/graph/TestCoreGraphUtil.java
similarity index 93%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestCoreGraphUtil.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestCoreGraphUtil.java
index 4b6a4b111f..76c3d947fe 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestCoreGraphUtil.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestCoreGraphUtil.java
@@ -19,14 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import junit.framework.*;
-import org.apache.jena.graph.*;
import org.apache.jena.graph.impl.*;
+import org.apache.jena.test.JenaTestBase;
import org.apache.jena.util.iterator.*;
-public class TestCoreGraphUtil extends GraphTestBase
+public class TestCoreGraphUtil extends JenaTestBase
{
public TestCoreGraphUtil(String name)
{ super(name); }
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestDateTime.java b/jena-core/src/test/java/org/apache/jena/graph/TestDateTime.java
similarity index 99%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestDateTime.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestDateTime.java
index c255d81e07..99dc2bf0a0 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestDateTime.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestDateTime.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import java.io.StringReader;
import java.io.StringWriter;
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestFactory.java b/jena-core/src/test/java/org/apache/jena/graph/TestFactory.java
similarity index 90%
copy from jena-core/src/test/java/org/apache/jena/graph/test/TestFactory.java
copy to jena-core/src/test/java/org/apache/jena/graph/TestFactory.java
index 0666da21c1..0501865e83 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestFactory.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestFactory.java
@@ -19,12 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import junit.framework.*;
-import org.apache.jena.graph.*;
+import org.apache.jena.test.JenaTestBase;
-public class TestFactory extends GraphTestBase {
+public class TestFactory extends JenaTestBase {
public TestFactory(String name) {
super(name);
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestFindLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/TestFindLiterals.java
similarity index 93%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestFindLiterals.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestFindLiterals.java
index 7deaf73d86..51ba8fb0da 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestFindLiterals.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestFindLiterals.java
@@ -19,19 +19,17 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import java.util.Set;
import junit.framework.TestSuite;
import org.apache.jena.atlas.iterator.Iter;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.graph.Triple;
import org.apache.jena.graph.impl.LiteralLabelFactory;
+import org.apache.jena.junit.NodeCreateUtils;
+import org.apache.jena.test.JenaTestBase;
-public class TestFindLiterals extends GraphTestBase {
+public class TestFindLiterals extends JenaTestBase {
public TestFindLiterals(String name) {
super(name);
}
@@ -41,11 +39,11 @@ public class TestFindLiterals extends GraphTestBase {
}
private void runTest(String graph, int size, String search, String results) {
- Graph g = graphWith(graph);
+ Graph g = GraphTestLib.graphWith(graph);
Node literal = NodeCreateUtils.create(search);
assertEquals("graph has wrong size", size, g.size());
Set<Node> got = g.find(Node.ANY, Node.ANY, literal).mapWith(t -> t.getObject()).toSet();
- assertEquals(nodeSet(results), got);
+ assertEquals(GraphTestLib.nodeSet(results), got);
}
public void test01() {
@@ -151,7 +149,7 @@ public class TestFindLiterals extends GraphTestBase {
Node as = NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral((short)42));
Node ai = NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral(42));
Node al = NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral((long)42));
- Graph g = graphWith("");
+ Graph g = GraphTestLib.graphWith("");
Node SB = NodeCreateUtils.create("SB");
Node SS = NodeCreateUtils.create("SS");
Node SI = NodeCreateUtils.create("SI");
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraph.java
similarity index 90%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestGraph.java
index 839fc8e156..b17e2540d8 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraph.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
/**
Tests that check GraphMem and WrappedGraph for correctness against the Graph
@@ -28,16 +28,15 @@ package org.apache.jena.graph.test;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.GraphMemFactory;
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 GraphTestBase {
+public class TestGraph extends JenaTestBase {
public TestGraph(String name) {
super(name);
}
@@ -80,10 +79,10 @@ public class TestGraph extends GraphTestBase {
public void testWrappedSame() {
Graph m = GraphMemFactory.createDefaultGraph();
Graph w = new WrappedGraph(m);
- graphAdd(m, "a trumps b; c eats d");
- assertIsomorphic(m, w);
- graphAdd(w, "i write this; you read that");
- assertIsomorphic(w, m);
+ GraphTestLib.graphAdd(m, "a trumps b; c eats d");
+ GraphTestLib.assertIsomorphic(m, w);
+ GraphTestLib.graphAdd(w, "i write this; you read that");
+ GraphTestLib.assertIsomorphic(w, m);
}
/**
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphBaseToString.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphBaseToString.java
similarity index 94%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestGraphBaseToString.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestGraphBaseToString.java
index ae8af75caa..fb5e3c2bda 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphBaseToString.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphBaseToString.java
@@ -19,22 +19,23 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import static org.apache.jena.graph.impl.GraphBase.TOSTRING_TRIPLE_BASE;
import static org.apache.jena.graph.impl.GraphBase.TOSTRING_TRIPLE_LIMIT;
import java.util.*;
-import org.apache.jena.graph.*;
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 GraphTestBase {
+public class TestGraphBaseToString extends JenaTestBase {
private static final class LittleGraphBase extends GraphBase {
Set<Triple> triples = new HashSet<>();
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphEvents.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphEvents.java
similarity index 87%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestGraphEvents.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestGraphEvents.java
index e856573821..ea860a46f6 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphEvents.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphEvents.java
@@ -19,11 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
-import org.apache.jena.graph.*;
+import org.apache.jena.junit.NodeCreateUtils;
+import org.apache.jena.test.JenaTestBase;
-public class TestGraphEvents extends GraphTestBase {
+public class TestGraphEvents extends JenaTestBase {
public TestGraphEvents(String name) {
super(name);
}
@@ -43,7 +44,7 @@ public class TestGraphEvents extends GraphTestBase {
private void testGraphEventsRemove(String S, String P, String O) {
Triple expected = NodeCreateUtils.createTriple(S + " " + P + " " + O);
- GraphEvents e = GraphEvents.remove(node(S), node(P), node(O));
+ GraphEvents e = GraphEvents.remove(GraphTestLib.node(S), GraphTestLib.node(P), GraphTestLib.node(O));
assertEquals(expected, e.getContent());
assertEquals("remove", e.getTitle());
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphListener.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestGraphListener.java
index 2a02990be4..9db23d22eb 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphListener.java
@@ -19,14 +19,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import junit.framework.TestSuite;
-import org.apache.jena.graph.*;
import org.apache.jena.mem.GraphMemFast;
/**
@@ -59,7 +58,7 @@ public class TestGraphListener extends MetaTestGraph {
}
protected void verify() {
- assertIsomorphic(desc + " has not been tracked correctly. [delegating,copy-from-listener]", original, copy);
+ GraphTestLib.assertIsomorphic(desc + " has not been tracked correctly. [delegating,copy-from-listener]", original, copy);
}
@Override
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphMatchWithInference.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphMatchWithInference.java
similarity index 83%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestGraphMatchWithInference.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestGraphMatchWithInference.java
index f428230c84..34c641bd79 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphMatchWithInference.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphMatchWithInference.java
@@ -19,16 +19,17 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+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 GraphTestBase {
+public class TestGraphMatchWithInference extends JenaTestBase {
public TestGraphMatchWithInference(String name) {
super(name);
}
@@ -43,9 +44,9 @@ public class TestGraphMatchWithInference extends GraphTestBase {
Model concrete = ModelFactory.createDefaultModel();
concrete.add(mrdfs);
- assertIsomorphic(concrete.getGraph(), mrdfs.getGraph());
+ GraphTestLib.assertIsomorphic(concrete.getGraph(), mrdfs.getGraph());
- assertIsomorphic(mrdfs.getGraph(), concrete.getGraph());
+ GraphTestLib.assertIsomorphic(mrdfs.getGraph(), concrete.getGraph());
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphPlain.java
similarity index 78%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestGraphPlain.java
index dfb947f5cb..66ed20452d 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphPlain.java
@@ -19,20 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
-import static org.apache.jena.graph.test.GraphTestBase.graphAdd;
-import static org.apache.jena.graph.test.GraphTestBase.node;
-import static org.apache.jena.graph.test.GraphTestBase.triple;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.List;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.Triple;
import org.apache.jena.graph.impl.GraphPlain;
import org.apache.jena.util.iterator.ExtendedIterator;
import org.junit.BeforeClass;
@@ -48,12 +42,12 @@ public class TestGraphPlain {
// GraphMem is the old in-memory graph which has value-based indexing.
// It is not the default graph implementation.
graph = new org.apache.jena.memvalue.GraphMemValue();
- graphAdd(graph, "s p o; s p 1; s p 01");
+ GraphTestLib.graphAdd(graph, "s p o; s p 1; s p 01");
}
@Test
public void contains1() {
- Triple triple = triple("s p 001");
+ Triple triple = GraphTestLib.triple("s p 001");
assertTrue(graph.contains(triple));
Graph plain = GraphPlain.plain(graph);
assertFalse(plain.contains(triple));
@@ -61,7 +55,7 @@ public class TestGraphPlain {
@Test
public void contains2() {
- Triple triple = triple("s p 1");
+ Triple triple = GraphTestLib.triple("s p 1");
assertTrue(graph.contains(triple));
Graph plain = GraphPlain.plain(graph);
assertTrue(plain.contains(triple));
@@ -69,7 +63,7 @@ public class TestGraphPlain {
@Test
public void contains3() {
- Triple triple = triple("s1 p 1");
+ Triple triple = GraphTestLib.triple("s1 p 1");
assertFalse(graph.contains(triple));
Graph plain = GraphPlain.plain(graph);
assertFalse(plain.contains(triple));
@@ -77,9 +71,9 @@ public class TestGraphPlain {
@Test
public void contains4() {
- Node s = node("s");
- Node p = node("p");
- Node x = node("001");
+ Node s = GraphTestLib.node("s");
+ Node p = GraphTestLib.node("p");
+ Node x = GraphTestLib.node("001");
assertTrue(graph.contains(s, p, x));
Graph plain = GraphPlain.plain(graph);
@@ -96,9 +90,9 @@ public class TestGraphPlain {
@Test
public void find2() {
Graph plain = GraphPlain.plain(graph);
- Node s = node("s");
- Node p = node("p");
- Node x = node("001");
+ Node s = GraphTestLib.node("s");
+ Node p = GraphTestLib.node("p");
+ Node x = GraphTestLib.node("001");
List<Triple> list = plain.find(s, p, x).toList();
assertEquals(0, list.size());
}
@@ -106,15 +100,15 @@ public class TestGraphPlain {
@Test
public void find3() {
Graph plain = GraphPlain.plain(graph);
- Node s = node("s");
- Node p = node("p");
- Node x = node("??");
+ Node s = GraphTestLib.node("s");
+ Node p = GraphTestLib.node("p");
+ Node x = GraphTestLib.node("??");
List<Triple> list = plain.find(s, p, x).toList();
assertEquals(3, list.size());
}
private static void find_test(Graph testGraph, int n) {
- Triple triple = triple("?? p 1");
+ Triple triple = GraphTestLib.triple("?? p 1");
ExtendedIterator<Triple> iter = testGraph.find(triple);
// assertTrue(iter.hasNext());
List<Triple> list = iter.toList();
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPrefixMapping.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphPrefixMapping.java
similarity index 86%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPrefixMapping.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestGraphPrefixMapping.java
index 1da14d1a6c..b0273af2f9 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPrefixMapping.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphPrefixMapping.java
@@ -19,15 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import junit.framework.TestSuite;
-import org.apache.jena.graph.GraphMemFactory;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.shared.AbstractTestPrefixMapping;
+import org.apache.jena.graph.compose.AbstractTestPrefixMapping;
import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.test.JenaTestBase;
-public class TestGraphPrefixMapping extends GraphTestBase {
+public class TestGraphPrefixMapping extends JenaTestBase {
public TestGraphPrefixMapping(String name) {
super(name);
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/TestGraphUtil.java b/jena-core/src/test/java/org/apache/jena/graph/TestGraphUtil.java
index f3ab8fa4c4..81e4328f3d 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/TestGraphUtil.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestGraphUtil.java
@@ -23,7 +23,6 @@ package org.apache.jena.graph;
import static org.junit.Assert.assertEquals;
-import org.apache.jena.graph.test.GraphTestBase;
import org.junit.Test;
// Test for the compare by src.size and step dst case.
@@ -35,7 +34,7 @@ public class TestGraphUtil {
private static Graph make(int N) {
Graph graph = GraphMemFactory.createDefaultGraph();
for ( int i = 0; i < N; i++ ) {
- Triple t = GraphTestBase.triple("a P 'x"+i+"'");
+ Triple t = GraphTestLib.triple("a P 'x"+i+"'");
graph.add(t);
}
return graph;
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabelSameValueAs.java b/jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabelSameValueAs.java
similarity index 98%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabelSameValueAs.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabelSameValueAs.java
index e189a58522..cf5a661f3c 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabelSameValueAs.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabelSameValueAs.java
@@ -19,13 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import static org.junit.Assert.*;
import junit.framework.JUnit4TestAdapter;
import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.datatypes.xsd.XSDDatatype;
-import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.impl.LiteralLabel;
import org.apache.jena.graph.impl.LiteralLabelFactory;
import org.junit.Test;
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabels.java b/jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabels.java
similarity index 79%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabels.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabels.java
index f765190fe9..d2b6882273 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabels.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestLiteralLabels.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -27,9 +27,10 @@ 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 GraphTestBase {
+public class TestLiteralLabels extends JenaTestBase {
public TestLiteralLabels(String name) {
super(name);
}
@@ -50,26 +51,26 @@ public class TestLiteralLabels extends GraphTestBase {
}
public void testHashCodesForBase64Binary_1() {
- LiteralLabel A = node("'0123'http://www.w3.org/2001/XMLSchema#base64Binary").getLiteral();
- LiteralLabel B = node("'0123'http://www.w3.org/2001/XMLSchema#base64Binary").getLiteral();
+ LiteralLabel A = GraphTestLib.node("'0123'http://www.w3.org/2001/XMLSchema#base64Binary").getLiteral();
+ LiteralLabel B = GraphTestLib.node("'0123'http://www.w3.org/2001/XMLSchema#base64Binary").getLiteral();
assertEquals(A.hashCode(), B.hashCode());
}
public void testHashCodesForBase64Binary_2() {
- LiteralLabel A = node("'illgeal'http://www.w3.org/2001/XMLSchema#base64Binary").getLiteral();
- LiteralLabel B = node("'illgeal'http://www.w3.org/2001/XMLSchema#base64Binary").getLiteral();
+ LiteralLabel A = GraphTestLib.node("'illgeal'http://www.w3.org/2001/XMLSchema#base64Binary").getLiteral();
+ LiteralLabel B = GraphTestLib.node("'illgeal'http://www.w3.org/2001/XMLSchema#base64Binary").getLiteral();
assertEquals(A.hashCode(), B.hashCode());
}
public void testHashCodesForHexBinary_1() {
- LiteralLabel A = node("'0123'http://www.w3.org/2001/XMLSchema#hexBinary").getLiteral();
- LiteralLabel B = node("'0123'http://www.w3.org/2001/XMLSchema#hexBinary").getLiteral();
+ LiteralLabel A = GraphTestLib.node("'0123'http://www.w3.org/2001/XMLSchema#hexBinary").getLiteral();
+ LiteralLabel B = GraphTestLib.node("'0123'http://www.w3.org/2001/XMLSchema#hexBinary").getLiteral();
assertEquals(A.hashCode(), B.hashCode());
}
public void testHashCodesForHexBinary_2() {
- LiteralLabel A = node("'illegal'http://www.w3.org/2001/XMLSchema#hexBinary").getLiteral();
- LiteralLabel B = node("'illegal'http://www.w3.org/2001/XMLSchema#hexBinary").getLiteral();
+ LiteralLabel A = GraphTestLib.node("'illegal'http://www.w3.org/2001/XMLSchema#hexBinary").getLiteral();
+ LiteralLabel B = GraphTestLib.node("'illegal'http://www.w3.org/2001/XMLSchema#hexBinary").getLiteral();
assertEquals(A.hashCode(), B.hashCode());
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java b/jena-core/src/test/java/org/apache/jena/graph/TestNode.java
similarity index 94%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestNode.java
index e7c6a88982..b4b1d9e060 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestNode.java
@@ -19,31 +19,20 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import junit.framework.TestSuite;
import org.apache.jena.atlas.lib.Creator;
import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.datatypes.TypeMapper;
import org.apache.jena.datatypes.xsd.XSDDatatype;
-import org.apache.jena.graph.BlankNodeId;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.GraphMemFactory;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.graph.NodeVisitor;
-import org.apache.jena.graph.Node_ANY;
-import org.apache.jena.graph.Node_Blank;
-import org.apache.jena.graph.Node_Graph;
-import org.apache.jena.graph.Node_Literal;
-import org.apache.jena.graph.Node_Triple;
-import org.apache.jena.graph.Node_URI;
-import org.apache.jena.graph.Node_Variable;
-import org.apache.jena.graph.Triple;
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.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;
import org.apache.jena.vocabulary.OWL;
@@ -55,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 GraphTestBase {
+public class TestNode extends JenaTestBase {
public TestNode(String name) {
super(name);
}
@@ -115,7 +104,7 @@ public class TestNode extends GraphTestBase {
public void testNodeVariableConstructor() {
assertEquals(NodeFactory.createVariable("hello"), new Node_Variable("hello"));
assertEquals(NodeFactory.createVariable("world"), new Node_Variable("world"));
- assertDiffer(NodeFactory.createVariable("hello"), new Node_Variable("world"));
+ JenaTestLib.assertDiffer(NodeFactory.createVariable("hello"), new Node_Variable("world"));
assertEquals("myName", new Node_Variable("myName").getName());
}
@@ -162,7 +151,7 @@ public class TestNode extends GraphTestBase {
if ( testEq )
assertEquals(testName + "should be equal", x, y);
else
- assertDiffer(testName + " should differ", x, y);
+ JenaTestLib.assertDiffer(testName + " should differ", x, y);
}
private String getType(Object x) {
@@ -172,7 +161,7 @@ public class TestNode extends GraphTestBase {
@SuppressWarnings("deprecation")
public void testEquals() {
- assertDiffer("different variables", NodeFactory.createVariable("xx"), NodeFactory.createVariable("yy"));
+ JenaTestLib.assertDiffer("different variables", NodeFactory.createVariable("xx"), NodeFactory.createVariable("yy"));
assertEquals("same vars", NodeFactory.createVariable("aa"), NodeFactory.createVariable("aa"));
assertEquals("same URI", NodeFactory.createURI(U), NodeFactory.createURI(U));
assertEquals("same anon", NodeFactory.createBlankNode(A), NodeFactory.createBlankNode(A));
@@ -262,7 +251,7 @@ public class TestNode extends GraphTestBase {
public void testVariableSupport() {
assertEquals(new Node_Variable("xxx"), new Node_Variable("xxx"));
- assertDiffer(new Node_Variable("xxx"), new Node_Variable("yyy"));
+ JenaTestLib.assertDiffer(new Node_Variable("xxx"), new Node_Variable("yyy"));
}
/**
@@ -446,11 +435,11 @@ public class TestNode extends GraphTestBase {
}
public void testNodeHelp() {
- assertTrue("node() making URIs", node("hello").isURI());
- assertTrue("node() making literals", node("123").isLiteral());
- assertTrue("node() making literals", node("'hello'").isLiteral());
- assertTrue("node() making hyphens", node("_x").isBlank());
- assertTrue("node() making variables", node("?x").isVariable());
+ assertTrue("node() making URIs", GraphTestLib.node("hello").isURI());
+ assertTrue("node() making literals", GraphTestLib.node("123").isLiteral());
+ assertTrue("node() making literals", GraphTestLib.node("'hello'").isLiteral());
+ assertTrue("node() making hyphens", GraphTestLib.node("_x").isBlank());
+ assertTrue("node() making variables", GraphTestLib.node("?x").isVariable());
}
public void testVisitorPatternNode() {
@@ -498,20 +487,20 @@ public class TestNode extends GraphTestBase {
}
private void testVisitorPatternNode(String ns, NodeVisitor v) {
- Node n = node(ns);
+ Node n = GraphTestLib.node(ns);
assertEquals(n, n.visitWith(v));
}
private void visitExamples(NodeVisitor nv) {
- node("sortOfURI").visitWith(nv);
- node("?variableI").visitWith(nv);
- node("_anon").visitWith(nv);
- node("11").visitWith(nv);
- node("??").visitWith(nv);
+ GraphTestLib.node("sortOfURI").visitWith(nv);
+ GraphTestLib.node("?variableI").visitWith(nv);
+ GraphTestLib.node("_anon").visitWith(nv);
+ GraphTestLib.node("11").visitWith(nv);
+ GraphTestLib.node("??").visitWith(nv);
// ---
- Node s = node("uri1");
- Node p = node("uri2");
- Node o = node("uri1");
+ Node s = GraphTestLib.node("uri1");
+ Node p = GraphTestLib.node("uri2");
+ Node o = GraphTestLib.node("uri1");
Node nt = NodeFactory.createTripleTerm(s, p, o);
nt.visitWith(nv);
// ---
@@ -650,7 +639,7 @@ public class TestNode extends GraphTestBase {
RDFDatatype dt2 = tm.getTypeByValue(Short.valueOf((short)10));
Node a = NodeFactory.createLiteralDT("10", dt1);
Node b = NodeFactory.createLiteralDT("10", dt2);
- assertDiffer("types must make a difference", a, b);
+ JenaTestLib.assertDiffer("types must make a difference", a, b);
assertTrue("A and B must express the same value", a.sameValueAs(b));
}
@@ -776,7 +765,7 @@ public class TestNode extends GraphTestBase {
private static void assertLangString(Node n) {
RDFDatatype dt = n.getLiteralDatatype();
- assertDiffer("", n.getLiteralLanguage()); // "" is not legal.
+ JenaTestLib.assertDiffer("", n.getLiteralLanguage()); // "" is not legal.
assertEquals(RDF.dtLangString, dt);
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeCreateStrings.java b/jena-core/src/test/java/org/apache/jena/graph/TestNodeCreateStrings.java
similarity index 96%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestNodeCreateStrings.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestNodeCreateStrings.java
index e416498453..efabd02f75 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeCreateStrings.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestNodeCreateStrings.java
@@ -19,13 +19,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
import org.apache.jena.rdf.model.impl.Util;
import org.junit.Test;
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeEdgeCases.java b/jena-core/src/test/java/org/apache/jena/graph/TestNodeEdgeCases.java
similarity index 94%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestNodeEdgeCases.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestNodeEdgeCases.java
index ad73642631..4812831bae 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeEdgeCases.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestNodeEdgeCases.java
@@ -19,14 +19,12 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import static org.junit.Assert.assertNotNull;
import org.apache.jena.datatypes.xsd.impl.RDFDirLangString;
import org.apache.jena.datatypes.xsd.impl.RDFLangString;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
import org.junit.Test;
public class TestNodeEdgeCases {
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeExtras.java b/jena-core/src/test/java/org/apache/jena/graph/TestNodeExtras.java
similarity index 98%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestNodeExtras.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestNodeExtras.java
index 243a883339..95ad98c839 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeExtras.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestNodeExtras.java
@@ -19,11 +19,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import static org.junit.Assert.*;
-import org.apache.jena.graph.*;
+import org.apache.jena.junit.NodeCreateUtils;
import org.apache.jena.rdf.model.impl.Util;
import org.apache.jena.vocabulary.RDF;
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestRDFStringLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/TestRDFStringLiterals.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestRDFStringLiterals.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestRDFStringLiterals.java
index 9e6910758b..346b7f14bf 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestRDFStringLiterals.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestRDFStringLiterals.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import static org.apache.jena.graph.TextDirection.RTL;
import static org.junit.Assert.assertEquals;
@@ -29,9 +29,6 @@ import org.junit.Test;
import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.datatypes.xsd.XSDDatatype;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.graph.TextDirection;
import org.apache.jena.shared.JenaException;
import org.apache.jena.vocabulary.RDF;
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestRegisterGraphListener.java b/jena-core/src/test/java/org/apache/jena/graph/TestRegisterGraphListener.java
similarity index 94%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestRegisterGraphListener.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestRegisterGraphListener.java
index babf364bb1..9f45d2953d 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestRegisterGraphListener.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestRegisterGraphListener.java
@@ -19,20 +19,18 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import java.util.Iterator;
import java.util.List;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.GraphListener;
-import org.apache.jena.graph.Triple;
+import org.apache.jena.test.JenaTestBase;
/**
* 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 GraphTestBase {
+public class TestRegisterGraphListener extends JenaTestBase {
private ComeAndGoListener all[];
private Graph graph;
@@ -114,7 +112,7 @@ public class TestRegisterGraphListener extends GraphTestBase {
}
private void testAddingTriple(int addMe, ComeAndGoListener...allx) {
- graph = newGraph();
+ graph = GraphTestLib.newGraph();
all = allx;
for ( int i = 0 ; i < addMe ; i++ ) {
all[i].registerWith(graph);
@@ -122,7 +120,7 @@ public class TestRegisterGraphListener extends GraphTestBase {
for ( ComeAndGoListener l : all ) {
l.start();
}
- graph.add(triple("make a change"));
+ graph.add(GraphTestLib.triple("make a change"));
for ( ComeAndGoListener l : all ) {
l.check();
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestReifier.java b/jena-core/src/test/java/org/apache/jena/graph/TestReifier.java
similarity index 54%
rename from jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestReifier.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestReifier.java
index ed25b59247..49b896370e 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestReifier.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestReifier.java
@@ -19,30 +19,58 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
+import java.lang.reflect.Constructor;
+
+import junit.framework.TestSuite;
import org.apache.jena.atlas.iterator.Iter;
-import org.apache.jena.graph.*;
+import org.apache.jena.junit.NodeCreateUtils;
+import org.apache.jena.mem.GraphMemFast;
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;
/**
- * Abstract base class for reification tests.
+ * This class tests the reifiers of ordinary graphs. Old test suite - kept to ensure
+ * compatibility for the one and only Standard mode
*/
-public abstract class AbstractTestReifier extends GraphTestBase {
- protected static final Triple ALL = Triple.ANY;
+public class TestReifier extends JenaTestBase {
+ protected final Class<? extends Graph> graphClass;
- public AbstractTestReifier(String name) {
+ public TestReifier(String name) {
super(name);
+ graphClass = null;
}
- public abstract Graph getGraph();
+ public TestReifier(Class<? extends Graph> graphClass, String name) {
+ super(name);
+ this.graphClass = graphClass;
+ }
- protected final Graph getGraphWith(String facts) {
+ private Graph getGraph() {
+ try {
+ Constructor<? > cons = JenaTestLib.getConstructor(graphClass, new Class[]{});
+ if ( cons != null )
+ return (Graph)cons.newInstance();
+ Constructor<? > cons2 = JenaTestLib.getConstructor(graphClass, new Class[]{this.getClass()});
+ if ( cons2 != null )
+ return (Graph)cons2.newInstance(this);
+ throw new JenaException("no suitable graph constructor found for " + graphClass);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new JenaException(e);
+ }
+ }
+
+ private final Graph getGraphWith(String facts) {
Graph result = getGraph();
- graphAdd(result, facts);
+ GraphTestLib.graphAdd(result, facts);
return result;
}
@@ -51,7 +79,7 @@ public abstract class AbstractTestReifier extends GraphTestBase {
* facts.
*/
protected final Graph graphWithUnless(boolean cond, String facts) {
- return graphWith(cond ? "" : facts);
+ return GraphTestLib.graphWith(cond ? "" : facts);
}
protected final Graph graphWithIf(boolean cond, String facts) {
@@ -67,7 +95,7 @@ public abstract class AbstractTestReifier extends GraphTestBase {
*/
public void testStandard() {
Graph g = getGraph();
- assertFalse(ReifierStd.hasTriple(g, triple("s p o")));
+ assertFalse(ReifierStd.hasTriple(g, GraphTestLib.triple("s p o")));
g.add(NodeCreateUtils.createTriple("x rdf:subject s"));
assertEquals(1, g.size());
g.add(NodeCreateUtils.createTriple("x rdf:predicate p"));
@@ -76,7 +104,7 @@ public abstract class AbstractTestReifier extends GraphTestBase {
assertEquals(3, g.size());
g.add(NodeCreateUtils.createTriple("x rdf:type rdf:Statement"));
assertEquals(4, g.size());
- assertTrue(ReifierStd.hasTriple(g, triple("s p o")));
+ assertTrue(ReifierStd.hasTriple(g, GraphTestLib.triple("s p o")));
}
/**
@@ -85,11 +113,11 @@ public abstract class AbstractTestReifier extends GraphTestBase {
*/
public void testStandardExplode() {
Graph g = getGraph();
- ReifierStd.reifyAs(g, node("a"), triple("p Q r"));
+ ReifierStd.reifyAs(g, GraphTestLib.node("a"), GraphTestLib.triple("p Q r"));
Graph r = GraphMemFactory.createDefaultGraph();
- graphAdd(r, "a rdf:type rdf:Statement; a rdf:subject p; a rdf:predicate Q; a rdf:object r");
+ GraphTestLib.graphAdd(r, "a rdf:type rdf:Statement; a rdf:subject p; a rdf:predicate Q; a rdf:object r");
assertEquals(4, g.size());
- assertIsomorphic(r, g);
+ GraphTestLib.assertIsomorphic(r, g);
}
/**
@@ -98,10 +126,10 @@ public abstract class AbstractTestReifier extends GraphTestBase {
*/
public void testOverspecificationSuppressesReification() {
Graph g = getGraph();
- graphAdd(g, "x rdf:subject A; x rdf:predicate P; x rdf:object O; x rdf:type rdf:Statement");
- assertEquals(triple("A P O"), ReifierStd.getTriple(g, node("x")));
- graphAdd(g, "x rdf:subject BOOM");
- assertEquals(null, ReifierStd.getTriple(g, node("x")));
+ GraphTestLib.graphAdd(g, "x rdf:subject A; x rdf:predicate P; x rdf:object O; x rdf:type rdf:Statement");
+ assertEquals(GraphTestLib.triple("A P O"), ReifierStd.getTriple(g, GraphTestLib.node("x")));
+ GraphTestLib.graphAdd(g, "x rdf:subject BOOM");
+ assertEquals(null, ReifierStd.getTriple(g, GraphTestLib.node("x")));
}
public void testReificationSubjectClash() {
@@ -119,10 +147,10 @@ public abstract class AbstractTestReifier extends GraphTestBase {
protected void testReificationClash(String clashingStatement) {
Graph g = getGraph();
Triple SPO = NodeCreateUtils.createTriple("S P O");
- ReifierStd.reifyAs(g, node("x"), SPO);
+ ReifierStd.reifyAs(g, GraphTestLib.node("x"), SPO);
assertTrue(ReifierStd.hasTriple(g, SPO));
- graphAdd(g, clashingStatement);
- assertEquals(null, ReifierStd.getTriple(g, node("x")));
+ GraphTestLib.graphAdd(g, clashingStatement);
+ assertEquals(null, ReifierStd.getTriple(g, GraphTestLib.node("x")));
assertFalse(ReifierStd.hasTriple(g, SPO));
}
@@ -132,25 +160,25 @@ public abstract class AbstractTestReifier extends GraphTestBase {
*/
public void testManifestQuads() {
Graph g = getGraph();
- ReifierStd.reifyAs(g, node("A"), triple("S P O"));
+ ReifierStd.reifyAs(g, GraphTestLib.node("A"), GraphTestLib.triple("S P O"));
String reified = "A rdf:type rdf:Statement; A rdf:subject S; A rdf:predicate P; A rdf:object O";
- assertIsomorphic(graphWith(reified), g);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(reified), g);
}
public void testHiddenVsReification() {
Graph g = getGraph();
- ReifierStd.reifyAs(g, node("A"), triple("S P O"));
- assertTrue(ReifierStd.findEither(g, ALL, false).hasNext());
+ ReifierStd.reifyAs(g, GraphTestLib.node("A"), GraphTestLib.triple("S P O"));
+ assertTrue(ReifierStd.findEither(g, Triple.ANY, false).hasNext());
}
public void testRetrieveTriplesByNode() {
Graph G = getGraph();
Node N = NodeFactory.createBlankNode(), M = NodeFactory.createBlankNode();
- ReifierStd.reifyAs(G, N, triple("x R y"));
- assertEquals("gets correct triple", triple("x R y"), ReifierStd.getTriple(G, N));
- ReifierStd.reifyAs(G, M, triple("p S q"));
- assertDiffer("the anon nodes must be distinct", N, M);
- assertEquals("gets correct triple", triple("p S q"), ReifierStd.getTriple(G, M));
+ ReifierStd.reifyAs(G, N, GraphTestLib.triple("x R y"));
+ assertEquals("gets correct triple", GraphTestLib.triple("x R y"), ReifierStd.getTriple(G, N));
+ ReifierStd.reifyAs(G, M, GraphTestLib.triple("p S q"));
+ JenaTestLib.assertDiffer("the anon nodes must be distinct", N, M);
+ assertEquals("gets correct triple", GraphTestLib.triple("p S q"), ReifierStd.getTriple(G, M));
assertTrue("node is known bound", ReifierStd.hasTriple(G, M));
assertTrue("node is known bound", ReifierStd.hasTriple(G, N));
@@ -159,8 +187,8 @@ public abstract class AbstractTestReifier extends GraphTestBase {
public void testRetrieveTriplesByTriple() {
Graph G = getGraph();
- Triple T = triple("x R y"), T2 = triple("y R x");
- Node N = node("someNode");
+ Triple T = GraphTestLib.triple("x R y"), T2 = GraphTestLib.triple("y R x");
+ Node N = GraphTestLib.node("someNode");
ReifierStd.reifyAs(G, N, T);
assertTrue("R must have T", ReifierStd.hasTriple(G, T));
assertFalse("R must not have T2", ReifierStd.hasTriple(G, T2));
@@ -169,61 +197,61 @@ public abstract class AbstractTestReifier extends GraphTestBase {
public void testReifyAs() {
Graph G = getGraph();
Node X = NodeFactory.createURI("some:uri");
- assertEquals("node used", X, ReifierStd.reifyAs(G, X, triple("x R y")));
- assertEquals("retrieves correctly", triple("x R y"), ReifierStd.getTriple(G, X));
+ assertEquals("node used", X, ReifierStd.reifyAs(G, X, GraphTestLib.triple("x R y")));
+ assertEquals("retrieves correctly", GraphTestLib.triple("x R y"), ReifierStd.getTriple(G, X));
}
public void testAllNodes() {
Graph G = getGraph();
- ReifierStd.reifyAs(G, node("x"), triple("cows eat grass"));
- ReifierStd.reifyAs(G, node("y"), triple("pigs can fly"));
- ReifierStd.reifyAs(G, node("z"), triple("dogs may bark"));
- assertEquals("", nodeSet("z y x"), Iter.toSet(ReifierStd.allNodes(G)));
+ ReifierStd.reifyAs(G, GraphTestLib.node("x"), GraphTestLib.triple("cows eat grass"));
+ ReifierStd.reifyAs(G, GraphTestLib.node("y"), GraphTestLib.triple("pigs can fly"));
+ ReifierStd.reifyAs(G, GraphTestLib.node("z"), GraphTestLib.triple("dogs may bark"));
+ assertEquals("", GraphTestLib.nodeSet("z y x"), Iter.toSet(ReifierStd.allNodes(G)));
}
public void testRemoveByNode() {
Graph G = getGraph();
- Node X = node("x"), Y = node("y");
- ReifierStd.reifyAs(G, X, triple("x R a"));
- ReifierStd.reifyAs(G, Y, triple("y R a"));
- ReifierStd.remove(G, X, triple("x R a"));
+ Node X = GraphTestLib.node("x"), Y = GraphTestLib.node("y");
+ ReifierStd.reifyAs(G, X, GraphTestLib.triple("x R a"));
+ ReifierStd.reifyAs(G, Y, GraphTestLib.triple("y R a"));
+ ReifierStd.remove(G, X, GraphTestLib.triple("x R a"));
assertFalse("triple X has gone", ReifierStd.hasTriple(G, X));
- assertEquals("triple Y still there", triple("y R a"), ReifierStd.getTriple(G, Y));
+ assertEquals("triple Y still there", GraphTestLib.triple("y R a"), ReifierStd.getTriple(G, Y));
}
public void testRemoveFromNothing() {
Graph G = getGraph();
- G.delete(triple("quint rdf:subject S"));
+ G.delete(GraphTestLib.triple("quint rdf:subject S"));
}
public void testException() {
Graph G = getGraph();
- Node X = node("x");
- ReifierStd.reifyAs(G, X, triple("x R y"));
- ReifierStd.reifyAs(G, X, triple("x R y"));
+ Node X = GraphTestLib.node("x");
+ ReifierStd.reifyAs(G, X, GraphTestLib.triple("x R y"));
+ ReifierStd.reifyAs(G, X, GraphTestLib.triple("x R y"));
try {
- ReifierStd.reifyAs(G, X, triple("x R z"));
+ ReifierStd.reifyAs(G, X, GraphTestLib.triple("x R z"));
fail("did not detect already reified node");
} catch (AlreadyReifiedException e) {}
}
public void testKevinCaseA() {
Graph G = getGraph();
- Node X = node("x"), a = node("a"), b = node("b"), c = node("c");
+ Node X = GraphTestLib.node("x"), a = GraphTestLib.node("a"), b = GraphTestLib.node("b"), c = GraphTestLib.node("c");
G.add(Triple.create(X, RDF.Nodes.type, RDF.Nodes.Statement));
ReifierStd.reifyAs(G, X, Triple.create(a, b, c));
}
public void testKevinCaseB() {
Graph G = getGraph();
- Node X = node("x"), Y = node("y");
- Node a = node("a"), b = node("b"), c = node("c");
+ Node X = GraphTestLib.node("x"), Y = GraphTestLib.node("y");
+ Node a = GraphTestLib.node("a"), b = GraphTestLib.node("b"), c = GraphTestLib.node("c");
G.add(Triple.create(X, RDF.Nodes.subject, Y));
try {
ReifierStd.reifyAs(G, X, Triple.create(a, b, c));
fail("X already has subject Y: cannot make it a");
} catch (CannotReifyException e) {
- pass();
+ JenaTestLib.pass();
}
}
@@ -249,19 +277,19 @@ public abstract class AbstractTestReifier extends GraphTestBase {
public void testEmpty() {
Graph g = getGraph();
assertTrue(g.isEmpty());
- graphAdd(g, "x rdf:type rdf:Statement");
+ GraphTestLib.graphAdd(g, "x rdf:type rdf:Statement");
assertFalse(g.isEmpty());
- graphAdd(g, "x rdf:subject Deconstruction");
+ GraphTestLib.graphAdd(g, "x rdf:subject Deconstruction");
assertFalse(g.isEmpty());
- graphAdd(g, "x rdf:predicate rdfs:subTypeOf");
+ GraphTestLib.graphAdd(g, "x rdf:predicate rdfs:subTypeOf");
assertFalse(g.isEmpty());
- graphAdd(g, "x rdf:object LiteraryCriticism");
+ GraphTestLib.graphAdd(g, "x rdf:object LiteraryCriticism");
assertFalse(g.isEmpty());
}
public void testReifierEmptyFind() {
Graph g = getGraph();
- assertEquals(tripleSet(""), ReifierStd.findExposed(g, Triple.ANY).toSet());
+ assertEquals(GraphTestLib.tripleSet(""), ReifierStd.findExposed(g, Triple.ANY).toSet());
}
public void testReifierFindSubject() {
@@ -282,8 +310,8 @@ public abstract class AbstractTestReifier extends GraphTestBase {
public void testReifierFindFilter() {
Graph g = getGraph();
- graphAdd(g, "s rdf:subject S");
- assertEquals(tripleSet(""), ReifierStd.findExposed(g, triple("s otherPredicate S")).toSet());
+ GraphTestLib.graphAdd(g, "s rdf:subject S");
+ assertEquals(GraphTestLib.tripleSet(""), ReifierStd.findExposed(g, GraphTestLib.triple("s otherPredicate S")).toSet());
}
protected void testReifierFind(String triples) {
@@ -292,7 +320,15 @@ public abstract class AbstractTestReifier extends GraphTestBase {
protected void testReifierFind(String triples, String pattern) {
Graph g = getGraph();
- graphAdd(g, triples);
- assertEquals(tripleSet(triples), ReifierStd.findExposed(g, triple(pattern)).toSet());
+ GraphTestLib.graphAdd(g, triples);
+ assertEquals(GraphTestLib.tripleSet(triples), ReifierStd.findExposed(g, GraphTestLib.triple(pattern)).toSet());
}
+
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
+ result.addTest(MetaTestGraph.suite(TestReifier.class, GraphMemFast.class));
+ result.setName(TestReifier.class.getSimpleName());
+ return result;
+ }
+
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java b/jena-core/src/test/java/org/apache/jena/graph/TestTriple.java
similarity index 89%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestTriple.java
index 1cce141ae4..59a29c9f61 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestTriple.java
@@ -19,21 +19,20 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import java.util.function.Function;
import junit.framework.TestSuite;
-import org.apache.jena.graph.BlankNodeId;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.graph.Triple;
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 GraphTestBase {
+public class TestTriple extends JenaTestBase {
public TestTriple(String name) {
super(name);
@@ -91,7 +90,7 @@ public class TestTriple extends GraphTestBase {
}
assertEquals("triple, null", triples[0].equals(null), false);
- assertDiffer("triple, string", triples[0], "string");
+ JenaTestLib.assertDiffer("triple, string", triples[0], "string");
// now compare each triple with each other triple
for ( int i = 0 ; i < triples.length ; i++ ) {
@@ -99,7 +98,7 @@ public class TestTriple extends GraphTestBase {
if ( expected[i][j] ) {
assertEquals("triples " + i + ", " + j, triples[i], triples[j]);
} else {
- assertDiffer("triples" + i + ", " + j, triples[i], triples[j]);
+ JenaTestLib.assertDiffer("triples" + i + ", " + j, triples[i], triples[j]);
}
}
}
@@ -173,14 +172,14 @@ public class TestTriple extends GraphTestBase {
}
public void testMatchesNodes() {
- assertTrue(NodeCreateUtils.createTriple("S P O").matches(node("S"), node("P"), node("O")));
- assertTrue(NodeCreateUtils.createTriple("?? P O").matches(node("Z"), node("P"), node("O")));
- assertTrue(NodeCreateUtils.createTriple("S ?? O").matches(node("S"), node("Q"), node("O")));
- assertTrue(NodeCreateUtils.createTriple("S P ??").matches(node("S"), node("P"), node("I")));
+ assertTrue(NodeCreateUtils.createTriple("S P O").matches(GraphTestLib.node("S"), GraphTestLib.node("P"), GraphTestLib.node("O")));
+ assertTrue(NodeCreateUtils.createTriple("?? P O").matches(GraphTestLib.node("Z"), GraphTestLib.node("P"), GraphTestLib.node("O")));
+ assertTrue(NodeCreateUtils.createTriple("S ?? O").matches(GraphTestLib.node("S"), GraphTestLib.node("Q"), GraphTestLib.node("O")));
+ assertTrue(NodeCreateUtils.createTriple("S P ??").matches(GraphTestLib.node("S"), GraphTestLib.node("P"), GraphTestLib.node("I")));
/* */
- assertFalse(NodeCreateUtils.createTriple("S P O").matches(node("Z"), node("P"), node("O")));
- assertFalse(NodeCreateUtils.createTriple("S P O").matches(node("S"), node("Q"), node("O")));
- assertFalse(NodeCreateUtils.createTriple("S P O").matches(node("Z"), node("P"), node("I")));
+ assertFalse(NodeCreateUtils.createTriple("S P O").matches(GraphTestLib.node("Z"), GraphTestLib.node("P"), GraphTestLib.node("O")));
+ assertFalse(NodeCreateUtils.createTriple("S P O").matches(GraphTestLib.node("S"), GraphTestLib.node("Q"), GraphTestLib.node("O")));
+ assertFalse(NodeCreateUtils.createTriple("S P O").matches(GraphTestLib.node("Z"), GraphTestLib.node("P"), GraphTestLib.node("I")));
}
public void testConcrete() {
@@ -224,9 +223,9 @@ public class TestTriple extends GraphTestBase {
}
public void testTripleMaps() {
- assertEquals(node("x"), getSubject.apply(NodeCreateUtils.createTriple("x P z")));
- assertEquals(node("P"), getPredicate.apply(NodeCreateUtils.createTriple("x P z")));
- assertEquals(node("z"), getObject.apply(NodeCreateUtils.createTriple("x P z")));
+ assertEquals(GraphTestLib.node("x"), getSubject.apply(NodeCreateUtils.createTriple("x P z")));
+ assertEquals(GraphTestLib.node("P"), getPredicate.apply(NodeCreateUtils.createTriple("x P z")));
+ assertEquals(GraphTestLib.node("z"), getObject.apply(NodeCreateUtils.createTriple("x P z")));
}
public static final Function<Triple, Node> getSubject = t -> t.getSubject();
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
new file mode 100644
index 0000000000..cbd8a83f57
--- /dev/null
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestTripleField.java
@@ -0,0 +1,90 @@
+/*
+ * 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.graph;
+
+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 TestTripleField(String name) {
+ super(name);
+ }
+
+ public static TestSuite suite() {
+ return new TestSuite(TestTripleField.class);
+ }
+
+ public void testFieldsExistAndAreTyped() {
+ JenaTestLib.assertInstanceOf(Triple.Field.class, Triple.Field.fieldSubject);
+ JenaTestLib.assertInstanceOf(Triple.Field.class, Triple.Field.fieldObject);
+ JenaTestLib.assertInstanceOf(Triple.Field.class, Triple.Field.fieldPredicate);
+ }
+
+ public void testGetSubject() {
+ assertEquals(GraphTestLib.node("s"), Field.fieldSubject.getField(GraphTestLib.triple("s p o")));
+ }
+
+ public void testGetObject() {
+ assertEquals(GraphTestLib.node("o"), Field.fieldObject.getField(GraphTestLib.triple("s p o")));
+ }
+
+ public void testGetPredicate() {
+ assertEquals(GraphTestLib.node("p"), Field.fieldPredicate.getField(GraphTestLib.triple("s p o")));
+ }
+
+ public void testFilterSubject() {
+ assertTrue(Field.fieldSubject.filterOn(GraphTestLib.node("a")).test(GraphTestLib.triple("a P b")));
+ assertFalse(Field.fieldSubject.filterOn(GraphTestLib.node("x")).test(GraphTestLib.triple("a P b")));
+ }
+
+ public void testFilterObject() {
+ assertTrue(Field.fieldObject.filterOn(GraphTestLib.node("b")).test(GraphTestLib.triple("a P b")));
+ assertFalse(Field.fieldObject.filterOn(GraphTestLib.node("c")).test(GraphTestLib.triple("a P b")));
+ }
+
+ public void testFilterPredicate() {
+ assertTrue(Field.fieldPredicate.filterOn(GraphTestLib.node("P")).test(GraphTestLib.triple("a P b")));
+ assertFalse(Field.fieldPredicate.filterOn(GraphTestLib.node("Q")).test(GraphTestLib.triple("a P b")));
+ }
+
+ public void testFilterOnConcreteSubject() {
+ assertTrue(Field.fieldSubject.filterOnConcrete(GraphTestLib.node("a")).test(GraphTestLib.triple("a P b")));
+ assertFalse(Field.fieldSubject.filterOnConcrete(GraphTestLib.node("x")).test(GraphTestLib.triple("a P b")));
+ }
+
+ public void testFilterOnConcreteObject() {
+ assertTrue(Field.fieldObject.filterOnConcrete(GraphTestLib.node("b")).test(GraphTestLib.triple("a P b")));
+ assertFalse(Field.fieldObject.filterOnConcrete(GraphTestLib.node("c")).test(GraphTestLib.triple("a P b")));
+ }
+
+ public void testFilterOnConcretePredicate() {
+ assertTrue(Field.fieldPredicate.filterOnConcrete(GraphTestLib.node("P")).test(GraphTestLib.triple("a P b")));
+ assertFalse(Field.fieldPredicate.filterOnConcrete(GraphTestLib.node("Q")).test(GraphTestLib.triple("a P b")));
+ }
+
+ public void testFilterByTriple() {
+ assertTrue(Field.fieldSubject.filterOn(GraphTestLib.triple("s P o")).test(GraphTestLib.triple("s Q p")));
+ assertFalse(Field.fieldSubject.filterOn(GraphTestLib.triple("s P o")).test(GraphTestLib.triple("x Q p")));
+ }
+}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/TestTypedLiterals.java
similarity index 99%
rename from jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
rename to jena-core/src/test/java/org/apache/jena/graph/TestTypedLiterals.java
index 646f0f5b37..35e2868ead 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/TestTypedLiterals.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.graph;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -35,7 +35,6 @@ import org.apache.jena.datatypes.RDFDatatype;
import org.apache.jena.datatypes.TypeMapper;
import org.apache.jena.datatypes.xsd.*;
import org.apache.jena.datatypes.xsd.impl.RDFLangString;
-import org.apache.jena.graph.*;
import org.apache.jena.graph.impl.LiteralLabel;
import org.apache.jena.graph.impl.LiteralLabelFactory;
import org.apache.jena.rdf.model.*;
diff --git a/jena-core/src/test/java/org/apache/jena/shared/AbstractTestPrefixMapping.java b/jena-core/src/test/java/org/apache/jena/graph/compose/AbstractTestPrefixMapping.java
similarity index 96%
copy from jena-core/src/test/java/org/apache/jena/shared/AbstractTestPrefixMapping.java
copy to jena-core/src/test/java/org/apache/jena/graph/compose/AbstractTestPrefixMapping.java
index db78891ebc..eaf0927ad3 100644
--- a/jena-core/src/test/java/org/apache/jena/shared/AbstractTestPrefixMapping.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/AbstractTestPrefixMapping.java
@@ -19,20 +19,22 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.shared;
+package org.apache.jena.graph.compose;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.jena.graph.test.GraphTestBase;
+import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.test.JenaTestBase;
+import org.apache.jena.test.JenaTestLib;
/**
* Test prefix mappings - subclass this test and override getMapping() to deliver the
* prefixMapping to be tested.
*/
-public abstract class AbstractTestPrefixMapping extends GraphTestBase {
+public abstract class AbstractTestPrefixMapping extends JenaTestBase {
public AbstractTestPrefixMapping(String name) {
super(name);
}
@@ -82,7 +84,7 @@ public abstract class AbstractTestPrefixMapping extends GraphTestBase {
ns.setNsPrefix(bad, crispURI);
fail("'" + bad + "' is an illegal prefix and should be trapped");
} catch (PrefixMapping.IllegalPrefixException e) {
- pass();
+ JenaTestLib.pass();
}
}
}
@@ -92,7 +94,7 @@ public abstract class AbstractTestPrefixMapping extends GraphTestBase {
getMapping().setNsPrefix("xy", null);
fail("should trap null URI in setNsPrefix");
} catch (NullPointerException e) {
- pass();
+ JenaTestLib.pass();
}
}
@@ -102,7 +104,7 @@ public abstract class AbstractTestPrefixMapping extends GraphTestBase {
*/
public void testPrefixMappingMapping() {
String toast = "ftp://ftp.nowhere.not/";
- assertDiffer("crisp and toast must differ", crispURI, toast);
+ JenaTestLib.assertDiffer("crisp and toast must differ", crispURI, toast);
/* */
PrefixMapping ns = getMapping();
assertEquals("crisp should be unset", null, ns.getNsPrefixURI("crisp"));
@@ -430,7 +432,7 @@ public abstract class AbstractTestPrefixMapping extends GraphTestBase {
}
protected void fill(PrefixMapping pm, String settings) {
- List<String> L = listOfStrings(settings);
+ List<String> L = JenaTestLib.listOfStrings(settings);
for ( String setting : L ) {
int eq = setting.indexOf('=');
pm.setNsPrefix(setting.substring(0, eq), setting.substring(eq + 1));
@@ -450,28 +452,28 @@ public abstract class AbstractTestPrefixMapping extends GraphTestBase {
A.setNsPrefix("crisp", crispURI);
fail("mapping should be frozen");
} catch (PrefixMapping.JenaLockedException e) {
- pass();
+ JenaTestLib.pass();
}
/* */
try {
A.setNsPrefixes(A);
fail("mapping should be frozen");
} catch (PrefixMapping.JenaLockedException e) {
- pass();
+ JenaTestLib.pass();
}
/* */
try {
A.setNsPrefixes(new HashMap<String, String>());
fail("mapping should be frozen");
} catch (PrefixMapping.JenaLockedException e) {
- pass();
+ JenaTestLib.pass();
}
/* */
try {
A.removeNsPrefix("toast");
fail("mapping should be frozen");
} catch (PrefixMapping.JenaLockedException e) {
- pass();
+ JenaTestLib.pass();
}
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TS3_compose.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TS3_compose.java
old mode 100755
new mode 100644
similarity index 54%
rename from jena-core/src/test/java/org/apache/jena/graph/compose/test/TS3_compose.java
rename to jena-core/src/test/java/org/apache/jena/graph/compose/TS3_compose.java
index 64ff881553..e4ef07da19
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TS3_compose.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TS3_compose.java
@@ -19,58 +19,52 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.compose.test;
+package org.apache.jena.graph.compose;
-import junit.framework.*;
-import org.apache.jena.graph.GraphMemFactory;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.compose.*;
+import org.apache.jena.graph.GraphMemFactory;
+import org.apache.jena.rdf.model.AbstractTestPackage;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.test.AbstractTestPackage;
-import org.apache.jena.rdf.model.test.helpers.TestingModelFactory;
-import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.rdf.model.helpers.ModelCreator;
public class TS3_compose extends TestCase {
public static TestSuite suite() {
TestSuite result = new TestSuite();
- GraphModelFactory gmf = new GraphModelFactory() {
-
- @Override
- Graph getGraph() {
- return new Intersection(GraphMemFactory.createGraphMemForModel(), GraphMemFactory.createGraphMemForModel());
- }
+ ModelCreator gmf1 = ()-> {
+ Graph graph = new Intersection(GraphMemFactory.createGraphMemForModel(), GraphMemFactory.createGraphMemForModel());
+ Model model = ModelFactory.createModelForGraph(graph);
+ return model;
};
- AbstractTestPackage atp = new AbstractTestPackage("Intersection", gmf) {};
+ AbstractTestPackage atp = new AbstractTestPackage("Intersection", gmf1) {};
for ( int i = 0; i < atp.testCount(); i++ ) {
result.addTest(atp.testAt(i));
}
- gmf = new GraphModelFactory() {
-
- @Override
- Graph getGraph() {
- return new Difference(GraphMemFactory.createGraphMemForModel(), GraphMemFactory.createGraphMemForModel());
- }
+ ModelCreator gmf2 = ()-> {
+ Graph graph = new Difference(GraphMemFactory.createGraphMemForModel(), GraphMemFactory.createGraphMemForModel());
+ Model model = ModelFactory.createModelForGraph(graph);
+ return model;
};
- atp = new AbstractTestPackage("Difference", gmf) {};
+
+ atp = new AbstractTestPackage("Difference", gmf2) {};
for ( int i = 0; i < atp.testCount(); i++ ) {
result.addTest(atp.testAt(i));
}
- gmf = new GraphModelFactory() {
-
- @Override
- Graph getGraph() {
- return new Union(GraphMemFactory.createGraphMemForModel(), GraphMemFactory.createGraphMemForModel());
- }
+ ModelCreator gmf3 = ()-> {
+ Graph graph = new Union(GraphMemFactory.createGraphMemForModel(), GraphMemFactory.createGraphMemForModel());
+ Model model = ModelFactory.createModelForGraph(graph);
+ return model;
};
- atp = new AbstractTestPackage("Union", gmf) {};
+ atp = new AbstractTestPackage("Union", gmf3) {};
for ( int i = 0; i < atp.testCount(); i++ ) {
result.addTest(atp.testAt(i));
}
@@ -85,24 +79,4 @@ public class TS3_compose extends TestCase {
result.addTest(TestPolyadicPrefixMapping.suite());
return result;
}
-
- private static abstract class GraphModelFactory implements TestingModelFactory {
- abstract Graph getGraph();
-
- @Override
- public Model createModel() {
- return createModel(getGraph());
- }
-
- @Override
- public Model createModel(final Graph base) {
- return ModelFactory.createModelForGraph(base);
- }
-
- @Override
- public PrefixMapping getPrefixMapping() {
- return ModelFactory.createDefaultModel().getGraph().getPrefixMapping();
- }
- }
-
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/TestDelta.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestDelta.java
new file mode 100755
index 0000000000..00406844e1
--- /dev/null
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestDelta.java
@@ -0,0 +1,188 @@
+/*
+ * 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.graph.compose;
+
+import junit.framework.TestSuite;
+import org.apache.jena.graph.AbstractTestGraph;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.GraphTestLib;
+import org.apache.jena.graph.Triple;
+
+public class TestDelta extends AbstractTestGraph {
+
+ private static final String DEFAULT_TRIPLES = "x R y; p S q";
+
+ public TestDelta(String name) {
+ super(name);
+ }
+
+ public static TestSuite suite() {
+ return new TestSuite(TestDelta.class);
+ }
+
+ @Override
+ public Graph getNewGraph() {
+ Graph gBase = GraphTestLib.graphWith("");
+ return new Delta(gBase);
+ }
+
+ public void testDeltaMirrorsBase() {
+ Graph base = GraphTestLib.graphWith(DEFAULT_TRIPLES);
+ Delta delta = new Delta(base);
+ GraphTestLib.assertIsomorphic(base, delta);
+ }
+
+ public void testAddGoesToAdditions() {
+ Graph base = GraphTestLib.graphWith(DEFAULT_TRIPLES);
+ Delta delta = new Delta(base);
+ delta.add(GraphTestLib.triple("x R z"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), base);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R z"), delta.getAdditions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getDeletions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES + "; x R z"), delta);
+ }
+
+ public void testDeleteGoesToDeletions() {
+ Graph base = GraphTestLib.graphWith(DEFAULT_TRIPLES);
+ Delta delta = new Delta(base);
+ delta.delete(GraphTestLib.triple("x R y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), base);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), delta.getDeletions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("p S q"), delta);
+ }
+
+ public void testRedundantAddNoOp() {
+ Graph base = GraphTestLib.graphWith(DEFAULT_TRIPLES);
+ Delta delta = new Delta(base);
+ delta.add(GraphTestLib.triple("x R y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), base);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getAdditions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getDeletions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), delta);
+ }
+
+ public void testRedundantDeleteNoOp() {
+ Graph base = GraphTestLib.graphWith(DEFAULT_TRIPLES);
+ Delta delta = new Delta(base);
+ delta.delete(GraphTestLib.triple("a T b"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), base);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getAdditions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getDeletions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), delta);
+ }
+
+ public void testAddThenDelete() {
+ Graph base = GraphTestLib.graphWith(DEFAULT_TRIPLES);
+ Delta delta = new Delta(base);
+ delta.add(GraphTestLib.triple("a T b"));
+ delta.delete(GraphTestLib.triple("a T b"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), base);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getAdditions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getDeletions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), delta);
+ }
+
+ public void testDeleteThenAdd() {
+ Graph base = GraphTestLib.graphWith(DEFAULT_TRIPLES);
+ Delta delta = new Delta(base);
+ delta.delete(GraphTestLib.triple("p S q"));
+ delta.add(GraphTestLib.triple("p S q"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), base);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getAdditions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), delta.getDeletions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), delta);
+ }
+
+ public void testAddAndDelete() {
+ Graph base = GraphTestLib.graphWith(DEFAULT_TRIPLES);
+ Delta delta = new Delta(base);
+ delta.delete(GraphTestLib.triple("a T b"));
+ delta.add(GraphTestLib.triple("x R z"));
+ delta.delete(GraphTestLib.triple("p S q"));
+ delta.add(GraphTestLib.triple("a T b"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(DEFAULT_TRIPLES), base);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("a T b; x R z"), delta.getAdditions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("p S q"), delta.getDeletions());
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; x R z; a T b"), delta);
+ }
+
+ public void testTerms1() {
+ Triple t1 = GraphTestLib.triple("s p 1");
+ Triple t01 = GraphTestLib.triple("s p 01");
+ Graph base = GraphTestLib.newGraph();
+ base.add(t1);
+ Delta delta = new Delta(base);
+
+ delta.add(t01);
+
+ assertTrue(delta.getAdditions().contains(GraphTestLib.triple("s p 01")));
+ assertFalse(delta.getAdditions().contains(GraphTestLib.triple("s p 1")));
+ assertTrue(delta.contains(t1));
+ assertTrue(delta.contains(t01));
+ }
+
+ public void testTerms2() {
+ Triple t1 = GraphTestLib.triple("s p 1");
+ Triple t01 = GraphTestLib.triple("s p 01");
+ Graph base = GraphTestLib.newGraph();
+ base.add(t1);
+ Delta delta = new Delta(base);
+
+ delta.delete(t01);
+
+ assertFalse(delta.getDeletions().contains(GraphTestLib.triple("s p 01")));
+ assertFalse(delta.getAdditions().contains(GraphTestLib.triple("s p 1")));
+ }
+
+ public void testTerms3() {
+ Triple t1 = GraphTestLib.triple("s p 1");
+ Triple t01 = GraphTestLib.triple("s p 01");
+ Graph base = GraphTestLib.newGraph();
+ base.add(t1);
+ Delta delta = new Delta(base);
+
+ delta.add(t01);
+ delta.delete(t01);
+ delta.delete(t1);
+
+ assertFalse(delta.getDeletions().contains(t01));
+ assertTrue(delta.getDeletions().contains(t1));
+ assertFalse(delta.getDeletions().contains(t01));
+ assertFalse(delta.getAdditions().contains(t01));
+ }
+
+ public void testTerms4() {
+ Triple t1 = GraphTestLib.triple("s p 1");
+ Triple t01 = GraphTestLib.triple("s p 01");
+ Graph base = GraphTestLib.newGraph();
+ Delta delta = new Delta(base);
+
+ delta.add(t1);
+ delta.delete(t01);
+
+ assertFalse(delta.getDeletions().contains(GraphTestLib.triple("s p 01")));
+ assertTrue(delta.getDeletions().isEmpty());
+
+ assertTrue(delta.getAdditions().contains(GraphTestLib.triple("s p 1")));
+ assertFalse(delta.getAdditions().isEmpty());
+ }
+}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/TestDifference.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestDifference.java
new file mode 100755
index 0000000000..eaab0bff9c
--- /dev/null
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestDifference.java
@@ -0,0 +1,117 @@
+/*
+ * 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.graph.compose;
+
+import junit.framework.TestSuite;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.GraphTestLib;
+
+public class TestDifference extends TestDyadic
+{
+ public TestDifference( String name )
+ { super( name ); }
+
+ public static TestSuite suite()
+ { return new TestSuite( TestDifference.class ); }
+
+ @Override
+ public Graph getNewGraph()
+ {
+ Graph gBase = GraphTestLib.graphWith( "" ), g1 = GraphTestLib.graphWith( "" );
+ return new Difference( gBase, g1 );
+ }
+
+ public Difference differenceOf(String s1, String s2) {
+ return new Difference( GraphTestLib.graphWith( s1 ), GraphTestLib.graphWith( s2 ) );
+ }
+
+ public void testStaticDifference() {
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), differenceOf( "", "" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), differenceOf( "x R y", "" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), differenceOf( "", "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), differenceOf( "x R y", "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p R q" ), differenceOf( "x R y; p R q", "r A s; x R y" ) );
+ }
+
+ public void testDifferenceReflectsChangesToOperands() {
+ Graph l = GraphTestLib.graphWith( "x R y" );
+ Graph r = GraphTestLib.graphWith( "x R y" );
+ Difference diff = new Difference( l, r );
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith( "" ), diff);
+ r.delete( GraphTestLib.triple( "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), diff );
+ l.add( GraphTestLib.triple( "x R z" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; x R z" ), diff );
+ r.add( GraphTestLib.triple( "x R z" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), diff );
+ }
+
+ public void testAdd() {
+ Graph l = GraphTestLib.graphWith( "x R y" );
+ Graph r = GraphTestLib.graphWith( "x R y; x R z" );
+ Difference diff = new Difference( l, r );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), diff );
+
+ // case 1: add to the left operand
+ diff.add( GraphTestLib.triple( "p S q" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q" ), diff );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; p S q" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; x R z" ), r );
+
+ // case 2: remove from the right, and add to the left operand
+ diff.add( GraphTestLib.triple( "x R z" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R z; p S q" ), diff );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; x R z; p S q" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), r );
+
+ // case 3: remove from the right operand
+ diff.add( GraphTestLib.triple( "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; x R z; p S q" ), diff );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; x R z; p S q" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), r );
+ }
+
+ public void testDelete() {
+ Graph l = GraphTestLib.graphWith( "x R y; x R z" );
+ Graph r = GraphTestLib.graphWith( "x R y" );
+ Difference diff = new Difference( l, r );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R z" ), diff );
+
+ // case 1: remove non-existent triple is a no-op
+ diff.delete( GraphTestLib.triple( "p S q" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R z" ), diff );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; x R z" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), r );
+
+ // case 2: remove triple that exists in both - removes from left
+ diff.delete( GraphTestLib.triple( "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R z" ), diff );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R z" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), r );
+
+ // case 3: remove triple that exists in left is removed
+ diff.delete( GraphTestLib.triple( "x R z" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), diff );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), r );
+ }
+}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDisjointUnion.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestDisjointUnion.java
similarity index 57%
rename from jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDisjointUnion.java
rename to jena-core/src/test/java/org/apache/jena/graph/compose/TestDisjointUnion.java
index f5f27cb6d6..5c2058b381 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDisjointUnion.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestDisjointUnion.java
@@ -19,11 +19,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.compose.test;
+package org.apache.jena.graph.compose;
import junit.framework.TestSuite;
import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.compose.DisjointUnion;
+import org.apache.jena.graph.GraphTestLib;
/**
* TestDisjointUnion - test that DisjointUnion works, as well as we can.
@@ -39,7 +39,7 @@ public class TestDisjointUnion extends TestDyadic {
@Override
public Graph getNewGraph() {
- Graph gBase = graphWith(""), g1 = graphWith("");
+ Graph gBase = GraphTestLib.graphWith(""), g1 = GraphTestLib.graphWith("");
return new DisjointUnion(gBase, g1);
}
@@ -49,49 +49,49 @@ public class TestDisjointUnion extends TestDyadic {
}
public void testLeftUnion() {
- Graph g = graphWith("");
+ Graph g = GraphTestLib.graphWith("");
testSingleComponent(g, new DisjointUnion(g, Graph.emptyGraph));
}
public void testRightUnion() {
- Graph g = graphWith("");
+ Graph g = GraphTestLib.graphWith("");
testSingleComponent(g, new DisjointUnion(Graph.emptyGraph, g));
}
protected void testSingleComponent(Graph g, DisjointUnion du) {
- graphAdd(g, "x R y; a P b; x Q b");
- assertIsomorphic(g, du);
- graphAdd(g, "roses growOn you");
- assertIsomorphic(g, du);
- g.delete(triple("a P b"));
- assertIsomorphic(g, du);
+ GraphTestLib.graphAdd(g, "x R y; a P b; x Q b");
+ GraphTestLib.assertIsomorphic(g, du);
+ GraphTestLib.graphAdd(g, "roses growOn you");
+ GraphTestLib.assertIsomorphic(g, du);
+ g.delete(GraphTestLib.triple("a P b"));
+ GraphTestLib.assertIsomorphic(g, du);
}
public void testBothComponents() {
- Graph L = graphWith(""), R = graphWith("");
+ Graph L = GraphTestLib.graphWith(""), R = GraphTestLib.graphWith("");
Graph du = new DisjointUnion(L, R);
- assertIsomorphic(Graph.emptyGraph, du);
- L.add(triple("x P y"));
- assertIsomorphic(graphWith("x P y"), du);
- R.add(triple("A rdf:type Route"));
- assertIsomorphic(graphWith("x P y; A rdf:type Route"), du);
+ GraphTestLib.assertIsomorphic(Graph.emptyGraph, du);
+ L.add(GraphTestLib.triple("x P y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x P y"), du);
+ R.add(GraphTestLib.triple("A rdf:type Route"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x P y; A rdf:type Route"), du);
}
public void testRemoveBoth() {
- Graph L = graphWith("x R y; a P b"), R = graphWith("x R y; p Q r");
+ Graph L = GraphTestLib.graphWith("x R y; a P b"), R = GraphTestLib.graphWith("x R y; p Q r");
Graph du = new DisjointUnion(L, R);
- du.delete(triple("x R y"));
- assertIsomorphic(graphWith("a P b"), L);
- assertIsomorphic(graphWith("p Q r"), R);
+ du.delete(GraphTestLib.triple("x R y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("a P b"), L);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("p Q r"), R);
}
public void testAddLeftOnlyIfNecessary() {
- Graph L = graphWith(""), R = graphWith("x R y");
+ Graph L = GraphTestLib.graphWith(""), R = GraphTestLib.graphWith("x R y");
Graph du = new DisjointUnion(L, R);
- graphAdd(du, "x R y");
+ GraphTestLib.graphAdd(du, "x R y");
assertEquals(true, L.isEmpty());
- graphAdd(du, " a P b");
- assertIsomorphic(graphWith("a P b"), L);
- assertIsomorphic(graphWith("x R y"), R);
+ GraphTestLib.graphAdd(du, " a P b");
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("a P b"), L);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), R);
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDyadic.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestDyadic.java
similarity index 88%
rename from jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDyadic.java
rename to jena-core/src/test/java/org/apache/jena/graph/compose/TestDyadic.java
index 59bb0fcb77..87848944f8 100755
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDyadic.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestDyadic.java
@@ -19,15 +19,17 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.compose.test;
+package org.apache.jena.graph.compose;
-import java.util.*;
+import java.util.StringTokenizer;
-import junit.framework.*;
-import org.apache.jena.graph.*;
-import org.apache.jena.graph.compose.*;
-import org.apache.jena.graph.test.*;
-import org.apache.jena.util.iterator.*;
+import junit.framework.TestSuite;
+import org.apache.jena.graph.AbstractTestGraph;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.GraphMemFactory;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.util.iterator.NiceIterator;
public abstract class TestDyadic extends AbstractTestGraph {
public TestDyadic(String name) {
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/TestIntersection.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestIntersection.java
new file mode 100755
index 0000000000..5fb47d8822
--- /dev/null
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestIntersection.java
@@ -0,0 +1,123 @@
+/*
+ * 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.graph.compose;
+
+import junit.framework.TestSuite;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.GraphTestLib;
+
+public class TestIntersection extends TestDyadic
+{
+ public TestIntersection( String name )
+ { super( name ); }
+
+ public static TestSuite suite()
+ { return new TestSuite( TestIntersection.class ); }
+
+ @Override
+ public Graph getNewGraph()
+ {
+ Graph gBase = GraphTestLib.graphWith( "" ), g1 = GraphTestLib.graphWith( "" );
+ return new Intersection( gBase, g1 );
+ }
+
+ public Intersection intersectionOf(String s1, String s2) {
+ return new Intersection( GraphTestLib.graphWith( s1 ), GraphTestLib.graphWith( s2 ) );
+ }
+
+ public void testStaticIntersection() {
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), intersectionOf( "", "" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), intersectionOf( "x R y", "" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), intersectionOf( "", "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), intersectionOf( "x R y", "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), intersectionOf( "x R y; p R q", "r A s; x R y" ) );
+ }
+
+ public void testIntersectionReflectsChangesToOperands() {
+ Graph l = GraphTestLib.graphWith( "x R y" );
+ Graph r = GraphTestLib.graphWith( "p S q" );
+ Intersection isec = new Intersection( l, r );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), isec );
+
+ // add to the left what is already in the right
+ l.add( GraphTestLib.triple( "p S q" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q" ), isec );
+
+ // add to the right what is already in the left
+ r.add( GraphTestLib.triple( "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q; x R y" ), isec );
+
+ // add to a single graph is not reflected
+ l.add( GraphTestLib.triple( "p S o" ) );
+ r.add( GraphTestLib.triple( "x R z" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q; x R y" ), isec );
+
+ // remove from the left
+ l.delete( GraphTestLib.triple( "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q" ), isec );
+
+ // remove from the right
+ r.delete( GraphTestLib.triple( "p S q" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), isec );
+ }
+
+ public void testAdd() {
+ Graph l = GraphTestLib.graphWith( "x R y" );
+ Graph r = GraphTestLib.graphWith( "p S q" );
+ Intersection isec = new Intersection( l, r );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), isec );
+
+ isec.add( GraphTestLib.triple( "r A s" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "r A s" ), isec );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; r A s" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q; r A s" ), r );
+
+ isec.add( GraphTestLib.triple ( "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "r A s; x R y" ), isec );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; r A s" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q; r A s; x R y" ), r );
+
+ isec.add( GraphTestLib.triple ( "p S q" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q; r A s; x R y" ), isec );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q; r A s; x R y" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "p S q; r A s; x R y" ), r );
+ }
+
+ public void testDelete() {
+ Graph l = GraphTestLib.graphWith( "r A s; x R y" );
+ Graph r = GraphTestLib.graphWith( "x R y; p S q" );
+ Intersection isec = new Intersection( l, r );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y" ), isec );
+
+ // removing non-contained triples is a no-op
+ isec.delete( GraphTestLib.triple( "r A s" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "r A s; x R y" ), l);
+ isec.delete( GraphTestLib.triple( "p S q" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; p S q" ), r);
+
+ // removing a contained triple removes it from the left operand
+ isec.delete( GraphTestLib.triple( "x R y" ) );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "" ), isec );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "r A s" ), l );
+ GraphTestLib.assertIsomorphic( GraphTestLib.graphWith( "x R y; p S q" ), r );
+ }
+}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestMultiUnion.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnion.java
similarity index 78%
rename from jena-core/src/test/java/org/apache/jena/graph/compose/test/TestMultiUnion.java
rename to jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnion.java
index 288b0caac0..ece406e541 100755
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestMultiUnion.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnion.java
@@ -21,7 +21,7 @@
// Package
///////////////
-package org.apache.jena.graph.compose.test;
+package org.apache.jena.graph.compose;
// Imports
@@ -32,9 +32,9 @@ import java.util.Iterator;
import java.util.List;
import junit.framework.TestSuite;
+import org.apache.jena.graph.AbstractTestGraph;
import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.compose.MultiUnion;
-import org.apache.jena.graph.test.AbstractTestGraph;
+import org.apache.jena.graph.GraphTestLib;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
@@ -60,7 +60,7 @@ public class TestMultiUnion extends AbstractTestGraph
@Override
public Graph getNewGraph()
{
- Graph gBase = graphWith( "" ), g1 = graphWith( "" );
+ Graph gBase = GraphTestLib.graphWith( "" ), g1 = GraphTestLib.graphWith( "" );
return new MultiUnion( new Graph[] {gBase, g1} );
}
@@ -71,9 +71,9 @@ public class TestMultiUnion extends AbstractTestGraph
}
public void testGraphSize1() {
- Graph g0 = graphWith( "x p y" );
- Graph g1 = graphWith( "x p z; z p zz" ); // disjoint with g0
- Graph g2 = graphWith( "x p y; z p a" ); // intersects with g1
+ Graph g0 = GraphTestLib.graphWith( "x p y" );
+ Graph g1 = GraphTestLib.graphWith( "x p z; z p zz" ); // disjoint with g0
+ Graph g2 = GraphTestLib.graphWith( "x p y; z p a" ); // intersects with g1
Graph m01 = new MultiUnion( new Graph[] {g0, g1} );
Graph m10 = new MultiUnion( new Graph[] {g1, g0} );
@@ -102,9 +102,9 @@ public class TestMultiUnion extends AbstractTestGraph
public void testGraphSize2() {
- Graph g0 = graphWith( "x p y" );
- Graph g1 = graphWith( "x p z; z p zz" ); // disjoint with g0
- Graph g2 = graphWith( "x p y; z p a" ); // intersects with g1
+ Graph g0 = GraphTestLib.graphWith( "x p y" );
+ Graph g1 = GraphTestLib.graphWith( "x p z; z p zz" ); // disjoint with g0
+ Graph g2 = GraphTestLib.graphWith( "x p y; z p a" ); // intersects with g1
Graph m01 = new MultiUnion( iterateOver( g0, g1 ) );
Graph m10 = new MultiUnion( iterateOver( g1, g0 ) );
@@ -133,9 +133,9 @@ public class TestMultiUnion extends AbstractTestGraph
public void testGraphAddSize() {
- Graph g0 = graphWith( "x p y" );
- Graph g1 = graphWith( "x p z; z p zz" ); // disjoint with g0
- Graph g2 = graphWith( "x p y; z p a" ); // intersects with g1
+ Graph g0 = GraphTestLib.graphWith( "x p y" );
+ Graph g1 = GraphTestLib.graphWith( "x p z; z p zz" ); // disjoint with g0
+ Graph g2 = GraphTestLib.graphWith( "x p y; z p a" ); // intersects with g1
int s0 = g0.size();
int s1 = g1.size();
@@ -167,9 +167,9 @@ public class TestMultiUnion extends AbstractTestGraph
public void testAdd() {
- Graph g0 = graphWith( "x p y" );
- Graph g1 = graphWith( "x p z; z p zz" ); // disjoint with g0
- Graph g2 = graphWith( "x p y; z p a" ); // intersects with g1
+ Graph g0 = GraphTestLib.graphWith( "x p y" );
+ Graph g1 = GraphTestLib.graphWith( "x p z; z p zz" ); // disjoint with g0
+ Graph g2 = GraphTestLib.graphWith( "x p y; z p a" ); // intersects with g1
MultiUnion m = new MultiUnion( new Graph[] {g0, g1} );
@@ -179,7 +179,7 @@ public class TestMultiUnion extends AbstractTestGraph
int m0 = m.size();
// add a triple to the union
- m.add( triple( "a q b" ) );
+ m.add( GraphTestLib.triple( "a q b" ) );
assertEquals( "m.size should have increased by one", m0 + 1, m.size() );
assertEquals( "g0.size should have increased by one", s0 + 1, g0.size() );
@@ -193,7 +193,7 @@ public class TestMultiUnion extends AbstractTestGraph
s2 = g2.size();
m0 = m.size();
- m.add( triple( "a1 q b1" ));
+ m.add( GraphTestLib.triple( "a1 q b1" ));
assertEquals( "m.size should have increased by one", m0 + 1, m.size() );
assertEquals( "g0 size should be constant", s0, g0.size() );
@@ -212,59 +212,59 @@ public class TestMultiUnion extends AbstractTestGraph
public void testDelete() {
- Graph g0 = graphWith( "x p y" );
- Graph g1 = graphWith( "x p z; z p zz" ); // disjoint with g0
+ Graph g0 = GraphTestLib.graphWith( "x p y" );
+ Graph g1 = GraphTestLib.graphWith( "x p z; z p zz" ); // disjoint with g0
MultiUnion m = new MultiUnion( new Graph[] {g0, g1} );
checkDeleteSizes( 1, 2, 3, g0, g1, m );
- m.delete( triple( "x p y") );
+ m.delete( GraphTestLib.triple( "x p y") );
checkDeleteSizes( 0, 2, 2, g0, g1, m );
- m.delete( triple( "x p y") );
+ m.delete( GraphTestLib.triple( "x p y") );
checkDeleteSizes( 0, 2, 2, g0, g1, m );
m.setBaseGraph( g1 );
- m.delete( triple( "x p z") );
+ m.delete( GraphTestLib.triple( "x p z") );
checkDeleteSizes( 0, 1, 1, g0, g1, m );
- m.delete( triple( "z p zz") );
+ m.delete( GraphTestLib.triple( "z p zz") );
checkDeleteSizes( 0, 0, 0, g0, g1, m );
}
public void testContains() {
- Graph g0 = graphWith( "x p y" );
- Graph g1 = graphWith( "x p z; z p zz" ); // disjoint with g0
+ Graph g0 = GraphTestLib.graphWith( "x p y" );
+ Graph g1 = GraphTestLib.graphWith( "x p z; z p zz" ); // disjoint with g0
MultiUnion m = new MultiUnion( new Graph[] {g0, g1} );
- assertTrue( "m should contain triple", m.contains( triple( "x p y ")));
- assertTrue( "m should contain triple", m.contains( triple( "x p z ")));
- assertTrue( "m should contain triple", m.contains( triple( "z p zz ")));
+ assertTrue( "m should contain triple", m.contains( GraphTestLib.triple( "x p y ")));
+ assertTrue( "m should contain triple", m.contains( GraphTestLib.triple( "x p z ")));
+ assertTrue( "m should contain triple", m.contains( GraphTestLib.triple( "z p zz ")));
- assertFalse( "m should not contain triple", m.contains( triple( "zz p z ")));
+ assertFalse( "m should not contain triple", m.contains( GraphTestLib.triple( "zz p z ")));
}
/* Test using a model to wrap a multi union */
public void testModel() {
- Graph g0 = graphWith( "x p y" );
+ Graph g0 = GraphTestLib.graphWith( "x p y" );
MultiUnion u = new MultiUnion( new Graph[] {g0} );
Model m = ModelFactory.createModelForGraph( u );
assertEquals( "Model size not correct", 1, m.size() );
- Graph g1 = graphWith( "x p z; z p zz" ); // disjoint with g0
+ Graph g1 = GraphTestLib.graphWith( "x p z; z p zz" ); // disjoint with g0
u.addGraph( g1 );
assertEquals( "Model size not correct", 3, m.size() );
// adds one more statement to the model
- m.read( getFileName("ontology/list0.rdf") );
+ m.read( GraphTestLib.getFileName("ontology/list0.rdf") );
assertEquals( "Model size not correct", 4, m.size() );
// debug m.write( System.out );
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestMultiUnionReifier.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnionReifier.java
similarity index 85%
rename from jena-core/src/test/java/org/apache/jena/graph/compose/test/TestMultiUnionReifier.java
rename to jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnionReifier.java
index 5aeb999467..01219276a3 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestMultiUnionReifier.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestMultiUnionReifier.java
@@ -19,22 +19,18 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.compose.test;
+package org.apache.jena.graph.compose;
-import org.apache.jena.graph.GraphMemFactory;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.GraphUtil;
-import org.apache.jena.graph.Triple;
-import org.apache.jena.graph.compose.MultiUnion;
-import org.apache.jena.graph.test.NodeCreateUtils;
+import org.apache.jena.graph.*;
+import org.apache.jena.junit.NodeCreateUtils;
import org.apache.jena.rdf.model.impl.ReifierStd;
-import org.apache.jena.rdf.model.test.ModelTestBase;
+import org.apache.jena.test.JenaTestBase;
import org.apache.jena.util.iterator.ExtendedIterator;
/**
Test the reifier for multi-unions.
*/
-public class TestMultiUnionReifier extends ModelTestBase {
+public class TestMultiUnionReifier extends JenaTestBase {
public TestMultiUnionReifier(String name) {
super(name);
}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestPolyadicPrefixMapping.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestPolyadicPrefixMapping.java
similarity index 97%
rename from jena-core/src/test/java/org/apache/jena/graph/compose/test/TestPolyadicPrefixMapping.java
rename to jena-core/src/test/java/org/apache/jena/graph/compose/TestPolyadicPrefixMapping.java
index 71a5b4c060..1f2d1ef667 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestPolyadicPrefixMapping.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestPolyadicPrefixMapping.java
@@ -19,12 +19,10 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.compose.test;
+package org.apache.jena.graph.compose;
import junit.framework.TestSuite;
import org.apache.jena.graph.*;
-import org.apache.jena.graph.compose.*;
-import org.apache.jena.shared.AbstractTestPrefixMapping;
import org.apache.jena.shared.PrefixMapping;
public class TestPolyadicPrefixMapping extends AbstractTestPrefixMapping {
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/TestUnion.java b/jena-core/src/test/java/org/apache/jena/graph/compose/TestUnion.java
new file mode 100755
index 0000000000..cb84c93a31
--- /dev/null
+++ b/jena-core/src/test/java/org/apache/jena/graph/compose/TestUnion.java
@@ -0,0 +1,114 @@
+/*
+ * 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.graph.compose;
+
+import junit.framework.TestSuite;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.GraphTestLib;
+
+public class TestUnion extends TestDyadic {
+ public TestUnion(String name) {
+ super(name);
+ }
+
+ public static TestSuite suite() {
+ return new TestSuite(TestUnion.class);
+ }
+
+ @Override
+ public Graph getNewGraph() {
+ Graph gBase = GraphTestLib.graphWith(""), g1 = GraphTestLib.graphWith("");
+ return new Union(gBase, g1);
+ }
+
+ public Union unionOf(String s1, String s2) {
+ return new Union(GraphTestLib.graphWith(s1), GraphTestLib.graphWith(s2));
+ }
+
+ public void testStaticUnion() {
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), unionOf("", ""));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), unionOf("x R y", ""));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), unionOf("", "x R y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; x R z"), unionOf("x R y", "x R z"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), unionOf("x R y", "x R y"));
+ }
+
+ public void testUnionReflectsChangesToOperands() {
+ Graph l = GraphTestLib.graphWith("x R y");
+ Graph r = GraphTestLib.graphWith("x R y");
+ Union u = new Union(l, r);
+
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), u);
+
+ l.add(GraphTestLib.triple("x R z"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; x R z"), u);
+
+ l.delete(GraphTestLib.triple("x R y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; x R z"), u);
+
+ r.add(GraphTestLib.triple("p S q"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; x R z; p S q"), u);
+
+ r.delete(GraphTestLib.triple("x R y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R z; p S q"), u);
+ }
+
+ public void testAdd() {
+ Graph l = GraphTestLib.graphWith("x R y");
+ Graph r = GraphTestLib.graphWith("x R y; p S q");
+ Union u = new Union(l, r);
+
+ u.add(GraphTestLib.triple("x R y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), l);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; p S q"), r);
+
+ u.add(GraphTestLib.triple("p S q"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; p S q"), l);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; p S q"), r);
+
+ u.add(GraphTestLib.triple("r A s"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; p S q; r A s"), l);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; p S q"), r);
+ }
+
+ public void testDelete() {
+ Graph l = GraphTestLib.graphWith("x R y; x R z");
+ Graph r = GraphTestLib.graphWith("x R y; p S q");
+ Union u = new Union(l, r);
+
+ u.delete(GraphTestLib.triple("r A s"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; x R z"), l);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; p S q"), r);
+
+ u.delete(GraphTestLib.triple("x R z"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), l);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y; p S q"), r);
+
+ u.delete(GraphTestLib.triple("p S q"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), l);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith("x R y"), r);
+
+ u.delete(GraphTestLib.triple("x R y"));
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), l);
+ GraphTestLib.assertIsomorphic(GraphTestLib.graphWith(""), r);
+ }
+}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestCaseBasic.java b/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestCaseBasic.java
deleted file mode 100755
index ac1c4c62c6..0000000000
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestCaseBasic.java
+++ /dev/null
@@ -1,49 +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.graph.compose.test;
-
-import java.lang.reflect.*;
-
-import org.apache.jena.graph.*;
-import org.apache.jena.rdf.model.ModelFactory;
-
-public class TestCaseBasic extends org.apache.jena.regression.TestCaseBasic {
- private Class<? extends Graph> graphClass;
-
- public TestCaseBasic(String name, Class<? extends Graph> graphClass) {
- super(name);
- this.graphClass = graphClass;
- }
-
- private Graph newGraph(Constructor<? extends Graph> cons) throws Exception {
- return cons.newInstance(GraphMemFactory.createDefaultGraph(), GraphMemFactory.createDefaultGraph());
- }
-
- @Override
- public void setUp() throws Exception {
- Constructor<? extends Graph> constructor = graphClass.getConstructor(new Class[]{Graph.class, Graph.class});
- m1 = ModelFactory.createModelForGraph(newGraph(constructor));
- m2 = ModelFactory.createModelForGraph(newGraph(constructor));
- m3 = ModelFactory.createModelForGraph(newGraph(constructor));
- m4 = ModelFactory.createModelForGraph(newGraph(constructor));
- }
-}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDelta.java b/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDelta.java
deleted file mode 100755
index c38e5e70dd..0000000000
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDelta.java
+++ /dev/null
@@ -1,188 +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.graph.compose.test;
-
-import junit.framework.TestSuite;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.Triple;
-import org.apache.jena.graph.compose.Delta;
-import org.apache.jena.graph.test.AbstractTestGraph;
-
-public class TestDelta extends AbstractTestGraph {
-
- private static final String DEFAULT_TRIPLES = "x R y; p S q";
-
- public TestDelta(String name) {
- super(name);
- }
-
- public static TestSuite suite() {
- return new TestSuite(TestDelta.class);
- }
-
- @Override
- public Graph getNewGraph() {
- Graph gBase = graphWith("");
- return new Delta(gBase);
- }
-
- public void testDeltaMirrorsBase() {
- Graph base = graphWith(DEFAULT_TRIPLES);
- Delta delta = new Delta(base);
- assertIsomorphic(base, delta);
- }
-
- public void testAddGoesToAdditions() {
- Graph base = graphWith(DEFAULT_TRIPLES);
- Delta delta = new Delta(base);
- delta.add(triple("x R z"));
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), base);
- assertIsomorphic(graphWith("x R z"), delta.getAdditions());
- assertIsomorphic(graphWith(""), delta.getDeletions());
- assertIsomorphic(graphWith(DEFAULT_TRIPLES + "; x R z"), delta);
- }
-
- public void testDeleteGoesToDeletions() {
- Graph base = graphWith(DEFAULT_TRIPLES);
- Delta delta = new Delta(base);
- delta.delete(triple("x R y"));
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), base);
- assertIsomorphic(graphWith("x R y"), delta.getDeletions());
- assertIsomorphic(graphWith("p S q"), delta);
- }
-
- public void testRedundantAddNoOp() {
- Graph base = graphWith(DEFAULT_TRIPLES);
- Delta delta = new Delta(base);
- delta.add(triple("x R y"));
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), base);
- assertIsomorphic(graphWith(""), delta.getAdditions());
- assertIsomorphic(graphWith(""), delta.getDeletions());
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), delta);
- }
-
- public void testRedundantDeleteNoOp() {
- Graph base = graphWith(DEFAULT_TRIPLES);
- Delta delta = new Delta(base);
- delta.delete(triple("a T b"));
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), base);
- assertIsomorphic(graphWith(""), delta.getAdditions());
- assertIsomorphic(graphWith(""), delta.getDeletions());
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), delta);
- }
-
- public void testAddThenDelete() {
- Graph base = graphWith(DEFAULT_TRIPLES);
- Delta delta = new Delta(base);
- delta.add(triple("a T b"));
- delta.delete(triple("a T b"));
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), base);
- assertIsomorphic(graphWith(""), delta.getAdditions());
- assertIsomorphic(graphWith(""), delta.getDeletions());
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), delta);
- }
-
- public void testDeleteThenAdd() {
- Graph base = graphWith(DEFAULT_TRIPLES);
- Delta delta = new Delta(base);
- delta.delete(triple("p S q"));
- delta.add(triple("p S q"));
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), base);
- assertIsomorphic(graphWith(""), delta.getAdditions());
- assertIsomorphic(graphWith(""), delta.getDeletions());
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), delta);
- }
-
- public void testAddAndDelete() {
- Graph base = graphWith(DEFAULT_TRIPLES);
- Delta delta = new Delta(base);
- delta.delete(triple("a T b"));
- delta.add(triple("x R z"));
- delta.delete(triple("p S q"));
- delta.add(triple("a T b"));
- assertIsomorphic(graphWith(DEFAULT_TRIPLES), base);
- assertIsomorphic(graphWith("a T b; x R z"), delta.getAdditions());
- assertIsomorphic(graphWith("p S q"), delta.getDeletions());
- assertIsomorphic(graphWith("x R y; x R z; a T b"), delta);
- }
-
- public void testTerms1() {
- Triple t1 = triple("s p 1");
- Triple t01 = triple("s p 01");
- Graph base = newGraph();
- base.add(t1);
- Delta delta = new Delta(base);
-
- delta.add(t01);
-
- assertTrue(delta.getAdditions().contains(triple("s p 01")));
- assertFalse(delta.getAdditions().contains(triple("s p 1")));
- assertTrue(delta.contains(t1));
- assertTrue(delta.contains(t01));
- }
-
- public void testTerms2() {
- Triple t1 = triple("s p 1");
- Triple t01 = triple("s p 01");
- Graph base = newGraph();
- base.add(t1);
- Delta delta = new Delta(base);
-
- delta.delete(t01);
-
- assertFalse(delta.getDeletions().contains(triple("s p 01")));
- assertFalse(delta.getAdditions().contains(triple("s p 1")));
- }
-
- public void testTerms3() {
- Triple t1 = triple("s p 1");
- Triple t01 = triple("s p 01");
- Graph base = newGraph();
- base.add(t1);
- Delta delta = new Delta(base);
-
- delta.add(t01);
- delta.delete(t01);
- delta.delete(t1);
-
- assertFalse(delta.getDeletions().contains(t01));
- assertTrue(delta.getDeletions().contains(t1));
- assertFalse(delta.getDeletions().contains(t01));
- assertFalse(delta.getAdditions().contains(t01));
- }
-
- public void testTerms4() {
- Triple t1 = triple("s p 1");
- Triple t01 = triple("s p 01");
- Graph base = newGraph();
- Delta delta = new Delta(base);
-
- delta.add(t1);
- delta.delete(t01);
-
- assertFalse(delta.getDeletions().contains(triple("s p 01")));
- assertTrue(delta.getDeletions().isEmpty());
-
- assertTrue(delta.getAdditions().contains(triple("s p 1")));
- assertFalse(delta.getAdditions().isEmpty());
- }
-}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDifference.java b/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDifference.java
deleted file mode 100755
index 99b581c049..0000000000
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestDifference.java
+++ /dev/null
@@ -1,117 +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.graph.compose.test;
-
-import junit.framework.TestSuite;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.compose.Difference;
-
-public class TestDifference extends TestDyadic
-{
- public TestDifference( String name )
- { super( name ); }
-
- public static TestSuite suite()
- { return new TestSuite( TestDifference.class ); }
-
- @Override
- public Graph getNewGraph()
- {
- Graph gBase = graphWith( "" ), g1 = graphWith( "" );
- return new Difference( gBase, g1 );
- }
-
- public Difference differenceOf(String s1, String s2) {
- return new Difference( graphWith( s1 ), graphWith( s2 ) );
- }
-
- public void testStaticDifference() {
- assertIsomorphic( graphWith( "" ), differenceOf( "", "" ) );
- assertIsomorphic( graphWith( "x R y" ), differenceOf( "x R y", "" ) );
- assertIsomorphic( graphWith( "" ), differenceOf( "", "x R y" ) );
- assertIsomorphic( graphWith( "" ), differenceOf( "x R y", "x R y" ) );
- assertIsomorphic( graphWith( "p R q" ), differenceOf( "x R y; p R q", "r A s; x R y" ) );
- }
-
- public void testDifferenceReflectsChangesToOperands() {
- Graph l = graphWith( "x R y" );
- Graph r = graphWith( "x R y" );
- Difference diff = new Difference( l, r );
- assertIsomorphic(graphWith( "" ), diff);
- r.delete( triple( "x R y" ) );
- assertIsomorphic( graphWith( "x R y" ), diff );
- l.add( triple( "x R z" ) );
- assertIsomorphic( graphWith( "x R y; x R z" ), diff );
- r.add( triple( "x R z" ) );
- assertIsomorphic( graphWith( "x R y" ), diff );
- }
-
- public void testAdd() {
- Graph l = graphWith( "x R y" );
- Graph r = graphWith( "x R y; x R z" );
- Difference diff = new Difference( l, r );
- assertIsomorphic( graphWith( "" ), diff );
-
- // case 1: add to the left operand
- diff.add( triple( "p S q" ) );
- assertIsomorphic( graphWith( "p S q" ), diff );
- assertIsomorphic( graphWith( "x R y; p S q" ), l );
- assertIsomorphic( graphWith( "x R y; x R z" ), r );
-
- // case 2: remove from the right, and add to the left operand
- diff.add( triple( "x R z" ) );
- assertIsomorphic( graphWith( "x R z; p S q" ), diff );
- assertIsomorphic( graphWith( "x R y; x R z; p S q" ), l );
- assertIsomorphic( graphWith( "x R y" ), r );
-
- // case 3: remove from the right operand
- diff.add( triple( "x R y" ) );
- assertIsomorphic( graphWith( "x R y; x R z; p S q" ), diff );
- assertIsomorphic( graphWith( "x R y; x R z; p S q" ), l );
- assertIsomorphic( graphWith( "" ), r );
- }
-
- public void testDelete() {
- Graph l = graphWith( "x R y; x R z" );
- Graph r = graphWith( "x R y" );
- Difference diff = new Difference( l, r );
- assertIsomorphic( graphWith( "x R z" ), diff );
-
- // case 1: remove non-existent triple is a no-op
- diff.delete( triple( "p S q" ) );
- assertIsomorphic( graphWith( "x R z" ), diff );
- assertIsomorphic( graphWith( "x R y; x R z" ), l );
- assertIsomorphic( graphWith( "x R y" ), r );
-
- // case 2: remove triple that exists in both - removes from left
- diff.delete( triple( "x R y" ) );
- assertIsomorphic( graphWith( "x R z" ), diff );
- assertIsomorphic( graphWith( "x R z" ), l );
- assertIsomorphic( graphWith( "x R y" ), r );
-
- // case 3: remove triple that exists in left is removed
- diff.delete( triple( "x R z" ) );
- assertIsomorphic( graphWith( "" ), diff );
- assertIsomorphic( graphWith( "" ), l );
- assertIsomorphic( graphWith( "x R y" ), r );
- }
-}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestIntersection.java b/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestIntersection.java
deleted file mode 100755
index 9a6b1a0113..0000000000
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestIntersection.java
+++ /dev/null
@@ -1,123 +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.graph.compose.test;
-
-import junit.framework.TestSuite;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.compose.Intersection;
-
-public class TestIntersection extends TestDyadic
-{
- public TestIntersection( String name )
- { super( name ); }
-
- public static TestSuite suite()
- { return new TestSuite( TestIntersection.class ); }
-
- @Override
- public Graph getNewGraph()
- {
- Graph gBase = graphWith( "" ), g1 = graphWith( "" );
- return new Intersection( gBase, g1 );
- }
-
- public Intersection intersectionOf(String s1, String s2) {
- return new Intersection( graphWith( s1 ), graphWith( s2 ) );
- }
-
- public void testStaticIntersection() {
- assertIsomorphic( graphWith( "" ), intersectionOf( "", "" ) );
- assertIsomorphic( graphWith( "" ), intersectionOf( "x R y", "" ) );
- assertIsomorphic( graphWith( "" ), intersectionOf( "", "x R y" ) );
- assertIsomorphic( graphWith( "x R y" ), intersectionOf( "x R y", "x R y" ) );
- assertIsomorphic( graphWith( "x R y" ), intersectionOf( "x R y; p R q", "r A s; x R y" ) );
- }
-
- public void testIntersectionReflectsChangesToOperands() {
- Graph l = graphWith( "x R y" );
- Graph r = graphWith( "p S q" );
- Intersection isec = new Intersection( l, r );
- assertIsomorphic( graphWith( "" ), isec );
-
- // add to the left what is already in the right
- l.add( triple( "p S q" ) );
- assertIsomorphic( graphWith( "p S q" ), isec );
-
- // add to the right what is already in the left
- r.add( triple( "x R y" ) );
- assertIsomorphic( graphWith( "p S q; x R y" ), isec );
-
- // add to a single graph is not reflected
- l.add( triple( "p S o" ) );
- r.add( triple( "x R z" ) );
- assertIsomorphic( graphWith( "p S q; x R y" ), isec );
-
- // remove from the left
- l.delete( triple( "x R y" ) );
- assertIsomorphic( graphWith( "p S q" ), isec );
-
- // remove from the right
- r.delete( triple( "p S q" ) );
- assertIsomorphic( graphWith( "" ), isec );
- }
-
- public void testAdd() {
- Graph l = graphWith( "x R y" );
- Graph r = graphWith( "p S q" );
- Intersection isec = new Intersection( l, r );
- assertIsomorphic( graphWith( "" ), isec );
-
- isec.add( triple( "r A s" ) );
- assertIsomorphic( graphWith( "r A s" ), isec );
- assertIsomorphic( graphWith( "x R y; r A s" ), l );
- assertIsomorphic( graphWith( "p S q; r A s" ), r );
-
- isec.add( triple ( "x R y" ) );
- assertIsomorphic( graphWith( "r A s; x R y" ), isec );
- assertIsomorphic( graphWith( "x R y; r A s" ), l );
- assertIsomorphic( graphWith( "p S q; r A s; x R y" ), r );
-
- isec.add( triple ( "p S q" ) );
- assertIsomorphic( graphWith( "p S q; r A s; x R y" ), isec );
- assertIsomorphic( graphWith( "p S q; r A s; x R y" ), l );
- assertIsomorphic( graphWith( "p S q; r A s; x R y" ), r );
- }
-
- public void testDelete() {
- Graph l = graphWith( "r A s; x R y" );
- Graph r = graphWith( "x R y; p S q" );
- Intersection isec = new Intersection( l, r );
- assertIsomorphic( graphWith( "x R y" ), isec );
-
- // removing non-contained triples is a no-op
- isec.delete( triple( "r A s" ) );
- assertIsomorphic( graphWith( "r A s; x R y" ), l);
- isec.delete( triple( "p S q" ) );
- assertIsomorphic( graphWith( "x R y; p S q" ), r);
-
- // removing a contained triple removes it from the left operand
- isec.delete( triple( "x R y" ) );
- assertIsomorphic( graphWith( "" ), isec );
- assertIsomorphic( graphWith( "r A s" ), l );
- assertIsomorphic( graphWith( "x R y; p S q" ), r );
- }
-}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestUnion.java b/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestUnion.java
deleted file mode 100755
index cd78ed88aa..0000000000
--- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestUnion.java
+++ /dev/null
@@ -1,114 +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.graph.compose.test;
-
-import junit.framework.TestSuite;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.compose.Union;
-
-public class TestUnion extends TestDyadic {
- public TestUnion(String name) {
- super(name);
- }
-
- public static TestSuite suite() {
- return new TestSuite(TestUnion.class);
- }
-
- @Override
- public Graph getNewGraph() {
- Graph gBase = graphWith(""), g1 = graphWith("");
- return new Union(gBase, g1);
- }
-
- public Union unionOf(String s1, String s2) {
- return new Union(graphWith(s1), graphWith(s2));
- }
-
- public void testStaticUnion() {
- assertIsomorphic(graphWith(""), unionOf("", ""));
- assertIsomorphic(graphWith("x R y"), unionOf("x R y", ""));
- assertIsomorphic(graphWith("x R y"), unionOf("", "x R y"));
- assertIsomorphic(graphWith("x R y; x R z"), unionOf("x R y", "x R z"));
- assertIsomorphic(graphWith("x R y"), unionOf("x R y", "x R y"));
- }
-
- public void testUnionReflectsChangesToOperands() {
- Graph l = graphWith("x R y");
- Graph r = graphWith("x R y");
- Union u = new Union(l, r);
-
- assertIsomorphic(graphWith("x R y"), u);
-
- l.add(triple("x R z"));
- assertIsomorphic(graphWith("x R y; x R z"), u);
-
- l.delete(triple("x R y"));
- assertIsomorphic(graphWith("x R y; x R z"), u);
-
- r.add(triple("p S q"));
- assertIsomorphic(graphWith("x R y; x R z; p S q"), u);
-
- r.delete(triple("x R y"));
- assertIsomorphic(graphWith("x R z; p S q"), u);
- }
-
- public void testAdd() {
- Graph l = graphWith("x R y");
- Graph r = graphWith("x R y; p S q");
- Union u = new Union(l, r);
-
- u.add(triple("x R y"));
- assertIsomorphic(graphWith("x R y"), l);
- assertIsomorphic(graphWith("x R y; p S q"), r);
-
- u.add(triple("p S q"));
- assertIsomorphic(graphWith("x R y; p S q"), l);
- assertIsomorphic(graphWith("x R y; p S q"), r);
-
- u.add(triple("r A s"));
- assertIsomorphic(graphWith("x R y; p S q; r A s"), l);
- assertIsomorphic(graphWith("x R y; p S q"), r);
- }
-
- public void testDelete() {
- Graph l = graphWith("x R y; x R z");
- Graph r = graphWith("x R y; p S q");
- Union u = new Union(l, r);
-
- u.delete(triple("r A s"));
- assertIsomorphic(graphWith("x R y; x R z"), l);
- assertIsomorphic(graphWith("x R y; p S q"), r);
-
- u.delete(triple("x R z"));
- assertIsomorphic(graphWith("x R y"), l);
- assertIsomorphic(graphWith("x R y; p S q"), r);
-
- u.delete(triple("p S q"));
- assertIsomorphic(graphWith("x R y"), l);
- assertIsomorphic(graphWith("x R y"), r);
-
- u.delete(triple("x R y"));
- assertIsomorphic(graphWith(""), l);
- assertIsomorphic(graphWith(""), r);
- }
-}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestTripleStore.java b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestTripleStore.java
deleted file mode 100644
index 356e2efbc0..0000000000
--- a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestTripleStore.java
+++ /dev/null
@@ -1,125 +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.graph.test;
-
-import org.apache.jena.atlas.iterator.Iter;
-import org.apache.jena.graph.impl.TripleStore;
-
-/**
- * AbstractTestTripleStore - post-hoc tests for TripleStores.
- */
-public abstract class AbstractTestTripleStore extends GraphTestBase {
- public AbstractTestTripleStore(String name) {
- super(name);
- }
-
- /**
- * Subclasses must over-ride to return a new empty TripleStore.
- */
- public abstract TripleStore getTripleStore();
-
- protected TripleStore store;
-
- @Override
- public void setUp() {
- store = getTripleStore();
- }
-
- public void testEmpty() {
- testEmpty(store);
- }
-
- public void testAddOne() {
- store.add(triple("x P y"));
- assertEquals(false, store.isEmpty());
- assertEquals(1, store.size());
- assertEquals(true, store.contains(triple("x P y")));
- assertEquals(nodeSet("x"), Iter.toSet(store.listSubjects()));
- assertEquals(nodeSet("y"), Iter.toSet(store.listObjects()));
- assertEquals(tripleSet("x P y"), Iter.toSet(store.find(triple("?? ?? ??"))));
- }
-
- public void testListSubjects() {
- someStatements(store);
- assertEquals(nodeSet("a x _z r q"), Iter.toSet(store.listSubjects()));
- }
-
- public void testListObjects() {
- someStatements(store);
- assertEquals(nodeSet("b y i _j _t 17"), Iter.toSet(store.listObjects()));
- }
-
- public void testContains() {
- someStatements(store);
- assertEquals(true, store.contains(triple("a P b")));
- assertEquals(true, store.contains(triple("x P y")));
- assertEquals(true, store.contains(triple("a P i")));
- assertEquals(true, store.contains(triple("_z Q _j")));
- assertEquals(true, store.contains(triple("x R y")));
- assertEquals(true, store.contains(triple("r S _t")));
- assertEquals(true, store.contains(triple("q R 17")));
- /* */
- assertEquals(false, store.contains(triple("a P x")));
- assertEquals(false, store.contains(triple("a P _j")));
- assertEquals(false, store.contains(triple("b Z r")));
- assertEquals(false, store.contains(triple("_a P x")));
- }
-
- public void testFind() {
- someStatements(store);
- assertEquals(tripleSet(""), Iter.toSet(store.find(triple("no such thing"))));
- assertEquals(tripleSet("a P b; a P i"), Iter.toSet(store.find(triple("a P ??"))));
- assertEquals(tripleSet("a P b; x P y; a P i"), Iter.toSet(store.find(triple("?? P ??"))));
- assertEquals(tripleSet("x P y; x R y"), Iter.toSet(store.find(triple("x ?? y"))));
- assertEquals(tripleSet("_z Q _j"), Iter.toSet(store.find(triple("?? ?? _j"))));
- assertEquals(tripleSet("q R 17"), Iter.toSet(store.find(triple("?? ?? 17"))));
- }
-
- public void testRemove() {
- store.add(triple("nothing before ace"));
- store.add(triple("ace before king"));
- store.add(triple("king before queen"));
- store.delete(triple("ace before king"));
- assertEquals(tripleSet("king before queen; nothing before ace"), Iter.toSet(store.find(triple("?? ?? ??"))));
- store.delete(triple("king before queen"));
- assertEquals(tripleSet("nothing before ace"), Iter.toSet(store.find(triple("?? ?? ??"))));
- }
-
- public void someStatements(TripleStore ts) {
- ts.add(triple("a P b"));
- ts.add(triple("x P y"));
- ts.add(triple("a P i"));
- ts.add(triple("_z Q _j"));
- ts.add(triple("x R y"));
- ts.add(triple("r S _t"));
- ts.add(triple("q R 17"));
- }
-
- public void testEmpty(TripleStore ts) {
- assertEquals(true, ts.isEmpty());
- assertEquals(0, ts.size());
- assertEquals(false, ts.find(triple("?? ?? ??")).hasNext());
- assertEquals(false, ts.listObjects().hasNext());
- assertEquals(false, ts.listSubjects().hasNext());
- assertFalse(ts.contains(triple("x P y")));
- }
-}
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
deleted file mode 100644
index 70cd600e73..0000000000
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java
+++ /dev/null
@@ -1,71 +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.graph.test;
-
-import java.lang.reflect.Constructor;
-
-import junit.framework.TestSuite;
-import org.apache.jena.graph.Graph;
-import org.apache.jena.mem.GraphMemFast;
-import org.apache.jena.shared.JenaException;
-
-/**
- * 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 {
- public TestReifier(String name) {
- super(name);
- graphClass = null;
- }
-
- protected final Class<? extends Graph> graphClass;
-
- public TestReifier(Class<? extends Graph> graphClass, String name) {
- super(name);
- this.graphClass = graphClass;
- }
-
- public static TestSuite suite() {
- TestSuite result = new TestSuite();
- result.addTest(MetaTestGraph.suite(TestReifier.class, GraphMemFast.class));
- result.setName(TestReifier.class.getSimpleName());
- return result;
- }
-
- @Override
- public Graph getGraph() {
- try {
- Constructor<? > cons = getConstructor(graphClass, new Class[]{});
- if ( cons != null )
- return (Graph)cons.newInstance();
- Constructor<? > cons2 = getConstructor(graphClass, new Class[]{this.getClass()});
- if ( cons2 != null )
- return (Graph)cons2.newInstance(this);
- throw new JenaException("no suitable graph constructor found for " + graphClass);
- } catch (RuntimeException e) {
- throw e;
- } catch (Exception e) {
- throw new JenaException(e);
- }
- }
-}
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java
deleted file mode 100644
index d1b0186672..0000000000
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTripleField.java
+++ /dev/null
@@ -1,89 +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.graph.test;
-
-import junit.framework.TestSuite;
-import org.apache.jena.graph.*;
-import org.apache.jena.graph.Triple.*;
-
-public class TestTripleField extends GraphTestBase {
- public TestTripleField(String name) {
- super(name);
- }
-
- public static TestSuite suite() {
- return new TestSuite(TestTripleField.class);
- }
-
- public void testFieldsExistAndAreTyped() {
- assertInstanceOf(Triple.Field.class, Triple.Field.fieldSubject);
- assertInstanceOf(Triple.Field.class, Triple.Field.fieldObject);
- assertInstanceOf(Triple.Field.class, Triple.Field.fieldPredicate);
- }
-
- public void testGetSubject() {
- assertEquals(node("s"), Field.fieldSubject.getField(triple("s p o")));
- }
-
- public void testGetObject() {
- assertEquals(node("o"), Field.fieldObject.getField(triple("s p o")));
- }
-
- public void testGetPredicate() {
- assertEquals(node("p"), Field.fieldPredicate.getField(triple("s p o")));
- }
-
- public void testFilterSubject() {
- assertTrue(Field.fieldSubject.filterOn(node("a")).test(triple("a P b")));
- assertFalse(Field.fieldSubject.filterOn(node("x")).test(triple("a P b")));
- }
-
- public void testFilterObject() {
- assertTrue(Field.fieldObject.filterOn(node("b")).test(triple("a P b")));
- assertFalse(Field.fieldObject.filterOn(node("c")).test(triple("a P b")));
- }
-
- public void testFilterPredicate() {
- assertTrue(Field.fieldPredicate.filterOn(node("P")).test(triple("a P b")));
- assertFalse(Field.fieldPredicate.filterOn(node("Q")).test(triple("a P b")));
- }
-
- public void testFilterOnConcreteSubject() {
- assertTrue(Field.fieldSubject.filterOnConcrete(node("a")).test(triple("a P b")));
- assertFalse(Field.fieldSubject.filterOnConcrete(node("x")).test(triple("a P b")));
- }
-
- public void testFilterOnConcreteObject() {
- assertTrue(Field.fieldObject.filterOnConcrete(node("b")).test(triple("a P b")));
- assertFalse(Field.fieldObject.filterOnConcrete(node("c")).test(triple("a P b")));
- }
-
- public void testFilterOnConcretePredicate() {
- assertTrue(Field.fieldPredicate.filterOnConcrete(node("P")).test(triple("a P b")));
- assertFalse(Field.fieldPredicate.filterOnConcrete(node("Q")).test(triple("a P b")));
- }
-
- public void testFilterByTriple() {
- assertTrue(Field.fieldSubject.filterOn(triple("s P o")).test(triple("s Q p")));
- assertFalse(Field.fieldSubject.filterOn(triple("s P o")).test(triple("x Q p")));
- }
-}
diff --git a/jena-core/src/test/java/org/apache/jena/irix/AbstractTestIRIx_3986.java b/jena-core/src/test/java/org/apache/jena/irix/AbstractTestIRIx_3986.java
index 1795365216..bc54f8a882 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/AbstractTestIRIx_3986.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/AbstractTestIRIx_3986.java
@@ -21,14 +21,10 @@
package org.apache.jena.irix;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
import org.apache.jena.iri3986.provider.IRIProvider3986;
import org.apache.jena.iri3986.provider.JenaSeveritySettings;
@@ -41,16 +37,11 @@ import org.apache.jena.rfc3986.Violations;
*/
public class AbstractTestIRIx_3986 {
- @Parameters(name = "{index}: {0}")
- public static Iterable<Object[]> data() {
- List<Object[]> data = new ArrayList<>();
- data.add(new Object[]{"IRI3986", new IRIProvider3986()});
-
- // Does not pass the test suite.
- //data.add(new Object[]{"JDK.URI", new IRIProviderJDK()});
+ public AbstractTestIRIx_3986() {
+ // Use the IRIProvider3986 for these tests.
+ this.provider = new IRIProvider3986();
// Wire up IRIProvider3986 error/warning controls.
Violations.setSystemSeverityMap(JenaSeveritySettings.jenaSystemSettings());
- return data;
}
protected IRIProvider getProvider() {
@@ -81,7 +72,7 @@ public class AbstractTestIRIx_3986 {
private static boolean StrictFILE;
private static boolean StrictDID;
- @BeforeClass static public void beforeClass_StoreSystemProvider() {
+ @BeforeAll static public void beforeClass_StoreSystemProvider() {
systemProvider = SystemIRIx.getProvider();
StrictHTTP = systemProvider.isStrictMode("http");
StrictURN = systemProvider.isStrictMode("urn");
@@ -89,21 +80,21 @@ public class AbstractTestIRIx_3986 {
StrictDID = systemProvider.isStrictMode("did");
}
- @AfterClass static public void afterClass_RestoreSystemProvider() {
+ @AfterAll static public void afterClass_RestoreSystemProvider() {
systemProvider.strictMode("http", StrictHTTP);
systemProvider.strictMode("urn", StrictURN);
systemProvider.strictMode("file", StrictFILE);
systemProvider.strictMode("did", StrictDID);
}
- @Before public void beforeTest_setStrict() {
+ @BeforeEach public void beforeTest_setStrict() {
provider.strictMode("http", true);
provider.strictMode("urn", true);
provider.strictMode("file", true);
provider.strictMode("did", true);
}
- @After public void afterTest_restoreSystemProvider() {
+ @AfterEach public void afterTest_restoreSystemProvider() {
restore();
}
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TS_IRIx.java b/jena-core/src/test/java/org/apache/jena/irix/TS6_IRIx2.java
similarity index 86%
rename from jena-core/src/test/java/org/apache/jena/irix/TS_IRIx.java
rename to jena-core/src/test/java/org/apache/jena/irix/TS6_IRIx2.java
index 99cfaf6c45..c276427ad2 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TS_IRIx.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TS6_IRIx2.java
@@ -21,9 +21,10 @@
package org.apache.jena.irix;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
import org.apache.jena.iri3986.provider.InitIRI3986;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
/**
* Test of IRIx for the system default IRIProvider.
@@ -32,11 +33,8 @@ import org.junit.runners.Suite;
* @See {@code org.apache.jena.rfc3986.TS_iri3986} for detailed test of jena-iri3986.
*/
-//JUnit5. Does not mix with JUnit3. So until jena-core updates to JUnit 4 or 5 ...
-//@Suite
-//@SelectClasses({
-@RunWith(Suite.class)
-@Suite.SuiteClasses( {
+@Suite
+@SelectClasses({
// RFC3986 syntax only
TestIRIxSyntaxRFC3986.class,
@@ -54,7 +52,7 @@ import org.junit.runners.Suite;
// odds and ends that come up
TestIRIxOther.class
} )
-public class TS_IRIx {
+public class TS6_IRIx2 {
static {
SystemIRIx.init();
InitIRI3986.init();
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxAbsoluteRelative.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxAbsoluteRelative.java
index 0f03b90482..16005c86b5 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxAbsoluteRelative.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxAbsoluteRelative.java
@@ -21,18 +21,16 @@
package org.apache.jena.irix;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxAbsoluteRelative extends AbstractTestIRIx_3986 {
- public TestIRIxAbsoluteRelative(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxAbsoluteRelative() { super(); }
// -- isAbsolute, isRelative : These are not opposites in RFC 3986. (String, isAbsolute, isRelative)
@@ -47,7 +45,7 @@ public class TestIRIxAbsoluteRelative extends AbstractTestIRIx_3986 {
// Create - is it suitable for an RDF reference?
private void test_abs_rel(String uriStr, boolean isAbsolute, boolean isRelative) {
IRIx iri = test_create(uriStr);
- assertEquals("Absolute test: IRI = "+uriStr, isAbsolute, iri.isAbsolute());
- assertEquals("Relative test: IRI = "+uriStr, isRelative, iri.isRelative());
+ assertEquals( isAbsolute, iri.isAbsolute(), "Absolute test: IRI = "+uriStr);
+ assertEquals(isRelative, iri.isRelative(), "Relative test: IRI = "+uriStr);
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxJenaSystem.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxJenaSystem.java
index 0b29935e9c..f645df9302 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxJenaSystem.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxJenaSystem.java
@@ -22,17 +22,15 @@
package org.apache.jena.irix;
import static org.apache.jena.atlas.lib.Lib.uppercase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
/**
* Test of parsing and schema violations.
@@ -40,13 +38,10 @@ import org.junit.runners.Parameterized;
*
* See also {@link TestIRIxSyntaxRFC3986} for RDF 3986 syntax only parsing.
*/
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxJenaSystem extends AbstractTestIRIx_3986 {
// Up until jena 5.6.0, this was the test suite that compares results with jena-iri.
- public TestIRIxJenaSystem(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxJenaSystem() { super(); }
// Assumes full authority parsing and not scheme-specific checks.
@@ -404,7 +399,7 @@ public class TestIRIxJenaSystem extends AbstractTestIRIx_3986 {
warnings.incrementAndGet();
});
//System.out.printf("(e=%d, w=%d) %s\n", errors.get(), warnings.get(), string);
- assertEquals("errors", expectedNumErrors, errors.get());
- assertEquals("warnings", expectedNumWarnings, warnings.get());
+ assertEquals(errors.get(), expectedNumErrors, "errors");
+ assertEquals(warnings.get(), expectedNumWarnings, "warnings");
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxNormalize.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxNormalize.java
index 8b5230efda..0c61207f1b 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxNormalize.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxNormalize.java
@@ -21,18 +21,16 @@
package org.apache.jena.irix;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxNormalize extends AbstractTestIRIx_3986 {
- public TestIRIxNormalize(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxNormalize() { super(); }
@Test
public void normalize_01() {
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxOther.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxOther.java
index dc98ecbd24..bcf0cd573e 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxOther.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxOther.java
@@ -21,23 +21,21 @@
package org.apache.jena.irix;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
/**
* Tests that don't easily go in other TestIRIx suites.
*/
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxOther extends AbstractTestIRIx_3986 {
- public TestIRIxOther(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxOther() { super(); }
@Test public void scheme_unknown_1() {
good("mysteryScheme://authority/path/file");
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxReference.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxReference.java
index f90c67528f..f4f6c4503b 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxReference.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxReference.java
@@ -21,18 +21,16 @@
package org.apache.jena.irix;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxReference extends AbstractTestIRIx_3986 {
- public TestIRIxReference(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxReference() { super(); }
// --- Use in RDF
@@ -66,7 +64,7 @@ public class TestIRIxReference extends AbstractTestIRIx_3986 {
private void reference(String uriStr, boolean expected) {
IRIx iri = test_create(uriStr);
- assertEquals("IRI = "+uriStr, expected, iri.isReference());
+ assertEquals(expected, iri.isReference(), "IRI = "+uriStr);
}
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxRelative.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxRelative.java
index 5cec45be69..791dd31302 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxRelative.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxRelative.java
@@ -21,18 +21,16 @@
package org.apache.jena.irix;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxRelative extends AbstractTestIRIx_3986 {
- public TestIRIxRelative(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxRelative() { super(); }
// No trailing slash, not considered to be a "directory".
@Test public void relative_http_01() { relative("http://example/dir", "http://example/dir/abcd", "dir/abcd"); }
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxRelativize.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxRelativize.java
index c889fcb17a..853a30ddc3 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxRelativize.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxRelativize.java
@@ -21,18 +21,16 @@
package org.apache.jena.irix;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxRelativize extends AbstractTestIRIx_3986 {
- public TestIRIxRelativize(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxRelativize() { super(); }
@Test public void relativize_http_01() { testRelativize("http://host/dir/", "http://host/dir/file", "file"); }
@@ -86,7 +84,7 @@ public class TestIRIxRelativize extends AbstractTestIRIx_3986 {
IRIx path = IRIx.create(pathStr);
IRIx rel = base.relativize(path);
String result = (rel==null)?null:rel.str();
- assertEquals("Base=<"+baseStr+"> IRI=<"+pathStr+">", expected, result);
+ assertEquals(expected, result, "Base=<"+baseStr+"> IRI=<"+pathStr+">");
if ( expected != null ) {
IRIx path2 = base.resolve(rel);
assertEquals(path, path2);
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxResolve.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxResolve.java
index a3f4e36fe9..b051d53454 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxResolve.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxResolve.java
@@ -21,18 +21,16 @@
package org.apache.jena.irix;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxResolve extends AbstractTestIRIx_3986 {
- public TestIRIxResolve(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxResolve() { super(); }
// -- Resolving
@Test public void resolve_http_01() { resolve("http://example/", "path", "http://example/path"); }
diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxSyntaxRFC3986.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxSyntaxRFC3986.java
index 97291fe0e3..6310f4a9a9 100644
--- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxSyntaxRFC3986.java
+++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxSyntaxRFC3986.java
@@ -22,23 +22,21 @@
package org.apache.jena.irix;
import static org.apache.jena.atlas.lib.Lib.uppercase;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.MethodOrderer;
/**
* Basic tests of RFC 3986 syntax. Scheme-rules are not checked.
*
* {@link TestIRIxJenaSystem} contains tests with more scheme errors and warnings. It also compares to jena-iri.
*/
-@RunWith(Parameterized.class)
+@TestMethodOrder(MethodOrderer.MethodName.class)
public class TestIRIxSyntaxRFC3986 extends AbstractTestIRIx_3986 {
- public TestIRIxSyntaxRFC3986(String name, IRIProvider provider) {
- super(name, provider);
- }
+ public TestIRIxSyntaxRFC3986() { super(); }
@Test public void http_01() { parse("http://example/abc"); }
@@ -54,26 +52,21 @@ public class TestIRIxSyntaxRFC3986 extends AbstractTestIRIx_3986 {
// ---- Compliance with HTTP RFC7230. https://tools.ietf.org/html/rfc7230#section-2.7
- @Test(expected=IRIException.class)
- public void http_51() { parse("http:"); }
+ @Test public void http_51() { assertThrows(IRIException.class, ()-> parse("http:")); }
- @Test(expected=IRIException.class)
- public void http_52() { parse("http:/"); }
+ @Test public void http_52() { assertThrows(IRIException.class, ()-> parse("http:/")); }
- @Test(expected=IRIException.class)
- public void http_53() { parse("http://"); }
+ @Test public void http_53() { assertThrows(IRIException.class, ()-> parse("http://")); }
@Test public void http_54() { parse("http://x"); }
- @Test(expected=IRIException.class)
- public void http_55() { parse("http:abc"); }
+ @Test public void http_55() { assertThrows(IRIException.class, ()-> parse("http:abc")); }
- @Test(expected=IRIException.class)
- public void http_56() { parse("http:///abc"); }
+ @Test public void http_56() { assertThrows(IRIException.class, ()-> parse("http:///abc")); }
- @Test(expected=IRIException.class)
+ @Test
// [] not in IPv6 address
- public void http_57() { parse("http://h/ab[]"); }
+ public void http_57() { assertThrows(IRIException.class, ()-> parse("http://h/ab[]")); }
@Test public void http_58() { parse("http://example/~jena/file"); }
@@ -81,11 +74,9 @@ public class TestIRIxSyntaxRFC3986 extends AbstractTestIRIx_3986 {
@Test public void urn_01() { parse("urn:NID:NSS"); }
- @Test(expected=IRIException.class)
- public void urn_02() { parse("urn:x:abcd"); }
+ @Test public void urn_02() { assertThrows(IRIException.class, ()-> parse("urn:x:abcd")); }
- @Test(expected=IRIException.class)
- public void urn_03() { parse("urn:ex:"); }
+ @Test public void urn_03() { assertThrows(IRIException.class, ()-> parse("urn:ex:")); }
@Test public void urn_04() { notStrict("urn", ()->parse("urn:x:abc")); }
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractRecordingListener.java b/jena-core/src/test/java/org/apache/jena/junit/AbstractRecordingListener.java
similarity index 99%
rename from jena-core/src/test/java/org/apache/jena/testing_framework/AbstractRecordingListener.java
rename to jena-core/src/test/java/org/apache/jena/junit/AbstractRecordingListener.java
index 989f15b450..ce69217c78 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractRecordingListener.java
+++ b/jena-core/src/test/java/org/apache/jena/junit/AbstractRecordingListener.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.testing_framework;
+package org.apache.jena.junit;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/GraphHelper.java b/jena-core/src/test/java/org/apache/jena/junit/GraphHelper.java
similarity index 98%
rename from jena-core/src/test/java/org/apache/jena/testing_framework/GraphHelper.java
rename to jena-core/src/test/java/org/apache/jena/junit/GraphHelper.java
index 4347922361..388a06ecb3 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/GraphHelper.java
+++ b/jena-core/src/test/java/org/apache/jena/junit/GraphHelper.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.testing_framework;
+package org.apache.jena.junit;
/**
* Foo set of static test helpers. Generally included as a static.
@@ -37,7 +37,7 @@ import org.apache.jena.shared.PrefixMapping;
import org.apache.jena.util.CollectionFactory;
import org.apache.jena.util.iterator.ExtendedIterator;
-public class GraphHelper extends TestUtils {
+public class GraphHelper {
/**
* Answer a Node as described by <code>x</code>; a shorthand for
@@ -444,10 +444,10 @@ public class GraphHelper extends TestUtils {
*/
public static Graph getGraph(Object wrap, Class<? extends Graph> graphClass) {
try {
- Constructor<?> cons = getConstructor(graphClass, new Class[] {});
+ Constructor<?> cons = TestUtils.getConstructor(graphClass, new Class[] {});
if (cons != null)
return (Graph) cons.newInstance(new Object[] {});
- Constructor<?> cons2 = getConstructor(graphClass,
+ Constructor<?> cons2 = TestUtils.getConstructor(graphClass,
new Class[] { wrap.getClass() });
if (cons2 != null)
return (Graph) cons2.newInstance(new Object[] { wrap });
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/NodeCreateUtils.java b/jena-core/src/test/java/org/apache/jena/junit/NodeCreateUtils.java
similarity index 99%
rename from jena-core/src/test/java/org/apache/jena/graph/test/NodeCreateUtils.java
rename to jena-core/src/test/java/org/apache/jena/junit/NodeCreateUtils.java
index 9fe9c5a5e6..ebcb38d8ec 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/NodeCreateUtils.java
+++ b/jena-core/src/test/java/org/apache/jena/junit/NodeCreateUtils.java
@@ -19,7 +19,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.graph.test;
+package org.apache.jena.junit;
import java.util.StringTokenizer;
diff --git a/jena-core/src/test/java/org/apache/jena/util/junit/TestException.java b/jena-core/src/test/java/org/apache/jena/junit/TestException.java
similarity index 93%
rename from jena-core/src/test/java/org/apache/jena/util/junit/TestException.java
rename to jena-core/src/test/java/org/apache/jena/junit/TestException.java
index eeb78e7fc1..5485091072 100644
--- a/jena-core/src/test/java/org/apache/jena/util/junit/TestException.java
+++ b/jena-core/src/test/java/org/apache/jena/junit/TestException.java
@@ -19,14 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.util.junit;
+package org.apache.jena.junit;
/**
* TestException a root exception for all (intentional) exceptions in tests setup,
* not a failure of the test itself (e.g. manifest problems)
*/
-public class TestException extends RuntimeException {
+/*package*/ class TestException extends RuntimeException {
public TestException() {
super();
}
diff --git a/jena-core/src/test/java/org/apache/jena/junit/TestUtils.java b/jena-core/src/test/java/org/apache/jena/junit/TestUtils.java
new file mode 100644
index 0000000000..092bac451e
--- /dev/null
+++ b/jena-core/src/test/java/org/apache/jena/junit/TestUtils.java
@@ -0,0 +1,221 @@
+/*
+ * 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.junit;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.*;
+
+import org.apache.jena.rdf.model.*;
+import org.apache.jena.util.CollectionFactory;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.util.iterator.WrappedIterator;
+
+public class TestUtils {
+ public static Resource getResource(Resource r, Property p) {
+ if ( r == null )
+ return null;
+ if ( !r.hasProperty(p) )
+ return null;
+
+ RDFNode n = r.getProperty(p).getObject();
+ if ( n instanceof Resource )
+ return (Resource)n;
+
+ throw new TestException("Manifest problem (not a Resource): " + n + " => " + p);
+ }
+
+ public static Collection<Resource> listResources(Resource r, Property p) {
+ if ( r == null )
+ return null;
+ List<Resource> x = new ArrayList<>();
+ StmtIterator sIter = r.listProperties(p);
+ for ( ; sIter.hasNext() ; ) {
+ RDFNode n = sIter.next().getObject();
+ if ( !(n instanceof Resource) )
+ throw new TestException("Manifest problem (not a Resource): " + n + " => " + p);
+ x.add((Resource)n);
+ }
+ return x;
+ }
+
+ public static String getLiteral(Resource r, Property p) {
+ if ( r == null )
+ return null;
+ if ( !r.hasProperty(p) )
+ return null;
+
+ RDFNode n = r.getProperty(p).getObject();
+ if ( n instanceof Literal )
+ return ((Literal)n).getLexicalForm();
+
+ throw new TestException("Manifest problem (not a Literal): " + n + " => " + p);
+ }
+
+ public static String getLiteralOrURI(Resource r, Property p) {
+ if ( r == null )
+ return null;
+
+ if ( !r.hasProperty(p) )
+ return null;
+
+ RDFNode n = r.getProperty(p).getObject();
+ if ( n instanceof Literal )
+ return ((Literal)n).getLexicalForm();
+
+ if ( n instanceof Resource ) {
+ Resource r2 = (Resource)n;
+ if ( !r2.isAnon() )
+ return r2.getURI();
+ }
+
+ throw new TestException("Manifest problem: " + n + " => " + p);
+ }
+
+ public static String safeName(String s) {
+ // Safe from Eclipse
+ s = s.replace('(', '[');
+ s = s.replace(')', ']');
+ return s;
+
+ }
+
+ /**
+ * Answer a Set formed from the elements of the List <code>L</code>.
+ */
+ public static <T> Set<T> listToSet(List<T> L) {
+ return CollectionFactory.createHashedSet(L);
+ }
+
+ /**
+ * Answer a List of the substrings of <code>s</code> that are separated by
+ * spaces.
+ */
+ public static List<String> listOfStrings(String s) {
+ List<String> result = new ArrayList<>();
+ StringTokenizer st = new StringTokenizer(s);
+ while (st.hasMoreTokens())
+ result.add(st.nextToken());
+ return result;
+ }
+
+ /**
+ * Answer a Set of the substrings of <code>s</code> that are separated by
+ * spaces.
+ */
+ public static Set<String> setOfStrings(String s) {
+ Set<String> result = new HashSet<>();
+ StringTokenizer st = new StringTokenizer(s);
+ while (st.hasMoreTokens())
+ result.add(st.nextToken());
+ return result;
+ }
+
+ /**
+ * Answer a list containing the single object <code>x</code>.
+ */
+ public static <T> List<T> listOfOne(T x) {
+ List<T> result = new ArrayList<>();
+ result.add(x);
+ return result;
+ }
+
+ /**
+ * Answer a Set containing the single object <code>x</code>.
+ */
+ public static <T> Set<T> setOfOne(T x) {
+ Set<T> result = new HashSet<>();
+ result.add(x);
+ return result;
+ }
+
+ /**
+ * Answer a fresh list which is the concatenation of <code>L</code> then
+ * <code>R</code>. Neither <code>L</code> nor <code>R</code> is updated.
+ */
+ public static <T> List<T> append(List<? extends T> L, List<? extends T> R) {
+ List<T> result = new ArrayList<>(L);
+ result.addAll(R);
+ return result;
+ }
+
+ /**
+ * Answer an iterator over the space-separated substrings of <code>s</code>.
+ */
+ protected static ExtendedIterator<String> iteratorOfStrings(String s) {
+ return WrappedIterator.create(listOfStrings(s).iterator());
+ }
+
+ /**
+ * Answer the constructor of the class <code>c</code> which takes arguments
+ * of the type(s) in <code>args</code>, or <code>null</code> if there isn't
+ * one.
+ */
+ public static Constructor<?> getConstructor(Class<?> c, Class<?>[] args) {
+ try {
+ return c.getConstructor(args);
+ } catch (NoSuchMethodException e) {
+ return null;
+ }
+ }
+
+ /**
+ * Answer true iff <code>subClass</code> is the same class as
+ * <code>superClass</code>, if its superclass <i>is</i>
+ * <code>superClass</code>, or if one of its interfaces hasAsInterface that
+ * class.
+ */
+ public static boolean hasAsParent(Class<?> subClass, Class<?> superClass) {
+ if (subClass == superClass || subClass.getSuperclass() == superClass)
+ return true;
+ Class<?>[] is = subClass.getInterfaces();
+ for (int i = 0; i < is.length; i += 1)
+ if (hasAsParent(is[i], superClass))
+ return true;
+ return false;
+ }
+
+ static URL getURL(String fn) {
+ URL u = TestUtils4.class.getClassLoader().getResource(fn);
+ if (u == null) {
+ throw new RuntimeException(new FileNotFoundException(fn));
+ }
+ return u;
+ }
+
+ public static String getFileName(String fn) {
+
+ try {
+ return getURL(fn).toURI().toString();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static InputStream getInputStream(String fn) throws IOException {
+ return getURL(fn).openStream();
+ }
+}
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/TestUtils.java b/jena-core/src/test/java/org/apache/jena/junit/TestUtils4.java
similarity index 55%
rename from jena-core/src/test/java/org/apache/jena/testing_framework/TestUtils.java
rename to jena-core/src/test/java/org/apache/jena/junit/TestUtils4.java
index 8e30c0ff5f..05c4f4f30a 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/TestUtils.java
+++ b/jena-core/src/test/java/org/apache/jena/junit/TestUtils4.java
@@ -19,41 +19,24 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.testing_framework;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
+package org.apache.jena.junit;
import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
-import org.apache.jena.util.CollectionFactory;
-import org.apache.jena.util.iterator.ExtendedIterator;
-import org.apache.jena.util.iterator.WrappedIterator;
-
/**
* Basis for Jena test cases which provides assertFalse and assertDiffer.
* Often the logic of the names is clearer than using a negation.
+ * JUnit4.
*/
-public class TestUtils {
- // do not instantiate
- protected TestUtils() {
- throw new UnsupportedOperationException("Do not instantiate TestUtils");
- }
+public class TestUtils4 {
+ // do not instantiate, do not subclass.
+ private TestUtils4() {}
/**
* assert that the two objects must be unequal according to .equals().
- *
+ *
* @param title
* a labelling string for the assertion failure text
* @param x
@@ -70,7 +53,7 @@ public class TestUtils {
/**
* assert that the two objects must be unequal according to .equals().
- *
+ *
* @param x
* an object to test; the subject of a .equals()
* @param y
@@ -92,114 +75,19 @@ public class TestUtils {
+ x.getClass());
}
- /**
- * Answer a Set formed from the elements of the List <code>L</code>.
- */
- public static <T> Set<T> listToSet(List<T> L) {
- return CollectionFactory.createHashedSet(L);
- }
-
- /**
- * Answer a List of the substrings of <code>s</code> that are separated by
- * spaces.
- */
- public static List<String> listOfStrings(String s) {
- List<String> result = new ArrayList<>();
- StringTokenizer st = new StringTokenizer(s);
- while (st.hasMoreTokens())
- result.add(st.nextToken());
- return result;
- }
-
- /**
- * Answer a Set of the substrings of <code>s</code> that are separated by
- * spaces.
- */
- public static Set<String> setOfStrings(String s) {
- Set<String> result = new HashSet<>();
- StringTokenizer st = new StringTokenizer(s);
- while (st.hasMoreTokens())
- result.add(st.nextToken());
- return result;
- }
-
- /**
- * Answer a list containing the single object <code>x</code>.
- */
- public static <T> List<T> listOfOne(T x) {
- List<T> result = new ArrayList<>();
- result.add(x);
- return result;
- }
-
- /**
- * Answer a Set containing the single object <code>x</code>.
- */
- public static <T> Set<T> setOfOne(T x) {
- Set<T> result = new HashSet<>();
- result.add(x);
- return result;
- }
-
- /**
- * Answer a fresh list which is the concatenation of <code>L</code> then
- * <code>R</code>. Neither <code>L</code> nor <code>R</code> is updated.
- */
- public static <T> List<T> append(List<? extends T> L, List<? extends T> R) {
- List<T> result = new ArrayList<>(L);
- result.addAll(R);
- return result;
- }
-
- /**
- * Answer an iterator over the space-separated substrings of <code>s</code>.
- */
- protected static ExtendedIterator<String> iteratorOfStrings(String s) {
- return WrappedIterator.create(listOfStrings(s).iterator());
- }
-
- /**
- * Answer the constructor of the class <code>c</code> which takes arguments
- * of the type(s) in <code>args</code>, or <code>null</code> if there isn't
- * one.
- */
- public static Constructor<?> getConstructor(Class<?> c, Class<?>[] args) {
- try {
- return c.getConstructor(args);
- } catch (NoSuchMethodException e) {
- return null;
- }
- }
-
- /**
- * Answer true iff <code>subClass</code> is the same class as
- * <code>superClass</code>, if its superclass <i>is</i>
- * <code>superClass</code>, or if one of its interfaces hasAsInterface that
- * class.
- */
- public static boolean hasAsParent(Class<?> subClass, Class<?> superClass) {
- if (subClass == superClass || subClass.getSuperclass() == superClass)
- return true;
- Class<?>[] is = subClass.getInterfaces();
- for (int i = 0; i < is.length; i += 1)
- if (hasAsParent(is[i], superClass))
- return true;
- return false;
- }
-
/**
* Fail unless <code>subClass</code> has <code>superClass</code> as a
* parent, either a superclass or an implemented (directly or not)
* interface.
*/
public static void assertHasParent(Class<?> subClass, Class<?> superClass) {
- if (hasAsParent(subClass, superClass) == false)
+ if (TestUtils.hasAsParent(subClass, superClass) == false)
fail("" + subClass + " should have " + superClass + " as a parent");
}
/**
* Tests o1.equals( o2 ) && o2.equals(o1) && o1.hashCode() == o2.hashCode()
- *
+ *
* @param o1
* @param o2
*/
@@ -211,7 +99,7 @@ public class TestUtils {
/**
* Tests o1.equals( o2 ) && o2.equals(o1) && o1.hashCode() == o2.hashCode()
- *
+ *
* @param o1
* @param o2
*/
@@ -223,7 +111,7 @@ public class TestUtils {
/**
* Tests o1.equals( o2 ) && o2.equals(o1) && o1.hashCode() == o2.hashCode()
- *
+ *
* @param o1
* @param o2
*/
@@ -232,27 +120,6 @@ public class TestUtils {
assertNotEquals(msg, o2, o1);
}
- private static URL getURL(String fn) {
- URL u = TestUtils.class.getClassLoader().getResource(fn);
- if (u == null) {
- throw new RuntimeException(new FileNotFoundException(fn));
- }
- return u;
- }
-
- public static String getFileName(String fn) {
-
- try {
- return getURL(fn).toURI().toString();
- } catch (URISyntaxException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static InputStream getInputStream(String fn) throws IOException {
- return getURL(fn).openStream();
- }
-
// FIXME this is to be removed when testing is complete
public static void logAssertEquals(Class<?> clazz, String msg, Object obj1,
Object obj2) {
@@ -312,12 +179,4 @@ public class TestUtils {
.println(String.format("[%s WARNING] %s expected: %s got: %s",
clazz, msg, obj1, obj2));
}
-
- public static String safeName(String s) {
- // Safe from Eclipse
- s = s.replace('(', '[');
- s = s.replace(')', ']');
- return s;
-
- }
}
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestProperty.java b/jena-core/src/test/java/org/apache/jena/langtagx/TS6_LangTagX.java
similarity index 79%
rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestProperty.java
rename to jena-core/src/test/java/org/apache/jena/langtagx/TS6_LangTagX.java
index a03245b8b9..512ec69537 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestProperty.java
+++ b/jena-core/src/test/java/org/apache/jena/langtagx/TS6_LangTagX.java
@@ -19,15 +19,14 @@
* SPDX-License-Identifier: Apache-2.0
*/
-package org.apache.jena.enhanced.test;
+package org.apache.jena.langtagx;
-import org.apache.jena.rdf.model.RDFNode;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
-/**
- * @see TestObject
- */
-public interface TestProperty extends RDFNode, TestNode {
-
- boolean isProperty();
- TestObject anObject();
-}
+@Suite
+@SelectClasses({
+ TestLangTagX.class
+})
+
+public class TS6_LangTagX {}
diff --git a/jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java b/jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java
deleted file mode 100644
index 172fe6e026..0000000000
--- a/jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java
+++ /dev/null
@@ -1,33 +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.langtagx;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-//JUnit5. Does not mix with JUnit3. So until jena-core updates to JUnit 4 or 5 ...
-//@Suite
-//@SelectClasses({
-@RunWith(Suite.class)
-@Suite.SuiteClasses({TestLangTagX.class})
-
-public class TS_LangTagX {}
diff --git a/jena-core/src/test/java/org/apache/jena/langtagx/TestLangTagX.java b/jena-core/src/test/java/org/apache/jena/langtagx/TestLangTagX.java
index 85caa03d34..7466441b97 100644
--- a/jena-core/src/test/java/org/apache/jena/langtagx/TestLangTagX.java
+++ b/jena-core/src/test/java/org/apache/jena/langtagx/TestLangTagX.java
@@ -21,9 +21,10 @@
package org.apache.jena.langtagx;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
import org.apache.jena.langtag.LangTag;
import org.apache.jena.shared.JenaException;
@@ -54,9 +55,9 @@ public class TestLangTagX {
LangTagX.requireValidLanguageTag("en-gb");
}
- @Test(expected = JenaException.class)
+ @Test
public void require_langtag_02() {
- LangTagX.requireValidLanguageTag("en-ab-xy");
+ assertThrows(JenaException.class, ()->LangTagX.requireValidLanguageTag("en-ab-xy"));
}
@Test
@@ -65,10 +66,10 @@ public class TestLangTagX {
assertNotNull(langTag);
}
- @Test(expected = JenaException.class)
+ @Test
public void langtag_02() {
- LangTag langTag = LangTagX.createLanguageTag("en-ab-xy");
- assertNotNull(langTag);
+ assertThrows(JenaException.class, ()->
+ LangTagX.createLanguageTag("en-ab-xy"));
}
@Test
@@ -90,9 +91,10 @@ public class TestLangTagX {
assertEquals("", fmt);
}
- @Test(expected = JenaException.class)
+ @Test
public void langtag_format_04() {
- String fmt = LangTagX.formatLanguageTag(" ");
- assertEquals("", fmt);
+ assertThrows(JenaException.class, ()->{
+ String fmt = LangTagX.formatLanguageTag(" ");
+ });
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java b/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java
index a92b9efe7c..f8ca22888a 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java
@@ -21,8 +21,8 @@
package org.apache.jena.mem;
-import static org.apache.jena.testing_framework.GraphHelper.node;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java
index 95546c3f4b..dc94918737 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java
@@ -23,7 +23,7 @@ package org.apache.jena.mem;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java
index e6f4b36039..8ce0233d39 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java
@@ -31,7 +31,7 @@ import org.mockito.Mockito;
import java.util.Arrays;
import java.util.Collection;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
@RunWith(Parameterized.class)
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java
index 41db183a5a..4ff7b5f91f 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java
@@ -32,7 +32,7 @@ import org.mockito.Mockito;
import java.util.Arrays;
import java.util.Collection;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
@RunWith(Parameterized.class)
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java
index 0b91079bd8..095507ef24 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
import java.util.stream.Stream;
-import static org.apache.jena.testing_framework.GraphHelper.node;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
diff --git a/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java b/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java
index 643922a650..0f2c9ceffd 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java
@@ -23,7 +23,7 @@ package org.apache.jena.mem;
import org.apache.jena.mem.store.indexed.IndexedSetTripleStore;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java
index 2f14772b73..998028ff38 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java
@@ -33,7 +33,7 @@ import java.util.ConcurrentModificationException;
import java.util.NoSuchElementException;
import java.util.stream.StreamSupport;
-import static org.apache.jena.testing_framework.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.node;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java
index 65fa4f4eab..fa6d7d329b 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java
@@ -33,7 +33,7 @@ import java.util.ConcurrentModificationException;
import java.util.NoSuchElementException;
import java.util.stream.StreamSupport;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
@@ -122,8 +122,9 @@ public abstract class AbstractJenaSetTripleTest {
sut.tryAdd(triple("s o p"));
var spliterator = sut.keySpliterator();
sut.tryAdd(triple("t o p2"));
- assertThrows(ConcurrentModificationException.class, () -> spliterator.tryAdvance(t -> {
- }));
+ assertThrows(ConcurrentModificationException.class,
+ () -> spliterator.tryAdvance(t -> {})
+ );
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java
index 3e1983278a..f1428e0826 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java
@@ -27,7 +27,7 @@ import java.util.function.UnaryOperator;
import java.util.HashMap;
import java.util.HashSet;
-import static org.apache.jena.testing_framework.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.node;
import static org.junit.Assert.*;
public class FastHashMapTest2 {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java
index 1fc61f1a57..f1c62115eb 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import java.util.List;
-import static org.apache.jena.testing_framework.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.node;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java
index 1284b4fe9c..fb5550d03e 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import java.util.function.UnaryOperator;
-import static org.apache.jena.testing_framework.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.node;
import static org.junit.Assert.assertEquals;
public class HashCommonMapTest extends AbstractJenaMapNodeTest {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java
index f09547c926..b8f7d1657c 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java
@@ -23,7 +23,7 @@ package org.apache.jena.mem.collection;
import org.apache.jena.graph.Triple;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
diff --git a/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java b/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java
index 99e1562d53..fcc8457160 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java
@@ -23,8 +23,8 @@ package org.apache.jena.mem.pattern;
import org.apache.jena.graph.Node;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.node;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.assertEquals;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java
index 756709d6e4..d0bdb2364b 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java
@@ -29,8 +29,8 @@ import org.hamcrest.collection.IsIterableContainingInAnyOrder;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.node;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java
index b4b6e97eba..de969decea 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java
@@ -23,8 +23,8 @@ package org.apache.jena.mem.store.fast;
import org.apache.jena.graph.Node;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.node;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java
index 586bef4db5..da6f362174 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java
@@ -25,7 +25,7 @@ import org.apache.jena.mem.collection.AbstractJenaSetTripleTest;
import org.apache.jena.mem.collection.JenaSet;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.assertEquals;
public class FastHashedTripleBunchTest extends AbstractJenaSetTripleTest {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java
index 6e6fb79245..2f31d5b132 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java
@@ -25,7 +25,7 @@ import org.apache.jena.mem.store.TripleStore;
import org.junit.Test;
import static junit.framework.TestCase.assertEquals;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java
index f543b79544..0e630a63d2 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java
@@ -29,7 +29,7 @@ import java.util.ConcurrentModificationException;
import java.util.HashSet;
import java.util.NoSuchElementException;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java
index d3eb81b7c2..391bd98e5c 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import java.util.*;
import java.util.stream.StreamSupport;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java
index de65d110c7..a33728a4fc 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import java.util.*;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java
index 6b6161f37f..0ec83b6a1d 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import java.util.*;
import java.util.stream.StreamSupport;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java
index 3c32caa79d..bec5daa6e7 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java
@@ -33,7 +33,7 @@ import org.mockito.Mockito;
import java.util.Arrays;
import java.util.Collection;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
@RunWith(Parameterized.class)
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java
index 31662a7a13..950aaa13a6 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java
@@ -23,7 +23,7 @@ package org.apache.jena.mem.store.indexed;
import org.apache.jena.graph.Node;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.node;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java
index cfec08b9f5..884d73c746 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
/**
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java
index a74c139dce..52ad0e91f8 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java
@@ -24,8 +24,8 @@ import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.node;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
public class FieldFilterTest {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java
index 6ed026ca0b..5626ea89c6 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java
@@ -25,7 +25,7 @@ import org.apache.jena.mem.collection.AbstractJenaSetTripleTest;
import org.apache.jena.mem.collection.JenaSet;
import org.junit.Test;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.assertEquals;
public class HashedTripleBunchTest extends AbstractJenaSetTripleTest {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java
index da85c5f1fe..521020e0ac 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java
@@ -29,7 +29,7 @@ import java.util.ConcurrentModificationException;
import java.util.HashSet;
import java.util.NoSuchElementException;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.*;
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java
index a64bef12c4..1770e45367 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java
@@ -33,7 +33,7 @@ import org.mockito.Mockito;
import java.util.Arrays;
import java.util.Collection;
-import static org.apache.jena.testing_framework.GraphHelper.triple;
+import static org.apache.jena.junit.GraphHelper.triple;
import static org.junit.Assert.*;
@RunWith(Parameterized.class)
diff --git a/jena-core/src/test/java/org/apache/jena/memvalue/AbstractTestTripleBunch.java b/jena-core/src/test/java/org/apache/jena/memvalue/AbstractTestTripleBunch.java
new file mode 100644
index 0000000000..a607a25cf0
--- /dev/null
+++ b/jena-core/src/test/java/org/apache/jena/memvalue/AbstractTestTripleBunch.java
@@ -0,0 +1,156 @@
+/*
+ * 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.memvalue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.atlas.iterator.Iter;
+import org.apache.jena.graph.GraphTestLib;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.util.iterator.ExtendedIterator;
+
+public abstract class AbstractTestTripleBunch {
+ protected static final Triple tripleSPO = GraphTestLib.triple("s P o");
+ protected static final Triple tripleXQY = GraphTestLib.triple("x Q y");
+
+ protected static final TripleBunch emptyBunch = new ArrayBunch();
+
+ protected abstract TripleBunch getBunch();
+
+ @Test
+ public void testEmptyBunch() {
+ TripleBunch b = getBunch();
+ assertEquals(0, b.size());
+ assertFalse(b.contains(tripleSPO));
+ assertFalse(b.contains(tripleXQY));
+ assertFalse(b.iterator().hasNext());
+ }
+
+ @Test
+ public void testAddElement() {
+ TripleBunch b = getBunch();
+ b.add(tripleSPO);
+ assertEquals(1, b.size());
+ assertTrue(b.contains(tripleSPO));
+ assertEquals(listOf(tripleSPO), Iter.toList(b.iterator()));
+ }
+
+ @Test
+ public void testAddElements() {
+ TripleBunch b = getBunch();
+ b.add(tripleSPO);
+ b.add(tripleXQY);
+ assertEquals(2, b.size());
+ assertTrue(b.contains(tripleSPO));
+ assertTrue(b.contains(tripleXQY));
+ assertEquals(setOf(tripleSPO, tripleXQY), Iter.toSet(b.iterator()));
+ }
+
+ @Test
+ public void testRemoveOnlyElement() {
+ TripleBunch b = getBunch();
+ b.add(tripleSPO);
+ b.remove(tripleSPO);
+ assertEquals(0, b.size());
+ assertFalse(b.contains(tripleSPO));
+ assertFalse(b.iterator().hasNext());
+ }
+
+ @Test
+ public void testRemoveFirstOfTwo() {
+ TripleBunch b = getBunch();
+ b.add(tripleSPO);
+ b.add(tripleXQY);
+ b.remove(tripleSPO);
+ assertEquals(1, b.size());
+ assertFalse(b.contains(tripleSPO));
+ assertTrue(b.contains(tripleXQY));
+ assertEquals(listOf(tripleXQY), Iter.toList(b.iterator()));
+ }
+
+ @Test
+ public void testTableGrows() {
+ TripleBunch b = getBunch();
+ b.add(tripleSPO);
+ b.add(tripleXQY);
+ b.add(GraphTestLib.triple("a I b"));
+ b.add(GraphTestLib.triple("c J d"));
+ }
+
+ @Test
+ public void testIterator() {
+ TripleBunch b = getBunch();
+ b.add(GraphTestLib.triple("a P b"));
+ b.add(GraphTestLib.triple("c Q d"));
+ b.add(GraphTestLib.triple("e R f"));
+ assertEquals(GraphTestLib.tripleSet("a P b; c Q d; e R f"), b.iterator().toSet());
+ }
+
+ @Test
+ public void testIteratorRemoveOneItem() {
+ TripleBunch b = getBunch();
+ b.add(GraphTestLib.triple("a P b"));
+ b.add(GraphTestLib.triple("c Q d"));
+ b.add(GraphTestLib.triple("e R f"));
+ ExtendedIterator<Triple> it = b.iterator();
+ while (it.hasNext()) if (it.next().equals(GraphTestLib.triple("c Q d"))) it.remove();
+ assertEquals(GraphTestLib.tripleSet("a P b; e R f"), b.iterator().toSet());
+ }
+
+ @Test
+ public void testIteratorRemoveAlltems() {
+ TripleBunch b = getBunch();
+ b.add(GraphTestLib.triple("a P b"));
+ b.add(GraphTestLib.triple("c Q d"));
+ b.add(GraphTestLib.triple("e R f"));
+ ExtendedIterator<Triple> it = b.iterator();
+ while (it.hasNext()) it.removeNext();
+ assertEquals(GraphTestLib.tripleSet(""), b.iterator().toSet());
+ }
+
+ protected List<Triple> listOf(Triple x) {
+ List<Triple> result = new ArrayList<>();
+ result.add(x);
+ return result;
+ }
+
+ protected Set<Triple> setOf(Triple x, Triple y) {
+ Set<Triple> result = setOf(x);
+ result.add(y);
+ return result;
+ }
+
+ protected Set<Triple> setOf(Triple x) {
+ Set<Triple> result = new HashSet<>();
+ result.add(x);
+ return result;
+ }
+}
diff --git a/jena-core/src/test/java/org/apache/jena/memvalue/FieldFilterTest.java b/jena-core/src/test/java/org/apache/jena/memvalue/FieldFilterTest.java
index dd58a6103a..3e343161c3 100644
--- a/jena-core/src/test/java/org/apache/jena/memvalue/FieldFilterTest.java
+++ b/jena-core/src/test/java/org/apache/jena/memvalue/FieldFilterTest.java
@@ -20,45 +20,46 @@
*/
package org.apache.jena.memvalue;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.Triple;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.apache.jena.graph.test.GraphTestBase.node;
-import static org.apache.jena.graph.test.GraphTestBase.triple;
-import static org.junit.Assert.*;
+import org.apache.jena.graph.GraphTestLib;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
public class FieldFilterTest {
@Test
public void filterOnTwoNodes() {
- var sut = FieldFilter.filterOn(Triple.Field.fieldSubject, node("a"), Triple.Field.fieldPredicate, node("P"));
+ var sut = FieldFilter.filterOn(Triple.Field.fieldSubject, GraphTestLib.node("a"), Triple.Field.fieldPredicate, GraphTestLib.node("P"));
assertTrue(sut.hasFilter());
var filter = sut.getFilter();
- assertTrue(filter.test(triple( "a P b" )));
- assertFalse(filter.test(triple( "c P b" )));
- assertFalse(filter.test(triple( "a Q b" )));
+ assertTrue(filter.test(GraphTestLib.triple( "a P b" )));
+ assertFalse(filter.test(GraphTestLib.triple( "c P b" )));
+ assertFalse(filter.test(GraphTestLib.triple( "a Q b" )));
}
@Test
public void filterOnFirstNode() {
- var sut = FieldFilter.filterOn(Triple.Field.fieldSubject, node("a"), Triple.Field.fieldPredicate, Node.ANY);
+ var sut = FieldFilter.filterOn(Triple.Field.fieldSubject, GraphTestLib.node("a"), Triple.Field.fieldPredicate, Node.ANY);
assertTrue(sut.hasFilter());
var filter = sut.getFilter();
- assertTrue(filter.test(triple( "a P b" )));
- assertFalse(filter.test(triple( "c P b" )));
- assertTrue(filter.test(triple( "a Q b" )));
+ assertTrue(filter.test(GraphTestLib.triple( "a P b" )));
+ assertFalse(filter.test(GraphTestLib.triple( "c P b" )));
+ assertTrue(filter.test(GraphTestLib.triple( "a Q b" )));
}
@Test
public void filterOnSecondNode() {
- var sut = FieldFilter.filterOn(Triple.Field.fieldSubject, Node.ANY, Triple.Field.fieldPredicate, node("P"));
+ var sut = FieldFilter.filterOn(Triple.Field.fieldSubject, Node.ANY, Triple.Field.fieldPredicate, GraphTestLib.node("P"));
assertTrue(sut.hasFilter());
var filter = sut.getFilter();
- assertTrue(filter.test(triple( "a P b" )));
- assertTrue(filter.test(triple( "c P b" )));
- assertFalse(filter.test(triple( "a Q b" )));
+ assertTrue(filter.test(GraphTestLib.triple( "a P b" )));
+ assertTrue(filter.test(GraphTestLib.triple( "c P b" )));
+ assertFalse(filter.test(GraphTestLib.triple( "a Q b" )));
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/memvalue/SparseArraySpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/memvalue/SparseArraySpliteratorTest.java
index 0853f7f2bc..7b59812e02 100644
--- a/jena-core/src/test/java/org/apache/jena/memvalue/SparseArraySpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/memvalue/SparseArraySpliteratorTest.java
@@ -20,12 +20,13 @@
*/
... 13820 lines suppressed ...
(jena) 04/04: GH-3236: Convert 'mem' tests to JUnit6
Posted by an...@apache.org.
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 da0fb4e68144ace68ab0dd31130149c7f766c7a2
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Jun 11 09:09:26 2026 +0100
GH-3236: Convert 'mem' tests to JUnit6
---
.../org/apache/jena/mem/AbstractGraphMemTest.java | 14 ++++---
.../java/org/apache/jena/mem/GraphMemFastTest.java | 10 ++---
.../apache/jena/mem/GraphMemIndexedSetTest.java | 42 +++++++++++---------
.../org/apache/jena/mem/GraphMemRoaringTest.java | 43 ++++++++++++---------
.../java/org/apache/jena/mem/GraphMemTest.java | 19 +++++----
.../org/apache/jena/mem/IndexingStrategyTest.java | 9 +++--
.../mem/{TS4_GraphMem.java => TS6_GraphMem.java} | 14 +++----
.../mem/collection/AbstractJenaMapNodeTest.java | 10 ++---
.../mem/collection/AbstractJenaSetTripleTest.java | 10 ++---
.../jena/mem/collection/FastHashMapTest2.java | 13 ++++---
.../jena/mem/collection/FastHashSetTest.java | 6 +--
.../jena/mem/collection/FastHashSetTest2.java | 9 +++--
.../jena/mem/collection/HashCommonMapTest.java | 4 +-
.../jena/mem/collection/HashCommonSetTest.java | 4 +-
.../jena/mem/iterator/IteratorOfJenaSetsTest.java | 19 +++++----
.../jena/mem/iterator/SparseArrayIteratorTest.java | 9 +++--
.../jena/mem/pattern/PatternClassifierTest.java | 9 +++--
.../jena/mem/spliterator/ArraySpliteratorTest.java | 18 +++++----
.../mem/spliterator/ArraySubSpliteratorTest.java | 18 +++++----
.../spliterator/SparseArraySpliteratorTest.java | 16 ++++----
.../spliterator/SparseArraySubSpliteratorTest.java | 16 ++++----
.../jena/mem/store/AbstractTripleStoreTest.java | 20 +++++-----
.../jena/mem/store/fast/FastArrayBunchTest.java | 3 +-
.../mem/store/fast/FastHashedBunchMapTest.java | 5 ++-
.../mem/store/fast/FastHashedTripleBunchTest.java | 12 +++---
.../jena/mem/store/fast/FastTripleStoreTest.java | 16 ++++----
.../mem/store/indexed/IndexListIteratorTest.java | 21 +++++-----
.../store/indexed/IndexListSpliteratorTest.java | 21 +++++-----
.../jena/mem/store/indexed/IndexListTest.java | 7 ++--
.../mem/store/indexed/IndexListsIteratorTest.java | 17 ++++----
.../store/indexed/IndexListsSpliteratorTest.java | 22 +++++------
.../store/indexed/IndexedSetTripleStoreTest.java | 45 +++++++++++++---------
.../jena/mem/store/indexed/NodesToIndicesTest.java | 5 ++-
.../jena/mem/store/indexed/TripleSetTest.java | 12 +++---
.../jena/mem/store/legacy/ArrayBunchTest.java | 3 +-
.../jena/mem/store/legacy/FieldFilterTest.java | 7 ++--
.../mem/store/legacy/HashedTripleBunchTest.java | 12 +++---
.../mem/store/legacy/LegacyTripleStoreTest.java | 3 +-
.../mem/store/legacy/NodeToTriplesMapMemTest.java | 4 +-
.../roaring/RoaringBitmapTripleIteratorTest.java | 8 ++--
.../mem/store/roaring/RoaringTripleStoreTest.java | 45 +++++++++++++---------
.../org/apache/jena/test/JenaCoreTestAll_JU4.java | 3 +-
.../org/apache/jena/test/JenaCoreTestAll_JU6.java | 3 ++
43 files changed, 340 insertions(+), 266 deletions(-)
diff --git a/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java b/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java
index f8ca22888a..86badcf2fa 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/AbstractGraphMemTest.java
@@ -23,13 +23,11 @@ package org.apache.jena.mem;
import static org.apache.jena.junit.GraphHelper.node;
import static org.apache.jena.junit.GraphHelper.triple;
+import static org.junit.jupiter.api.Assertions.*;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.jena.datatypes.xsd.impl.XSDDouble;
import org.apache.jena.graph.NodeFactory;
@@ -45,7 +43,7 @@ public abstract class AbstractGraphMemTest {
protected abstract GraphMem createGraph();
- @Before
+ @BeforeEach
public void setUp() {
sut = createGraph();
}
@@ -1048,6 +1046,10 @@ public abstract class AbstractGraphMemTest {
@Test
public void testDeleteAll() {
+ deleteAllWorker() ;
+ }
+
+ protected void deleteAllWorker() {
for(var subjects=1; subjects <= 8 ; subjects++) {
for(var predicates=1; predicates <= 8 ; predicates++) {
for(var objects=1; objects <= 8 ; objects++) {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java
index dc94918737..dc25ae25f1 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemFastTest.java
@@ -21,11 +21,11 @@
package org.apache.jena.mem;
-import org.junit.Test;
-
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
/**
* Concrete instantiation of {@link AbstractGraphMemTest} that exercises
@@ -47,7 +47,7 @@ public class GraphMemFastTest extends AbstractGraphMemTest {
final var copy = sut.copy();
// The override on GraphMemFast must preserve the runtime type so
// callers don't lose subclass-specific functionality through copy().
- assertTrue("copy() must return a GraphMemFast", copy instanceof GraphMemFast);
+ assertTrue(copy instanceof GraphMemFast, "copy() must return a GraphMemFast");
assertNotSame(sut, copy);
}
}
\ No newline at end of file
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java
index 8ce0233d39..008900f9ce 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemIndexedSetTest.java
@@ -20,40 +20,44 @@
*/
package org.apache.jena.mem;
+import static org.apache.jena.junit.GraphHelper.triple;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
import org.apache.jena.mem.pattern.PatternClassifier;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.mockito.Mockito;
-import java.util.Arrays;
-import java.util.Collection;
-
-import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("provideArgs")
public class GraphMemIndexedSetTest extends AbstractGraphMemTest {
- @Parameterized.Parameter
- public IndexingStrategy indexingStrategy;
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> data() {
- return Arrays.stream(IndexingStrategy.values())
- .map(strategy -> new Object[]{strategy})
+ public static Stream<Arguments> provideArgs() {
+ List<Arguments> args = Arrays.stream(IndexingStrategy.values())
+ .map(strategy -> Arguments.of(strategy))
.toList();
+ return args.stream();
}
+ public IndexingStrategy indexingStrategy;
+
+ public GraphMemIndexedSetTest(IndexingStrategy indexingStrategy) { this.indexingStrategy = indexingStrategy; }
+
@Override
public void testDeleteAll() {
// the delete test takes almost a minute with MANUAL indexing
if(indexingStrategy == IndexingStrategy.MANUAL)
return;
-
- super.testDeleteAll();
+ super.deleteAllWorker();
}
@Override
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java
index 4ff7b5f91f..109e1bbb13 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemRoaringTest.java
@@ -20,34 +20,41 @@
*/
package org.apache.jena.mem;
+import static org.apache.jena.junit.GraphHelper.triple;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
import org.apache.jena.mem.pattern.PatternClassifier;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.mockito.Mockito;
-import java.util.Arrays;
-import java.util.Collection;
-
-import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("provideArgs")
public class GraphMemRoaringTest extends AbstractGraphMemTest {
- @Parameterized.Parameter
- public IndexingStrategy indexingStrategy;
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> data() {
- return Arrays.stream(IndexingStrategy.values())
- .map(strategy -> new Object[]{strategy})
+ public static Stream<Arguments> provideArgs() {
+ List<Arguments> args = Arrays.stream(IndexingStrategy.values())
+ .map(strategy -> Arguments.of(strategy))
.toList();
+ return args.stream();
}
+ public IndexingStrategy indexingStrategy;
+
+ public GraphMemRoaringTest(IndexingStrategy indexingStrategy) { this.indexingStrategy = indexingStrategy; }
+
@Override
protected GraphMem createGraph() {
return switch (indexingStrategy) {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java b/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java
index 095507ef24..1264ab5537 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMemTest.java
@@ -20,18 +20,21 @@
*/
package org.apache.jena.mem;
-import org.apache.jena.graph.Triple;
-import org.apache.jena.mem.store.TripleStore;
-import org.apache.jena.util.iterator.NullIterator;
-import org.junit.Test;
-
-import java.util.stream.Stream;
-
import static org.apache.jena.junit.GraphHelper.node;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.graph.Triple;
+import org.apache.jena.mem.store.TripleStore;
+import org.apache.jena.util.iterator.NullIterator;
+
public class GraphMemTest {
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java b/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java
index 0f2c9ceffd..4564d87350 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/IndexingStrategyTest.java
@@ -21,10 +21,11 @@
package org.apache.jena.mem;
import org.apache.jena.mem.store.indexed.IndexedSetTripleStore;
-import org.junit.Test;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
/**
* Unit tests for the {@link IndexingStrategy} enum: verifies the five
@@ -52,9 +53,9 @@ public class IndexingStrategyTest {
}
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void valueOfRejectsUnknownNames() {
- IndexingStrategy.valueOf("NOT_A_STRATEGY");
+ assertThrows(IllegalArgumentException.class, ()->IndexingStrategy.valueOf("NOT_A_STRATEGY"));
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/TS4_GraphMem.java b/jena-core/src/test/java/org/apache/jena/mem/TS6_GraphMem.java
similarity index 93%
rename from jena-core/src/test/java/org/apache/jena/mem/TS4_GraphMem.java
rename to jena-core/src/test/java/org/apache/jena/mem/TS6_GraphMem.java
index 09aa5836a1..6ce5eae312 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/TS4_GraphMem.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/TS6_GraphMem.java
@@ -21,6 +21,9 @@
package org.apache.jena.mem;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
import org.apache.jena.mem.collection.*;
import org.apache.jena.mem.iterator.IteratorOfJenaSetsTest;
import org.apache.jena.mem.iterator.SparseArrayIteratorTest;
@@ -38,11 +41,8 @@ import org.apache.jena.mem.store.legacy.*;
import org.apache.jena.mem.store.roaring.RoaringBitmapTripleIteratorTest;
import org.apache.jena.mem.store.roaring.RoaringTripleStoreTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses( {
+@Suite
+@SelectClasses( {
// spliterator/
SparseArraySubSpliteratorTest.class,
ArraySubSpliteratorTest.class,
@@ -94,9 +94,9 @@ import org.junit.runners.Suite;
// --
GraphMemLegacyTest.class,
GraphMemFastTest.class,
- GraphMemIndexedSetTest.class,
+ GraphMemIndexedSetTest.class, //5 less - 5 indexing strategies.
GraphMemRoaringTest.class,
GraphMemTest.class,
IndexingStrategyTest.class
} )
-public class TS4_GraphMem {}
+public class TS6_GraphMem {}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java
index 998028ff38..48b8f5b98f 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaMapNodeTest.java
@@ -24,8 +24,8 @@ package org.apache.jena.mem.collection;
import org.apache.jena.graph.Node;
import org.hamcrest.collection.IsEmptyCollection;
import org.hamcrest.collection.IsIterableContainingInAnyOrder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.Collections;
@@ -35,7 +35,7 @@ import java.util.stream.StreamSupport;
import static org.apache.jena.junit.GraphHelper.node;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public abstract class AbstractJenaMapNodeTest {
@@ -43,7 +43,7 @@ public abstract class AbstractJenaMapNodeTest {
protected abstract JenaMap<Node, Object> createNodeMap();
- @Before
+ @BeforeEach
public void setUp() {
sut = createNodeMap();
}
@@ -613,4 +613,4 @@ public abstract class AbstractJenaMapNodeTest {
}
assertTrue(sut.isEmpty());
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java
index fa6d7d329b..9c5e7f9350 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/AbstractJenaSetTripleTest.java
@@ -24,8 +24,8 @@ package org.apache.jena.mem.collection;
import org.apache.jena.graph.Triple;
import org.hamcrest.collection.IsEmptyCollection;
import org.hamcrest.collection.IsIterableContainingInAnyOrder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.Collections;
@@ -35,7 +35,7 @@ import java.util.stream.StreamSupport;
import static org.apache.jena.junit.GraphHelper.triple;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public abstract class AbstractJenaSetTripleTest {
@@ -43,7 +43,7 @@ public abstract class AbstractJenaSetTripleTest {
protected abstract JenaSet<Triple> createTripleSet();
- @Before
+ @BeforeEach
public void setUp() {
sut = createTripleSet();
}
@@ -363,4 +363,4 @@ public abstract class AbstractJenaSetTripleTest {
}
assertTrue(sut.isEmpty());
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java
index f1428e0826..d8bb11e5be 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashMapTest2.java
@@ -20,15 +20,18 @@
*/
package org.apache.jena.mem.collection;
-import org.apache.jena.graph.Node;
-import org.junit.Test;
+import static org.apache.jena.junit.GraphHelper.node;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
-import java.util.function.UnaryOperator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.function.UnaryOperator;
-import static org.apache.jena.junit.GraphHelper.node;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.graph.Node;
public class FastHashMapTest2 {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest.java
index 7c4c1c7c1e..32f0ecbf9e 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest.java
@@ -18,13 +18,11 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.collection;
import org.apache.jena.graph.Triple;
-/**
- * This test shall test only the parts of the {@link FastHashSet} which are not tested by the {@link AbstractJenaSetTripleTest}.
- */
public class FastHashSetTest extends AbstractJenaSetTripleTest {
@Override
protected JenaSet<Triple> createTripleSet() {
@@ -35,4 +33,4 @@ public class FastHashSetTest extends AbstractJenaSetTripleTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java
index f1c62115eb..40b4f63707 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/FastHashSetTest2.java
@@ -20,13 +20,14 @@
*/
package org.apache.jena.mem.collection;
-import org.junit.Before;
-import org.junit.Test;
import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import static org.apache.jena.junit.GraphHelper.node;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* This test shall test only the parts of the {@link FastHashSet} which are not tested by the {@link AbstractJenaSetTripleTest}.
@@ -35,7 +36,7 @@ public class FastHashSetTest2 {
private FastHashSet<String> sut;
- @Before
+ @BeforeEach
public void setUp() {
sut = new FastStringHashSet();
}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java
index fb5550d03e..91eb8e042c 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonMapTest.java
@@ -21,12 +21,12 @@
package org.apache.jena.mem.collection;
import org.apache.jena.graph.Node;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.function.UnaryOperator;
import static org.apache.jena.junit.GraphHelper.node;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HashCommonMapTest extends AbstractJenaMapNodeTest {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java
index b8f7d1657c..67091bfea5 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/collection/HashCommonSetTest.java
@@ -21,10 +21,10 @@
package org.apache.jena.mem.collection;
import org.apache.jena.graph.Triple;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public class HashCommonSetTest extends AbstractJenaSetTripleTest {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/iterator/IteratorOfJenaSetsTest.java b/jena-core/src/test/java/org/apache/jena/mem/iterator/IteratorOfJenaSetsTest.java
index 02779ea8f6..cf1e88d4b7 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/iterator/IteratorOfJenaSetsTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/iterator/IteratorOfJenaSetsTest.java
@@ -20,16 +20,19 @@
*/
package org.apache.jena.mem.iterator;
-import org.hamcrest.collection.IsIterableContainingInAnyOrder;
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.jena.mem.collection.FastHashSet;
-import org.apache.jena.mem.collection.JenaSet;
import java.util.*;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.mem.collection.FastHashSet;
+import org.apache.jena.mem.collection.JenaSet;
+import org.hamcrest.collection.IsIterableContainingInAnyOrder;
public class IteratorOfJenaSetsTest {
@@ -37,7 +40,7 @@ public class IteratorOfJenaSetsTest {
private IteratorOfJenaSets<String> sut;
private Iterator<JenaSet<String>> parentIterator;
- @Before
+ @BeforeEach
public void setUp() {
parentIterator = Arrays.asList(
new StringSet("1.1", "1.2"),
diff --git a/jena-core/src/test/java/org/apache/jena/mem/iterator/SparseArrayIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/iterator/SparseArrayIteratorTest.java
index 3ff22e6d36..75fdf5a9ca 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/iterator/SparseArrayIteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/iterator/SparseArrayIteratorTest.java
@@ -20,13 +20,14 @@
*/
package org.apache.jena.mem.iterator;
-import org.apache.jena.mem.collection.FastHashSet;
-import org.apache.jena.mem.collection.JenaSet;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
import java.util.NoSuchElementException;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.mem.collection.FastHashSet;
+import org.apache.jena.mem.collection.JenaSet;
public class SparseArrayIteratorTest {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java b/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java
index fcc8457160..113e3f594b 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/pattern/PatternClassifierTest.java
@@ -20,12 +20,13 @@
*/
package org.apache.jena.mem.pattern;
-import org.apache.jena.graph.Node;
-import org.junit.Test;
-
import static org.apache.jena.junit.GraphHelper.node;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.graph.Node;
/**
* Unit tests for {@link PatternClassifier}: maps a triple match into one of
diff --git a/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySpliteratorTest.java
index b71d43f2ca..2086cb099f 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySpliteratorTest.java
@@ -21,15 +21,19 @@
package org.apache.jena.mem.spliterator;
-import org.apache.jena.mem.collection.FastHashSet;
-import org.apache.jena.mem.collection.JenaSet;
-import org.junit.Test;
+import static java.util.Spliterator.DISTINCT;
+import static java.util.Spliterator.NONNULL;
+import static java.util.Spliterator.SIZED;
+import static java.util.Spliterator.SUBSIZED;
+import static org.junit.jupiter.api.Assertions.*;
import java.util.ArrayList;
import java.util.Spliterator;
-import static java.util.Spliterator.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.mem.collection.FastHashSet;
+import org.apache.jena.mem.collection.JenaSet;
public class ArraySpliteratorTest {
@@ -200,8 +204,8 @@ public class ArraySpliteratorTest {
}
private void assertBetween(long min, long max, long estimateSize) {
- assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize >= min);
- assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize <= max);
+ assertTrue(estimateSize >= min, "estimateSize=" + estimateSize + " min=" + min + " max=" + max);
+ assertTrue(estimateSize <= max, "estimateSize=" + estimateSize + " min=" + min + " max=" + max);
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySubSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySubSpliteratorTest.java
index dd08a063c4..639feb6254 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySubSpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/spliterator/ArraySubSpliteratorTest.java
@@ -20,15 +20,19 @@
*/
package org.apache.jena.mem.spliterator;
-import org.apache.jena.mem.collection.FastHashSet;
-import org.apache.jena.mem.collection.JenaSet;
-import org.junit.Test;
+import static java.util.Spliterator.DISTINCT;
+import static java.util.Spliterator.NONNULL;
+import static java.util.Spliterator.SIZED;
+import static java.util.Spliterator.SUBSIZED;
+import static org.junit.jupiter.api.Assertions.*;
import java.util.ArrayList;
import java.util.Spliterator;
-import static java.util.Spliterator.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.mem.collection.FastHashSet;
+import org.apache.jena.mem.collection.JenaSet;
public class ArraySubSpliteratorTest {
@@ -199,8 +203,8 @@ public class ArraySubSpliteratorTest {
}
private void assertBetween(long min, long max, long estimateSize) {
- assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize >= min);
- assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize <= max);
+ assertTrue(estimateSize >= min, "estimateSize=" + estimateSize + " min=" + min + " max=" + max);
+ assertTrue(estimateSize <= max, "estimateSize=" + estimateSize + " min=" + min + " max=" + max);
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySpliteratorTest.java
index e90061e47a..0e37698071 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySpliteratorTest.java
@@ -20,15 +20,17 @@
*/
package org.apache.jena.mem.spliterator;
-import org.apache.jena.mem.collection.FastHashSet;
-import org.apache.jena.mem.collection.JenaSet;
-import org.junit.Test;
+import static java.util.Spliterator.DISTINCT;
+import static java.util.Spliterator.NONNULL;
+import static org.junit.jupiter.api.Assertions.*;
import java.util.ArrayList;
import java.util.Spliterator;
-import static java.util.Spliterator.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.mem.collection.FastHashSet;
+import org.apache.jena.mem.collection.JenaSet;
public class SparseArraySpliteratorTest {
@@ -418,8 +420,8 @@ public class SparseArraySpliteratorTest {
}
private void assertBetween(long min, long max, long estimateSize) {
- assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize >= min);
- assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize <= max);
+ assertTrue(estimateSize >= min, "estimateSize=" + estimateSize + " min=" + min + " max=" + max);
+ assertTrue(estimateSize <= max, "estimateSize=" + estimateSize + " min=" + min + " max=" + max);
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySubSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySubSpliteratorTest.java
index a750578e70..87b812ef03 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySubSpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/spliterator/SparseArraySubSpliteratorTest.java
@@ -20,15 +20,17 @@
*/
package org.apache.jena.mem.spliterator;
-import org.apache.jena.mem.collection.FastHashSet;
-import org.apache.jena.mem.collection.JenaSet;
-import org.junit.Test;
+import static java.util.Spliterator.DISTINCT;
+import static java.util.Spliterator.NONNULL;
+import static org.junit.jupiter.api.Assertions.*;
import java.util.ArrayList;
import java.util.Spliterator;
-import static java.util.Spliterator.*;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.mem.collection.FastHashSet;
+import org.apache.jena.mem.collection.JenaSet;
public class SparseArraySubSpliteratorTest {
@@ -421,8 +423,8 @@ public class SparseArraySubSpliteratorTest {
}
private void assertBetween(long min, long max, long estimateSize) {
- assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize >= min);
- assertTrue("estimateSize=" + estimateSize + " min=" + min + " max=" + max, estimateSize <= max);
+ assertTrue(estimateSize >= min, "estimateSize=" + estimateSize + " min=" + min + " max=" + max);
+ assertTrue(estimateSize <= max, "estimateSize=" + estimateSize + " min=" + min + " max=" + max);
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java
index d0bdb2364b..e19ca45b0e 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/AbstractTripleStoreTest.java
@@ -21,18 +21,21 @@
package org.apache.jena.mem.store;
+import static org.apache.jena.junit.GraphHelper.node;
+import static org.apache.jena.junit.GraphHelper.triple;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.datatypes.xsd.impl.XSDDouble;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
import org.hamcrest.collection.IsEmptyCollection;
import org.hamcrest.collection.IsIterableContainingInAnyOrder;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.apache.jena.junit.GraphHelper.node;
-import static org.apache.jena.junit.GraphHelper.triple;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
public abstract class AbstractTripleStoreTest {
@@ -40,7 +43,7 @@ public abstract class AbstractTripleStoreTest {
protected abstract TripleStore createTripleStore();
- @Before
+ @BeforeEach
public void setUp() {
sut = createTripleStore();
}
@@ -54,7 +57,6 @@ public abstract class AbstractTripleStoreTest {
assertTrue(sut.isEmpty());
}
-
@Test
public void testDelete() {
sut.add(triple("x R y"));
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastArrayBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastArrayBunchTest.java
index 70fa266499..513d6aa6ba 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastArrayBunchTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastArrayBunchTest.java
@@ -18,6 +18,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.fast;
import org.apache.jena.graph.Triple;
@@ -51,4 +52,4 @@ public class FastArrayBunchTest extends AbstractJenaSetTripleTest {
return a.equals(b);
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java
index de969decea..0a1fc594ac 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedBunchMapTest.java
@@ -18,14 +18,15 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.fast;
import org.apache.jena.graph.Node;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.jena.junit.GraphHelper.node;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit tests for {@link FastHashedBunchMap}: a {@link Node}-keyed map of
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java
index da6f362174..de45034b0d 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastHashedTripleBunchTest.java
@@ -18,15 +18,17 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.fast;
+import static org.apache.jena.junit.GraphHelper.triple;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Triple;
import org.apache.jena.mem.collection.AbstractJenaSetTripleTest;
import org.apache.jena.mem.collection.JenaSet;
-import org.junit.Test;
-
-import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.assertEquals;
public class FastHashedTripleBunchTest extends AbstractJenaSetTripleTest {
@@ -72,4 +74,4 @@ public class FastHashedTripleBunchTest extends AbstractJenaSetTripleTest {
return a.equals(b);
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java
index 2f31d5b132..154b251d08 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/fast/FastTripleStoreTest.java
@@ -18,16 +18,18 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.fast;
+import static org.apache.jena.junit.GraphHelper.triple;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.mem.store.AbstractTripleStoreTest;
import org.apache.jena.mem.store.TripleStore;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
public class FastTripleStoreTest extends AbstractTripleStoreTest {
@@ -100,4 +102,4 @@ public class FastTripleStoreTest extends AbstractTripleStoreTest {
assertEquals(0, sut.stream(triple("?? P0 oX")).count());
assertFalse(sut.contains(triple("?? P0 oX")));
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java
index 0e630a63d2..b29120f22f 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListIteratorTest.java
@@ -18,11 +18,12 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.indexed;
import org.apache.jena.graph.Triple;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.ConcurrentModificationException;
@@ -30,7 +31,7 @@ import java.util.HashSet;
import java.util.NoSuchElementException;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit tests for {@link IndexListIterator}: iterates an {@link IndexList} of
@@ -45,7 +46,7 @@ public class IndexListIteratorTest {
private Triple t3;
private int idx2;
- @Before
+ @BeforeEach
public void setUp() {
triples = new TripleSet();
list = new IndexList();
@@ -80,11 +81,11 @@ public class IndexListIteratorTest {
assertFalse(it.hasNext());
}
- @Test(expected = NoSuchElementException.class)
+ @Test
public void nextThrowsWhenExhausted() {
final var emptyList = new IndexList();
final var it = new IndexListIterator(triples, emptyList);
- it.next();
+ assertThrows(NoSuchElementException.class, () -> it.next());
}
@Test
@@ -99,20 +100,20 @@ public class IndexListIteratorTest {
assertEquals(expected, collected);
}
- @Test(expected = ConcurrentModificationException.class)
+ @Test
public void nextDetectsConcurrentModification() {
final var it = new IndexListIterator(triples, list);
// Adding a new triple to the canonical set after constructing the
// iterator must invalidate it.
triples.addAndGetIndex(triple("s4 p4 o4"));
- it.next();
+ assertThrows(ConcurrentModificationException.class, () -> it.next());
}
- @Test(expected = ConcurrentModificationException.class)
+ @Test
public void forEachRemainingDetectsConcurrentModification() {
final var it = new IndexListIterator(triples, list);
triples.addAndGetIndex(triple("s5 p5 o5"));
- it.forEachRemaining(t -> {});
+ assertThrows(ConcurrentModificationException.class, () -> it.forEachRemaining(t -> {}));
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java
index 391bd98e5c..d0ae4ec82e 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListSpliteratorTest.java
@@ -18,17 +18,18 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.indexed;
import org.apache.jena.graph.Triple;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.*;
import java.util.stream.StreamSupport;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit tests for {@link IndexListSpliterator}: walks an {@link IndexList},
@@ -41,7 +42,7 @@ public class IndexListSpliteratorTest {
private IndexList list;
private List<Triple> expected;
- @Before
+ @BeforeEach
public void setUp() {
triples = new TripleSet();
list = new IndexList();
@@ -89,7 +90,7 @@ public class IndexListSpliteratorTest {
public void trySplitProducesNonOverlappingHalves() {
final var sp = new IndexListSpliterator(triples, list);
final var prefix = sp.trySplit();
- assertNotNull("a list of 8 must split", prefix);
+ assertNotNull(prefix, "a list of 8 must split");
final var firstHalf = new ArrayList<Triple>();
final var secondHalf = new ArrayList<Triple>();
@@ -105,7 +106,7 @@ public class IndexListSpliteratorTest {
// The two halves are disjoint
final var asSetA = new HashSet<>(firstHalf);
for (final var t : secondHalf) {
- assertFalse("split must be disjoint", asSetA.contains(t));
+ assertFalse(asSetA.contains(t), "split must be disjoint");
}
}
@@ -140,17 +141,17 @@ public class IndexListSpliteratorTest {
assertEquals(expected.size() - 1L, sp.getExactSizeIfKnown());
}
- @Test(expected = ConcurrentModificationException.class)
+ @Test
public void tryAdvanceDetectsConcurrentModification() {
final var sp = new IndexListSpliterator(triples, list);
triples.addAndGetIndex(triple("s99 p o"));
- sp.tryAdvance(t -> {});
+ assertThrows(ConcurrentModificationException.class, () -> sp.tryAdvance(t -> {}));
}
- @Test(expected = ConcurrentModificationException.class)
+ @Test
public void forEachRemainingDetectsConcurrentModification() {
final var sp = new IndexListSpliterator(triples, list);
triples.addAndGetIndex(triple("s99 p o"));
- sp.forEachRemaining(t -> {});
+ assertThrows(ConcurrentModificationException.class, () -> sp.forEachRemaining(t -> {}));
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListTest.java
index 7bb68b50e4..c30484817e 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListTest.java
@@ -18,11 +18,12 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.indexed;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit tests for {@link IndexList}: append-only int list with O(1)
@@ -66,7 +67,7 @@ public class IndexListTest {
for (int i = 0; i < 100; i++) {
assertEquals(i * 7, list.getIndexAt(i));
}
- assertTrue("backing array must have grown", list.getIndices().length >= 100);
+ assertTrue(list.getIndices().length >= 100, "backing array must have grown");
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java
index a33728a4fc..3dac19707b 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsIteratorTest.java
@@ -18,16 +18,17 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.indexed;
import org.apache.jena.graph.Triple;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.*;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit tests for {@link IndexListsIterator}: lazily walks the intersection
@@ -39,7 +40,7 @@ public class IndexListsIteratorTest {
private int[] reverseA;
private int[] reverseB;
- @Before
+ @BeforeEach
public void setUp() {
triples = new TripleSet();
// pre-size reverse arrays generously; the test triples will get
@@ -106,7 +107,7 @@ public class IndexListsIteratorTest {
assertFalse(it.hasNext());
}
- @Test(expected = NoSuchElementException.class)
+ @Test
public void nextThrowsWhenIntersectionExhausted() {
final int idx1 = addTriple("a b c");
final int idx2 = addTriple("d e f");
@@ -118,7 +119,7 @@ public class IndexListsIteratorTest {
final var it = new IndexListsIterator(triples,
listA, reverseA, listB, reverseB);
- it.next();
+ assertThrows(NoSuchElementException.class, () -> it.next());
}
@Test
@@ -194,7 +195,7 @@ public class IndexListsIteratorTest {
new HashSet<>(collected));
}
- @Test(expected = ConcurrentModificationException.class)
+ @Test
public void nextDetectsConcurrentModification() {
final int idx1 = addTriple("a b c");
@@ -206,6 +207,6 @@ public class IndexListsIteratorTest {
final var it = new IndexListsIterator(triples,
listA, reverseA, listB, reverseB);
triples.addAndGetIndex(triple("z z z"));
- it.next();
+ assertThrows(ConcurrentModificationException.class, () -> it.next());
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java
index 0ec83b6a1d..8a3a303539 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexListsSpliteratorTest.java
@@ -18,17 +18,18 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.indexed;
import org.apache.jena.graph.Triple;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.*;
import java.util.stream.StreamSupport;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit tests for {@link IndexListsSpliterator}: walks the intersection of
@@ -43,7 +44,7 @@ public class IndexListsSpliteratorTest {
private IndexList listB;
private List<Triple> commonTriples;
- @Before
+ @BeforeEach
public void setUp() {
triples = new TripleSet();
reverseA = new int[64];
@@ -126,7 +127,7 @@ public class IndexListsSpliteratorTest {
final var asSetA = new HashSet<>(firstHalf);
for (final var t : secondHalf) {
- assertFalse("split must be disjoint", asSetA.contains(t));
+ assertFalse(asSetA.contains(t), "split must be disjoint");
}
}
@@ -167,21 +168,20 @@ public class IndexListsSpliteratorTest {
// estimateSize is the remaining range of the smaller list, which is
// an upper bound on the intersection.
final long est = sp.estimateSize();
- assertTrue("estimate must bound actual intersection",
- est >= commonTriples.size());
+ assertTrue(est >= commonTriples.size(), "estimate must bound actual intersection");
}
- @Test(expected = ConcurrentModificationException.class)
+ @Test
public void tryAdvanceDetectsConcurrentModification() {
final var sp = new IndexListsSpliterator(triples, listA, reverseA, listB, reverseB);
triples.addAndGetIndex(triple("z z z"));
- sp.tryAdvance(t -> {});
+ assertThrows(ConcurrentModificationException.class, () -> sp.tryAdvance(t -> {}));
}
- @Test(expected = ConcurrentModificationException.class)
+ @Test
public void forEachRemainingDetectsConcurrentModification() {
final var sp = new IndexListsSpliterator(triples, listA, reverseA, listB, reverseB);
triples.addAndGetIndex(triple("z z z"));
- sp.forEachRemaining(t -> {});
+ assertThrows(ConcurrentModificationException.class, () -> sp.forEachRemaining(t -> {}));
}
}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java
index bec5daa6e7..bf204834bc 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/IndexedSetTripleStoreTest.java
@@ -18,37 +18,46 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.indexed;
+import static org.apache.jena.junit.GraphHelper.triple;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
import org.apache.jena.graph.Triple;
import org.apache.jena.mem.IndexingStrategy;
import org.apache.jena.mem.pattern.PatternClassifier;
import org.apache.jena.mem.store.AbstractTripleStoreTest;
import org.apache.jena.mem.store.TripleStore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.mockito.Mockito;
-import java.util.Arrays;
-import java.util.Collection;
-
-import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("provideArgs")
public class IndexedSetTripleStoreTest extends AbstractTripleStoreTest {
- @Parameterized.Parameter
- public IndexingStrategy indexingStrategy;
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> data() {
- return Arrays.stream(IndexingStrategy.values())
- .map(strategy -> new Object[]{strategy})
+ public static Stream<Arguments> provideArgs() {
+ List<Arguments> args = Arrays.stream(IndexingStrategy.values())
+ .map(strategy -> Arguments.of(strategy))
.toList();
+ return args.stream();
}
+ public IndexingStrategy indexingStrategy;
+
+ public IndexedSetTripleStoreTest(IndexingStrategy indexingStrategy) { this.indexingStrategy = indexingStrategy; }
+
@Override
protected TripleStore createTripleStore() {
return switch (indexingStrategy) {
@@ -245,4 +254,4 @@ public class IndexedSetTripleStoreTest extends AbstractTripleStoreTest {
throw new IllegalArgumentException("Unsupported indexing strategy: " + sut.getIndexingStrategy());
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java
index 950aaa13a6..2566dbee3e 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/NodesToIndicesTest.java
@@ -18,13 +18,14 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.indexed;
import org.apache.jena.graph.Node;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.jena.junit.GraphHelper.node;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit tests for {@link NodesToIndices}: {@link Node}-keyed
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java
index 884d73c746..6fd9911c17 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/indexed/TripleSetTest.java
@@ -18,14 +18,15 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.indexed;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.concurrent.atomic.AtomicInteger;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
/**
* Unit tests for {@link TripleSet}: hash set of triples extended with a
@@ -59,7 +60,7 @@ public class TripleSetTest {
// Re-adding the same triple returns the bitwise-complement of the
// existing index.
final int reAdd = set.addAndGetIndex(t1);
- assertTrue("re-add must return ~existingIndex", reAdd < 0);
+ assertTrue(reAdd < 0, "re-add must return ~existingIndex");
assertEquals(i1, ~reAdd);
assertEquals(2, set.size());
}
@@ -88,9 +89,8 @@ public class TripleSetTest {
set.addAndGetIndex(triple("s" + i + " p o"));
}
- assertTrue("hook must fire at least once when growing", callCount.get() > 0);
- assertTrue("reported size must be a positive integer (the new array length)",
- lastReportedSize.get() > 0);
+ assertTrue(callCount.get() > 0, "hook must fire at least once when growing");
+ assertTrue(lastReportedSize.get() > 0, "reported size must be a positive integer (the new array length)");
}
@Test
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/ArrayBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/ArrayBunchTest.java
index 5df2cab4e6..cbc83499b0 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/ArrayBunchTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/ArrayBunchTest.java
@@ -18,6 +18,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.legacy;
import org.apache.jena.graph.Triple;
@@ -30,4 +31,4 @@ public class ArrayBunchTest extends AbstractJenaSetTripleTest {
protected JenaSet<Triple> createTripleSet() {
return new ArrayBunch();
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java
index 52ad0e91f8..253c53b72d 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/FieldFilterTest.java
@@ -18,15 +18,16 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.legacy;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.jena.junit.GraphHelper.node;
import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public class FieldFilterTest {
@@ -69,4 +70,4 @@ public class FieldFilterTest {
assertFalse(sut.getFilter().test(triple("s P o2")));
assertFalse(sut.getFilter().test(triple("t P o")));
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java
index 5626ea89c6..8b4774ff29 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/HashedTripleBunchTest.java
@@ -18,15 +18,17 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.legacy;
+import static org.apache.jena.junit.GraphHelper.triple;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Triple;
import org.apache.jena.mem.collection.AbstractJenaSetTripleTest;
import org.apache.jena.mem.collection.JenaSet;
-import org.junit.Test;
-
-import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.assertEquals;
public class HashedTripleBunchTest extends AbstractJenaSetTripleTest {
@@ -51,4 +53,4 @@ public class HashedTripleBunchTest extends AbstractJenaSetTripleTest {
final var sut = new HashedTripleBunch(arrayBunch);
assertEquals(3, sut.size());
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/LegacyTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/LegacyTripleStoreTest.java
index bc05e55db2..f49d9d0ea8 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/LegacyTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/LegacyTripleStoreTest.java
@@ -18,6 +18,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.legacy;
import org.apache.jena.mem.store.AbstractTripleStoreTest;
@@ -29,4 +30,4 @@ public class LegacyTripleStoreTest extends AbstractTripleStoreTest {
protected TripleStore createTripleStore() {
return new LegacyTripleStore();
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/NodeToTriplesMapMemTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/NodeToTriplesMapMemTest.java
index 2e6405a1c1..2908c7a027 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/legacy/NodeToTriplesMapMemTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/legacy/NodeToTriplesMapMemTest.java
@@ -18,13 +18,13 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.legacy;
import org.apache.jena.graph.Triple;
import org.apache.jena.mem.collection.AbstractJenaSetTripleTest;
import org.apache.jena.mem.collection.JenaSet;
-
public class NodeToTriplesMapMemTest extends AbstractJenaSetTripleTest {
@Override
@@ -32,4 +32,4 @@ public class NodeToTriplesMapMemTest extends AbstractJenaSetTripleTest {
return new NodeToTriplesMapMem(
Triple.Field.fieldSubject, Triple.Field.fieldPredicate, Triple.Field.fieldObject);
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java
index 521020e0ac..cb9e263c55 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringBitmapTripleIteratorTest.java
@@ -18,11 +18,12 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.roaring;
import org.apache.jena.graph.Triple;
import org.hamcrest.collection.IsIterableContainingInAnyOrder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.roaringbitmap.RoaringBitmap;
import java.util.ConcurrentModificationException;
@@ -31,11 +32,10 @@ import java.util.NoSuchElementException;
import static org.apache.jena.junit.GraphHelper.triple;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public class RoaringBitmapTripleIteratorTest {
-
private static TripleSet createTripleSet() {
return new TripleSet();
}
@@ -135,4 +135,4 @@ public class RoaringBitmapTripleIteratorTest {
}
assertEquals(RoaringBitmapTripleIterator.BUFFER_SIZE + 1, counter);
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java
index 1770e45367..3a00b59c8f 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/store/roaring/RoaringTripleStoreTest.java
@@ -18,37 +18,46 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
+
package org.apache.jena.mem.store.roaring;
+import static org.apache.jena.junit.GraphHelper.triple;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedClass;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
import org.apache.jena.graph.Triple;
import org.apache.jena.mem.IndexingStrategy;
import org.apache.jena.mem.pattern.PatternClassifier;
import org.apache.jena.mem.store.AbstractTripleStoreTest;
import org.apache.jena.mem.store.TripleStore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.mockito.Mockito;
-import java.util.Arrays;
-import java.util.Collection;
-
-import static org.apache.jena.junit.GraphHelper.triple;
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
+@ParameterizedClass
+@MethodSource("provideArgs")
public class RoaringTripleStoreTest extends AbstractTripleStoreTest {
- @Parameterized.Parameter
- public IndexingStrategy indexingStrategy;
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<Object[]> data() {
- return Arrays.stream(IndexingStrategy.values())
- .map(strategy -> new Object[]{strategy})
+ public static Stream<Arguments> provideArgs() {
+ List<Arguments> args = Arrays.stream(IndexingStrategy.values())
+ .map(strategy -> Arguments.of(strategy))
.toList();
+ return args.stream();
}
+ public IndexingStrategy indexingStrategy;
+
+ public RoaringTripleStoreTest(IndexingStrategy indexingStrategy) { this.indexingStrategy = indexingStrategy; }
+
@Override
protected TripleStore createTripleStore() {
return switch (indexingStrategy) {
@@ -245,4 +254,4 @@ public class RoaringTripleStoreTest extends AbstractTripleStoreTest {
throw new IllegalArgumentException("Unsupported indexing strategy: " + sut.getIndexingStrategy());
}
}
-}
\ No newline at end of file
+}
diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU4.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU4.java
index 72fd24ab48..aebc0ed287 100644
--- a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU4.java
+++ b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU4.java
@@ -47,8 +47,7 @@ public class JenaCoreTestAll_JU4 extends TestCase {
addTest(ts, "Enhanced", org.apache.jena.enhanced.TS3_enh.suite());
addTest(ts, "Graph", adaptJUnit4(org.apache.jena.graph.TS3_graph.class));
- addTest(ts, "Mem", adaptJUnit4(org.apache.jena.mem.TS4_GraphMem.class));
-
+//JU6 addTest(ts, "Mem", adaptJUnit4(org.apache.jena.mem.TS4_GraphMem.class));
//JU6 addTest(ts, "MemValue", adaptJUnit4(org.apache.jena.memvalue.TS3_GraphMemValue.class));
// ** COMPLEX
diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java
index b7ab5cd698..456f8fed16 100644
--- a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java
+++ b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU6.java
@@ -28,6 +28,7 @@ import org.junit.platform.suite.api.Suite;
import org.apache.jena.datatypes.TS6_dt;
import org.apache.jena.irix.TS6_IRIx2;
import org.apache.jena.langtagx.TS6_LangTagX;
+import org.apache.jena.mem.TS6_GraphMem;
import org.apache.jena.memvalue.TS6_GraphMemValue;
import org.apache.jena.rdfxml.xmloutput.TS6_xmloutput;
import org.apache.jena.shared.TS6_SharedPackage;
@@ -40,10 +41,12 @@ import org.apache.jena.vocabulary.TS6_Vocabularies;
TestSystemSetup.class,
// Same order as JenaCoreTestAll_JU4
+ // There should be a corresponding line commented out in JenaCoreTestAll_JU4
TS6_IRIx2.class,
TS6_LangTagX.class,
TS6_dt.class,
+ TS6_GraphMem.class,
TS6_GraphMemValue.class,
TS6_xmloutput.class,
(jena) 02/04: Add dependency JUnit Jupiter to core
Posted by an...@apache.org.
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 a7a95565cd5b4d9162f8ca9d0c5be3faef8af021
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu May 21 08:32:53 2026 +0100
Add dependency JUnit Jupiter to core
---
jena-core/pom.xml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index e596f7c307..3cddb97965 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -63,13 +63,6 @@
<artifactId>RoaringBitmap</artifactId>
</dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!--
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
@@ -81,7 +74,12 @@
<artifactId>junit-platform-suite</artifactId>
<scope>test</scope>
</dependency>
- -->
+
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
(jena) 01/04: Remove test class with no tests
Posted by an...@apache.org.
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 99e200e1b4b561ebfb53f9b173654ca17d8f6124
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu May 21 14:34:32 2026 +0100
Remove test class with no tests
---
.../org/apache/jena/ontology/impl/TS3_ont.java | 1 -
.../org/apache/jena/ontology/impl/TestAxioms.java | 84 ----------------------
2 files changed, 85 deletions(-)
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TS3_ont.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TS3_ont.java
index fb967ac845..37b5072315 100644
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TS3_ont.java
+++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TS3_ont.java
@@ -29,7 +29,6 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses({
TestOntGraph.class,
TestOntResource.class,
- TestAxioms.class,
TestClassExpression.class,
TestOntDocumentManager.class,
TestOntology.class,
diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAxioms.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAxioms.java
deleted file mode 100644
index b99979d9df..0000000000
--- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAxioms.java
+++ /dev/null
@@ -1,84 +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
-///////////////
-package org.apache.jena.ontology.impl;
-
-
-// Imports
-///////////////
-import junit.framework.TestSuite;
-
-
-
-
-/**
- * <p>
- * Unit tests for all different declaration
- * </p>
- */
-public class TestAxioms
- extends OntTestBase
-{
- // Constants
- //////////////////////////////////
-
- // Static variables
- //////////////////////////////////
-
- // Instance variables
- //////////////////////////////////
-
- // Constructors
- //////////////////////////////////
-
- public TestAxioms( String s ) {
- super( s );
- }
-
- // External signature methods
- //////////////////////////////////
-
- protected String getTestName() {
- return "TestAxioms";
- }
-
- public static TestSuite suite() {
- return new TestAxioms( "TestAxioms" );
- }
-
-
- @Override
- public OntTestCase[] getTests() {
- return new OntTestCase[] {
- };
- }
-
-
- // Internal implementation methods
- //////////////////////////////////
-
- //==============================================================================
- // Inner class definitions
- //==============================================================================
-
-}