Author: claude
Date: Thu Oct 17 06:41:38 2013
New Revision: 1532977
URL: http://svn.apache.org/r1532977
Log:
test cleanup
Modified:
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/ResourceContractTests.java
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/temp/SeqMethodsTest.java
Modified:
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelContractSuite.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelContractSuite.java?rev=1532977&r1=1532976&r2=1532977&view=diff
==============================================================================
---
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelContractSuite.java
(original)
+++
jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AbstractModelContractSuite.java
Thu Oct 17 06:41:38 2013
@@ -20,17 +20,18 @@ import com.hp.hpl.jena.testing_framework
import
com.hp.hpl.jena.util.iterator.ExtendedIteratorContractTests.IteratorProducer;
import com.hp.hpl.jena.vocabulary.RDF;
[email protected]({ AbstractModelContractSuite.ModelContractTests.class,
[email protected]({
+ AbstractModelContractSuite.ModelContractTests.class,
AbstractModelContractSuite.AltMethodsTests.class,
AbstractModelContractSuite.BagMethodsTests.class,
AbstractModelContractSuite.SeqMethodsTests.class,
- AbstractModelContractSuite.ResourceTests.class,
+ //AbstractModelContractSuite.ResourceTests.class,
AbstractModelContractSuite.StatementTests.class,
AbstractModelContractSuite.StatementIterTests.class,
AbstractModelContractSuite.NodeIterTests.class,
AbstractModelContractSuite.NameSpaceIteratorTests.class,
- AbstractModelContractSuite.ReifiedStatementIteratorTests.class})
-
+ //AbstractModelContractSuite.ReifiedStatementIteratorTests.class
+ })
public abstract class AbstractModelContractSuite {
static protected AbstractModelProducer<Model> modelProducer;
@@ -232,7 +233,6 @@ public abstract class AbstractModelContr
//
public interface R extends Resource {
}
-
@RunWith(ContractSuite.class)
@ContractImpl(R.class)
public static class ResourceTests {
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=1532977&r1=1532976&r2=1532977&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
Thu Oct 17 06:41:38 2013
@@ -27,13 +27,16 @@ import com.hp.hpl.jena.rdf.model.RDFNode
import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.shared.PropertyNotFoundException;
import com.hp.hpl.jena.testing_framework.IResourceProducer;
+import com.hp.hpl.jena.util.iterator.Map1;
import com.hp.hpl.jena.vocabulary.RDF;
+import com.hp.hpl.jena.vocabulary.RDFS;
import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
import java.util.Arrays;
import java.util.List;
+import java.util.Set;
import static org.junit.Assert.*;
@@ -95,8 +98,7 @@ public abstract class ResourceContractTe
SL.assertContains("remove", statement("x P b"));
SL.assertContains("someEvent", model, new GraphEvents("remove",
new Triple(r.asNode(), property("P").asNode(),
Node.ANY)));
-
- assertIsoModels("x's P-values should go", memModel(rest),
r.getModel());
+ assertEquals( 0, model.listStatements(r, property("P"),
(RDFNode) null).toList().size() );
}
@Test
@@ -570,7 +572,7 @@ public abstract class ResourceContractTe
r.addProperty(RDF.value, rdf);
txnCommit(model);
assertTrue(r.hasProperty(RDF.value));
- assertFalse(r.hasProperty(RDF.type));
+ assertFalse(r.hasProperty(RDFS.domain));
assertTrue(r.hasProperty(null));
}
@@ -641,6 +643,7 @@ public abstract class ResourceContractTe
public void testlistProperties() {
Property[] props = { property("P"), property("Q"),
property("R"),
property("S") };
+ int i = r.listProperties().toList().size();
txnBegin(model);
r.addLiteral(property("P"), "foo");
r.addLiteral(property("Q"), "foo");
@@ -650,11 +653,19 @@ public abstract class ResourceContractTe
txnCommit(model);
List<Statement> lst = r.listProperties().toList();
- List<Property> pLst = Arrays.asList(props);
- assertEquals(5, lst.size());
- for (Statement s : lst) {
- assertTrue("missing " + s.getPredicate(),
- pLst.contains(s.getPredicate()));
+ 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));
+ }
+ for (Statement s : lst )
+ {
assertEquals(r, s.getSubject());
}
}
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=1532977&r1=1532976&r2=1532977&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
Thu Oct 17 06:41:38 2013
@@ -1,6 +1,9 @@
package com.hp.hpl.jena.rdf.model.temp;
+import org.junit.runner.RunWith;
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.Container;
import com.hp.hpl.jena.rdf.model.Resource;
@@ -11,7 +14,9 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.testing_framework.IContainerProducer;
import com.hp.hpl.jena.vocabulary.RDF;
-public class SeqMethodsTest extends SeqContractTests {
+@RunWith( ContractSuite.class )
+@ContractImpl( Seq.class )
+public class SeqMethodsTest {
IContainerProducer<Seq> producer = new IContainerProducer<Seq>() {
Model model = null;
@@ -54,7 +59,7 @@ public class SeqMethodsTest extends SeqC
}
};
- @Override
+ //@Override
@Inject("com.hp.hpl.jena.testing_framework.IContainerProducer<%s>")
public IContainerProducer<Seq> getSeqProducer() {
return producer;
