You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2013/10/09 19:16:18 UTC
svn commit: r1530718 [1/10] - in /jena/Experimental/new-test: ./
src/test/java/com/hp/hpl/jena/graph/
src/test/java/com/hp/hpl/jena/graph/compose/
src/test/java/com/hp/hpl/jena/graph/impl/
src/test/java/com/hp/hpl/jena/mem/ src/test/java/com/hp/hpl/jen...
Author: claude
Date: Wed Oct 9 17:16:15 2013
New Revision: 1530718
URL: http://svn.apache.org/r1530718
Log:
Refactored names
Updated Graph tests to Contract testing framework where indicated.
Added:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/GraphContractTest.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/GraphEventManagerContractTest.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractEventManagerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/GraphExtractTest.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphExtractTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/GraphMakerContractTest.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphMakerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/GraphWithPerformContractTest.java (with props)
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/RecordingGraphListener.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/RecordingListener.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/ReifierTest.java (with props)
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestGraphUtil.java
- copied, changed from r1520788, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestGraphUtils.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TransactionHandlerContractTest.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractTransactionHandlerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TripleStoreContractTest.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTripleStoreTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/ArrayBunchTest.java
- copied, changed from r1520822, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/ArrayTripleBunchTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/BunchMapContractTest.java
- copied, changed from r1520822, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/AbstractBunchMapTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/TripleBunchContractTest.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/AbstractTripleBunchTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AltContractTest.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractAltMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/BagContractTests.java
- copied, changed from r1523135, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractBagMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ContainerContractTests.java
- copied, changed from r1525287, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractContainerMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LockContractTests.java
- copied, changed from r1525287, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractLockContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelConContractTests.java
- copied, changed from r1525417, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelConContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelContractTests.java
- copied, changed from r1525342, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFListContractTests.java
- copied, changed from r1525287, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractRDFListContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFNodeContractTests.java
- copied, changed from r1525417, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractRDFNodeContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFReaderFContractTests.java
- copied, changed from r1525287, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractRDFReaderFContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFWriterFContractTests.java
- copied, changed from r1525287, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractRDFWriterFContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ResourceContractTests.java
- copied, changed from r1525417, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractResourceTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SeqContractTests.java
- copied, changed from r1525287, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractSeqMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/StatementContractTests.java
- copied, changed from r1525287, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractStatementTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelComTest.java (with props)
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/PrefixMappingContractTest.java
- copied, changed from r1525417, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/AbstractPrefixMappingTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractRecordingListener.java (with props)
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IContainerProducer.java (with props)
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/INodeProducer.java (with props)
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IStatementProducer.java (with props)
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ITripleStoreProducer.java
- copied, changed from r1520788, jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/TripleStoreProducerInterface.java
Removed:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractEventManagerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractFindLiteralsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphExtractTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphListenerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphMakerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphPrefixMappingTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractRegisterGraphListenerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractReifierTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractTestGraphMaker.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractTransactionHandlerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/RecordingListener.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestGraphUtils.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/AbstractTripleStoreTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/AbstractBunchMapTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/AbstractTripleBunchTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/ArrayTripleBunchTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemListenerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemPrefixMappingTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemRegisterListenerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemReifierTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractAltMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractBagMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractContainerMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractLockContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelConContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractRDFListContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractRDFNodeContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractRDFReaderFContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractRDFWriterFContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractResourceTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractSeqMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractStatementTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/AbstractPrefixMappingTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractGraphProducerUser.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducerUser.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphProducerUserInterface.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerInterface.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelProducerUserInterface.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/TripleStoreProducerInterface.java
Modified:
jena/Experimental/new-test/pom.xml
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestNode.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/TestNodeToTriplesMap.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/AbstractDyadicTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/DeltaSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/DeltaTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/DifferenceSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/DifferenceTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/DisjointUnionSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/DisjointUnionTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/IntersectionSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/IntersectionTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/MultiUnionReifierTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/MultiUnionSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/MultiUnionTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/PolyadicPrefixMappingTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/compose/UnionTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/CollectionGraphSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/CollectionGraphTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphMakerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleEventManagerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/SimpleGraphMakerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphTripleStoreTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/HashedBunchMapTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/HashedTripleBunchTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/WrappedHashMapTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractFindPropertiesTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractIteratorTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractListObjectsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractLiteralTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelContractSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelExtractTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelGraphInterfaceContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelMakerTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractPropertyTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractReifiedStatementsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AnonIDTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/DefaultModelTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelFactoryTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelTestBase.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFWriterFTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RecordingModelListener.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ResourceFactoryTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SimpleSelectorTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/ModelComSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/ModelComTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/ModelMakerImplTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/PropertyImplTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/AltMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/BagMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/FindPropertiesTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/IteratorTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelConTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelExtractTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelGraphInterfaceTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelListObjectTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelLockTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelSuite.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFNodeTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFReaderFTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFWriterFTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ReifiedStatementTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ResourceNodeTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/StatementTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/JenaExceptionTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/impl/PrefixMappingTest.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/package-info.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractGraphProducer.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphProducerInterface.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/NodeProducerInterface.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/TestFileData.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/TestUtils.java
Modified: jena/Experimental/new-test/pom.xml
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/pom.xml?rev=1530718&r1=1530717&r2=1530718&view=diff
==============================================================================
--- jena/Experimental/new-test/pom.xml (original)
+++ jena/Experimental/new-test/pom.xml Wed Oct 9 17:16:15 2013
@@ -19,7 +19,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
- <version>${version}</version>
+ <version>2.11.0</version>
<type>pom</type>
</dependency>
<dependency>
@@ -28,5 +28,11 @@
<version>1.9.5</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.xenei</groupId>
+ <artifactId>junit-contracts</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphSuite.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphSuite.java?rev=1530718&r1=1530717&r2=1530718&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphSuite.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/AbstractGraphSuite.java Wed Oct 9 17:16:15 2013
@@ -17,149 +17,133 @@
*/
package com.hp.hpl.jena.graph;
-import static com.hp.hpl.jena.testing_framework.GraphHelper.node;
-import static com.hp.hpl.jena.testing_framework.GraphHelper.triple;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
+import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import com.hp.hpl.jena.testing_framework.GraphEventManagerProducerInterface;
-import com.hp.hpl.jena.testing_framework.GraphProducerInterface;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import org.xenei.junit.contract.Contract;
+import org.xenei.junit.contract.Contract.Inject;
+import org.xenei.junit.contract.ContractImpl;
+import org.xenei.junit.contract.ContractSuite;
+
+import com.hp.hpl.jena.shared.PrefixMapping;
+import org.xenei.junit.contract.IProducer;
@Suite.SuiteClasses({ AbstractGraphSuite.GraphTest.class,
- AbstractGraphSuite.ReifierTest.class,
- AbstractGraphSuite.FindLiterals.class,
+ AbstractGraphSuite.GraphReifierTest.class,
AbstractGraphSuite.ExtractTest.class,
AbstractGraphSuite.EventManagerTest.class,
AbstractGraphSuite.TransactionTest.class,
- AbstractGraphSuite.RegisterListenerTest.class,
- AbstractGraphSuite.ListenerTest.class,
AbstractGraphSuite.PrefixMappingTest.class })
public abstract class AbstractGraphSuite {
- static protected GraphProducerInterface graphProducer;
+ static protected IProducer<? extends Graph> graphProducer;
- public static void setGraphProducer(GraphProducerInterface graphProducer) {
+ public static void setGraphProducer(IProducer<? extends Graph> graphProducer) {
AbstractGraphSuite.graphProducer = graphProducer;
}
- public static class GraphTest extends AbstractGraphTest {
- @Override
- public GraphProducerInterface getGraphProducer() {
- return AbstractGraphSuite.graphProducer;
+ protected static class GraphTest extends GraphContractTest {
+ public GraphTest() {
}
- }
- public static class ReifierTest extends AbstractReifierTest {
@Override
- public GraphProducerInterface getGraphProducer() {
+ public IProducer<? extends Graph> getGraphProducer() {
return AbstractGraphSuite.graphProducer;
}
}
- public static class FindLiterals extends AbstractFindLiteralsTest {
- public FindLiterals(String data, int size, String search,
- String results, boolean litReq) {
- super(data, size, search, results, litReq);
- AbstractFindLiteralsTest.graphProducer = AbstractGraphSuite.graphProducer;
+ protected static class GraphReifierTest extends ReifierTest {
+ public GraphReifierTest() {
+ super.graphProducer = AbstractGraphSuite.graphProducer;
}
}
- public static class ExtractTest extends AbstractGraphExtractTest {
- @Override
- public GraphProducerInterface getGraphProducer() {
- return AbstractGraphSuite.graphProducer;
+ protected static class ExtractTest extends GraphExtractTest {
+ public ExtractTest() {
+ super.graphProducer = graphProducer;
}
}
- public static class EventManagerTest extends AbstractEventManagerTest {
- @Override
- protected GraphEventManagerProducerInterface getEventManagerProducer() {
- return new GraphEventManagerProducerInterface() {
+ public static interface GEM extends GraphEventManager {
+ };
+
+ @RunWith(ContractSuite.class)
+ @ContractImpl(GEM.class)
+ protected static class EventManagerTest {
+ public EventManagerTest() {
+ };
+
+ @Contract.Inject( "org.xenei.junit.contract.IProducer<%s>" )
+ public IProducer<GraphEventManager> getEventManagerProducer() {
+ return new IProducer<GraphEventManager>() {
@Override
- public GraphEventManager newEventManager() {
- return AbstractGraphSuite.graphProducer.newGraph()
- .getEventManager();
+ public GraphEventManager newInstance() {
+ return graphProducer.newInstance().getEventManager();
}
+
+ @Override
+ public void cleanUp() {
+ // do nothing
+ }
+
};
}
- /**
- * Utility: get a graph, register L with its manager, return the graph.
- */
- protected Graph getAndRegister(GraphListener gl) {
- Graph g = AbstractGraphSuite.graphProducer.newGraph();
- g.getEventManager().register(gl);
- return g;
- }
-
- @Test
- public void testRemoveAllEvent() {
- Graph g = getAndRegister(L);
- g.clear();
- L.assertHas(new Object[] { "someEvent", g, GraphEvents.removeAll });
- }
-
- @Test
- public void testRemoveSomeEvent() {
- Graph g = getAndRegister(L);
- Node S = node("S"), P = node("??"), O = node("??");
- g.remove(S, P, O);
- Object event = GraphEvents.remove(S, P, O);
- L.assertHas(new Object[] { "someEvent", g, event });
- }
-
- /**
- * Ensure that triples removed by calling .remove() on the iterator
- * returned by a find() will generate deletion notifications.
- */
- @Test
- public void testEventDeleteByFind() {
- Graph g = getAndRegister(L);
- if (g.getCapabilities().iteratorRemoveAllowed()) {
- Triple toRemove = triple("remove this triple");
- g.add(toRemove);
- ExtendedIterator<Triple> rtr = g.find(toRemove);
- assertTrue("ensure a(t least) one triple", rtr.hasNext());
- rtr.next();
- rtr.remove();
- rtr.close();
- L.assertHas(new Object[] { "add", g, toRemove, "delete", g,
- toRemove });
- }
- }
}
- public static class TransactionTest extends AbstractTransactionHandlerTest {
- @Override
- public GraphProducerInterface getGraphProducer() {
- return AbstractGraphSuite.graphProducer;
- }
- }
+ public static interface TH extends TransactionHandler {
+ };
- public static class RegisterListenerTest extends
- AbstractRegisterGraphListenerTest {
- @Override
- public GraphProducerInterface getGraphProducer() {
- return AbstractGraphSuite.graphProducer;
- }
- }
+ @RunWith(ContractSuite.class)
+ @ContractImpl(TH.class)
+ protected static class TransactionTest// extends
+ // AbstractTransactionHandlerTest
+ {
+ public TransactionTest() {
+ };
+
+ @Inject( "org.xenei.junit.contract.IProducer<%s>" )
+ public IProducer<TransactionHandler> getTransactionHandlerProducer() {
+ return new IProducer<TransactionHandler>() {
- public static class ListenerTest extends AbstractGraphListenerTest {
- @Override
- public GraphProducerInterface getGraphProducer() {
- return AbstractGraphSuite.graphProducer;
+ @Override
+ public TransactionHandler newInstance() {
+ return graphProducer.newInstance().getTransactionHandler();
+ }
+
+ @Override
+ public void cleanUp() {
+ // do nothing
+ }
+ };
}
}
- public static class PrefixMappingTest extends
- AbstractGraphPrefixMappingTest {
- @Override
- public GraphProducerInterface getGraphProducer() {
- return AbstractGraphSuite.graphProducer;
+ public static interface PM extends PrefixMapping {
+ };
+
+ @RunWith(ContractSuite.class)
+ @ContractImpl(PM.class)
+ protected static class PrefixMappingTest {
+ public PrefixMappingTest() {
+ };
+
+ @Contract.Inject( "org.xenei.junit.contract.IProducer<%s>" )
+ public IProducer<PrefixMapping> getMappingProducer() {
+ return new IProducer<PrefixMapping>() {
+
+ @Override
+ public PrefixMapping newInstance() {
+ return graphProducer.newInstance().getPrefixMapping();
+ }
+
+ @Override
+ public void cleanUp() {
+ // do nothing
+ }
+ };
}
+
}
}