This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 6052981dd9552dff34a89e1d01c1f8dd69045a1a Author: Andy Seaborne <[email protected]> AuthorDate: Sun Jun 1 20:54:42 2025 +0100 GH-3236: Convert TestPackage* to TS_* JUnit4 --- jena-core/pom.xml | 2 - .../org/apache/jena/graph/GraphMemFactory.java | 2 +- .../java/org/apache/jena/util/FileManagerImpl.java | 2 +- .../jena/assembler/acceptance/AllAccept.java | 67 ------------ .../apache/jena/assembler/test/TS3_Assembler.java | 88 ++++++++++++++++ .../jena/assembler/test/TestAssemblerPackage.java | 35 ------- .../apache/jena/assembler/test/TestAssemblers.java | 59 ----------- .../org/apache/jena/assembler/test/TestMode.java | 84 +++++++-------- ...nceTesting.java => TestOntModelAcceptance.java} | 4 +- .../TS3_dt.java} | 14 +-- .../test/{TestPackage_enh.java => TS3_enh.java} | 6 +- .../jena/graph/compose/test/TS3_compose.java | 105 +++++++++++++++++++ .../graph/compose/test/TestPackage_compose.java | 114 --------------------- .../TS_LangTagX.java => graph/test/TS3_graph.java} | 43 +++++--- .../apache/jena/graph/test/TestPackage_graph.java | 64 ------------ .../test/java/org/apache/jena/irix/TS_IRIx.java | 12 +-- .../java/org/apache/jena/langtagx/TS_LangTagX.java | 9 +- .../test/TS3_GraphMemValue.java} | 20 ++-- .../jena/mem/test/TestPackage_GraphMemValue.java | 39 ------- .../java/org/apache/jena/mem2/TS4_GraphMem2.java | 83 +++++++++++++++ .../impl/TS3_ont.java} | 37 ++++--- .../apache/jena/ontology/impl/TestPackage_ont.java | 61 ----------- ...ckage_ModelMakers.java => TS3_ModelMakers.java} | 19 ++-- .../jena/rdf/model/test/IsomorphicTests.java | 10 +- .../{TestPackage_model.java => TS3_Model1.java} | 11 +- ...StandardModels.java => TS3_StandardModels.java} | 6 +- .../apache/jena/rdf/model/test/TestIterators.java | 7 +- .../apache/jena/rdf/model/test/TestModelRead.java | 2 +- .../jena/rdf/model/test/TestReaderEvents.java | 2 +- .../apache/jena/rdf/model/test/TestReaders.java | 2 +- .../org/apache/jena/rdfxml/libtest/package.html | 30 ------ ...stPackage_xmlinput1.java => TS3_xmlinput1.java} | 6 +- ...stPackage_xmloutput.java => TS3_xmloutput.java} | 2 +- .../jena/rdfxml/xmloutput/TestXMLFeatures.java | 2 +- .../reasoner/{test => examples}/ManualExample.java | 24 +++-- .../jena/reasoner/rulesys/TS3_RuleReasoners.java | 59 +++++++++++ .../reasoner/rulesys/test/TestRuleReasoners.java | 84 --------------- .../test/TS3_reasoners.java} | 21 ++-- .../jena/reasoner/test/TestPackage_reasoners.java | 53 ---------- .../jena/reasoner/test/WGReasonerTester.java | 2 +- .../org/apache/jena/shared/TestSharedPackage.java | 25 ++--- .../java/org/apache/jena/test/TestModelUtil.java | 8 +- .../org/apache/jena/test/TestPackage_core.java | 77 ++++++++++++-- .../java/org/apache/jena/test/TestSystemSetup.java | 7 +- .../{TurtleTestSuite.java => TS_TestTurtle.java} | 23 ++--- .../{TestBadSyntax.java => TestItemBadSyntax.java} | 29 +++--- .../{TestSyntax.java => TestItemSyntax.java} | 27 +++-- .../{TestTurtle.java => TestItemTurtleExec.java} | 57 +++++------ ...eInternalTests.java => TestTurtleInternal.java} | 7 +- .../ttl_test/test/turtle/TestTurtleReader.java | 37 +++---- .../ttl_test/test/turtle/TurtleTestFactory.java | 80 +++++++-------- .../test/turtle/TurtleTestSuiteManifest.java | 84 +++++++++++++++ .../TestPackage_dt.java => util/TS3_coreutil.java} | 42 ++++---- .../org/apache/jena/util/TestPackage_util.java | 66 ------------ .../iterator/test/TS3_coreiter.java} | 19 ++-- .../jena/util/iterator/test/TestPackage_iter.java | 39 ------- .../test/TS_Vocabularies.java} | 18 ++-- .../jena/vocabulary/test/TestVocabularies.java | 42 -------- .../contract/model/SecTestLiterals.java | 4 +- .../contract/model/SecTestReaderEvents.java | 4 +- .../permissions/contract/model/SecTestReaders.java | 4 +- 61 files changed, 848 insertions(+), 1143 deletions(-) diff --git a/jena-core/pom.xml b/jena-core/pom.xml index ec81cd7240..c474b6f52e 100644 --- a/jena-core/pom.xml +++ b/jena-core/pom.xml @@ -175,8 +175,6 @@ <argLine>-javaagent:${org.mockito:mockito-core:jar} -Xshare:off</argLine> <includes> <include>org/apache/jena/test/TestPackage_core.java</include> - <include>org/apache/jena/mem2/**/*Test.java</include> - <include>org/apache/jena/mem2/**/*Test2.java</include> </includes> </configuration> </plugin> diff --git a/jena-core/src/main/java/org/apache/jena/graph/GraphMemFactory.java b/jena-core/src/main/java/org/apache/jena/graph/GraphMemFactory.java index 64464e3bd2..cf63f49519 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/GraphMemFactory.java +++ b/jena-core/src/main/java/org/apache/jena/graph/GraphMemFactory.java @@ -105,7 +105,7 @@ public class GraphMemFactory } /** - * @deprecated To be renamed. Use {@link #createGraphMemForModel()}. The function will be re-purposed for the default samer-term memory graph. + * @deprecated To be renamed. Use {@link #createGraphMemForModel()}. The function will be re-purposed for the default same-term memory graph. */ @Deprecated(forRemoval = true) public static Graph createGraphMem() { diff --git a/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java b/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java index 0ea439ff6a..cc1b54cbad 100644 --- a/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java +++ b/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java @@ -342,7 +342,7 @@ public class FileManagerImpl implements FileManager throw new NotFoundException("Not found: " + filenameOrURI); } model.read(in.getInput(), baseURI, syntax) ; - try { in.getInput().close(); } catch (IOException ex) {} + try { in.getInput().close(); } catch (IOException ex) { ex.printStackTrace();} return model ; } diff --git a/jena-core/src/test/java/org/apache/jena/assembler/acceptance/AllAccept.java b/jena-core/src/test/java/org/apache/jena/assembler/acceptance/AllAccept.java deleted file mode 100644 index a284c1f492..0000000000 --- a/jena-core/src/test/java/org/apache/jena/assembler/acceptance/AllAccept.java +++ /dev/null @@ -1,67 +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 - * - * http://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. - */ - -package org.apache.jena.assembler.acceptance; - -import java.io.File ; -import java.io.FileOutputStream ; -import java.io.IOException ; - -import junit.framework.TestSuite ; -import org.apache.jena.assembler.Assembler ; -import org.apache.jena.assembler.test.AssemblerTestBase ; -import org.apache.jena.rdf.model.InfModel ; -import org.apache.jena.rdf.model.Model ; -import org.apache.jena.rdf.model.Resource ; -import org.apache.jena.reasoner.rulesys.GenericRuleReasoner ; -import org.apache.jena.util.FileUtils ; - -public class AllAccept extends AssemblerTestBase - { - public AllAccept( String name ) - { super( name ); } - - public static TestSuite suite() - { - TestSuite result = new TestSuite(); - result.addTestSuite( AllAccept.class ); - return result; - } - - public void testUnadornedInferenceModel() - { - Resource root = resourceInModel( "x ja:reasoner R; R rdf:type ja:ReasonerFactory" ); - Model m = Assembler.general().openModel( root ); - assertInstanceOf( InfModel.class, m ); - InfModel inf = (InfModel) m; - assertIsoModels( empty, inf.getRawModel() ); - assertInstanceOf( GenericRuleReasoner.class, inf.getReasoner() ); - } - - public void testWithContent() throws IOException - { - File f = FileUtils.tempFileName( "assembler-acceptance-", ".n3" ); - Model data = model( "a P b; b Q c" ); - try ( FileOutputStream fs = new FileOutputStream( f ) ) { - data.write( fs, "N3" ); - } - Resource root = resourceInModel( "x rdf:type ja:MemoryModel; x ja:content y; y ja:externalContent file:" + f.getAbsolutePath() ); - Model m = Assembler.general().openModel( root ); - assertIsoModels( data, m ); - } - } 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/test/TS3_Assembler.java new file mode 100644 index 0000000000..f48f37cf35 --- /dev/null +++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TS3_Assembler.java @@ -0,0 +1,88 @@ +/* + * 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 + * + * http://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. + */ + +package org.apache.jena.assembler.test; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + + +@RunWith(Suite.class) [email protected]( { + // Convert t0 JUnit4 + TestMode.class, + + // JUnit3 + TestModelExpansion.class, + TestImportManager.class, + TestOntModelAcceptance.class, + +// // Was "TestAssemblers" : 19 + TestRuleSet.class , + TestAssemblerHelp.class , + TestDefaultModelAssembler.class , + TestMemoryModelAssembler.class , + TestAssemblerVocabulary.class , + TestRuleSetAssembler.class , + TestInfModelAssembler.class , + TestAssemblerGroup.class , + TestAssemblerGroupTracing.class , + TestReasonerFactoryAssembler.class , + TestContentAssembler.class , + TestModelContent.class , + TestUnionModelAssembler.class , + TestPrefixMappingAssembler.class , + TestBuiltinAssemblerGroup.class , + TestModelAssembler.class , + TestDocumentManagerAssembler.class, + TestOntModelSpecAssembler.class, + TestOntModelAssembler.class +}) + +public class TS3_Assembler {} + +// public static TestSuite suite() { +// TestSuite result = new TestSuite(); +// result.addTestSuite(TestMode.class); +// result.addTestSuite(TestModelExpansion.class); +// result.addTestSuite(TestImportManager.class); +// result.addTestSuite(TestOntModelAcceptance.class); +// +// // Was "TestAssemblers" : 19 +// result.addTestSuite( TestRuleSet.class ); +// result.addTestSuite( TestAssemblerHelp.class ); +// result.addTestSuite( TestDefaultModelAssembler.class ); +// result.addTestSuite( TestMemoryModelAssembler.class ); +// result.addTestSuite( TestAssemblerVocabulary.class ); +// result.addTestSuite( TestRuleSetAssembler.class ); +// result.addTestSuite( TestInfModelAssembler.class ); +// result.addTestSuite( TestAssemblerGroup.class ); +// result.addTestSuite( TestAssemblerGroupTracing.class ); +// result.addTestSuite( TestReasonerFactoryAssembler.class ); +// result.addTestSuite( TestContentAssembler.class ); +// result.addTestSuite( TestModelContent.class ); +// result.addTestSuite( TestUnionModelAssembler.class ); +// result.addTestSuite( TestPrefixMappingAssembler.class ); +// result.addTestSuite( TestBuiltinAssemblerGroup.class ); +// result.addTestSuite( TestModelAssembler.class ); +// result.addTestSuite( TestDocumentManagerAssembler.class ); +// result.addTest( TestOntModelSpecAssembler.suite() ); +// result.addTest( TestOntModelAssembler.suite() ); +// +// return result; +// } diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerPackage.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerPackage.java deleted file mode 100644 index c972c4322d..0000000000 --- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerPackage.java +++ /dev/null @@ -1,35 +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 - * - * http://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. - */ - -package org.apache.jena.assembler.test; - -import junit.framework.*; - -public class TestAssemblerPackage extends TestCase - { - public static TestSuite suite() - { - TestSuite result = new TestSuite(); - result.addTestSuite( TestMode.class ); - result.addTestSuite( TestModelExpansion.class ); - result.addTestSuite( TestImportManager.class ); - result.addTest( TestAssemblers.suite() ); - result.addTestSuite( AcceptanceTesting.class ); - return result; - } - } diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblers.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblers.java deleted file mode 100644 index 5858e34fe1..0000000000 --- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblers.java +++ /dev/null @@ -1,59 +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 - * - * http://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. - */ - -package org.apache.jena.assembler.test; - -import junit.framework.TestSuite; -import org.apache.jena.assembler.Assembler ; -import org.apache.jena.shared.BrokenException ; - -public class TestAssemblers extends AssemblerTestBase - { - public TestAssemblers( String name ) - { super( name ); } - - public static TestSuite suite() - { - TestSuite result = new TestSuite( TestAssemblers.class ); - result.addTestSuite( TestRuleSet.class ); - result.addTestSuite( TestAssemblerHelp.class ); - result.addTestSuite( TestDefaultModelAssembler.class ); - result.addTestSuite( TestMemoryModelAssembler.class ); - result.addTestSuite( TestAssemblerVocabulary.class ); - result.addTestSuite( TestRuleSetAssembler.class ); - result.addTestSuite( TestInfModelAssembler.class ); - result.addTestSuite( TestAssemblerGroup.class ); - result.addTestSuite( TestAssemblerGroupTracing.class ); - result.addTestSuite( TestReasonerFactoryAssembler.class ); - result.addTestSuite( TestContentAssembler.class ); - result.addTestSuite( TestModelContent.class ); - result.addTestSuite( TestUnionModelAssembler.class ); - result.addTestSuite( TestPrefixMappingAssembler.class ); - result.addTestSuite( TestBuiltinAssemblerGroup.class ); - result.addTestSuite( TestModelAssembler.class ); - result.addTestSuite( TestDocumentManagerAssembler.class ); - result.addTest( TestOntModelSpecAssembler.suite() ); - result.addTest( TestOntModelAssembler.suite() ); - return result; - } - - public void testToSilenceJUnit() {} - - @Override protected Class<? extends Assembler> getAssemblerClass() - { throw new BrokenException( "TestAssemblers does not need this method" ); } - } 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/test/TestMode.java index 1bef7bd339..ce52c18f57 100644 --- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestMode.java +++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestMode.java @@ -18,50 +18,54 @@ package org.apache.jena.assembler.test; +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; -public class TestMode extends AssemblerTestBase - { - public TestMode( String name ) - { super( name ); } +public class TestMode { - public void testConstantsExist() - { + @Test + public void testConstantsExist() { Mode a = Mode.CREATE, b = Mode.DEFAULT; Mode c = Mode.REUSE, d = Mode.ANY; - assertDiffer( Mode.CREATE, Mode.DEFAULT ); - assertDiffer( Mode.CREATE, Mode.REUSE ); - assertDiffer( Mode.CREATE, Mode.ANY ); - assertDiffer( Mode.DEFAULT, Mode.REUSE ); - assertDiffer( Mode.DEFAULT, Mode.ANY ); - assertDiffer( Mode.REUSE, Mode.ANY ); - } - - static final String someName = "aName"; - static final Resource someRoot = resource( "aRoot" ); - - public void testCreate() - { - assertEquals( true, Mode.CREATE.permitCreateNew( someRoot, someName ) ); - assertEquals( false, Mode.CREATE.permitUseExisting( someRoot, someName ) ); - } - - public void testReuse() - { - assertEquals( false, Mode.REUSE.permitCreateNew( someRoot, someName ) ); - assertEquals( true, Mode.REUSE.permitUseExisting( someRoot, someName ) ); - } - - public void testAny() - { - assertEquals( true, Mode.ANY.permitCreateNew( someRoot, someName ) ); - assertEquals( true, Mode.ANY.permitUseExisting( someRoot, someName ) ); - } - - public void testDefault() - { - assertEquals( false, Mode.DEFAULT.permitCreateNew( someRoot, someName ) ); - assertEquals( true, Mode.DEFAULT.permitUseExisting( someRoot, someName ) ); - } + + assertNotEquals(Mode.CREATE, Mode.DEFAULT); + assertNotEquals(Mode.CREATE, Mode.REUSE); + assertNotEquals(Mode.CREATE, Mode.ANY); + assertNotEquals(Mode.DEFAULT, Mode.REUSE); + assertNotEquals(Mode.DEFAULT, Mode.ANY); + assertNotEquals(Mode.REUSE, Mode.ANY); + } + + private static final String someName = "aName"; + private static final Resource someRoot = ResourceFactory.createResource("http://example/aRoot";); + + @Test + public void testCreate() { + assertTrue(Mode.CREATE.permitCreateNew(someRoot, someName)); + assertFalse(Mode.CREATE.permitUseExisting(someRoot, someName)); + } + + @Test + public void testReuse() { + assertFalse(Mode.REUSE.permitCreateNew(someRoot, someName)); + assertTrue(Mode.REUSE.permitUseExisting(someRoot, someName)); + } + + @Test + public void testAny() { + assertTrue(Mode.ANY.permitCreateNew(someRoot, someName)); + assertTrue(Mode.ANY.permitUseExisting(someRoot, someName)); + } + + @Test + public void testDefault() { + assertFalse(Mode.DEFAULT.permitCreateNew(someRoot, someName)); + assertTrue(Mode.DEFAULT.permitUseExisting(someRoot, someName)); } +} diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/AcceptanceTesting.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAcceptance.java similarity index 94% rename from jena-core/src/test/java/org/apache/jena/assembler/test/AcceptanceTesting.java rename to jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAcceptance.java index b02a60d004..1b983115a9 100644 --- a/jena-core/src/test/java/org/apache/jena/assembler/test/AcceptanceTesting.java +++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestOntModelAcceptance.java @@ -21,9 +21,9 @@ package org.apache.jena.assembler.test; import org.apache.jena.ontology.* ; import org.apache.jena.rdf.model.* ; -public class AcceptanceTesting extends AssemblerTestBase +public class TestOntModelAcceptance extends AssemblerTestBase { - public AcceptanceTesting( String name ) + public TestOntModelAcceptance( String name ) { super( name ); } /** diff --git a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java b/jena-core/src/test/java/org/apache/jena/datatypes/TS3_dt.java similarity index 83% copy from jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java copy to jena-core/src/test/java/org/apache/jena/datatypes/TS3_dt.java index 2a4f239f55..eed9b8a8e8 100644 --- a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java +++ b/jena-core/src/test/java/org/apache/jena/datatypes/TS3_dt.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.jena.mem2; +package org.apache.jena.datatypes; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses( { - GraphMem2LegacyTest.class, - GraphMem2FastTest.class, - GraphMem2RoaringTest.class, - GraphMem2Test.class -} ) -public class TestPackage_GraphMem2 { + TestDatatypes.class, + TestDatatypeValues.class, + TestRDFXMLiteral.class +}) + +public class TS3_dt { } diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPackage_enh.java b/jena-core/src/test/java/org/apache/jena/enhanced/test/TS3_enh.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/enhanced/test/TestPackage_enh.java rename to jena-core/src/test/java/org/apache/jena/enhanced/test/TS3_enh.java index c1468432d1..60f7c1b1ac 100644 --- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPackage_enh.java +++ b/jena-core/src/test/java/org/apache/jena/enhanced/test/TS3_enh.java @@ -49,7 +49,7 @@ import org.apache.jena.shared.JenaException ; *These tests only test EnhNode polymorphism and not EnhGraph polymorphism. *EnhGraph polymorphism currently will not work. */ -public class TestPackage_enh extends GraphTestBase { +public class TS3_enh extends GraphTestBase { static final private Personality<RDFNode> split = new Personality<>(); @@ -83,13 +83,13 @@ public class TestPackage_enh extends GraphTestBase { broken.add( TestProperty.class, TestObjectImpl.factory ); } /** Creates a new instance of EnhancedTestSuite */ - public TestPackage_enh(String name) + public TS3_enh(String name) { super( name ); } public static TestSuite suite() - { return new TestSuite( TestPackage_enh.class ); } + { return new TestSuite( TS3_enh.class ); } /** test that equals works on an EnhNode (after hedgehog introduced FrontsNode 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/test/TS3_compose.java new file mode 100755 index 0000000000..fb4de1b999 --- /dev/null +++ b/jena-core/src/test/java/org/apache/jena/graph/compose/test/TS3_compose.java @@ -0,0 +1,105 @@ +/* + * 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 + * + * http://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. + */ + +package org.apache.jena.graph.compose.test; + +import junit.framework.*; +import org.apache.jena.graph.GraphMemFactory; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.compose.*; +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; + +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()); + } + }; + + AbstractTestPackage atp = new AbstractTestPackage("Intersection", gmf) {}; + 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()); + } + }; + + atp = new AbstractTestPackage("Difference", gmf) {}; + 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()); + } + }; + + atp = new AbstractTestPackage("Union", gmf) {}; + for ( int i = 0 ; i < atp.testCount() ; i++ ) { + result.addTest(atp.testAt(i)); + } + /* */ + result.addTest(TestDelta.suite()); + result.addTest(TestUnion.suite()); + result.addTest(TestDisjointUnion.suite()); + result.addTest(TestDifference.suite()); + result.addTest(TestIntersection.suite()); + result.addTest(TestMultiUnion.suite()); + /* */ + 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/test/TestPackage_compose.java b/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestPackage_compose.java deleted file mode 100755 index 957a57555f..0000000000 --- a/jena-core/src/test/java/org/apache/jena/graph/compose/test/TestPackage_compose.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 - * - * http://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. - */ - -package org.apache.jena.graph.compose.test; - - -import junit.framework.*; -import org.apache.jena.graph.GraphMemFactory ; -import org.apache.jena.graph.Graph ; -import org.apache.jena.graph.compose.* ; -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 ; - -public class TestPackage_compose extends TestCase { - - public static TestSuite suite() { - TestSuite result = new TestSuite(); - - GraphModelFactory gmf = new GraphModelFactory(){ - - @Override - Graph getGraph() - { - return new Intersection(GraphMemFactory.createGraphMem(), GraphMemFactory.createGraphMem()); - }}; - - AbstractTestPackage atp = new AbstractTestPackage( "Intersection", gmf ){}; - for (int i=0;i<atp.testCount();i++) - { - result.addTest( atp.testAt(i) ); - } - - gmf = new GraphModelFactory(){ - - @Override - Graph getGraph() - { - return new Difference(GraphMemFactory.createGraphMem(), GraphMemFactory.createGraphMem()); - }}; - - atp = new AbstractTestPackage( "Difference", gmf ){}; - for (int i=0;i<atp.testCount();i++) - { - result.addTest( atp.testAt(i) ); - } - - gmf = new GraphModelFactory(){ - - @Override - Graph getGraph() - { - return new Union(GraphMemFactory.createGraphMem(), GraphMemFactory.createGraphMem()); - }}; - - atp = new AbstractTestPackage( "Union", gmf ){}; - for (int i=0;i<atp.testCount();i++) - { - result.addTest( atp.testAt(i) ); - } - /* */ - result.addTest( TestDelta.suite() ); - result.addTest( TestUnion.suite() ); - result.addTest( TestDisjointUnion.suite() ); - result.addTest( TestDifference.suite() ); - result.addTest( TestIntersection.suite() ); - result.addTest( TestMultiUnion.suite() ); - /* */ - 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/langtagx/TS_LangTagX.java b/jena-core/src/test/java/org/apache/jena/graph/test/TS3_graph.java similarity index 55% copy from jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java copy to jena-core/src/test/java/org/apache/jena/graph/test/TS3_graph.java index 96633d00fe..94217962ee 100644 --- a/jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TS3_graph.java @@ -16,27 +16,38 @@ * limitations under the License. */ -package org.apache.jena.langtagx; +package org.apache.jena.graph.test; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; - -//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 + TestFindLiterals.class, + TestLiteralLabels.class, + TestLiteralLabelSameValueAs.class, + TestNode.class, + TestTriple.class, + TestTripleField.class, + TestNodeToTriplesMapMem.class, + TestReifier.class, + TestTypedLiterals.class, + TestDateTime.class, + TestFactory.class, + TestGraph.class, + TestGraphPlain.class, + TestCoreGraphUtil.class, + TestGraphPrefixMapping.class, + TestGraphMatchWithInference.class, + TestGraphEvents.class, + TestGraphBaseToString.class, + TestNodeExtras.class, + TestRDFStringLiterals.class, + TestNodeEdgeCases.class, + + // Has to be in a specific package. + org.apache.jena.graph.TestGraphUtil.class + }) -public class TS_LangTagX { - public static TestSuite suite() { - TestSuite ts = new TestSuite(); - ts.setName("LangTagX"); - ts.addTest(new JUnit4TestAdapter(TS_LangTagX.class)); - return ts; - } -} +public class TS3_graph { } diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestPackage_graph.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestPackage_graph.java deleted file mode 100644 index 78d2aa9537..0000000000 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestPackage_graph.java +++ /dev/null @@ -1,64 +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 - * - * http://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. - */ - -package org.apache.jena.graph.test; - -import junit.framework.JUnit4TestAdapter ; -import junit.framework.TestSuite ; -import org.apache.jena.graph.TestGraphUtil; - -/** - Collected test suite for the .graph package. -*/ - -public class TestPackage_graph extends TestSuite { - - static public TestSuite suite() { - return new TestPackage_graph(); - } - - /** Creates new TestPackage */ - private TestPackage_graph() { - super("graph"); - addTest( TestFindLiterals.suite() ); - addTest( TestLiteralLabels.suite() ); - addTest( TestLiteralLabelSameValueAs.suite() ); - addTest( TestNode.suite() ); - addTest( TestTriple.suite() ); - addTest( TestTripleField.suite() ); - addTest( TestNodeToTriplesMapMem.suite() ); - addTest( TestReifier.suite() ); - addTest( TestTypedLiterals.suite() ); - addTest( TestDateTime.suite() ); - addTest( TestFactory.suite() ); - addTest( TestGraph.suite() ); - addTest( new JUnit4TestAdapter(TestGraphPlain.class) ); - addTest( TestCoreGraphUtil.suite() ); - addTest( TestGraphPrefixMapping.suite() ); - addTest( TestGraphMatchWithInference.suite()); - addTestSuite( TestGraphEvents.class ); - addTestSuite( TestGraphBaseToString.class ); - addTest( new JUnit4TestAdapter(TestNodeExtras.class) ); - addTest( new JUnit4TestAdapter(TestRDFStringLiterals.class) ); - addTest( new JUnit4TestAdapter(TestNodeEdgeCases.class) ); - - // Has to be in a different package. - addTest( new JUnit4TestAdapter(TestGraphUtil.class) ); - - } -} 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/TS_IRIx.java index 9b601c9543..9a3253d63d 100644 --- a/jena-core/src/test/java/org/apache/jena/irix/TS_IRIx.java +++ b/jena-core/src/test/java/org/apache/jena/irix/TS_IRIx.java @@ -18,13 +18,10 @@ package org.apache.jena.irix; +import org.apache.jena.iri3986.provider.InitIRI3986; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; -import org.apache.jena.iri3986.provider.InitIRI3986; - /** * Test of IRIx for the system default IRIProvider. * This forms the contract for IRIPRoviders. @@ -59,11 +56,4 @@ public class TS_IRIx { SystemIRIx.init(); InitIRI3986.init(); } - - public static TestSuite suite() { - TestSuite ts = new TestSuite(); - ts.setName("IRIx"); - ts.addTest(new JUnit4TestAdapter(TS_IRIx.class)); - return ts; - } } 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 index 96633d00fe..b07b9517e9 100644 --- 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 @@ -32,11 +32,4 @@ import junit.framework.TestSuite; TestLangTagX.class }) -public class TS_LangTagX { - public static TestSuite suite() { - TestSuite ts = new TestSuite(); - ts.setName("LangTagX"); - ts.addTest(new JUnit4TestAdapter(TS_LangTagX.class)); - return ts; - } -} +public class TS_LangTagX {} diff --git a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java b/jena-core/src/test/java/org/apache/jena/mem/test/TS3_GraphMemValue.java similarity index 75% copy from jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java copy to jena-core/src/test/java/org/apache/jena/mem/test/TS3_GraphMemValue.java index 2a4f239f55..b7dd2d4e9e 100644 --- a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java +++ b/jena-core/src/test/java/org/apache/jena/mem/test/TS3_GraphMemValue.java @@ -16,17 +16,21 @@ * limitations under the License. */ -package org.apache.jena.mem2; +package org.apache.jena.mem.test; + import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses( { - GraphMem2LegacyTest.class, - GraphMem2FastTest.class, - GraphMem2RoaringTest.class, - GraphMem2Test.class -} ) -public class TestPackage_GraphMem2 { -} + TestGraphMemModel.class, + TestGraphTripleStoreMem.class, + TestConcurrentModificationException.class, + TestArrayTripleBunch.class, + TestHashedTripleBunch.class, + TestHashedBunchMap.class, + TestHashCommon.class +}) + +public class TS3_GraphMemValue {} diff --git a/jena-core/src/test/java/org/apache/jena/mem/test/TestPackage_GraphMemValue.java b/jena-core/src/test/java/org/apache/jena/mem/test/TestPackage_GraphMemValue.java deleted file mode 100644 index 153a03d134..0000000000 --- a/jena-core/src/test/java/org/apache/jena/mem/test/TestPackage_GraphMemValue.java +++ /dev/null @@ -1,39 +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 - * - * http://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. - */ - -package org.apache.jena.mem.test; - - -import junit.framework.*; - -public class TestPackage_GraphMemValue extends TestCase - { - public static TestSuite suite() - { - TestSuite result = new TestSuite(); - result.addTest( TestGraphMemModel.suite() ); - result.addTest( TestGraphTripleStoreMem.suite() ); - result.addTest( TestConcurrentModificationException.suite() ); - result.addTestSuite( TestArrayTripleBunch.class ); - result.addTestSuite( TestHashedTripleBunch.class ); - result.addTestSuite( TestHashedBunchMap.class ); - result.addTestSuite( TestHashCommon.class ); - - return result; - } - } diff --git a/jena-core/src/test/java/org/apache/jena/mem2/TS4_GraphMem2.java b/jena-core/src/test/java/org/apache/jena/mem2/TS4_GraphMem2.java new file mode 100644 index 0000000000..ddbaf26d4c --- /dev/null +++ b/jena-core/src/test/java/org/apache/jena/mem2/TS4_GraphMem2.java @@ -0,0 +1,83 @@ +/* + * 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 + * + * http://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. + */ + +package org.apache.jena.mem2; + +import org.apache.jena.mem2.collection.*; +import org.apache.jena.mem2.iterator.IteratorOfJenaSetsTest; +import org.apache.jena.mem2.iterator.SparseArrayIteratorTest; +import org.apache.jena.mem2.pattern.PatternClassifierTest; +import org.apache.jena.mem2.spliterator.ArraySpliteratorTest; +import org.apache.jena.mem2.spliterator.ArraySubSpliteratorTest; +import org.apache.jena.mem2.spliterator.SparseArraySpliteratorTest; +import org.apache.jena.mem2.spliterator.SparseArraySubSpliteratorTest; +import org.apache.jena.mem2.store.fast.FastArrayBunchTest; +import org.apache.jena.mem2.store.fast.FastHashedTripleBunchTest; +import org.apache.jena.mem2.store.fast.FastTripleStoreTest; +import org.apache.jena.mem2.store.legacy.*; +import org.apache.jena.mem2.store.roaring.RoaringBitmapTripleIteratorTest; +import org.apache.jena.mem2.store.roaring.RoaringTripleStoreTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) [email protected]( { + // spliterator/ + SparseArraySubSpliteratorTest.class, + ArraySubSpliteratorTest.class, + ArraySpliteratorTest.class, + SparseArraySpliteratorTest.class, + + // iterator/ + IteratorOfJenaSetsTest.class, + SparseArrayIteratorTest.class, + + // collection/ + FastHashMapTest.class, + FastHashMapTest2.class, + HashCommonMapTest.class, + HashCommonSetTest.class, + FastHashSetTest.class, + FastHashSetTest2.class, + + // store/fast + FastTripleStoreTest.class, + FastArrayBunchTest.class, + FastHashedTripleBunchTest.class, + + // store/roaring + RoaringTripleStoreTest.class, + RoaringBitmapTripleIteratorTest.class, + + // store/legacy + ArrayBunchTest.class, + LegacyTripleStoreTest.class, + NodeToTriplesMapMemTest.class, + FieldFilterTest.class, + HashedTripleBunchTest.class, + + // pattern/ + PatternClassifierTest.class, + + // -- + GraphMem2LegacyTest.class, + GraphMem2FastTest.class, + GraphMem2RoaringTest.class, + GraphMem2Test.class +} ) +public class TS4_GraphMem2 {} diff --git a/jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TS3_ont.java similarity index 62% copy from jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java copy to jena-core/src/test/java/org/apache/jena/ontology/impl/TS3_ont.java index 96633d00fe..649ab1be99 100644 --- a/jena-core/src/test/java/org/apache/jena/langtagx/TS_LangTagX.java +++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TS3_ont.java @@ -16,27 +16,30 @@ * limitations under the License. */ -package org.apache.jena.langtagx; +package org.apache.jena.ontology.impl; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite; -//JUnit5. Does not mix with JUnit3. So until jena-core updates to JUnit 4 or 5 ... -//@Suite -//@SelectClasses({ @RunWith(Suite.class) [email protected]( { - TestLangTagX.class [email protected]({ + TestOntGraph.class, + TestResource.class, + TestAxioms.class, + TestClassExpression.class, + TestOntDocumentManager.class, + TestOntology.class, + TestProperty.class, + TestListSyntaxCategories.class, + TestCreate.class, + TestIndividual.class, + TestAllDifferent.class, + TestOntModelSpec.class, + TestOntReasoning.class, + TestOntModel.class, + TestOntClass.class, + TestFrameView.class, + TestOntTools.class, }) - -public class TS_LangTagX { - public static TestSuite suite() { - TestSuite ts = new TestSuite(); - ts.setName("LangTagX"); - ts.addTest(new JUnit4TestAdapter(TS_LangTagX.class)); - return ts; - } -} +public class TS3_ont {} diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestPackage_ont.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestPackage_ont.java deleted file mode 100644 index cefbfb4986..0000000000 --- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestPackage_ont.java +++ /dev/null @@ -1,61 +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 - * - * http://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. - */ - -package org.apache.jena.ontology.impl; - - -import junit.framework.TestSuite; - -/** - Collected test suite for the .ontology.impl package. -*/ - -public class TestPackage_ont extends TestSuite { - - static public TestSuite suite() { - return new TestPackage_ont(); - } - - /** Creates new TestPackage */ - private TestPackage_ont() { - super("ontology.impl"); - addTest( "TestOntGraph", TestOntGraph.suite() ); - addTest( "TestResource", TestResource.suite() ); - addTest( "TestAxioms", TestAxioms.suite() ); - addTest( "TestClassExpression", TestClassExpression.suite() ); - addTest( "TestOntDocumentManager", TestOntDocumentManager.suite() ); - addTest( "TestOntology", TestOntology.suite() ); - addTest( "TestProperty", TestProperty.suite() ); - addTest( "TestListSyntaxCategories", TestListSyntaxCategories.suite() ); - addTest( "TestCreate", TestCreate.suite() ); - addTest( "TestIndividual", TestIndividual.suite() ); - addTest( "TestAllDifferent", TestAllDifferent.suite() ); - addTestSuite( TestOntModelSpec.class ); - addTest( new TestSuite( TestOntReasoning.class ) ); - addTest( new TestSuite( TestOntModel.class ) ); - addTest( new TestSuite( TestOntClass.class )); - addTest( new TestSuite( TestFrameView.class )); - addTest( new TestSuite( TestOntTools.class )); - } - - private void addTest(String name, TestSuite tc) { - tc.setName(name); - addTest(tc); - } - -} diff --git a/jena-core/src/test/java/org/apache/jena/ontology/makers/TestPackage_ModelMakers.java b/jena-core/src/test/java/org/apache/jena/ontology/makers/TS3_ModelMakers.java similarity index 72% rename from jena-core/src/test/java/org/apache/jena/ontology/makers/TestPackage_ModelMakers.java rename to jena-core/src/test/java/org/apache/jena/ontology/makers/TS3_ModelMakers.java index bdfaa8edae..e5f75578e4 100644 --- a/jena-core/src/test/java/org/apache/jena/ontology/makers/TestPackage_ModelMakers.java +++ b/jena-core/src/test/java/org/apache/jena/ontology/makers/TS3_ModelMakers.java @@ -18,15 +18,12 @@ package org.apache.jena.ontology.makers; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class TestPackage_ModelMakers extends TestSuite { - - public static TestSuite suite() { - TestSuite result = new TestSuite(); - result.addTestSuite(TestSimpleGraphMaker.class); - result.addTestSuite(TestModelMakerImpl.class); - return result; - } - -} +@RunWith(Suite.class) [email protected]({ + TestSimpleGraphMaker.class, + TestModelMakerImpl.class +}) +public class TS3_ModelMakers {} diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java index 96eef1a6a5..89b5a53f7a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/IsomorphicTests.java @@ -6,9 +6,9 @@ * 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 - * + * * http://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. @@ -29,12 +29,12 @@ import org.junit.Assert; public class IsomorphicTests extends AbstractModelTestBase { - // This is not part of the standard test suite + // This is not part of the standard test suite // It's not stable enough for inclusion in the automatic test suite. // Often, they pass, but there is a significant number of times they don't. // It also seems to be machine-dependent - failures are more frequent - // on Apache Jenkins (hardware influening "random" numbers?) - + // on Apache Jenkins (hardware influencing "random" numbers?) + /** * A theoretical graph for testing purposes. * All nodes are anonymous resources. All edges are labelled diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestPackage_model.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TS3_Model1.java similarity index 86% rename from jena-core/src/test/java/org/apache/jena/rdf/model/test/TestPackage_model.java rename to jena-core/src/test/java/org/apache/jena/rdf/model/test/TS3_Model1.java index 1f2df0d31b..26b6ebb835 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestPackage_model.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TS3_Model1.java @@ -25,12 +25,7 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.test.helpers.TestingModelFactory; import org.apache.jena.shared.PrefixMapping; -/** - * Implementation of the basic Model TestPackage. Uses the standard ModelFactory to - * create models for testing. - */ - -public class TestPackage_model extends AbstractTestPackage { +public class TS3_Model1 extends AbstractTestPackage { public static class PlainModelFactory implements TestingModelFactory { @Override @@ -50,10 +45,10 @@ public class TestPackage_model extends AbstractTestPackage { } static public TestSuite suite() { - return new TestPackage_model(); + return new TS3_Model1(); } - public TestPackage_model() { + public TS3_Model1() { super("Model", new PlainModelFactory()); } } diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStandardModels.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TS3_StandardModels.java similarity index 87% rename from jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStandardModels.java rename to jena-core/src/test/java/org/apache/jena/rdf/model/test/TS3_StandardModels.java index 851d3f0bfa..16a32f40e8 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStandardModels.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TS3_StandardModels.java @@ -21,15 +21,15 @@ package org.apache.jena.rdf.model.test; import junit.framework.*; import org.apache.jena.rdf.model.* ; -public class TestStandardModels extends AbstractTestModel +public class TS3_StandardModels extends AbstractTestModel { - public TestStandardModels(String name) + public TS3_StandardModels(String name) { super(name); } public static TestSuite suite() { - return new TestSuite( TestStandardModels.class ); + return new TestSuite( TS3_StandardModels.class ); } @Override diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java index 7ab3a6b85d..214fb5d206 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestIterators.java @@ -6,9 +6,9 @@ * 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 - * + * * http://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. @@ -81,6 +81,9 @@ public class TestIterators extends AbstractModelTestBase } Assert.assertEquals("Remove failed", 0, model.size()); } + catch (UnsupportedOperationException ex) { + throw ex; + } finally { it.close(); diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java index 18e26e0619..28d94718d6 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java @@ -38,7 +38,7 @@ public class TestModelRead extends AbstractModelTestBase } public TestModelRead() { - this(new TestPackage_model.PlainModelFactory(), "TestModelRead") ; + this(new TS3_Model1.PlainModelFactory(), "TestModelRead") ; } public void testDefaultLangXML() { diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReaderEvents.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReaderEvents.java index 33f24794c8..f9f9f60b00 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReaderEvents.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReaderEvents.java @@ -38,7 +38,7 @@ public class TestReaderEvents extends AbstractModelTestBase public TestReaderEvents() { - this( new TestPackage_model.PlainModelFactory(), "TestReaderEvents"); + this( new TS3_Model1.PlainModelFactory(), "TestReaderEvents"); } public void testNTriplesReaderEvents() diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReaders.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReaders.java index 382510591a..8395d983fc 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReaders.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReaders.java @@ -38,7 +38,7 @@ public class TestReaders extends AbstractModelTestBase } public TestReaders() { - this(new TestPackage_model.PlainModelFactory(), "TestReaders") ; + this(new TS3_Model1.PlainModelFactory(), "TestReaders") ; } /** diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/package.html b/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/package.html deleted file mode 100644 index 8bd36a1994..0000000000 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/libtest/package.html +++ /dev/null @@ -1,30 +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 - - http://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. ---> - -<html> -<head> -<title>shared.wg</title> -</head> -<body> -This package defines some classes to help with accessing tests -produced by the RDF Core and WebOnt WGs. -The tests can be accessed either from the web, -or from a zip on the web, -from a local copy in the testing directory. -</body> -</html> \ No newline at end of file diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPackage_xmlinput1.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java similarity index 93% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPackage_xmlinput1.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java index 68008fd177..88cd9f972a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPackage_xmlinput1.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java @@ -20,14 +20,14 @@ package org.apache.jena.rdfxml.xmlinput1; import junit.framework.TestSuite; -public class TestPackage_xmlinput1 extends TestSuite +public class TS3_xmlinput1 extends TestSuite { static public TestSuite suite() { - return new TestPackage_xmlinput1() ; + return new TS3_xmlinput1() ; } - private TestPackage_xmlinput1() + private TS3_xmlinput1() { super("RDF/XML Input ARP1") ; addTest( org.apache.jena.rdfxml.xmlinput1.TestURIs.suite()); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestPackage_xmloutput.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TS3_xmloutput.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestPackage_xmloutput.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TS3_xmloutput.java index 1dcceae5a9..c24caa7328 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestPackage_xmloutput.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TS3_xmloutput.java @@ -26,7 +26,7 @@ import org.apache.jena.test.X_RDFReaderF; /** * JUnit regression tests for output */ -public class TestPackage_xmloutput extends TestCase{ +public class TS3_xmloutput extends TestCase{ /** * Answer a suite of all the tests defined here diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java index ec19259bc7..4b967cfa19 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java @@ -381,7 +381,7 @@ public class TestXMLFeatures extends XMLOutputTestBase { blockLogger() ; Node blank = NodeFactory.createBlankNode() ; Node prop = NodeFactory.createURI(s) ; - Graph g = GraphMemFactory.createGraphMem() ; + Graph g = GraphMemFactory.createDefaultGraphSameValue() ; g.add(Triple.create(blank, prop, blank)) ; // create Model Model m = ModelFactory.createModelForGraph(g) ; diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/ManualExample.java b/jena-core/src/test/java/org/apache/jena/reasoner/examples/ManualExample.java similarity index 91% rename from jena-core/src/test/java/org/apache/jena/reasoner/test/ManualExample.java rename to jena-core/src/test/java/org/apache/jena/reasoner/examples/ManualExample.java index 12bba8bc73..2cf1a2d493 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/test/ManualExample.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/examples/ManualExample.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.reasoner.test; +package org.apache.jena.reasoner.examples; import java.io.PrintWriter; import java.util.*; @@ -36,7 +36,7 @@ import org.apache.jena.vocabulary.ReasonerVocabulary ; public class ManualExample { /** Illustrate different ways of finding a reasoner */ - public void test1() { + public void example1() { String NS = "urn:example:"; // Build a trivial example data set @@ -64,7 +64,7 @@ public class ManualExample { } /** illustrate validation */ - public void test2(String fname) { + public void example2(String fname) { System.out.println("Testing " + fname); Model data = FileManager.getInternal().loadModelInternal(fname); InfModel infmodel = ModelFactory.createRDFSModel(data); @@ -82,7 +82,7 @@ public class ManualExample { } /** illustrate generic rules and derivation tracing */ - public void test3() { + public void example3() { // Test data String egNS = PrintUtil.egNS; // Namespace for examples Model rawData = ModelFactory.createDefaultModel(); @@ -114,7 +114,7 @@ public class ManualExample { } /** Another generic rules illustration */ - public void test4() { + public void example4() { // Test data String egNS = PrintUtil.egNS; // Namespace for examples Model rawData = ModelFactory.createDefaultModel(); @@ -133,7 +133,8 @@ public class ManualExample { // Rule example for String rules = - "[r1: (?c eg:concatFirst ?p), (?c eg:concatSecond ?q) -> " + " [r1b: (?x ?c ?y) <- (?x ?p ?z) (?z ?q ?y)] ]"; Reasoner reasoner = new GenericRuleReasoner(Rule.parseRules(rules)); + "[r1: (?c eg:concatFirst ?p), (?c eg:concatSecond ?q) -> " + " [r1b: (?x ?c ?y) <- (?x ?p ?z) (?z ?q ?y)] ]"; + Reasoner reasoner = new GenericRuleReasoner(Rule.parseRules(rules)); // reasoner.setParameter(ReasonerVocabulary.PROPtraceOn, Boolean.TRUE); InfModel inf = ModelFactory.createInfModel(reasoner, rawData); // System.out.println("OK = " + inf.contains(A, r, C)); @@ -146,11 +147,12 @@ public class ManualExample { public static void main(String[] args) { try { -// new ManualExample().test1(); -// new ManualExample().test2("file:testing/reasoners/rdfs/dttest2.nt"); -// new ManualExample().test2("file:testing/reasoners/rdfs/dttest3.nt"); -// new ManualExample().test3(); - new ManualExample().test4(); + ManualExample examples = new ManualExample(); + examples.example1(); + examples.example2("file:testing/reasoners/rdfs/dttest2.nt"); + examples.example2("file:testing/reasoners/rdfs/dttest3.nt"); + examples.example3(); + examples.example4(); } catch (Exception e) { System.out.println("Problem: " + e); e.printStackTrace(); diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/TS3_RuleReasoners.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/TS3_RuleReasoners.java new file mode 100755 index 0000000000..7ca912231c --- /dev/null +++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/TS3_RuleReasoners.java @@ -0,0 +1,59 @@ +/* + * 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 + * + * http://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. + */ + +package org.apache.jena.reasoner.rulesys; + + +import org.apache.jena.reasoner.rulesys.impl.TestLPBRuleCloseBug; +import org.apache.jena.reasoner.rulesys.impl.TestLPBRuleEngine; +import org.apache.jena.reasoner.rulesys.impl.TestLPBRuleEngineLeak; +import org.apache.jena.reasoner.rulesys.impl.TestRestartableLBRule; +import org.apache.jena.reasoner.rulesys.test.*; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) [email protected]({ + TestConfigVocabulary.class, + TestGenericRuleReasonerConfig.class, + TestBasics.class, + + TestComparatorBuiltins.class, + TestRuleUtil.class, + + TestBackchainer.class, + TestBasicLP.class, + + TestLPDerivation.class, + TestLPBRuleEngine.class, + TestRestartableLBRule.class, + TestFBRules.class, + TestGenericRules.class, + TestRETE.class, + TestSetRules.class, + TestLPBRuleEngineLeak.class, + OWLUnitTest.class, + TestRuleSystemBugs.class, + TestOWLMisc.class, + FRuleEngineIFactoryTest.class, + TestLPBRuleCloseBug.class, + + ConcurrencyTest.class, + TestRestrictionsDontNeedTyping.class +}) +public class TS3_RuleReasoners {} diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRuleReasoners.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRuleReasoners.java deleted file mode 100755 index 9d907337cc..0000000000 --- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestRuleReasoners.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 - * - * http://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. - */ - -package org.apache.jena.reasoner.rulesys.test; - - -import junit.framework.JUnit4TestAdapter; -import junit.framework.TestSuite ; -import org.apache.jena.reasoner.rulesys.TestRuleUtil; -import org.apache.jena.reasoner.rulesys.impl.TestLPBRuleCloseBug; -import org.apache.jena.reasoner.rulesys.impl.TestLPBRuleEngine; -import org.apache.jena.reasoner.rulesys.impl.TestLPBRuleEngineLeak; -import org.apache.jena.reasoner.rulesys.impl.TestRestartableLBRule; -import org.slf4j.Logger ; -import org.slf4j.LoggerFactory ; - -/** - * Aggregate tester that runs all the test associated with the rulesys package. - */ - -public class TestRuleReasoners extends TestSuite { - - protected static Logger logger = LoggerFactory.getLogger(TestRuleReasoners.class); - - static public TestSuite suite() { - return new TestRuleReasoners(); - } - - /** Creates new TestPackage */ - private TestRuleReasoners() { - super("RuleSys"); - - addTestSuite( TestConfigVocabulary.class ); - addTestSuite( TestGenericRuleReasonerConfig.class ); - addTest( "TestBasics", TestBasics.suite() ); - - addTest( "TestComparatorBuiltins", TestComparatorBuiltins.suite() ); - addTest( new JUnit4TestAdapter(TestRuleUtil.class)); - - addTest( "TestBackchainer", TestBackchainer.suite() ); - addTest( "TestLPBasics", TestBasicLP.suite() ); - - addTest( "TestLPDerivation", TestLPDerivation.suite() ); - addTest( "TestLPBRuleEngine", TestLPBRuleEngine.suite() ); - addTest( "TestRestartableLBRule", TestRestartableLBRule.suite() ); - addTest( "TestFBRules", TestFBRules.suite() ); - addTest( "TestGenericRules", TestGenericRules.suite() ); - addTest( "TestRETE", TestRETE.suite() ); - addTest( "TestSetRules", TestSetRules.suite() ); - addTest( "TestLPBRuleEngineLeak", TestLPBRuleEngineLeak.suite() ); - addTest( "OWLRuleUnitTests", OWLUnitTest.suite() ); - addTest( "TestBugs", TestRuleSystemBugs.suite() ); - addTest( "TestOWLMisc", TestOWLMisc.suite() ); - addTest( "FRuleEngineIFactoryTest", FRuleEngineIFactoryTest.suite() ); - addTest( "TestLPBRuleCloseBug", TestLPBRuleCloseBug.suite() ); - - addTest( "ConcurrentyTest", ConcurrencyTest.suite() ); - addTest( "TestRestrictionsDontNeedTyping", TestRestrictionsDontNeedTyping.suite() ); - - // No longer needed because the tests are now subsumed in OWLUnitTest - // addTest( "TestOWLConsistency", TestOWLRules.suite() ); - } - - // helper method - private void addTest(String name, TestSuite tc) { - tc.setName(name); - addTest(tc); - } -} diff --git a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TS3_reasoners.java similarity index 75% copy from jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java copy to jena-core/src/test/java/org/apache/jena/reasoner/test/TS3_reasoners.java index 2a4f239f55..11924f49cb 100644 --- a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/TS3_reasoners.java @@ -16,17 +16,20 @@ * limitations under the License. */ -package org.apache.jena.mem2; +package org.apache.jena.reasoner.test; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) [email protected]( { - GraphMem2LegacyTest.class, - GraphMem2FastTest.class, - GraphMem2RoaringTest.class, - GraphMem2Test.class -} ) -public class TestPackage_GraphMem2 { -} [email protected]({ + TestTransitiveGraphCache.class, + TestReasoners.class, + TestRDFSReasoners.class, + TestInfPrefixMapping.class, + TestInfGraph.class, + TestInfModel.class, + TestSafeModel.class, +}) + +public class TS3_reasoners {} diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestPackage_reasoners.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/TestPackage_reasoners.java deleted file mode 100644 index 57e3d4aece..0000000000 --- a/jena-core/src/test/java/org/apache/jena/reasoner/test/TestPackage_reasoners.java +++ /dev/null @@ -1,53 +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 - * - * http://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. - */ - -package org.apache.jena.reasoner.test; - -import junit.framework.*; -import org.apache.jena.reasoner.rulesys.test.TestRuleReasoners; - -/** - * Aggregate tester that runs all the test associated with the reasoner package. - */ - -public class TestPackage_reasoners extends TestSuite { - - static public TestSuite suite() { - return new TestPackage_reasoners(); - } - - /** Creates new TestPackage */ - private TestPackage_reasoners() { - super("reasoners"); - addTest( "TestTransitiveGraphCache", TestTransitiveGraphCache.suite() ); - addTest( "TestReasoners", TestReasoners.suite() ); - addTest( "TestRDFSReasoners", TestRDFSReasoners.suite() ); - addTest( "TestRuleReasoners", TestRuleReasoners.suite() ); - addTest( "TestReasonerPrefixMapping", TestInfPrefixMapping.suite() ); - addTest( "TestInfGraph", TestInfGraph.suite() ); - addTest( "TestInfModel", TestInfModel.suite() ); - addTest( "TestSafeModel", TestSafeModel.suite() ); - } - - // helper method - private void addTest(String name, TestSuite tc) { - tc.setName(name); - addTest(tc); - } - -} diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/test/WGReasonerTester.java b/jena-core/src/test/java/org/apache/jena/reasoner/test/WGReasonerTester.java index 569414e882..dda30375f6 100644 --- a/jena-core/src/test/java/org/apache/jena/reasoner/test/WGReasonerTester.java +++ b/jena-core/src/test/java/org/apache/jena/reasoner/test/WGReasonerTester.java @@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory ; * entailment tests are handled by this utility. Each test defines a set * of data files to load. For normal positive entailment tests we check each * triple in the conclusions file to ensure it is included in the inferred - * graph. For postive entailment tests which are supposed to entail the + * graph. For positive entailment tests which are supposed to entail the * false document we run an additional validation check. For * negative entailment tests which tests all triples in the non-conclusions file * and check that at least one trile is missing. </p> diff --git a/jena-core/src/test/java/org/apache/jena/shared/TestSharedPackage.java b/jena-core/src/test/java/org/apache/jena/shared/TestSharedPackage.java index 6bcd6f040b..4e8e713926 100644 --- a/jena-core/src/test/java/org/apache/jena/shared/TestSharedPackage.java +++ b/jena-core/src/test/java/org/apache/jena/shared/TestSharedPackage.java @@ -18,20 +18,13 @@ package org.apache.jena.shared; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class TestSharedPackage extends TestCase - { - public TestSharedPackage() - { super(); } - - public static TestSuite suite() - { - final TestSuite result = new TestSuite(); - result.addTest( TestPrefixMapping.suite() ); - result.addTest( TestJenaException.suite() ); - result.addTest( TestLockMRPlusSW.suite() ); - return result; - } - } +@RunWith(Suite.class) [email protected]({ + TestPrefixMapping.class, + TestJenaException.class, + TestLockMRPlusSW.class +}) +public class TestSharedPackage {} diff --git a/jena-core/src/test/java/org/apache/jena/test/TestModelUtil.java b/jena-core/src/test/java/org/apache/jena/test/TestModelUtil.java index a9d1b92b89..97d46e4dc4 100644 --- a/jena-core/src/test/java/org/apache/jena/test/TestModelUtil.java +++ b/jena-core/src/test/java/org/apache/jena/test/TestModelUtil.java @@ -21,18 +21,12 @@ package org.apache.jena.test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import junit.framework.TestSuite; import org.apache.jena.graph.Node; import org.apache.jena.graph.NodeFactory; import org.apache.jena.rdf.model.impl.Util; import org.junit.Test; -/** Tests for {@link org.apache.jena.rdf.model.impl.Util} */ -public class TestModelUtil extends TestSuite { - - public static TestSuite suite() { - return new TestSuite(TestModelUtil.class); - } +public class TestModelUtil { // -- xsd:string diff --git a/jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java b/jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java index be450f9217..86ae97f1ff 100644 --- a/jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java +++ b/jena-core/src/test/java/org/apache/jena/test/TestPackage_core.java @@ -18,8 +18,7 @@ package org.apache.jena.test; -import junit.framework.TestCase ; -import junit.framework.TestSuite ; +import junit.framework.*; import org.apache.jena.rdf.model.impl.RDFReaderFImpl; import org.apache.jena.sys.JenaSystem; @@ -30,21 +29,76 @@ public class TestPackage_core extends TestCase { static public TestSuite suite() { JenaSystem.init(); - // Reads Turtle (old parser, not up-to-date but we need something for testing.) + // Include old Turtle parser - not up-to-date but enouhg to read test input files RDFReaderFImpl.alternative(new X_RDFReaderF()); TestSuite ts = new TestSuite() ; ts.setName("Jena Core") ; + addTest(ts, "System setup", adaptJUnit4(TestSystemSetup.class)); + + addTest(ts, "IRIx", adaptJUnit4(org.apache.jena.irix.TS_IRIx.class)); + addTest(ts, "LangTagX", adaptJUnit4(org.apache.jena.langtagx.TS_LangTagX.class)); + addTest(ts, "Datatypes", adaptJUnit4(org.apache.jena.datatypes.TS3_dt.class)); + // ** COMPLEX + addTest(ts, "Enhanced", org.apache.jena.enhanced.test.TS3_enh.suite()); + addTest(ts, "Graph", adaptJUnit4(org.apache.jena.graph.test.TS3_graph.class)); + // mem2 + addTest(ts, "Mem", adaptJUnit4(org.apache.jena.mem2.TS4_GraphMem2.class)); + + // Old GraphMem/GraphMemValue. + // TO CHECK + addTest(ts, "MemValue", adaptJUnit4(org.apache.jena.mem.test.TS3_GraphMemValue.class)); + + // ** COMPLEX (rename class and create TS3_Model for these two) + addTest(ts, "Model", org.apache.jena.rdf.model.test.TS3_Model1.suite()); + // ** COMPLEX + addTest(ts, "StandardModels", org.apache.jena.rdf.model.test.TS3_StandardModels.suite() ); + + addTest(ts, "XML Input [ARP/IRIx]", org.apache.jena.rdfxml.xmlinput1.TS3_xmlinput1.suite()); + addTest(ts, "XML Output", org.apache.jena.rdfxml.xmloutput.TS3_xmloutput.suite()); + + addTest(ts, "Util", adaptJUnit4(org.apache.jena.util.TS3_coreutil.class)); + addTest(ts, "Jena iterator", adaptJUnit4(org.apache.jena.util.iterator.test.TS3_coreiter.class)); + addTest(ts, "Assembler", adaptJUnit4(org.apache.jena.assembler.test.TS3_Assembler.class)); + addTest(ts, "Vocabularies", adaptJUnit4(org.apache.jena.vocabulary.test.TS_Vocabularies.class)); + addTest(ts, "Shared", adaptJUnit4(org.apache.jena.shared.TestSharedPackage.class)); + addTest(ts, "ModelUtils", adaptJUnit4(org.apache.jena.test.TestModelUtil.class)); + + // ** COMPLEX + addTest(ts, "Composed graphs", org.apache.jena.graph.compose.test.TS3_compose.suite() ); + + addTest(ts, "Reasoners", adaptJUnit4(org.apache.jena.reasoner.test.TS3_reasoners.class)); + addTest(ts, "RuleReasoners", adaptJUnit4(org.apache.jena.reasoner.rulesys.TS3_RuleReasoners.class)); + + addTest(ts, "Ontology ModelMaker", adaptJUnit4(org.apache.jena.ontology.makers.TS3_ModelMakers.class)); + addTest(ts, "Ontology", adaptJUnit4(org.apache.jena.ontology.impl.TS3_ont.class)); + + // Local TTL parser for tests - not fully compliant. + addTest(ts, "Turtle", adaptJUnit4(org.apache.jena.ttl_test.test.turtle.TS_TestTurtle.class)); + // ** Generated tests + addTest(ts, "Turtle:Manifest", org.apache.jena.ttl_test.test.turtle.TurtleTestSuiteManifest.suite()) ; + + return ts ; + } + + /* ORIGINAL + static public TestSuite suite() { + JenaSystem.init(); + // Reads Turtle (old parser, not up-to-date but we need something for testing.) + RDFReaderFImpl.alternative(new X_RDFReaderF()); + + TestSuite ts = new TestSuite() ; + ts.setName("Jena") ; + addTest(ts, "System setup", TestSystemSetup.suite()); addTest(ts, "IRIx", org.apache.jena.irix.TS_IRIx.suite()); addTest(ts, "LangTagX", org.apache.jena.langtagx.TS_LangTagX.suite()); addTest(ts, "Enhanced", org.apache.jena.enhanced.test.TestPackage_enh.suite()); addTest(ts, "Datatypes", org.apache.jena.datatypes.TestPackage_dt.suite()); addTest(ts, "Graph", org.apache.jena.graph.test.TestPackage_graph.suite()); - - addTest(ts, "Mem", org.apache.jena.mem.test.TestPackage_GraphMemValue.suite() ); - + addTest(ts, "Mem", org.apache.jena.mem.test.TestMemPackage.suite() ); + addTest(ts, "Mem2", org.apache.jena.mem.test.TestGraphMemPackage.suite() ); addTest(ts, "Model", org.apache.jena.rdf.model.test.TestPackage_model.suite()); addTest(ts, "StandardModels", org.apache.jena.rdf.model.test.TestStandardModels.suite() ); @@ -66,10 +120,21 @@ public class TestPackage_core extends TestCase { return ts ; } +*/ + private static Test adaptJUnit4(Class<?> testClass) { + return new JUnit4TestAdapter(testClass); + } private static void addTest(TestSuite ts, String name, TestSuite tc) { if ( name != null ) tc.setName(name); ts.addTest(tc); } + + private static void addTest(TestSuite ts, String name, Test test) { + // Extra level but does name the test suite. + TestSuite ts2 = new TestSuite(name); + ts2.addTest(test); + ts.addTest(ts2); + } } diff --git a/jena-core/src/test/java/org/apache/jena/test/TestSystemSetup.java b/jena-core/src/test/java/org/apache/jena/test/TestSystemSetup.java index 93321e6872..11bcaf1a1e 100644 --- a/jena-core/src/test/java/org/apache/jena/test/TestSystemSetup.java +++ b/jena-core/src/test/java/org/apache/jena/test/TestSystemSetup.java @@ -19,16 +19,13 @@ package org.apache.jena.test; import junit.framework.TestCase ; -import junit.framework.TestSuite ; +import org.junit.Test; public class TestSystemSetup extends TestCase { - public static TestSuite suite() { - return new TestSuite(TestSystemSetup.class, "System setup") ; - } - // Check any settings that must have particular values in a release. + @Test public void testRDF11() { // RDF 1.1 and later is now built-in. } diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestSuite.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TS_TestTurtle.java similarity index 69% rename from jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestSuite.java rename to jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TS_TestTurtle.java index b582863f02..257aa76dcb 100644 --- a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TS_TestTurtle.java @@ -18,19 +18,12 @@ package org.apache.jena.ttl_test.test.turtle; -import junit.framework.* ; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -public class TurtleTestSuite extends TestSuite -{ - static public TestSuite suite() { - return new TurtleTestSuite() ; - } - - private TurtleTestSuite() - { - super("Turtle") ; - addTest(TestTurtleReader.suite()) ; - addTest(TurtleInternalTests.suite()) ; - addTest(TurtleTestFactory.make("testing/Turtle/manifest.ttl")) ; - } -} +@RunWith(Suite.class) [email protected]({ + TestTurtleReader.class, + TestTurtleInternal.class, +}) +public class TS_TestTurtle {} \ No newline at end of file diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestBadSyntax.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemBadSyntax.java similarity index 67% rename from jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestBadSyntax.java rename to jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemBadSyntax.java index a90c0e9d3f..048013891c 100644 --- a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestBadSyntax.java +++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemBadSyntax.java @@ -19,27 +19,26 @@ package org.apache.jena.ttl_test.test.turtle; import junit.framework.TestCase; -import org.apache.jena.rdf.model.* ; +import org.apache.jena.rdf.model.*; import org.apache.jena.ttl_test.turtle.TurtleParseException; import org.apache.jena.ttl_test.turtle.TurtleReader; +public class TestItemBadSyntax extends TestCase { + String uri; + public TestItemBadSyntax(String name, String uri) { + super(name); + this.uri = uri; + } -public class TestBadSyntax extends TestCase -{ - String uri ; - public TestBadSyntax(String name, String uri) { super(name) ; this.uri = uri ; } - @Override - public void runTest() - { - Model model = ModelFactory.createDefaultModel() ; - RDFReaderI t = new TurtleReader() ; + public void runTest() { + Model model = ModelFactory.createDefaultModel(); + RDFReaderI t = new TurtleReader(); try { - t.read(model, uri) ; - fail("Bad syntax test succeed in parsing the file") ; - } catch (TurtleParseException ex) - { - return ; + t.read(model, uri); + fail("Bad syntax test succeed in parsing the file"); + } catch (TurtleParseException ex) { + return; } } diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestSyntax.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemSyntax.java similarity index 70% rename from jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestSyntax.java rename to jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemSyntax.java index 5b3280998f..0c4183149b 100644 --- a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestSyntax.java +++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemSyntax.java @@ -19,26 +19,25 @@ package org.apache.jena.ttl_test.test.turtle; import junit.framework.TestCase; -import org.apache.jena.rdf.model.* ; +import org.apache.jena.rdf.model.*; import org.apache.jena.ttl_test.turtle.TurtleParseException; import org.apache.jena.ttl_test.turtle.TurtleReader; +public class TestItemSyntax extends TestCase { + String uri; + public TestItemSyntax(String name, String uri) { + super(name); + this.uri = uri; + } -public class TestSyntax extends TestCase -{ - String uri ; - public TestSyntax(String name, String uri) { super(name) ; this.uri = uri ; } - @Override - public void runTest() - { - Model model = ModelFactory.createDefaultModel() ; - RDFReaderI t = new TurtleReader() ; + public void runTest() { + Model model = ModelFactory.createDefaultModel(); + RDFReaderI t = new TurtleReader(); try { - t.read(model, uri) ; - } catch (TurtleParseException ex) - { - throw ex ; + t.read(model, uri); + } catch (TurtleParseException ex) { + throw ex; } } diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtle.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemTurtleExec.java similarity index 58% rename from jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtle.java rename to jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemTurtleExec.java index d48764692a..33fcf0ee87 100644 --- a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtle.java +++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestItemTurtleExec.java @@ -18,47 +18,46 @@ package org.apache.jena.ttl_test.test.turtle; - import junit.framework.TestCase; -import org.apache.jena.rdf.model.Model ; -import org.apache.jena.rdf.model.ModelFactory ; -import org.apache.jena.rdf.model.RDFReaderI ; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.ttl_test.turtle.TurtleParseException; import org.apache.jena.ttl_test.turtle.TurtleReader; -import org.apache.jena.util.FileManager ; -import org.apache.jena.util.FileUtils ; - - -public class TestTurtle extends TestCase -{ - String input ; - String output ; - String baseIRI ; - - public TestTurtle(String name, String input, String output, String baseIRI) - { super(name) ; this.input = input ; this.output = output ; this.baseIRI = baseIRI ; } +import org.apache.jena.util.FileManager; +import org.apache.jena.util.FileUtils; + +public class TestItemTurtleExec extends TestCase { + String input; + String output; + String baseIRI; + + public TestItemTurtleExec(String name, String input, String output, String baseIRI) { + super(name); + this.input = input; + this.output = output; + this.baseIRI = baseIRI; + } @Override - public void runTest() - { - Model model = ModelFactory.createDefaultModel() ; - RDFReaderI t = new TurtleReader() ; + public void runTest() { + Model model = ModelFactory.createDefaultModel(); + RDFReaderI t = new TurtleReader(); try { if ( baseIRI != null ) - t.read(model, FileManager.getInternal().open(input), baseIRI) ; + t.read(model, FileManager.getInternal().open(input), baseIRI); else - t.read(model, input) ; + t.read(model, input); // "http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl"; - String syntax = FileUtils.guessLang(output, FileUtils.langNTriple) ; - Model results = ModelFactory.createDefaultModel() ; + String syntax = FileUtils.guessLang(output, FileUtils.langNTriple); + Model results = ModelFactory.createDefaultModel(); results.read(output, null, syntax); - boolean b = model.isIsomorphicWith(results) ; + boolean b = model.isIsomorphicWith(results); if ( !b ) - assertTrue("Models not isomorphic", b) ; - } catch (TurtleParseException ex) - { - throw ex ; + assertTrue("Models not isomorphic", b); + } catch (TurtleParseException ex) { + throw ex; } } } diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleInternalTests.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleInternal.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleInternalTests.java rename to jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleInternal.java index 7ba92db599..f4ffbabf3d 100644 --- a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleInternalTests.java +++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleInternal.java @@ -26,17 +26,16 @@ import org.apache.jena.ttl_test.turtle.TurtleEventNull; import org.apache.jena.ttl_test.turtle.parser.TurtleParser; import org.apache.jena.util.junit.TestUtils ; -public class TurtleInternalTests extends TestSuite +public class TestTurtleInternal extends TestSuite { static public TestSuite suite() { - return new TurtleInternalTests() ; + return new TestTurtleInternal() ; } static public final String QUOTE3 = "\"\"\"" ; static public boolean VERBOSE = false ; - public TurtleInternalTests() - { + public TestTurtleInternal() { super("Turtle Parser Syntactic tests") ; // ---- Debug testing diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleReader.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleReader.java index 86832bf031..78f8d7e694 100644 --- a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleReader.java +++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TestTurtleReader.java @@ -20,36 +20,31 @@ package org.apache.jena.ttl_test.test.turtle; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.jena.rdf.model.Model ; -import org.apache.jena.rdf.model.ModelFactory ; -import org.apache.jena.rdf.model.RDFReaderI ; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.ttl_test.turtle.TurtleReader; -public class TestTurtleReader extends TestCase -{ +public class TestTurtleReader extends TestCase { - public static TestSuite suite() - { - return new TestSuite(TestTurtleReader.class, "Basic Turtle tests") ; + public static TestSuite suite() { + return new TestSuite(TestTurtleReader.class, "Basic Turtle tests"); } - public void test0() - { + public void test0() { RDFReaderI r = new TurtleReader(); - assertNotNull(r) ; + assertNotNull(r); } - public void test1() - { - Model m = ModelFactory.createDefaultModel() ; - m.read("file:testing/Turtle/simple.ttl", "TTL") ; - assertFalse(m.isEmpty()) ; + public void test1() { + Model m = ModelFactory.createDefaultModel(); + m.read("file:testing/Turtle/simple.ttl", "TTL"); + assertFalse(m.isEmpty()); } - public void test2() - { - Model m = ModelFactory.createDefaultModel() ; - m.read("file:testing/Turtle/i18n.ttl", "TTL") ; - assertFalse(m.isEmpty()) ; + public void test2() { + Model m = ModelFactory.createDefaultModel(); + m.read("file:testing/Turtle/i18n.ttl", "TTL"); + assertFalse(m.isEmpty()); } } diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestFactory.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestFactory.java index 6ab81247ad..03c821cdbf 100644 --- a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestFactory.java +++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestFactory.java @@ -20,58 +20,52 @@ package org.apache.jena.ttl_test.test.turtle; import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.jena.rdf.model.Resource ; +import org.apache.jena.rdf.model.Resource; import org.apache.jena.ttl_test.TestFactoryManifestOld; -import org.apache.jena.util.junit.TestUtils ; -import org.apache.jena.vocabulary.RDF ; +import org.apache.jena.util.junit.TestUtils; +import org.apache.jena.vocabulary.RDF; +public class TurtleTestFactory extends TestFactoryManifestOld { -public class TurtleTestFactory extends TestFactoryManifestOld -{ - - public static TestSuite make(String filename) - { - return new TurtleTestFactory().process(filename) ; + public static TestSuite make(String filename) { + return new TurtleTestFactory().process(filename); } - + @Override - public Test makeTest(Resource manifest, Resource item, String testName, Resource action, Resource result) - { + public Test makeTest(Resource manifest, Resource item, String testName, Resource action, Resource result) { try { - Resource r = TestUtils.getResource(item, RDF.type) ; - Resource input = TestUtils.getResource(action, TurtleTestVocab.input) ; - Resource output = TestUtils.getResource(result, TurtleTestVocab.output) ; - Resource inputIRIr = TestUtils.getResource(action, TurtleTestVocab.inputIRI) ; - String baseIRI = (inputIRIr == null)?null:inputIRIr.getURI() ; - - if ( r.equals(TurtleTestVocab.TestInOut)) - { - return new TestTurtle(testName, input.getURI(), output.getURI(), baseIRI) ; + Resource r = TestUtils.getResource(item, RDF.type); + Resource input = TestUtils.getResource(action, TurtleTestVocab.input); + Resource output = TestUtils.getResource(result, TurtleTestVocab.output); + Resource inputIRIr = TestUtils.getResource(action, TurtleTestVocab.inputIRI); + String baseIRI = (inputIRIr == null) ? null : inputIRIr.getURI(); + + if ( r.equals(TurtleTestVocab.TestInOut) ) { + System.out.printf("TestInOut %s, in:%s, out:%s, base=%s\n", testName, input.getURI(), output.getURI(), baseIRI); + return new TestItemTurtleExec(testName, input.getURI(), output.getURI(), baseIRI); } - - if ( r.equals(TurtleTestVocab.TestSyntax)) - { - return new TestSyntax(testName, input.getURI()) ; + + if ( r.equals(TurtleTestVocab.TestSyntax) ) { + System.out.printf("TestSynGood %s, in:%s\n", testName, input.getURI()); + return new TestItemSyntax(testName, input.getURI()); } - - if ( r.equals(TurtleTestVocab.TestBadSyntax)) - { - return new TestBadSyntax(testName, input.getURI()) ; + + if ( r.equals(TurtleTestVocab.TestBadSyntax) ) { + System.out.printf("TestSynBad %s, in:%s, out:%s, base=%s\n", testName, input.getURI(), output.getURI(), baseIRI); + return new TestItemBadSyntax(testName, input.getURI()); } - - //if ( r.equals(TurtleTestVocab.TestSurpeessed )) - // return new TestSupressed(testName, null) ; - - System.err.println("Unrecognized test : "+testName) ; - return null ; - - - } catch (Exception ex) - { - ex.printStackTrace(System.err) ; - System.err.println("Failed to grok test : "+testName) ; - return null ; + + // if ( r.equals(TurtleTestVocab.TestSurpeessed )) + // return new TestSupressed(testName, null) ; + + System.err.println("Unrecognized test : " + testName); + return null; + + } catch (Exception ex) { + ex.printStackTrace(System.err); + System.err.println("Failed to grok test : " + testName); + return null; } - + } } diff --git a/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestSuiteManifest.java b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestSuiteManifest.java new file mode 100644 index 0000000000..97f049fda0 --- /dev/null +++ b/jena-core/src/test/java/org/apache/jena/ttl_test/test/turtle/TurtleTestSuiteManifest.java @@ -0,0 +1,84 @@ +/* + * 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 + * + * http://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. + */ + +package org.apache.jena.ttl_test.test.turtle; + +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class TurtleTestSuiteManifest extends TestSuite { + static public TestSuite suite() { + return new TurtleTestSuiteManifest(); + } + + private TurtleTestSuiteManifest() { + super("TurtleManifest"); + //addTest(TurtleTestFactory.make("testing/Turtle/manifest.ttl")); + testGood("rdf-schema" , "RaptorTurtle/rdf-schema.ttl", "RaptorTurtle/rdf-schema.out"); + testGood("rdfq-results" , "RaptorTurtle/rdfq-results.ttl", "RaptorTurtle/rdfq-results.out", "http://www.w3.org/2001/sw/DataAccess/df1/tests/rdfq-results.ttl";); + testGood("rdfs-namespace" , "RaptorTurtle/rdfs-namespace.ttl", "RaptorTurtle/rdfs-namespace.out"); + testGood("test-00" , "RaptorTurtle/test-00.ttl", "RaptorTurtle/test-00.out", "http://www.w3.org/2001/sw/DataAccess/df1/tests/test-00.ttl";); + testGood("test-01" , "RaptorTurtle/test-01.ttl", "RaptorTurtle/test-01.out"); + testGood("test-02" , "RaptorTurtle/test-02.ttl", "RaptorTurtle/test-02.out"); + testGood("test-03" , "RaptorTurtle/test-03.ttl", "RaptorTurtle/test-03.out"); + testGood("test-04" , "RaptorTurtle/test-04.ttl", "RaptorTurtle/test-04.out"); + testGood("test-05" , "RaptorTurtle/test-05.ttl", "RaptorTurtle/test-05.out"); + testGood("test-06" , "RaptorTurtle/test-06.ttl", "RaptorTurtle/test-06.out"); + testGood("test-07" , "RaptorTurtle/test-07.ttl", "RaptorTurtle/test-07.out"); + testGood("test-08" , "RaptorTurtle/test-08.ttl", "RaptorTurtle/test-08.out"); + testGood("test-09" , "RaptorTurtle/test-09.ttl", "RaptorTurtle/test-09.out"); + testGood("test-10" , "RaptorTurtle/test-10.ttl", "RaptorTurtle/test-10.out"); + testGood("test-11" , "RaptorTurtle/test-11.ttl", "RaptorTurtle/test-11.out"); + testGood("test-12" , "RaptorTurtle/test-12.ttl", "RaptorTurtle/test-12.out"); + testGood("test-13" , "RaptorTurtle/test-13.ttl", "RaptorTurtle/test-13.out"); + testGood("test-14" , "RaptorTurtle/test-14.ttl", "RaptorTurtle/test-14.out"); + testGood("test-15" , "RaptorTurtle/test-15.ttl", "RaptorTurtle/test-15.out"); + testGood("test-16" , "RaptorTurtle/test-16.ttl", "RaptorTurtle/test-16.out"); + + testBad("Bad-00" , "RaptorTurtle/bad-00.ttl"); + testBad("Bad-01" , "RaptorTurtle/bad-01.ttl"); + testBad("Bad-02" , "RaptorTurtle/bad-02.ttl"); + testBad("Bad-03" , "RaptorTurtle/bad-03.ttl"); + testBad("Bad-04" , "RaptorTurtle/bad-04.ttl"); + testBad("Bad-05" , "RaptorTurtle/bad-05.ttl"); + testBad("Bad-06" , "RaptorTurtle/bad-06.ttl"); + testBad("Bad-07" , "RaptorTurtle/bad-07.ttl"); + testBad("Bad-08" , "RaptorTurtle/bad-08.ttl"); + testBad("Bad-09" , "RaptorTurtle/bad-09.ttl"); + testBad("Bad-10" , "RaptorTurtle/bad-10.ttl"); + testBad("Bad-11" , "RaptorTurtle/bad-11.ttl"); + testBad("Bad-12" , "RaptorTurtle/bad-12.ttl"); + testBad("Bad-13" , "RaptorTurtle/bad-13.ttl"); + + } + + private void testBad(String name, String inputFile) { + TestCase test = new TestItemBadSyntax(name, "file:testing/Turtle/"+inputFile); + this.addTest(test); + + } + + private void testGood(String name, String inputFile, String outputFile) { + testGood(name, inputFile, outputFile, null); + } + + private void testGood(String name, String inputFile, String outputFile, String baseURI) { + TestCase test = new TestItemTurtleExec(name, "file:testing/Turtle/"+inputFile, "file:testing/Turtle/"+outputFile, baseURI); + this.addTest(test); + } +} diff --git a/jena-core/src/test/java/org/apache/jena/datatypes/TestPackage_dt.java b/jena-core/src/test/java/org/apache/jena/util/TS3_coreutil.java similarity index 55% rename from jena-core/src/test/java/org/apache/jena/datatypes/TestPackage_dt.java rename to jena-core/src/test/java/org/apache/jena/util/TS3_coreutil.java index f0df6a9c0c..382407ae30 100644 --- a/jena-core/src/test/java/org/apache/jena/datatypes/TestPackage_dt.java +++ b/jena-core/src/test/java/org/apache/jena/util/TS3_coreutil.java @@ -16,27 +16,31 @@ * limitations under the License. */ -package org.apache.jena.datatypes; +package org.apache.jena.util; -import junit.framework.JUnit4TestAdapter ; -import junit.framework.TestSuite ; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; -/** - Collected test suite for the .datatype package. - (many other tests are elsewhere) -*/ +@RunWith(Suite.class) [email protected]( { + TestSimpleTokenizer.class, + TestFileUtils.class, + TestCollectionFactory.class, + TestLocationMapper.class, + TestFileManager.class, + TestMonitors.class, + TestPrintUtil.class, + TestPrefixMappingUtils.class, + TestIteratorCollection.class, + TestModelCollector.class, -public class TestPackage_dt extends TestSuite { + TestSplitIRI_Display.class, + TestSplitIRI_XML.class, + TestSplitIRI_TTL.class, - static public TestSuite suite() { - return new TestPackage_dt(); - } + // Needs the legacy N3 reader loaded. + TestLocators.class, + TestOneToManyMap.class +}) - /** Creates new TestPackage */ - private TestPackage_dt() { - super("datatypes"); - addTest(new JUnit4TestAdapter(TestDatatypes.class)) ; - addTest(new JUnit4TestAdapter(TestDatatypeValues.class)) ; - addTest(new JUnit4TestAdapter(TestRDFXMLiteral.class)) ; - } -} +public class TS3_coreutil {} diff --git a/jena-core/src/test/java/org/apache/jena/util/TestPackage_util.java b/jena-core/src/test/java/org/apache/jena/util/TestPackage_util.java deleted file mode 100644 index b40812a9f8..0000000000 --- a/jena-core/src/test/java/org/apache/jena/util/TestPackage_util.java +++ /dev/null @@ -1,66 +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 - * - * http://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. - */ - -package org.apache.jena.util; - -import junit.framework.*; - -/** - * All developers should edit this file to add their tests. - * Please try to name your tests and test suites appropriately. - * Note, it is better to name your test suites on creation - * rather than in this file. - */ -public class TestPackage_util extends TestSuite { - - static public TestSuite suite() { - return new TestPackage_util(); - } - - /** Creates new TestPackage */ - private TestPackage_util() { - super( "util" ); - addTest( "TestSimpleTokenzier", TestSimpleTokenizer.suite()); - addTest( "TestFileUtils", TestFileUtils.suite() ); - addTest( "TestHashUtils", TestCollectionFactory.suite() ); - addTest( "TestLocationMapper", TestLocationMapper.suite() ) ; - addTest( "TestFileManager", TestFileManager.suite()) ; - addTest( "TestMonitors", TestMonitors.suite()) ; - addTest( "TestPrintUtil", TestPrintUtil.suite()) ; - addTest( "TestPrefixMappingUtils", TestPrefixMappingUtils.suite() ); - addTest( "TestIteratorCollection", TestIteratorCollection.suite() ); - addTest( "TestModelCollector", TestModelCollector.suite()) ; - - addTest( "TestSplitIRI_Display", TestSplitIRI_Display.suite()) ; - addTest( "TestSplitIRI_XML", TestSplitIRI_XML.suite()) ; - addTest( "TestSplitIRI_TTL", TestSplitIRI_TTL.suite()) ; - - // Needs the legacy N3 reader loaded. - addTestSuite( TestLocators.class ); - addTestSuite( TestOneToManyMap.class ); - } - - private void addTest(String name, TestSuite tc) { - tc.setName(name); - addTest(tc); - } - private void addTest(String name, Test tc) { - addTest(tc); - } - -} diff --git a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java b/jena-core/src/test/java/org/apache/jena/util/iterator/test/TS3_coreiter.java similarity index 77% copy from jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java copy to jena-core/src/test/java/org/apache/jena/util/iterator/test/TS3_coreiter.java index 2a4f239f55..db338d45c5 100644 --- a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java +++ b/jena-core/src/test/java/org/apache/jena/util/iterator/test/TS3_coreiter.java @@ -16,17 +16,20 @@ * limitations under the License. */ -package org.apache.jena.mem2; +package org.apache.jena.util.iterator.test; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses( { - GraphMem2LegacyTest.class, - GraphMem2FastTest.class, - GraphMem2RoaringTest.class, - GraphMem2Test.class -} ) -public class TestPackage_GraphMem2 { -} + TestWrappedIterator.class, + TestNullIterator.class, + TestFilters.class, + TestAndThen.class, + TestAsCollection.class, + TestMapIterators.class, + TestResourceUtils.class +}) + +public class TS3_coreiter {} diff --git a/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestPackage_iter.java b/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestPackage_iter.java deleted file mode 100644 index e1f2972dca..0000000000 --- a/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestPackage_iter.java +++ /dev/null @@ -1,39 +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 - * - * http://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. - */ - -package org.apache.jena.util.iterator.test; - -import junit.framework.TestSuite; - -public class TestPackage_iter extends TestSuite - { - static public TestSuite suite() - { return new TestPackage_iter(); } - - private TestPackage_iter() - { - super( "iterators" ); - addTest( TestWrappedIterator.suite() ); - addTest( TestNullIterator.suite() ); - addTest( TestFilters.suite() ); - addTest( TestAndThen.suite() ); - addTestSuite( TestAsCollection.class ); - addTestSuite( TestMapIterators.class ); - addTest( new TestSuite( TestResourceUtils.class ) ); - } - } diff --git a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java b/jena-core/src/test/java/org/apache/jena/vocabulary/test/TS_Vocabularies.java similarity index 78% rename from jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java rename to jena-core/src/test/java/org/apache/jena/vocabulary/test/TS_Vocabularies.java index 2a4f239f55..cd5fb0f3a3 100644 --- a/jena-core/src/test/java/org/apache/jena/mem2/TestPackage_GraphMem2.java +++ b/jena-core/src/test/java/org/apache/jena/vocabulary/test/TS_Vocabularies.java @@ -16,17 +16,19 @@ * limitations under the License. */ -package org.apache.jena.mem2; +package org.apache.jena.vocabulary.test; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) [email protected]( { - GraphMem2LegacyTest.class, - GraphMem2FastTest.class, - GraphMem2RoaringTest.class, - GraphMem2Test.class [email protected]({ + TestVocabRDF.class, + TestVocabRDFS.class, + TestVocabVCARD.class, + TestVocabRSS.class, + TestVocabDC10.class, + TestOWL2Vocabulary.class } ) -public class TestPackage_GraphMem2 { -} + +public class TS_Vocabularies {} diff --git a/jena-core/src/test/java/org/apache/jena/vocabulary/test/TestVocabularies.java b/jena-core/src/test/java/org/apache/jena/vocabulary/test/TestVocabularies.java deleted file mode 100644 index dce0fd06c1..0000000000 --- a/jena-core/src/test/java/org/apache/jena/vocabulary/test/TestVocabularies.java +++ /dev/null @@ -1,42 +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 - * - * http://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. - */ - -package org.apache.jena.vocabulary.test; - -import junit.framework.*; - -/** - Collect together all the vocabulary tests. -*/ -public class TestVocabularies extends TestCase - { - public TestVocabularies( String name ) - { super( name ); } - - public static TestSuite suite() - { - TestSuite result = new TestSuite(); - result.addTest( TestVocabRDF.suite() ); - result.addTest( TestVocabRDFS.suite() ); - result.addTest( TestVocabVCARD.suite() ); - result.addTest( TestVocabRSS.suite() ); - result.addTest( TestVocabDC10.suite() ); - result.addTestSuite( TestOWL2Vocabulary.class ); - return result; - } - } diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestLiterals.java b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestLiterals.java index d415736d18..02f9b59abb 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestLiterals.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestLiterals.java @@ -18,12 +18,12 @@ package org.apache.jena.permissions.contract.model; import org.apache.jena.rdf.model.test.TestLiterals; -import org.apache.jena.rdf.model.test.TestPackage_model; +import org.apache.jena.rdf.model.test.TS3_Model1; public class SecTestLiterals extends TestLiterals { public SecTestLiterals() { - super(new TestPackage_model.PlainModelFactory(), "SecTestLiterals"); + super(new TS3_Model1.PlainModelFactory(), "SecTestLiterals"); } } diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestReaderEvents.java b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestReaderEvents.java index 9c61d13f72..1a45264a82 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestReaderEvents.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestReaderEvents.java @@ -17,12 +17,12 @@ */ package org.apache.jena.permissions.contract.model; -import org.apache.jena.rdf.model.test.TestPackage_model; +import org.apache.jena.rdf.model.test.TS3_Model1; public class SecTestReaderEvents extends org.apache.jena.rdf.model.test.TestReaderEvents { public SecTestReaderEvents() { - super(new TestPackage_model.PlainModelFactory(), "SecTestReaderEvents"); + super(new TS3_Model1.PlainModelFactory(), "SecTestReaderEvents"); } } diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestReaders.java b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestReaders.java index e87cc39507..dbc4940c53 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestReaders.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestReaders.java @@ -17,12 +17,12 @@ */ package org.apache.jena.permissions.contract.model; -import org.apache.jena.rdf.model.test.TestPackage_model; +import org.apache.jena.rdf.model.test.TS3_Model1; public class SecTestReaders extends org.apache.jena.rdf.model.test.TestReaders { public SecTestReaders() { - super(new TestPackage_model.PlainModelFactory(), "SecTestReaders"); + super(new TS3_Model1.PlainModelFactory(), "SecTestReaders"); } }
