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/27 12:35:21 UTC
svn commit: r1536104 [3/4] - in /jena/Experimental/new-test: ./
src/test/java/ 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/...
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFListContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFListContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFListContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFListContractTests.java Sun Oct 27 11:35:20 2013
@@ -34,10 +34,12 @@ import com.hp.hpl.jena.rdf.model.RDFList
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.testing_framework.IResourceProducer;
+import com.hp.hpl.jena.testing_framework.TestFileData;
import com.hp.hpl.jena.util.iterator.Map1;
import com.hp.hpl.jena.vocabulary.RDF;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -63,67 +65,21 @@ import org.xenei.junit.contract.Contract
@Ignore
@Contract(RDFList.class)
public class RDFListContractTests<T extends RDFList> {
-
+
private IResourceProducer<T> producer;
- private Model model;
-
-// public RDFListContractTests()
-// {
-// @SuppressWarnings("unchecked")
-// IResourceProducer<T> p = (IResourceProducer<T>) new IResourceProducer<RDFList>() {
-//
-// Model model;
-//
-// @Override
-// public RDFList newInstance(String uri) {
-// return getModel().createResource( uri ).as( RDFList.class );
-// }
-//
-// @Override
-// public Model getModel() {
-// if (model == null)
-// {
-// model = ModelFactory.createDefaultModel();
-// }
-// return model;
-// }
-//
-// @Override
-// public RDFList newInstance() {
-// return getModel().createList();
-// }
-//
-// @Override
-// public void cleanUp() {
-// if (model == null)
-// {
-// model.close();
-// model = null;
-// }
-// }
-//
-// @Override
-// public boolean supportsAnonymous() {
-// // TODO Auto-generated method stub
-// return false;
-// }
-//
-// } ;
-// producer = p;
-// }
-
+ private Model model;
+
@Contract.Inject
- public final void setRDFListContractTestsProducer(IResourceProducer<T> producer )
- {
+ public final void setRDFListContractTestsProducer(
+ IResourceProducer<T> producer) {
this.producer = producer;
}
-
- protected final IResourceProducer<T> getListProducer() {
+
+ protected final IResourceProducer<T> getListProducer() {
return producer;
}
-
@Before
final public void beforeRDFListContractTests() {
model = getListProducer().getModel();
@@ -132,8 +88,6 @@ public class RDFListContractTests<T exte
// Constants
// ////////////////////////////////
- public static final String NS = "uri:urn:x-rdf:test#";
-
/** Test that an iterator delivers the expected values */
protected static void iteratorTest(final Iterator<?> i,
final Object[] expected) {
@@ -217,11 +171,11 @@ public class RDFListContractTests<T exte
// ////////////////////////////////
protected RDFList getListRoot(final Model m) {
- final Resource root = m.getResource(RDFListContractTests.NS + "root");
+ final Resource root = m.getResource(TestFileData.NS + "root");
Assert.assertNotNull("Root resource should not be null", root);
final Resource listHead = root.getRequiredProperty(
- m.getProperty(RDFListContractTests.NS + "p")).getResource();
+ m.getProperty(TestFileData.NS + "p")).getResource();
final RDFList l = listHead.as(RDFList.class);
Assert.assertNotNull("as(RDFList) should not return null for root", l);
@@ -230,21 +184,21 @@ public class RDFListContractTests<T exte
}
@Test
- public void testAdd() {
+ public void testAdd() throws Exception {
- final Resource root = model.createResource(RDFListContractTests.NS
+ final Resource root = model.createResource(TestFileData.NS
+ "root");
- final Property p = model.createProperty(RDFListContractTests.NS, "p");
+ final Property p = model.createProperty(TestFileData.NS, "p");
final Resource nil = model.getResource(RDF.nil.getURI());
RDFList list = nil.as(RDFList.class);
final Resource[] toAdd = new Resource[] {
- model.createResource(RDFListContractTests.NS + "a"),
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "d"),
- model.createResource(RDFListContractTests.NS + "e"), };
+ model.createResource(TestFileData.NS + "a"),
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "d"),
+ model.createResource(TestFileData.NS + "e"), };
// add each of these resources onto the end of the list
for (final Resource element : toAdd) {
@@ -258,11 +212,12 @@ public class RDFListContractTests<T exte
}
// relate the root to the list
+ txnBegin( model );
model.add(root, p, list);
-
+ txnCommit( model );
+
// should be isomorphic with list 5
- final Model m0 = ModelFactory.createDefaultModel();
- m0.read(getFileName("ontology/list5.rdf"));
+ final Model m0 = TestFileData.getRDFModel("OntologyList5");
Assert.assertTrue("Add'ed and read models should be the same",
m0.isIsomorphicWith(model));
@@ -270,16 +225,17 @@ public class RDFListContractTests<T exte
}
@Test
- public void testAppend() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testAppend() throws Exception {
+ TestFileData.populateRDFModel( model, "OntologyList5");
final Resource nil = model.getResource(RDF.nil.getURI());
RDFList list = nil.as(RDFList.class);
final Resource r = model
- .createResource(RDFListContractTests.NS + "foo");
+ .createResource(TestFileData.NS + "foo");
// create a list of foos
+ txnBegin( model );
for (int i = 0; i < 5; i++) {
list = list.cons(r);
}
@@ -292,6 +248,8 @@ public class RDFListContractTests<T exte
final RDFList appended = root.append(list);
+ txnCommit( model );
+
// original list should be unchanged
checkValid("appendTest0", root, true);
Assert.assertEquals("Original list should be unchanged", rootLen,
@@ -308,8 +266,8 @@ public class RDFListContractTests<T exte
}
@Test
- public void testApply() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testApply() throws Exception {
+ TestFileData.populateRDFModel( model, "OntologyList5");
final RDFList root = getListRoot(model);
@@ -332,14 +290,14 @@ public class RDFListContractTests<T exte
}
@Test
- public void testConcatenate() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testConcatenate() throws Exception {
+ TestFileData.populateRDFModel( model, "OntologyList5");
final Resource nil = model.getResource(RDF.nil.getURI());
RDFList list = nil.as(RDFList.class);
final Resource r = model
- .createResource(RDFListContractTests.NS + "foo");
+ .createResource(TestFileData.NS + "foo");
// create a list of foos
for (int i = 0; i < 5; i++) {
@@ -365,17 +323,17 @@ public class RDFListContractTests<T exte
}
@Test
- public void testConcatenate2() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testConcatenate2() throws Exception {
+ TestFileData.populateRDFModel( model, "OntologyList5");
- final Resource a = model.createResource(RDFListContractTests.NS + "a");
+ final Resource a = model.createResource(TestFileData.NS + "a");
// create a list of foos
final Resource[] rs = new Resource[] {
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "d"),
- model.createResource(RDFListContractTests.NS + "e") };
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "d"),
+ model.createResource(TestFileData.NS + "e") };
final RDFList aList = model.createList().cons(a);
final RDFList rsList = model.createList(rs);
@@ -390,21 +348,22 @@ public class RDFListContractTests<T exte
}
@Test
- public void testCons() {
- final Resource root = model.createResource(RDFListContractTests.NS
+ public void testCons() throws IOException {
+ final Resource root = model.createResource(TestFileData.NS
+ "root");
- final Property p = model.createProperty(RDFListContractTests.NS, "p");
+ final Property p = model.createProperty(TestFileData.NS, "p");
- final Resource nil = model.getResource(RDF.nil.getURI());
- RDFList list = nil.as(RDFList.class);
+
+ RDFList list = producer.newInstance();
final Resource[] toAdd = new Resource[] {
- model.createResource(RDFListContractTests.NS + "e"),
- model.createResource(RDFListContractTests.NS + "d"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "a"), };
+ model.createResource(TestFileData.NS + "e"),
+ model.createResource(TestFileData.NS + "d"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "a"), };
+ txnBegin( model );
// cons each of these resources onto the front of the list
for (final Resource element : toAdd) {
final RDFList list0 = list.cons(element);
@@ -415,24 +374,26 @@ public class RDFListContractTests<T exte
list = list0;
}
+
// relate the root to the list
model.add(root, p, list);
-
+ txnCommit( model );
+
// should be isomorphic with list 5
- final Model m0 = ModelFactory.createDefaultModel();
- m0.read(getFileName("ontology/list5.rdf"));
+ final Model m0 = TestFileData.getRDFModel("OntologyList5");
Assert.assertTrue("Cons'ed and read models should be the same",
m0.isIsomorphicWith(model));
}
@Test
- public void testCount() {
+ public void testCount() throws Exception {
for (int i = 0; i <= 5; i++) {
+ txnBegin( model );
model.removeAll();
- model.read(getFileName("ontology/list" + i + ".rdf"));
-
+ model.read(TestFileData.getRDFInput(String.format("OntologyList%s", i)), "http://example.com/test/");
+ txnCommit( model );
final RDFList l0 = getListRoot(model);
Assert.assertEquals("List size should be " + i, i, l0.size());
}
@@ -440,30 +401,30 @@ public class RDFListContractTests<T exte
}
@Test
- public void testHead() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testHead() throws IOException {
+ TestFileData.populateRDFModel( model, "OntologyList5" );
RDFList l0 = getListRoot(model);
final String[] names = { "a", "b", "c", "d", "e" };
for (final String name : names) {
Assert.assertEquals("head of list has incorrect URI",
- RDFListContractTests.NS + name,
+ TestFileData.NS + name,
((Resource) l0.getHead()).getURI());
l0 = l0.getTail();
}
}
@Test
- public void testIndex1() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testIndex1() throws IOException {
+ TestFileData.populateRDFModel( model, "OntologyList5" );
final Resource[] toGet = new Resource[] {
- model.createResource(RDFListContractTests.NS + "a"),
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "d"),
- model.createResource(RDFListContractTests.NS + "e"), };
+ model.createResource(TestFileData.NS + "a"),
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "d"),
+ model.createResource(TestFileData.NS + "e"), };
final RDFList l1 = getListRoot(model);
@@ -479,16 +440,17 @@ public class RDFListContractTests<T exte
@Test
public void testIndex2() {
- final Resource nil = model.getResource(RDF.nil.getURI());
- RDFList list = nil.as(RDFList.class);
+ RDFList list = producer.newInstance();
- final Resource r = model.createResource(RDFListContractTests.NS + "a");
+ final Resource r = model.createResource(TestFileData.NS + "a");
// cons each a's onto the front of the list
+ txnBegin( model );
for (int i = 0; i < 10; i++) {
list = list.cons(r);
}
-
+ txnCommit( model );
+
// now index them back again
for (int j = 0; j < 10; j++) {
Assert.assertEquals("index of j'th item should be j", j,
@@ -499,42 +461,42 @@ public class RDFListContractTests<T exte
@Test
public void testListEquals() {
- final Resource nil = model.getResource(RDF.nil.getURI());
- final RDFList nilList = nil.as(RDFList.class);
+
+ final RDFList nilList = producer.newInstance();
// create a list of foos
final Resource[] r0 = new Resource[] {
- model.createResource(RDFListContractTests.NS + "a"), // canonical
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "d"),
- model.createResource(RDFListContractTests.NS + "e") };
+ model.createResource(TestFileData.NS + "a"), // canonical
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "d"),
+ model.createResource(TestFileData.NS + "e") };
final Resource[] r1 = new Resource[] {
- model.createResource(RDFListContractTests.NS + "a"), // same
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "d"),
- model.createResource(RDFListContractTests.NS + "e") };
+ model.createResource(TestFileData.NS + "a"), // same
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "d"),
+ model.createResource(TestFileData.NS + "e") };
final Resource[] r2 = new Resource[] {
- model.createResource(RDFListContractTests.NS + "a"), // one
+ model.createResource(TestFileData.NS + "a"), // one
// shorter
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "d") };
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "d") };
final Resource[] r3 = new Resource[] {
- model.createResource(RDFListContractTests.NS + "a"), // elements
+ model.createResource(TestFileData.NS + "a"), // elements
// swapped
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "d"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "e") };
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "d"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "e") };
final Resource[] r4 = new Resource[] {
- model.createResource(RDFListContractTests.NS + "a"), // different
+ model.createResource(TestFileData.NS + "a"), // different
// name
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "D"),
- model.createResource(RDFListContractTests.NS + "e") };
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "D"),
+ model.createResource(TestFileData.NS + "e") };
final Object[][] testSpec = new Object[][] { { r0, r1, Boolean.TRUE },
{ r0, r2, Boolean.FALSE }, { r0, r3, Boolean.FALSE },
@@ -543,10 +505,12 @@ public class RDFListContractTests<T exte
{ r2, r3, Boolean.FALSE }, { r2, r4, Boolean.FALSE }, };
for (int i = 0; i < testSpec.length; i++) {
+ txnBegin( model );
final RDFList l0 = nilList.append(Arrays.asList(
(Resource[]) testSpec[i][0]).iterator());
final RDFList l1 = nilList.append(Arrays.asList(
(Resource[]) testSpec[i][1]).iterator());
+ txnCommit( model );
final boolean expected = ((Boolean) testSpec[i][2]).booleanValue();
Assert.assertEquals("sameListAs testSpec[" + i + "] incorrect",
@@ -557,15 +521,15 @@ public class RDFListContractTests<T exte
}
@Test
- public void testListGet() {
- model.read(getFileName("ontology/list5.rdf"));
-
+ public void testListGet() throws IOException {
+ TestFileData.populateRDFModel( model, "OntologyList5" );
+
final Resource[] toGet = new Resource[] {
- model.createResource(RDFListContractTests.NS + "a"),
- model.createResource(RDFListContractTests.NS + "b"),
- model.createResource(RDFListContractTests.NS + "c"),
- model.createResource(RDFListContractTests.NS + "d"),
- model.createResource(RDFListContractTests.NS + "e"), };
+ model.createResource(TestFileData.NS + "a"),
+ model.createResource(TestFileData.NS + "b"),
+ model.createResource(TestFileData.NS + "c"),
+ model.createResource(TestFileData.NS + "d"),
+ model.createResource(TestFileData.NS + "e"), };
final RDFList l1 = getListRoot(model);
@@ -575,7 +539,7 @@ public class RDFListContractTests<T exte
toGet[i], l1.get(i));
}
- // now test we get an exception for going beyong the end of the list
+ // now test we get an exception for going beyond the end of the list
boolean gotEx = false;
try {
l1.get(toGet.length + 1);
@@ -589,8 +553,8 @@ public class RDFListContractTests<T exte
}
@Test
- public void testMap1() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testMap1() throws IOException {
+ TestFileData.populateRDFModel( model, "OntologyList5" );
final RDFList root = getListRoot(model);
RDFListContractTests.iteratorTest(
@@ -604,8 +568,8 @@ public class RDFListContractTests<T exte
}
@Test
- public void testReduce() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testReduce() throws IOException {
+ TestFileData.populateRDFModel( model, "OntologyList5" );
final RDFList root = getListRoot(model);
@@ -628,14 +592,16 @@ public class RDFListContractTests<T exte
RDFList list0 = nil.as(RDFList.class);
RDFList list1 = nil.as(RDFList.class);
- final Resource r0 = model.createResource(RDFListContractTests.NS + "x");
- final Resource r1 = model.createResource(RDFListContractTests.NS + "y");
- final Resource r2 = model.createResource(RDFListContractTests.NS + "z");
+ final Resource r0 = model.createResource(TestFileData.NS + "x");
+ final Resource r1 = model.createResource(TestFileData.NS + "y");
+ final Resource r2 = model.createResource(TestFileData.NS + "z");
+ txnBegin( model );
for (int i = 0; i < 10; i++) {
list0 = list0.cons(r0);
list1 = list1.cons(r1);
}
+ txnCommit( model );
// delete the elements of list0 one at a time
while (!list0.isEmpty()) {
@@ -644,30 +610,40 @@ public class RDFListContractTests<T exte
}
// delete all of list1 in one go
+ txnBegin( model );
list1.removeList();
+ txnCommit( model );
// model should now be empty
Assert.assertEquals("Model should be empty after deleting two lists",
0, model.size());
// selective remove
+ txnBegin( model );
RDFList list2 = (nil.as(RDFList.class)).cons(r2).cons(r1).cons(r0);
-
+ txnCommit( model );
+
Assert.assertTrue("list should contain x ", list2.contains(r0));
Assert.assertTrue("list should contain y ", list2.contains(r1));
Assert.assertTrue("list should contain z ", list2.contains(r2));
+ txnBegin( model );
list2 = list2.remove(r1);
+ txnCommit( model );
Assert.assertTrue("list should contain x ", list2.contains(r0));
Assert.assertTrue("list should contain y ", !list2.contains(r1));
Assert.assertTrue("list should contain z ", list2.contains(r2));
+ txnBegin( model );
list2 = list2.remove(r0);
+ txnCommit( model );
Assert.assertTrue("list should contain x ", !list2.contains(r0));
Assert.assertTrue("list should contain y ", !list2.contains(r1));
Assert.assertTrue("list should contain z ", list2.contains(r2));
+ txnBegin( model );
list2 = list2.remove(r2);
+ txnCommit( model );
Assert.assertTrue("list should contain x ", !list2.contains(r0));
Assert.assertTrue("list should contain y ", !list2.contains(r1));
Assert.assertTrue("list should contain z ", !list2.contains(r2));
@@ -675,8 +651,8 @@ public class RDFListContractTests<T exte
}
@Test
- public void testReplace() {
- model.read(getFileName("ontology/list5.rdf"));
+ public void testReplace() throws IOException {
+ TestFileData.populateRDFModel( model, "OntologyList5" );
final Literal[] toSet = new Literal[] { model.createLiteral("a"),
model.createLiteral("b"), model.createLiteral("c"),
@@ -684,18 +660,20 @@ public class RDFListContractTests<T exte
final RDFList l1 = getListRoot(model);
+ txnBegin( model );
// change all the values
for (int i = 0; i < toSet.length; i++) {
l1.replace(i, toSet[i]);
}
-
+ txnCommit( model );
+
// then check them
for (int i = 0; i < toSet.length; i++) {
Assert.assertEquals("list element " + i + " is not correct",
toSet[i], l1.get(i));
}
- // now test we get an exception for going beyong the end of the list
+ // now test we get an exception for going beyond the end of the list
boolean gotEx = false;
try {
l1.replace(toSet.length + 1, toSet[0]);
@@ -712,10 +690,11 @@ public class RDFListContractTests<T exte
@Test
public void testSetHead() {
- final Resource root = model.createResource(RDFListContractTests.NS
+ final Resource root = model.createResource(TestFileData.NS
+ "root");
- final Property p = model.createProperty(RDFListContractTests.NS, "p");
+ final Property p = model.createProperty(TestFileData.NS, "p");
+ txnBegin( model );
// a list of the nil object, but not typed
final Resource nil = RDF.nil;
model.add(nil, RDF.type, RDF.List);
@@ -726,13 +705,18 @@ public class RDFListContractTests<T exte
model.add(list, RDF.rest, nil);
model.add(root, p, list);
+ txnCommit( model );
+
final RDFList l1 = getListRoot(model);
checkValid("sethead1", l1, true);
Assert.assertEquals("List head should be 'fred'", "fred",
((Literal) l1.getHead()).getString());
+ txnBegin( model );
l1.setHead(model.createTypedLiteral(42));
+ txnCommit( model );
+
checkValid("sethead2", l1, true);
Assert.assertEquals("List head should be '42'", 42,
((Literal) l1.getHead()).getInt());
@@ -741,28 +725,31 @@ public class RDFListContractTests<T exte
@Test
public void testSetTail() {
- final Model m = ModelFactory.createDefaultModel();
-
- final Resource root = m
- .createResource(RDFListContractTests.NS + "root");
- final Property p = m.createProperty(RDFListContractTests.NS, "p");
+ final Resource root = model
+ .createResource(TestFileData.NS + "root");
+ final Property p = model.createProperty(TestFileData.NS, "p");
+ txnBegin( model );
final Resource nil = RDF.nil;
- m.add(nil, RDF.type, RDF.List);
-
- final Resource list0 = m.createResource();
- m.add(list0, RDF.type, RDF.List);
- m.add(list0, RDF.first, "fred");
- m.add(list0, RDF.rest, nil);
+ model.add(nil, RDF.type, RDF.List);
- m.add(root, p, list0);
- final RDFList l1 = getListRoot(m);
+ final Resource list0 = model.createResource();
+ model.add(list0, RDF.type, RDF.List);
+ model.add(list0, RDF.first, "fred");
+ model.add(list0, RDF.rest, nil);
+
+ model.add(root, p, list0);
+ txnCommit( model );
+
+ final RDFList l1 = getListRoot(model);
checkValid("settail1", l1, true);
- final Resource list1 = m.createResource();
- m.add(list1, RDF.type, RDF.List);
- m.add(list1, RDF.first, "george");
- m.add(list1, RDF.rest, nil);
+ final Resource list1 = model.createResource();
+ txnBegin( model );
+ model.add(list1, RDF.type, RDF.List);
+ model.add(list1, RDF.first, "george");
+ model.add(list1, RDF.rest, nil);
+ txnCommit( model );
final RDFList l2 = list1.as(RDFList.class);
Assert.assertNotNull("as(RDFList) should not return null for root", l2);
@@ -772,8 +759,9 @@ public class RDFListContractTests<T exte
Assert.assertEquals("l2 should have length 1", 1, l2.size());
// use set tail to join the lists together
+ txnBegin( model );
l1.setTail(l2);
-
+ txnCommit( model );
checkValid("settail3", l1, true);
checkValid("settail4", l2, true);
@@ -783,10 +771,11 @@ public class RDFListContractTests<T exte
}
@Test
- public void testTail() {
+ public void testTail() throws IOException {
for (int i = 0; i <= 5; i++) {
- model.read(getFileName("ontology/list" + i + ".rdf"));
-
+ txnBegin( model );
+ model.read(TestFileData.getRDFInput("OntologyList" + i ), "http://example.com/test/");
+ txnCommit( model );
RDFList l0 = getListRoot(model);
// get the tail n times, should be nil at the end
@@ -802,12 +791,13 @@ public class RDFListContractTests<T exte
@Test
public void testValidity() {
- final Resource root = model.createResource(RDFListContractTests.NS
+ final Resource root = model.createResource(TestFileData.NS
+ "root");
- final Property p = model.createProperty(RDFListContractTests.NS, "p");
+ final Property p = model.createProperty(TestFileData.NS, "p");
// a list of the nil object, but not typed
final Resource nil = RDF.nil;
+ txnBegin( model );
model.add(root, p, nil);
final RDFList l0 = getListRoot(model);
checkValid("valid1", l0, true);
@@ -817,16 +807,19 @@ public class RDFListContractTests<T exte
model.getRequiredProperty(root, p).remove();
model.add(root, p, badList);
model.add(badList, RDF.type, RDF.List);
-
+ txnCommit( model );
final RDFList l1 = getListRoot(model);
checkValid("valid2", l1, false);
// checkValid( "valid3", l1, false );
-
+ txnBegin( model );
model.add(badList, RDF.first, "fred");
+ txnCommit( model );
checkValid("valid4", l1, false);
+ txnBegin( model );
model.add(badList, RDF.rest, nil);
+ txnCommit( model );
checkValid("valid5", l1, true);
}
@@ -853,7 +846,8 @@ public class RDFListContractTests<T exte
//
// }
//
- // /** Foo simple extension to RDFList to test user-subclassing of RDFList */
+ // /** Foo simple extension to RDFList to test user-subclassing of RDFList
+ // */
// protected static interface UserList extends RDFList {
// }
//
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFNodeContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFNodeContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFNodeContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFNodeContractTests.java Sun Oct 27 11:35:20 2013
@@ -48,54 +48,18 @@ import org.xenei.junit.contract.Contract
@Ignore
@Contract(RDFNode.class)
public class RDFNodeContractTests<T extends RDFNode> {
-
+
private INodeProducer<T> producer;
protected RDFNode node;
protected Model model;
-
-// public RDFNodeContractTests()
-// {
-// producer = new INodeProducer<T>(){
-// Model model = null;
-//
-// @Override
-// public T newInstance() {
-// return (T) getModel().createResource();
-// }
-//
-// @Override
-// public void cleanUp() {
-// if (model != null)
-// {
-// model.close();
-// }
-// model = null;
-// }
-//
-// @Override
-// public T newInstance(String uri) {
-// return (T) getModel().createResource( uri );
-// }
-//
-// @Override
-// public Model getModel() {
-// if (model == null)
-// {
-// model = ModelFactory.createDefaultModel();
-// }
-// return model;
-// }};
-// }
@Contract.Inject
- public final void setRDFNodeProducer( INodeProducer<T> producer )
- {
+ public final void setRDFNodeProducer(INodeProducer<T> producer) {
this.producer = producer;
}
-
- public final INodeProducer<T> getNodeProducer()
- {
+
+ public final INodeProducer<T> getNodeProducer() {
return producer;
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFReaderFContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFReaderFContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFReaderFContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFReaderFContractTests.java Sun Oct 27 11:35:20 2013
@@ -14,14 +14,15 @@ import com.hp.hpl.jena.testing_framework
import com.hp.hpl.jena.testing_framework.TestFileData;
import static org.junit.Assert.*;
import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
+
@Ignore
@Contract(RDFReaderF.class)
-public class RDFReaderFContractTests<T extends RDFReaderF> extends ContractTemplate<T> {
+public class RDFReaderFContractTests<T extends RDFReaderF> extends
+ ContractTemplate<T> {
@Contract.Inject
- public final void setRDFReaderFContractTestsProducer( IProducer<T> producer )
- {
- setProducer( producer );
+ public final void setRDFReaderFContractTestsProducer(IProducer<T> producer) {
+ setProducer(producer);
}
@Test
@@ -42,16 +43,14 @@ public class RDFReaderFContractTests<T e
* RDF/XML - default RDF/XML-ABBREV N-TRIPLE N3
*/
Model model = ModelFactory.createDefaultModel();
- RDFReader reader = getProducer().newInstance().getReader(
- "RDF/XML");
+ RDFReader reader = getProducer().newInstance().getReader("RDF/XML");
// read the RDF file just to make sure we can
txnBegin(model);
reader.read(model, TestFileData.getRDFName());
txnCommit(model);
model = ModelFactory.createDefaultModel();
- reader = getProducer().newInstance().getReader(
- "RDF/XML-ABBREV");
+ reader = getProducer().newInstance().getReader("RDF/XML-ABBREV");
// read the RDF file just to make sure we can
txnBegin(model);
reader.read(model, TestFileData.getRDFName());
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFWriterFContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFWriterFContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFWriterFContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/RDFWriterFContractTests.java Sun Oct 27 11:35:20 2013
@@ -17,33 +17,15 @@ import static org.junit.Assert.*;
@Ignore
@Contract(RDFWriterF.class)
-public class RDFWriterFContractTests<T extends RDFWriterF> extends ContractTemplate<T>{
+public class RDFWriterFContractTests<T extends RDFWriterF> extends
+ ContractTemplate<T> {
// known model to use for writing.
private Model model = ModelFactory.createModelForGraph(TestFileData
.getGraph());
-// @SuppressWarnings("unchecked")
-// public RDFWriterFContractTests() {
-// setProducer( (IProducer<T>) new IProducer<Model>() {
-//
-// @Override
-// public Model newInstance() {
-// return ModelFactory.createDefaultModel();
-// }
-//
-// @Override
-// public void cleanUp() {
-// // TODO Auto-generated method stub
-//
-// }
-// });
-//
-// }
-
@Contract.Inject
- public final void setRDFWriterFContractTestsProducer( IProducer<T> producer)
- {
+ public final void setRDFWriterFContractTestsProducer(IProducer<T> producer) {
super.setProducer(producer);
}
@@ -62,15 +44,13 @@ public class RDFWriterFContractTests<T e
* RDF/XML - default RDF/XML-ABBREV N-TRIPLE N3
*/
Model model = ModelFactory.createDefaultModel();
- RDFWriter writer = getProducer().newInstance().getWriter(
- "RDF/XML");
+ RDFWriter writer = getProducer().newInstance().getWriter("RDF/XML");
// read the RDF file just to make sure we can
writer.write(model, new ByteArrayOutputStream(),
"http://example.com/base/");
model = ModelFactory.createDefaultModel();
- writer = getProducer().newInstance().getWriter(
- "RDF/XML-ABBREV");
+ writer = getProducer().newInstance().getWriter("RDF/XML-ABBREV");
// read the RDF file just to make sure we can
writer.write(model, new ByteArrayOutputStream(),
"http://example.com/base/");
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ResourceContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ResourceContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ResourceContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ResourceContractTests.java Sun Oct 27 11:35:20 2013
@@ -55,59 +55,18 @@ import org.xenei.junit.contract.Contract
public class ResourceContractTests<T extends Resource> {
private IResourceProducer<T> producer;
-
+
private Resource r;
private RecordingModelListener SL;
private Model model;
-
-// public ResourceContractTests()
-// {
-// @SuppressWarnings("unchecked")
-// IResourceProducer<T> p = (IResourceProducer<T>) new IResourceProducer<Resource>() {
-// Model model = null;
-//
-// @Override
-// public Resource newInstance() {
-// return getModel().createResource();
-// }
-//
-// @Override
-// public void cleanUp() {
-// if (model != null) {
-// model.close();
-// }
-// }
-//
-// @Override
-// public Resource newInstance(String uri) {
-// return getModel().createResource(uri);
-// }
-//
-// @Override
-// public Model getModel() {
-// if (model == null) {
-// model = ModelFactory.createDefaultModel();
-// }
-// return model;
-// }
-//
-// @Override
-// public boolean supportsAnonymous() {
-// return false;
-// }
-// };
-// producer = p;
-// }
@Contract.Inject
- public final void setResourceContractTestsProducer(IResourceProducer<T> producer)
- {
+ public final void setResourceContractTestsProducer(
+ IResourceProducer<T> producer) {
this.producer = producer;
}
-
-
- protected final IResourceProducer<T> getResourceProducer()
- {
+
+ protected final IResourceProducer<T> getResourceProducer() {
return this.producer;
}
@@ -150,7 +109,8 @@ public class ResourceContractTests<T ext
SL.assertContains("remove", statement("x P b"));
SL.assertContains("someEvent", model, new GraphEvents("remove",
new Triple(r.asNode(), property("P").asNode(), Node.ANY)));
- assertEquals( 0, model.listStatements(r, property("P"), (RDFNode) null).toList().size() );
+ assertEquals(0, model.listStatements(r, property("P"), (RDFNode) null)
+ .toList().size());
}
@Test
@@ -513,8 +473,7 @@ public class ResourceContractTests<T ext
@Test
public void testGetURI() {
- if (getResourceProducer().supportsAnonymous())
- {
+ if (getResourceProducer().supportsAnonymous()) {
assertNull(r.getURI());
}
assertEquals("http://example.com/foo",
@@ -705,19 +664,19 @@ public class ResourceContractTests<T ext
txnCommit(model);
List<Statement> lst = r.listProperties().toList();
- assertEquals(5+i, lst.size());
- Set<Property> pSet = r.listProperties().mapWith( new Map1<Statement,Property>(){
-
- @Override
- public Property map1(Statement o) {
- return o.getPredicate();
- }}).toSet();
+ assertEquals(5 + i, lst.size());
+ Set<Property> pSet = r.listProperties()
+ .mapWith(new Map1<Statement, Property>() {
+
+ @Override
+ public Property map1(Statement o) {
+ return o.getPredicate();
+ }
+ }).toSet();
for (Property p : props) {
- assertTrue("missing " + p,
- pSet.contains(p));
+ assertTrue("missing " + p, pSet.contains(p));
}
- for (Statement s : lst )
- {
+ for (Statement s : lst) {
assertEquals(r, s.getSubject());
}
}
@@ -807,7 +766,7 @@ public class ResourceContractTests<T ext
// expected
}
}
-
+
/**
* Test that the simple reification results in a reified statement
*/
@@ -816,7 +775,7 @@ public class ResourceContractTests<T ext
final Resource R = model.createResource();
final Resource S = model.createResource("http://example.com/subject");
final Property P = model.createProperty("http://example.com/predicate");
- final Literal O = model .createLiteral("http://example.com/object");
+ final Literal O = model.createLiteral("http://example.com/object");
final Statement SPO = model.createStatement(S, P, O);
model.add(R, RDF.type, RDF.Statement);
model.add(R, RDF.subject, S);
@@ -871,6 +830,5 @@ public class ResourceContractTests<T ext
// assertTrue(r.hasProperty(RDF.value,
// tvString, lang));
// }
-
-
+
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SeqContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SeqContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SeqContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/SeqContractTests.java Sun Oct 27 11:35:20 2013
@@ -26,8 +26,6 @@ import com.hp.hpl.jena.rdf.model.RDFNode
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Seq;
import com.hp.hpl.jena.rdf.model.SeqIndexBoundsException;
-import com.hp.hpl.jena.test.JenaTestBase;
-import com.hp.hpl.jena.testing_framework.ContractTemplate;
import com.hp.hpl.jena.testing_framework.IContainerProducer;
import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
@@ -43,25 +41,21 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.xenei.junit.contract.Contract;
-import org.xenei.junit.contract.IProducer;
@Ignore
@Contract(Seq.class)
-public class SeqContractTests<T extends Seq> {
-
+public class SeqContractTests<T extends Seq> {
+
private IContainerProducer<T> producer;
@Contract.Inject
- public final void setSeqContractTestProducer(IContainerProducer<T> producer)
- {
+ public final void setSeqContractTestProducer(IContainerProducer<T> producer) {
this.producer = producer;
}
-
- protected final IContainerProducer<T> getSeqProducer()
- {
+
+ protected final IContainerProducer<T> getSeqProducer() {
return producer;
}
-
protected LitTestObj aLitTestObj;
@@ -90,26 +84,10 @@ public class SeqContractTests<T extends
getSeqProducer().cleanUp();
}
- // @Override
- // protected Class<? extends Container> getContainerClass() {
- // return Seq.class;
- // }
- //
- // @Override
- // protected Container createContainer(String uri) {
- // return uri == null ? getSeqProducer().newInstance() :
- // getSeqProducer().newInstance(uri);
- // }
-
private void error(final String test, final int n) {
fail(test + " -- " + n);
}
- // @Override
- // protected Resource getContainerType() {
- // return RDF.Seq;
- // }
-
@Before
final public void beforeSeqContractTests() throws Exception {
aLitTestObj = new LitTestObj(12345);
@@ -134,7 +112,7 @@ public class SeqContractTests<T extends
seq.add(0, false);
fail("cannot at at position 0");
} catch (final SeqIndexBoundsException e) {
- JenaTestBase.pass();
+ // expected
}
seq.add(num + 1, false);
@@ -145,7 +123,7 @@ public class SeqContractTests<T extends
seq.add(num + 2, false);
fail("cannot add past the end");
} catch (final SeqIndexBoundsException e) {
- JenaTestBase.pass();
+ // expected
}
final int size = seq.size();
@@ -831,13 +809,13 @@ public class SeqContractTests<T extends
seq.getInt(16);
fail("there is no element 16");
} catch (final SeqIndexBoundsException e) {
- JenaTestBase.pass();
+ // expected
}
try {
seq.getInt(0);
fail("there is no element 0");
} catch (final SeqIndexBoundsException e) {
- JenaTestBase.pass();
+ // expected
}
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/StatementContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/StatementContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/StatementContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/StatementContractTests.java Sun Oct 27 11:35:20 2013
@@ -19,8 +19,6 @@
package com.hp.hpl.jena.rdf.model;
import java.util.List;
-import java.util.StringTokenizer;
-
import com.hp.hpl.jena.graph.FrontsTriple;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Property;
@@ -30,7 +28,6 @@ import com.hp.hpl.jena.rdf.model.Stateme
import com.hp.hpl.jena.shared.PropertyNotFoundException;
import org.xenei.junit.contract.IProducer;
-import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
import com.hp.hpl.jena.testing_framework.IStatementProducer;
import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
@@ -53,71 +50,13 @@ public class StatementContractTests<T ex
private Model model;
private RecordingModelListener CL;
-
-// public StatementContractTests()
-// {
-//
-// @SuppressWarnings("unchecked")
-// IStatementProducer<T> p = (IStatementProducer<T>) new IStatementProducer<Statement>() {
-//
-// private Model model;
-//
-// private AbstractModelProducer<Model> modelProducer = new AbstractModelProducer<Model>() {
-//
-// @Override
-// public boolean areIndependent() {
-// return true;
-// }
-//
-// @Override
-// protected Model createNewModel() {
-// return ModelFactory.createDefaultModel();
-// }
-// };
-//
-// @Override
-// public Statement newInstance(String fact) {
-// StringTokenizer st = new StringTokenizer(fact);
-// Resource sub = resource(st.nextToken());
-// Property pred = property(st.nextToken());
-// RDFNode obj = rdfNode(st.nextToken());
-// return newInstance(sub, pred, obj);
-// }
-//
-// @Override
-// public Statement newInstance(Resource s, Property p, RDFNode o) {
-// return getModel().createStatement(s, p, o);
-// }
-//
-// @Override
-// public Model getModel() {
-// if (model == null) {
-// model = getModelProducer().newInstance();
-// }
-// return model;
-// }
-//
-// @Override
-// public void cleanUp() {
-// getModelProducer().cleanUp();
-// }
-//
-// @Override
-// public AbstractModelProducer<Model> getModelProducer() {
-// return modelProducer;
-// }
-// };
-// producer = p;
-// }
@Contract.Inject
- public final void setProducer( IStatementProducer<T> producer )
- {
+ public final void setProducer(IStatementProducer<T> producer) {
this.producer = producer;
}
-
- protected final IStatementProducer<T> getStatementProducer()
- {
+
+ protected final IStatementProducer<T> getStatementProducer() {
return producer;
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/ModelComSuite.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/ModelComSuite.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/ModelComSuite.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/ModelComSuite.java Sun Oct 27 11:35:20 2013
@@ -1,37 +1,34 @@
package com.hp.hpl.jena.rdf.model.impl;
-
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.xenei.junit.contract.ContractImpl;
-import org.xenei.junit.contract.ContractSuite;
-import org.xenei.junit.contract.Dynamic;
-
-import com.hp.hpl.jena.mem.GraphMem;
-import com.hp.hpl.jena.rdf.model.AbstractModelContractSuite;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
-
-@RunWith( ContractSuite.class )
-@ContractImpl( ModelCom.class )
-public class ModelComSuite extends AbstractModelContractSuite {
-
- private AbstractModelProducer<Model> producer = new AbstractModelProducer<Model>() {
- @Override
- protected Model createNewModel() {
- return new ModelCom(new GraphMem());
- }
-
- @Override
- public boolean areIndependent() {
- return true;
- }
- };
-
- @Dynamic.Inject
- public AbstractModelProducer<? extends Model> getModelComSuiteProducer()
- {
- return producer;
- }
-
-}
+//
+//import org.junit.runner.RunWith;
+//import org.xenei.junit.contract.ContractImpl;
+//import org.xenei.junit.contract.ContractSuite;
+//import org.xenei.junit.contract.Dynamic;
+//
+//import com.hp.hpl.jena.mem.GraphMem;
+//import com.hp.hpl.jena.rdf.model.AbstractModelContractSuite;
+//import com.hp.hpl.jena.rdf.model.Model;
+//import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+//
+//@RunWith(ContractSuite.class)
+//@ContractImpl(ModelCom.class)
+//public class ModelComSuite extends AbstractModelContractSuite {
+//
+// private AbstractModelProducer<Model> producer = new AbstractModelProducer<Model>() {
+// @Override
+// protected Model createNewModel() {
+// return new ModelCom(new GraphMem());
+// }
+//
+// @Override
+// public boolean areIndependent() {
+// return true;
+// }
+// };
+//
+// @Dynamic.Inject
+// public AbstractModelProducer<? extends Model> getModelComSuiteProducer() {
+// return producer;
+// }
+//
+//}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/PropertyImplTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/PropertyImplTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/PropertyImplTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/impl/PropertyImplTest.java Sun Oct 27 11:35:20 2013
@@ -24,7 +24,6 @@ import org.xenei.junit.contract.Contract
import org.xenei.junit.contract.Contract.Inject;
import com.hp.hpl.jena.rdf.model.PropertyContractTest;
-import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.sparql.graph.GraphFactory;
import com.hp.hpl.jena.testing_framework.IResourceProducer;
@@ -32,49 +31,47 @@ import com.hp.hpl.jena.testing_framework
* Test ModelMakerImpl using a mock GraphMaker.
*/
@RunWith(ContractSuite.class)
-@ContractImpl( PropertyImpl.class )
+@ContractImpl(PropertyImpl.class)
public class PropertyImplTest extends PropertyContractTest<PropertyImpl> {
@Inject
- public final IResourceProducer<PropertyImpl> getPropertyImplTestProducer()
- {
- return new IResourceProducer<PropertyImpl>(){
-
- ModelCom model = null;
-
- @Override
- public PropertyImpl newInstance() {
- return new PropertyImpl("", getModel());
- }
-
- @Override
- public void cleanUp() {
- if (model != null)
- {
- model.close();
- model = null;
+ public final IResourceProducer<PropertyImpl> getPropertyImplTestProducer() {
+ return new IResourceProducer<PropertyImpl>() {
+
+ ModelCom model = null;
+
+ @Override
+ public PropertyImpl newInstance() {
+ return new PropertyImpl("", getModel());
}
- }
- @Override
- public PropertyImpl newInstance(String uri) {
- return new PropertyImpl(uri, getModel());
- }
-
- @Override
- public ModelCom getModel() {
- if (model == null)
- {
- model = new ModelCom( GraphFactory.createDefaultGraph() );
+ @Override
+ public void cleanUp() {
+ if (model != null) {
+ model.close();
+ model = null;
+ }
}
- return model;
- }
- @Override
- public boolean supportsAnonymous() {
- return false;
- }};
-
+ @Override
+ public PropertyImpl newInstance(String uri) {
+ return new PropertyImpl(uri, getModel());
+ }
+
+ @Override
+ public ModelCom getModel() {
+ if (model == null) {
+ model = new ModelCom(GraphFactory.createDefaultGraph());
+ }
+ return model;
+ }
+
+ @Override
+ public boolean supportsAnonymous() {
+ return false;
+ }
+ };
+
}
-
+
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/AltMethodsTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/AltMethodsTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/AltMethodsTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/AltMethodsTest.java Sun Oct 27 11:35:20 2013
@@ -4,11 +4,7 @@ import org.junit.runner.RunWith;
import org.xenei.junit.contract.Contract;
import org.xenei.junit.contract.ContractImpl;
import org.xenei.junit.contract.ContractSuite;
-import org.xenei.junit.contract.Contract.Inject;
-
import com.hp.hpl.jena.rdf.model.Alt;
-import com.hp.hpl.jena.rdf.model.AltContractTest;
-import com.hp.hpl.jena.rdf.model.Bag;
import com.hp.hpl.jena.rdf.model.Container;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -17,54 +13,52 @@ import com.hp.hpl.jena.testing_framework
import com.hp.hpl.jena.vocabulary.RDF;
@RunWith(ContractSuite.class)
-@ContractImpl( Alt.class )
+@ContractImpl(Alt.class)
public class AltMethodsTest {
@Contract.Inject
- public IContainerProducer<Alt> getProducer()
- {
+ public IContainerProducer<Alt> getProducer() {
return new IContainerProducer<Alt>() {
- Model model = null;
+ Model model = null;
+
+ @Override
+ public Alt newInstance(String uri) {
+ return getModel().createAlt(uri);
+ }
+
+ @Override
+ public Model getModel() {
+ if (model == null) {
+ model = ModelFactory.createDefaultModel();
+ }
+ return model;
+ }
+
+ @Override
+ public Alt newInstance() {
+ return getModel().createAlt();
+ }
- @Override
- public Alt newInstance(String uri) {
- return getModel().createAlt(uri);
- }
-
- @Override
- public Model getModel() {
- if (model == null) {
- model = ModelFactory.createDefaultModel();
- }
- return model;
- }
-
- @Override
- public Alt newInstance() {
- return getModel().createAlt();
- }
-
- @Override
- public void cleanUp() {
- model = null;
- }
-
- @Override
- public Resource getContainerType() {
- return RDF.Alt;
- }
-
- @Override
- public Class<? extends Container> getContainerClass() {
- return Alt.class;
- }
-
- @Override
- public boolean supportsAnonymous() {
- return false;
- }
- };
+ @Override
+ public void cleanUp() {
+ model = null;
+ }
+
+ @Override
+ public Resource getContainerType() {
+ return RDF.Alt;
+ }
+
+ @Override
+ public Class<? extends Container> getContainerClass() {
+ return Alt.class;
+ }
+
+ @Override
+ public boolean supportsAnonymous() {
+ return false;
+ }
+ };
}
-
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/BagMethodsTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/BagMethodsTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/BagMethodsTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/BagMethodsTest.java Sun Oct 27 11:35:20 2013
@@ -2,11 +2,9 @@ package com.hp.hpl.jena.rdf.model.temp;
import org.junit.runner.RunWith;
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.rdf.model.Bag;
-import com.hp.hpl.jena.rdf.model.BagContractTests;
import com.hp.hpl.jena.rdf.model.Container;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -15,57 +13,55 @@ import com.hp.hpl.jena.testing_framework
import com.hp.hpl.jena.vocabulary.RDF;
@RunWith(ContractSuite.class)
-@ContractImpl( Bag.class )
-public class BagMethodsTest {
+@ContractImpl(Bag.class)
+public class BagMethodsTest {
public BagMethodsTest() {
}
-
+
@Contract.Inject
- public IContainerProducer<Bag> getProducer()
- {
- return new IContainerProducer<Bag>() {
- Model model = null;
-
- @Override
- public Bag newInstance(String uri) {
- return getModel().createBag(uri);
- }
-
- @Override
- public Model getModel() {
- if (model == null) {
- model = ModelFactory.createDefaultModel();
- }
- return model;
- }
-
- @Override
- public Bag newInstance() {
- return getModel().createBag();
- }
-
- @Override
- public void cleanUp() {
- model = null;
- }
-
- @Override
- public Resource getContainerType() {
- return RDF.Bag;
- }
-
- @Override
- public Class<? extends Container> getContainerClass() {
- return Bag.class;
- }
-
- @Override
- public boolean supportsAnonymous() {
- return false;
- }
- };
+ public IContainerProducer<Bag> getProducer() {
+ return new IContainerProducer<Bag>() {
+ Model model = null;
+
+ @Override
+ public Bag newInstance(String uri) {
+ return getModel().createBag(uri);
+ }
+
+ @Override
+ public Model getModel() {
+ if (model == null) {
+ model = ModelFactory.createDefaultModel();
+ }
+ return model;
+ }
+
+ @Override
+ public Bag newInstance() {
+ return getModel().createBag();
+ }
+
+ @Override
+ public void cleanUp() {
+ model = null;
+ }
+
+ @Override
+ public Resource getContainerType() {
+ return RDF.Bag;
+ }
+
+ @Override
+ public Class<? extends Container> getContainerClass() {
+ return Bag.class;
+ }
+
+ @Override
+ public boolean supportsAnonymous() {
+ return false;
+ }
+ };
}
-
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/LiteralTest.java Sun Oct 27 11:35:20 2013
@@ -9,7 +9,7 @@ public class LiteralTest extends Literal
LiteralProducer producer = new LiteralProducer() {
private Model model;
-
+
@Override
public Literal newInstance(String uri) {
return getModel().createLiteral(uri);
@@ -17,8 +17,7 @@ public class LiteralTest extends Literal
@Override
public Model getModel() {
- if (model == null)
- {
+ if (model == null) {
model = ModelFactory.createDefaultModel();
}
return model;
@@ -31,14 +30,12 @@ public class LiteralTest extends Literal
@Override
public void cleanUp() {
- if (model != null)
- {
+ if (model != null) {
model.close();
model = null;
}
}
-
@Override
public Literal newInstance(boolean b) {
return getModel().createTypedLiteral(b);
@@ -69,15 +66,14 @@ public class LiteralTest extends Literal
return getModel().createTypedLiteral(l);
}
-
@Override
public Literal newInstance(String val, String lang) {
- return getModel().createLiteral(val,lang);
+ return getModel().createLiteral(val, lang);
}
@Override
public Literal newInstance(Object o) {
- return getModel().createTypedLiteral( o );
+ return getModel().createTypedLiteral(o);
}
};
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelComTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelComTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelComTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelComTest.java Sun Oct 27 11:35:20 2013
@@ -1,6 +1,5 @@
package com.hp.hpl.jena.rdf.model.temp;
-import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelCon;
import com.hp.hpl.jena.rdf.model.ModelConContractTests;
import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -8,7 +7,6 @@ import org.xenei.junit.contract.IProduce
public class ModelComTest extends ModelConContractTests<ModelCon> {
-
private IProducer<ModelCon> producer = new IProducer<ModelCon>() {
@Override
@@ -23,11 +21,10 @@ public class ModelComTest extends ModelC
};
- public ModelComTest()
- {
- setProducer( producer );
+ public ModelComTest() {
+ setProducer(producer);
}
-
+
public IProducer<ModelCon> getModelComTestProducer() {
return producer;
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelConTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelConTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelConTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelConTest.java Sun Oct 27 11:35:20 2013
@@ -1,28 +1,25 @@
package com.hp.hpl.jena.rdf.model.temp;
-import org.xenei.junit.contract.Contract.Inject;
-
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelConContractTests;
-import com.hp.hpl.jena.rdf.model.ModelCon;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import org.xenei.junit.contract.IProducer;
public class ModelConTest extends ModelConContractTests<Model> {
-
+
public ModelConTest() {
- setProducer( new IProducer<Model>() {
+ setProducer(new IProducer<Model>() {
- @Override
- public Model newInstance() {
- return ModelFactory.createDefaultModel();
- }
-
- @Override
- public void cleanUp() {
- // TODO Auto-generated method stub
+ @Override
+ public Model newInstance() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ @Override
+ public void cleanUp() {
+ // TODO Auto-generated method stub
- }
- } );
+ }
+ });
}
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ModelTest.java Sun Oct 27 11:35:20 2013
@@ -1,6 +1,5 @@
package com.hp.hpl.jena.rdf.model.temp;
-import org.xenei.junit.contract.Contract.Inject;
import com.hp.hpl.jena.rdf.model.ModelContractTests;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -21,8 +20,7 @@ public class ModelTest extends ModelCont
};
- public ModelTest()
- {
+ public ModelTest() {
setProducer(producer);
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFListTest.java Sun Oct 27 11:35:20 2013
@@ -1,7 +1,5 @@
package com.hp.hpl.jena.rdf.model.temp;
-import org.xenei.junit.contract.Contract.Inject;
-
import com.hp.hpl.jena.rdf.model.RDFList;
import com.hp.hpl.jena.rdf.model.RDFListContractTests;
import com.hp.hpl.jena.rdf.model.Model;
@@ -10,47 +8,44 @@ import com.hp.hpl.jena.testing_framework
public class RDFListTest extends RDFListContractTests<RDFList> {
- public RDFListTest()
- {
- super.setRDFListContractTestsProducer( new IResourceProducer<RDFList>() {
-
- Model model;
-
- @Override
- public RDFList newInstance(String uri) {
- return getModel().createResource( uri ).as( RDFList.class );
- }
-
- @Override
- public Model getModel() {
- if (model == null)
- {
- model = ModelFactory.createDefaultModel();
+ public RDFListTest() {
+ super.setRDFListContractTestsProducer(new IResourceProducer<RDFList>() {
+
+ Model model;
+
+ @Override
+ public RDFList newInstance(String uri) {
+ return getModel().createResource(uri).as(RDFList.class);
+ }
+
+ @Override
+ public Model getModel() {
+ if (model == null) {
+ model = ModelFactory.createDefaultModel();
+ }
+ return model;
+ }
+
+ @Override
+ public RDFList newInstance() {
+ return getModel().createList();
}
- return model;
- }
- @Override
- public RDFList newInstance() {
- return getModel().createList();
- }
-
- @Override
- public void cleanUp() {
- if (model == null)
- {
- model.close();
- model = null;
+ @Override
+ public void cleanUp() {
+ if (model == null) {
+ model.close();
+ model = null;
+ }
}
- }
- @Override
- public boolean supportsAnonymous() {
- // TODO Auto-generated method stub
- return false;
- }
+ @Override
+ public boolean supportsAnonymous() {
+ // TODO Auto-generated method stub
+ return false;
+ }
- } );
+ });
}
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFReaderFTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFReaderFTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFReaderFTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/RDFReaderFTest.java Sun Oct 27 11:35:20 2013
@@ -1,7 +1,5 @@
package com.hp.hpl.jena.rdf.model.temp;
-import org.xenei.junit.contract.Contract.Inject;
-
import com.hp.hpl.jena.rdf.model.RDFReaderFContractTests;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFReaderF;
@@ -9,21 +7,20 @@ import org.xenei.junit.contract.IProduce
public class RDFReaderFTest extends RDFReaderFContractTests<RDFReaderF> {
public RDFReaderFTest() {
-
- super.setProducer( new IProducer<RDFReaderF>() {
- @Override
- public RDFReaderF newInstance() {
- return ModelFactory.createDefaultModel();
- }
-
- @Override
- public void cleanUp() {
- // TODO Auto-generated method stub
+ super.setProducer(new IProducer<RDFReaderF>() {
+
+ @Override
+ public RDFReaderF newInstance() {
+ return ModelFactory.createDefaultModel();
+ }
+
+ @Override
+ public void cleanUp() {
+ // TODO Auto-generated method stub
- }
- } );
+ }
+ });
}
-
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ResourceNodeTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ResourceNodeTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ResourceNodeTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/ResourceNodeTest.java Sun Oct 27 11:35:20 2013
@@ -1,10 +1,5 @@
package com.hp.hpl.jena.rdf.model.temp;
-import org.junit.runner.RunWith;
-import org.xenei.junit.contract.ContractImpl;
-import org.xenei.junit.contract.ContractSuite;
-import org.xenei.junit.contract.Contract.Inject;
-
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceContractTests;
@@ -46,9 +41,8 @@ public class ResourceNodeTest extends Re
return false;
}
};
-
- public ResourceNodeTest()
- {
+
+ public ResourceNodeTest() {
super.setResourceContractTestsProducer(producer);
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java Sun Oct 27 11:35:20 2013
@@ -8,14 +8,13 @@ import org.xenei.junit.contract.Contract
import com.hp.hpl.jena.rdf.model.Container;
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.Seq;
-import com.hp.hpl.jena.rdf.model.SeqContractTests;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.testing_framework.IContainerProducer;
import com.hp.hpl.jena.vocabulary.RDF;
-@RunWith( ContractSuite.class )
-@ContractImpl( Seq.class )
+@RunWith(ContractSuite.class)
+@ContractImpl(Seq.class)
public class SeqMethodsTest {
IContainerProducer<Seq> producer = new IContainerProducer<Seq>() {
Model model = null;
@@ -52,14 +51,14 @@ public class SeqMethodsTest {
public Class<? extends Container> getContainerClass() {
return Seq.class;
}
-
+
@Override
public boolean supportsAnonymous() {
return false;
}
};
- //@Override
+ // @Override
@Inject
public IContainerProducer<Seq> getSeqProducer() {
return producer;
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/PrefixMappingContractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/PrefixMappingContractTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/PrefixMappingContractTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/PrefixMappingContractTest.java Sun Oct 27 11:35:20 2013
@@ -33,44 +33,27 @@ import org.xenei.junit.contract.Contract
import org.xenei.junit.contract.IProducer;
-import com.hp.hpl.jena.shared.impl.PrefixMappingImpl;
import com.hp.hpl.jena.testing_framework.ContractTemplate;
/**
- * Test prefix mappings - subclass this test and override getProducer()
- * to deliver the IProducer<prefixMapping> to be tested.
+ * Test prefix mappings - subclass this test and override getProducer() to
+ * deliver the IProducer<prefixMapping> to be tested.
*/
@Ignore
@Contract(PrefixMapping.class)
-public class PrefixMappingContractTest<T extends PrefixMapping> extends ContractTemplate<T> {
+public class PrefixMappingContractTest<T extends PrefixMapping> extends
+ ContractTemplate<T> {
public static boolean sameMapping(final PrefixMapping L,
final PrefixMapping R) {
return L.getNsPrefixMap().equals(R.getNsPrefixMap());
}
-
-// public PrefixMappingContractTest() {
-// setProducer( (IProducer<T>) new IProducer<PrefixMapping>(){
-//
-// @Override
-// public PrefixMapping newInstance() {
-// return new PrefixMappingImpl();
-// }
-//
-// @Override
-// public void cleanUp() {
-//
-// }});
-// }
-
@Contract.Inject
- public final void setPrefixMappingContractTest(IProducer<T> producer)
- {
+ public final void setPrefixMappingContractTest(IProducer<T> producer) {
super.setProducer(producer);
}
-
public static final String[] illegalPrefixes = { "<hello>", "has:colon",
"with a space", "-dashStart", "has#octothorp", "has/slash",
"1numericStart", ".dotStart" };
@@ -355,8 +338,8 @@ public class PrefixMappingContractTest<T
}
protected void testEqualsBase(String S, String T, boolean expected) {
- testEquals(S, T, expected, getProducer().newInstance(),
- getProducer().newInstance());
+ testEquals(S, T, expected, getProducer().newInstance(), getProducer()
+ .newInstance());
testEquals(S, T, expected, PrefixMapping.Factory.create(),
getProducer().newInstance());
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/shared/RandomOrderGraphTest.java Sun Oct 27 11:35:20 2013
@@ -25,12 +25,13 @@ import com.hp.hpl.jena.testing_framework
public class RandomOrderGraphTest extends WrappedGraphTest {
public RandomOrderGraphTest() {
- super( new Producer() );
+ super(new Producer());
}
@Test
public void testRandomFindTriple() {
- Graph g = graphWith( graphProducer.newInstance(), "a b 1; a b 2; a b 3; a b 4; a b 5; a b 6");
+ Graph g = graphWith(graphProducer.newInstance(),
+ "a b 1; a b 2; a b 3; a b 4; a b 5; a b 6");
List<Triple> l1 = g.find(new Triple(node("a"), node("b"), Node.ANY))
.toList();
List<Triple> l2 = g.find(new Triple(node("a"), node("b"), Node.ANY))
@@ -40,7 +41,8 @@ public class RandomOrderGraphTest extend
@Test
public void testRandomFindNodes() {
- Graph g = graphWith(graphProducer.newInstance(), "a b 1; a b 2; a b 3; a b 4; a b 5; a b 6");
+ Graph g = graphWith(graphProducer.newInstance(),
+ "a b 1; a b 2; a b 3; a b 4; a b 5; a b 6");
List<Triple> l1 = g.find(node("a"), node("b"), Node.ANY).toList();
List<Triple> l2 = g.find(node("a"), node("b"), Node.ANY).toList();
Assert.assertNotEquals("Lists should be different", l1, l2);
@@ -51,8 +53,9 @@ public class RandomOrderGraphTest extend
public IProducer<? extends WrappedGraph> getGraphProducer() {
return super.getGraphProducer();
}
-
- private static class Producer extends AbstractGraphProducer<RandomOrderGraph> {
+
+ private static class Producer extends
+ AbstractGraphProducer<RandomOrderGraph> {
@Override
public RandomOrderGraph createNewGraph() {
return new RandomOrderGraph(5, GraphFactory.createGraphMem());
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractGraphProducer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractGraphProducer.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractGraphProducer.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractGraphProducer.java Sun Oct 27 11:35:20 2013
@@ -22,7 +22,6 @@ import java.util.List;
import org.xenei.junit.contract.IProducer;
-
import com.hp.hpl.jena.graph.Graph;
/**
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/AbstractModelProducer.java Sun Oct 27 11:35:20 2013
@@ -22,7 +22,6 @@ import java.util.List;
import org.xenei.junit.contract.IProducer;
-
import com.hp.hpl.jena.rdf.model.Model;
/**
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ContractTemplate.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ContractTemplate.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ContractTemplate.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ContractTemplate.java Sun Oct 27 11:35:20 2013
@@ -1,17 +1,15 @@
package com.hp.hpl.jena.testing_framework;
-import org.xenei.junit.contract.Contract;
import org.xenei.junit.contract.IProducer;
public class ContractTemplate<T> {
private IProducer<T> producer;
-
- public final void setProducer( IProducer<T> producer )
- {
+
+ public final void setProducer(IProducer<T> producer) {
this.producer = producer;
}
-
+
protected final IProducer<T> getProducer() {
return producer;
}
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/GraphHelper.java Sun Oct 27 11:35:20 2013
@@ -291,18 +291,19 @@ public class GraphHelper extends TestUti
b.append(nice(n));
}
-// protected static Graph graphWithTxn(IProducer<? extends Graph> producer, String s) {
-// Graph g = producer.newInstance();
-// txnBegin(g);
-// try {
-// graphAdd(g, s);
-// txnCommit(g);
-// } catch (Exception e) {
-// txnRollback(g);
-// fail(e.getMessage());
-// }
-// return g;
-// }
+ // protected static Graph graphWithTxn(IProducer<? extends Graph> producer,
+ // String s) {
+ // Graph g = producer.newInstance();
+ // txnBegin(g);
+ // try {
+ // graphAdd(g, s);
+ // txnCommit(g);
+ // } catch (Exception e) {
+ // txnRollback(g);
+ // fail(e.getMessage());
+ // }
+ // return g;
+ // }
/**
* Answer the "nice" representation of this node, the string returned by
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IContainerProducer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IContainerProducer.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IContainerProducer.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IContainerProducer.java Sun Oct 27 11:35:20 2013
@@ -3,7 +3,8 @@ package com.hp.hpl.jena.testing_framewor
import com.hp.hpl.jena.rdf.model.Container;
import com.hp.hpl.jena.rdf.model.Resource;
-public interface IContainerProducer<T extends Container> extends IResourceProducer<T> {
+public interface IContainerProducer<T extends Container> extends
+ IResourceProducer<T> {
/**
* The Resource identifying the continer type. e.g. RDF.seq
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IIteratorProducer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IIteratorProducer.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IIteratorProducer.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/IIteratorProducer.java Sun Oct 27 11:35:20 2013
@@ -5,35 +5,38 @@ import java.util.List;
import com.hp.hpl.jena.util.iterator.ExtendedIterator;
public interface IIteratorProducer<T> {
-
+
/**
* Get a new instance of the iterator.
+ *
* @return
*/
public ExtendedIterator<T> newInstance();
-
+
/**
* Clean up after a test
*/
public void cleanUp();
/**
- * The list of items found in the iterator. Does not have to be in order.
+ * The list of items found in the iterator. Does not have to be in order.
+ *
* @return
*/
public List<T> getList();
-
+
/**
* True if delete is supported by the iterator
+ *
* @return
*/
- public boolean supportsDelete();
-
+ public boolean supportsDelete();
+
/**
- * True if this is an iterator on a copy so that delete works but
- * getting a new copy for the iterator test will return the original list.
+ * True if this is an iterator on a copy so that delete works but getting a
+ * new copy for the iterator test will return the original list.
+ *
* @return
*/
public boolean isCopy();
}
-
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/INodeProducer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/INodeProducer.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/INodeProducer.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/INodeProducer.java Sun Oct 27 11:35:20 2013
@@ -17,7 +17,6 @@
*/
package com.hp.hpl.jena.testing_framework;
-
import org.xenei.junit.contract.IProducer;
import com.hp.hpl.jena.rdf.model.Model;
Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/testing_framework/ModelHelper.java Sun Oct 27 11:35:20 2013
@@ -235,8 +235,8 @@ public class ModelHelper extends GraphHe
* a string in semicolon-separated "S P O" format
* @return a model containing those facts
*/
- public static Model modelWithStatements(IProducer<? extends Model> producer,
- String facts) {
+ public static Model modelWithStatements(
+ IProducer<? extends Model> producer, String facts) {
Model m = createModel(producer);
txnBegin(m);
modelAdd(m, facts);
@@ -254,8 +254,8 @@ public class ModelHelper extends GraphHe
* a string in semicolon-separated "S P O" format
* @return a model containing those facts
*/
- public static Model modelWithStatements(IProducer<? extends Model> producer,
- final StmtIterator it) {
+ public static Model modelWithStatements(
+ IProducer<? extends Model> producer, final StmtIterator it) {
Model m = createModel(producer);
txnBegin(m);
while (it.hasNext()) {