Return-Path: 
 <commits-return-8204-apmail-jena-commits-archive=jena.apache.org@jena.apache.org>
X-Original-To: apmail-jena-commits-archive@www.apache.org
Delivered-To: apmail-jena-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3BF9610879
	for <apmail-jena-commits-archive@www.apache.org>;
 Sun, 27 Oct 2013 11:36:03 +0000 (UTC)
Received: (qmail 88953 invoked by uid 500); 27 Oct 2013 11:36:03 -0000
Delivered-To: apmail-jena-commits-archive@jena.apache.org
Received: (qmail 88897 invoked by uid 500); 27 Oct 2013 11:36:02 -0000
Mailing-List: contact commits-help@jena.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jena.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jena.apache.org>
List-Post: <mailto:commits@jena.apache.org>
List-Id: <commits.jena.apache.org>
Reply-To: dev@jena.apache.org
Delivered-To: mailing list commits@jena.apache.org
Received: (qmail 88874 invoked by uid 99); 27 Oct 2013 11:36:02 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Oct 2013 11:36:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_FRT_STOCK2
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Oct 2013 11:35:47 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A784623889FD;
	Sun, 27 Oct 2013 11:35:24 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1536104 [2/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/...
Date: Sun, 27 Oct 2013 11:35:21 -0000
To: commits@jena.apache.org
From: claude@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131027113524.A784623889FD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/FileGraphTest.java Sun Oct 27 11:35:20 2013
@@ -17,169 +17,169 @@
  */
 
 package com.hp.hpl.jena.graph.impl;
-
-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 org.xenei.junit.contract.IProducer;
-
-/**
- * Test FileGraph by seeing if we can make some file graphs and then read them
- * back.
- */
-@RunWith(ContractSuite.class)
-@ContractImpl(FileGraph.class)
-public class FileGraphTest {
-
-	protected IProducer<FileGraph> graphProducer = new FileGraphSuite.GraphProducer();
-
-	@Inject
-	public IProducer<FileGraph> getGraphProducer() {
-		return graphProducer;
-	}
-
-	//
-	// // TODO want a wider variety of cases, now we've discovered how to
-	// abstract.
-	// public static TestSuite suite() {
-	// TestSuite result = new TestSuite(FileGraphTestSuite.class);
-	// result.addTest(new Case("x /R y", "xxxA", ".rdf"));
-	// result.addTest(new Case("x /R y", "xxxB", ".n3"));
-	// result.addTest(new Case("x /R y", "xxxC", ".nt"));
-	// result.addTest(new Case("x /R y; p /R q", "xxxD", ".rdf"));
-	// result.addTest(new Case("x /R y; p /R q", "xxxE", ".n3"));
-	// result.addTest(new Case("x /R y; p /R q", "xxxF", ".nt"));
-	// result.addTest(new Case("http://domain/S ftp:ftp/P O", "xxxG", ".rdf"));
-	// result.addTest(new Case("http://domain/S ftp:ftp/P O", "xxxH", ".nt"));
-	// result.addTest(new Case("http://domain/S ftp:ftp/P O", "xxxI", ".n3"));
-	// return result;
-	// }
-	//
-	// public void testPlausibleGraphname() {
-	// assertTrue(FileGraph.isPlausibleGraphName("agnessi.rdf"));
-	// assertTrue(FileGraph.isPlausibleGraphName("parabola.nt"));
-	// assertTrue(FileGraph.isPlausibleGraphName("hyperbola.n3"));
-	// assertTrue(FileGraph.isPlausibleGraphName("chris.dollin.n3"));
-	// assertTrue(FileGraph.isPlausibleGraphName("hedgehog.spine.end.rdf"));
-	// }
-	//
-	// public void testisPlausibleUppercaseGraphname() {
-	// assertTrue(FileGraph.isPlausibleGraphName("LOUDER.RDF"));
-	// assertTrue(FileGraph.isPlausibleGraphName("BRIDGE.NT"));
-	// assertTrue(FileGraph.isPlausibleGraphName("NOTN2.N3"));
-	// assertTrue(FileGraph.isPlausibleGraphName("chris.dollin.N3"));
-	// assertTrue(FileGraph.isPlausibleGraphName("hedgehog.spine.end.RDF"));
-	// }
-	//
-	// public void testImPlausibleGraphName() {
-	// assertFalse(FileGraph.isPlausibleGraphName("undecorated"));
-	// assertFalse(FileGraph.isPlausibleGraphName("danger.exe"));
-	// assertFalse(FileGraph.isPlausibleGraphName("pretty.jpg"));
-	// assertFalse(FileGraph.isPlausibleGraphName("FileGraph.java"));
-	// assertFalse(FileGraph.isPlausibleGraphName("infix.rdf.c"));
-	// }
-	//
-	// public void testTransactionCommit() {
-	// Graph initial = graphWithTxn("initial hasValue 42; also hasURI hello");
-	// Graph extra = graphWithTxn("extra hasValue 17; also hasURI world");
-	// File foo = FileUtils.tempFileName("fileGraph", ".nt");
-	//
-	// Graph g = new FileGraph(foo, true, true);
-	// GraphUtil.addInto(g, initial);
-	// g.getTransactionHandler().begin();
-	// GraphUtil.addInto(g, extra);
-	// g.getTransactionHandler().commit();
-	// Graph union = graphWithTxn("");
-	// GraphUtil.addInto(union, initial);
-	// GraphUtil.addInto(union, extra);
-	// assertIsomorphic(union, g);
-	// Model inFile = ModelFactory.createDefaultModel();
-	// inFile.read("file:///" + foo, "N-TRIPLES");
-	// assertIsomorphic(union, inFile.getGraph());
-	// }
-	//
-	// public void testTransactionAbort() {
-	// Graph initial = graphWithTxn("initial hasValue 42; also hasURI hello");
-	// Graph extra = graphWithTxn("extra hasValue 17; also hasURI world");
-	// File foo = FileUtils.tempFileName("fileGraph", ".n3");
-	// Graph g = new FileGraph(foo, true, true);
-	// GraphUtil.addInto(g, initial);
-	// g.getTransactionHandler().begin();
-	// GraphUtil.addInto(g, extra);
-	// g.getTransactionHandler().abort();
-	// assertIsomorphic(initial, g);
-	// }
-	//
-	// public void testTransactionCommitThenAbort() {
-	// Graph initial = graphWithTxn("Foo pings B; B pings C");
-	// Graph extra = graphWithTxn("C pingedBy B; fileGraph rdf:type Graph");
-	// File foo = FileUtils.tempFileName("fileGraph", ".nt");
-	// Graph g = new FileGraph(foo, true, true);
-	// g.getTransactionHandler().begin();
-	// GraphUtil.addInto(g, initial);
-	// g.getTransactionHandler().commit();
-	// g.getTransactionHandler().begin();
-	// GraphUtil.addInto(g, extra);
-	// g.getTransactionHandler().abort();
-	// assertIsomorphic(initial, g);
-	// Model inFile = ModelFactory.createDefaultModel();
-	// inFile.read("file:///" + foo, "N-TRIPLES");
-	// assertIsomorphic(initial, inFile.getGraph());
-	// }
-	//
-	// public void testClosingNotifys() {
-	// final List<File> history = new ArrayList<File>();
-	// FileGraph.NotifyOnClose n = new FileGraph.NotifyOnClose() {
-	// @Override
-	// public void notifyClosed(File f) {
-	// history.add(f);
-	// }
-	// };
-	// File file = FileUtils.tempFileName("fileGraph", ".nt");
-	// Graph g = new FileGraph(n, file, true, true);
-	// assertEquals(new ArrayList<File>(), history);
-	// g.close();
-	// assertEquals(oneElementList(file), history);
-	// }
-	//
-	// protected List<Object> oneElementList(Object x) {
-	// List<Object> result = new ArrayList<Object>();
-	// result.add(x);
-	// return result;
-	// }
-	//
-	// /**
-	// * Test that the graph encoded as the test-string content can be written
-	// out
-	// * to a temporary file generated from the prefix and suffix, and then read
-	// * back correctly. The temporary files are marked as delete-on-exit to try
-	// * and avoid cluttering the user's filespace ...
-	// */
-	// private static class Case extends FileGraphTestSuite {
-	// String content;
-	// String prefix;
-	// String suffix;
-	//
-	// Case(String content, String prefix, String suffix) {
-	// super("Case: " + content + " in " + prefix + "*" + suffix);
-	// this.content = content;
-	// this.prefix = prefix;
-	// this.suffix = suffix;
-	// }
-	//
-	// @Override
-	// public void runTest() {
-	// File foo = FileUtils.tempFileName(prefix, suffix);
-	// Graph original = graphWithTxn(content);
-	// Graph g = new FileGraph(foo, true, true);
-	// GraphUtil.addInto(g, original);
-	// g.close();
-	// Graph g2 = new FileGraph(foo, false, true);
-	// assertIsomorphic(original, g2);
-	// g2.close();
-	// }
-	// }
-
-}
+//
+//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 org.xenei.junit.contract.IProducer;
+//
+///**
+// * Test FileGraph by seeing if we can make some file graphs and then read them
+// * back.
+// */
+//@RunWith(ContractSuite.class)
+//@ContractImpl(FileGraph.class)
+//public class FileGraphTest {
+//
+//	protected IProducer<FileGraph> graphProducer = new FileGraphSuite.GraphProducer();
+//
+//	@Inject
+//	public IProducer<FileGraph> getGraphProducer() {
+//		return graphProducer;
+//	}
+//
+//	
+//	 // TODO want a wider variety of cases, now we've discovered how to
+//	 abstract.
+//	 public static TestSuite suite() {
+//	 TestSuite result = new TestSuite(FileGraphTestSuite.class);
+//	 result.addTest(new Case("x /R y", "xxxA", ".rdf"));
+//	 result.addTest(new Case("x /R y", "xxxB", ".n3"));
+//	 result.addTest(new Case("x /R y", "xxxC", ".nt"));
+//	 result.addTest(new Case("x /R y; p /R q", "xxxD", ".rdf"));
+//	 result.addTest(new Case("x /R y; p /R q", "xxxE", ".n3"));
+//	 result.addTest(new Case("x /R y; p /R q", "xxxF", ".nt"));
+//	 result.addTest(new Case("http://domain/S ftp:ftp/P O", "xxxG", ".rdf"));
+//	 result.addTest(new Case("http://domain/S ftp:ftp/P O", "xxxH", ".nt"));
+//	 result.addTest(new Case("http://domain/S ftp:ftp/P O", "xxxI", ".n3"));
+//	 return result;
+//	 }
+//	
+//	 public void testPlausibleGraphname() {
+//	 assertTrue(FileGraph.isPlausibleGraphName("agnessi.rdf"));
+//	 assertTrue(FileGraph.isPlausibleGraphName("parabola.nt"));
+//	 assertTrue(FileGraph.isPlausibleGraphName("hyperbola.n3"));
+//	 assertTrue(FileGraph.isPlausibleGraphName("chris.dollin.n3"));
+//	 assertTrue(FileGraph.isPlausibleGraphName("hedgehog.spine.end.rdf"));
+//	 }
+//	
+//	 public void testisPlausibleUppercaseGraphname() {
+//	 assertTrue(FileGraph.isPlausibleGraphName("LOUDER.RDF"));
+//	 assertTrue(FileGraph.isPlausibleGraphName("BRIDGE.NT"));
+//	 assertTrue(FileGraph.isPlausibleGraphName("NOTN2.N3"));
+//	 assertTrue(FileGraph.isPlausibleGraphName("chris.dollin.N3"));
+//	 assertTrue(FileGraph.isPlausibleGraphName("hedgehog.spine.end.RDF"));
+//	 }
+//	
+//	 public void testImPlausibleGraphName() {
+//	 assertFalse(FileGraph.isPlausibleGraphName("undecorated"));
+//	 assertFalse(FileGraph.isPlausibleGraphName("danger.exe"));
+//	 assertFalse(FileGraph.isPlausibleGraphName("pretty.jpg"));
+//	 assertFalse(FileGraph.isPlausibleGraphName("FileGraph.java"));
+//	 assertFalse(FileGraph.isPlausibleGraphName("infix.rdf.c"));
+//	 }
+//	
+//	 public void testTransactionCommit() {
+//	 Graph initial = graphWithTxn("initial hasValue 42; also hasURI hello");
+//	 Graph extra = graphWithTxn("extra hasValue 17; also hasURI world");
+//	 File foo = FileUtils.tempFileName("fileGraph", ".nt");
+//	
+//	 Graph g = new FileGraph(foo, true, true);
+//	 GraphUtil.addInto(g, initial);
+//	 g.getTransactionHandler().begin();
+//	 GraphUtil.addInto(g, extra);
+//	 g.getTransactionHandler().commit();
+//	 Graph union = graphWithTxn("");
+//	 GraphUtil.addInto(union, initial);
+//	 GraphUtil.addInto(union, extra);
+//	 assertIsomorphic(union, g);
+//	 Model inFile = ModelFactory.createDefaultModel();
+//	 inFile.read("file:///" + foo, "N-TRIPLES");
+//	 assertIsomorphic(union, inFile.getGraph());
+//	 }
+//	
+//	 public void testTransactionAbort() {
+//	 Graph initial = graphWithTxn("initial hasValue 42; also hasURI hello");
+//	 Graph extra = graphWithTxn("extra hasValue 17; also hasURI world");
+//	 File foo = FileUtils.tempFileName("fileGraph", ".n3");
+//	 Graph g = new FileGraph(foo, true, true);
+//	 GraphUtil.addInto(g, initial);
+//	 g.getTransactionHandler().begin();
+//	 GraphUtil.addInto(g, extra);
+//	 g.getTransactionHandler().abort();
+//	 assertIsomorphic(initial, g);
+//	 }
+//	
+//	 public void testTransactionCommitThenAbort() {
+//	 Graph initial = graphWithTxn("Foo pings B; B pings C");
+//	 Graph extra = graphWithTxn("C pingedBy B; fileGraph rdf:type Graph");
+//	 File foo = FileUtils.tempFileName("fileGraph", ".nt");
+//	 Graph g = new FileGraph(foo, true, true);
+//	 g.getTransactionHandler().begin();
+//	 GraphUtil.addInto(g, initial);
+//	 g.getTransactionHandler().commit();
+//	 g.getTransactionHandler().begin();
+//	 GraphUtil.addInto(g, extra);
+//	 g.getTransactionHandler().abort();
+//	 assertIsomorphic(initial, g);
+//	 Model inFile = ModelFactory.createDefaultModel();
+//	 inFile.read("file:///" + foo, "N-TRIPLES");
+//	 assertIsomorphic(initial, inFile.getGraph());
+//	 }
+//	
+//	 public void testClosingNotifys() {
+//	 final List<File> history = new ArrayList<File>();
+//	 FileGraph.NotifyOnClose n = new FileGraph.NotifyOnClose() {
+//	 @Override
+//	 public void notifyClosed(File f) {
+//	 history.add(f);
+//	 }
+//	 };
+//	 File file = FileUtils.tempFileName("fileGraph", ".nt");
+//	 Graph g = new FileGraph(n, file, true, true);
+//	 assertEquals(new ArrayList<File>(), history);
+//	 g.close();
+//	 assertEquals(oneElementList(file), history);
+//	 }
+//	
+//	 protected List<Object> oneElementList(Object x) {
+//	 List<Object> result = new ArrayList<Object>();
+//	 result.add(x);
+//	 return result;
+//	 }
+//	
+//	 /**
+//	 * Test that the graph encoded as the test-string content can be written
+//	 out
+//	 * to a temporary file generated from the prefix and suffix, and then read
+//	 * back correctly. The temporary files are marked as delete-on-exit to try
+//	 * and avoid cluttering the user's filespace ...
+//	 */
+//	 private static class Case extends FileGraphTestSuite {
+//	 String content;
+//	 String prefix;
+//	 String suffix;
+//	
+//	 Case(String content, String prefix, String suffix) {
+//	 super("Case: " + content + " in " + prefix + "*" + suffix);
+//	 this.content = content;
+//	 this.prefix = prefix;
+//	 this.suffix = suffix;
+//	 }
+//	
+//	 @Override
+//	 public void runTest() {
+//	 File foo = FileUtils.tempFileName(prefix, suffix);
+//	 Graph original = graphWithTxn(content);
+//	 Graph g = new FileGraph(foo, true, true);
+//	 GraphUtil.addInto(g, original);
+//	 g.close();
+//	 Graph g2 = new FileGraph(foo, false, true);
+//	 assertIsomorphic(original, g2);
+//	 g2.close();
+//	 }
+//	 }
+//
+//}

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TripleStoreContractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TripleStoreContractTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TripleStoreContractTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/TripleStoreContractTest.java Sun Oct 27 11:35:20 2013
@@ -36,44 +36,39 @@ import org.xenei.junit.contract.IProduce
 /**
  * AbstractTestTripleStore - post-hoc tests for TripleStores.
  */
-@Contract(TripleStore.class)
 @Ignore
-public class TripleStoreContractTest<T extends TripleStore> extends ContractTemplate<T> {
+@Contract(TripleStore.class)
+public class TripleStoreContractTest<T extends TripleStore> extends
+		ContractTemplate<T> {
 
 	protected TripleStore store;
 
-	
-	public TripleStoreContractTest()
-	{
-		IProducer<TripleStore> producer = new IProducer<TripleStore>()
-				{
-
-					@Override
-					public TripleStore newInstance() {
-						return new GraphTripleStore( memGraph() );
-					}
-
-					@Override
-					public void cleanUp() {
-						// TODO Auto-generated method stub
-						
-					}
-			
-				};
-		setProducer( (IProducer<T>) producer );
+	public TripleStoreContractTest() {
+		IProducer<TripleStore> producer = new IProducer<TripleStore>() {
+
+			@Override
+			public TripleStore newInstance() {
+				return new GraphTripleStore(memGraph());
+			}
+
+			@Override
+			public void cleanUp() {
+				// TODO Auto-generated method stub
+
+			}
+
+		};
+		setProducer((IProducer<T>) producer);
 	}
-	
+
 	/**
 	 * Subclasses must over-ride to return a new empty TripleStore.
 	 */
 	@Contract.Inject
-	public final void setTripleStoreContractTestProducer(IProducer<T> producer)
-	{
-		super.setProducer( producer );
+	public final void setTripleStoreContractTestProducer(IProducer<T> producer) {
+		super.setProducer(producer);
 	}
 
-
-	
 	@Before
 	public final void beforeAbstractTripleStoreTest() {
 		store = getProducer().newInstance();

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphSuite.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphSuite.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphSuite.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphSuite.java Sun Oct 27 11:35:20 2013
@@ -18,40 +18,31 @@
 
 package com.hp.hpl.jena.graph.impl;
 
-import org.junit.runners.Suite;
-/**
- Tests that check GraphMem and WrappedGraph for correctness against the Graph
- and reifier test suites.
- */
-
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.xenei.junit.contract.ContractImpl;
-import org.xenei.junit.contract.ContractSuite;
-import org.xenei.junit.contract.Dynamic;
-import org.xenei.junit.contract.IProducer;
-
-import com.hp.hpl.jena.graph.AbstractGraphSuite;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.impl.WrappedGraph;
-import com.hp.hpl.jena.sparql.graph.GraphFactory;
-import com.hp.hpl.jena.testing_framework.AbstractGraphProducer;
-
-@RunWith( ContractSuite.class )
-@ContractImpl( WrappedGraph.class )
-public class WrappedGraphSuite extends AbstractGraphSuite {
-	private AbstractGraphProducer<WrappedGraph> producer = 
-			new AbstractGraphProducer<WrappedGraph>(){
-		@Override
-		public WrappedGraph createNewGraph() {
-			return new WrappedGraph(GraphFactory.createGraphMem());
-		}
-	};
-	
-	@Dynamic.Inject
-	public IProducer<? extends Graph> getCollectionGraphSuiteProducer() {
-		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 org.xenei.junit.contract.IProducer;
+//
+//import com.hp.hpl.jena.graph.AbstractGraphSuite;
+//import com.hp.hpl.jena.graph.Graph;
+//import com.hp.hpl.jena.graph.impl.WrappedGraph;
+//import com.hp.hpl.jena.sparql.graph.GraphFactory;
+//import com.hp.hpl.jena.testing_framework.AbstractGraphProducer;
+
+//@RunWith(ContractSuite.class)
+//@ContractImpl(WrappedGraph.class)
+//public class WrappedGraphSuite extends AbstractGraphSuite {
+//	private AbstractGraphProducer<WrappedGraph> producer = new AbstractGraphProducer<WrappedGraph>() {
+//		@Override
+//		public WrappedGraph createNewGraph() {
+//			return new WrappedGraph(GraphFactory.createGraphMem());
+//		}
+//	};
+//
+//	@Dynamic.Inject
+//	public IProducer<? extends Graph> getCollectionGraphSuiteProducer() {
+//		return producer;
+//	}
+//
+//}

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/graph/impl/WrappedGraphTest.java Sun Oct 27 11:35:20 2013
@@ -44,22 +44,18 @@ public class WrappedGraphTest {
 
 	protected IProducer<? extends WrappedGraph> graphProducer;
 
-	public WrappedGraphTest()
-	{
-		graphProducer = 
-				new AbstractGraphProducer<WrappedGraph>(){
+	public WrappedGraphTest() {
+		graphProducer = new AbstractGraphProducer<WrappedGraph>() {
 			@Override
 			public WrappedGraph createNewGraph() {
 				return new WrappedGraph(GraphFactory.createGraphMem());
 			}
 		};
 	}
-	
-	protected WrappedGraphTest( IProducer<? extends WrappedGraph> producer )
-	{
+
+	protected WrappedGraphTest(IProducer<? extends WrappedGraph> producer) {
 		graphProducer = producer;
 	}
-	
 
 	@Contract.Inject
 	public IProducer<? extends WrappedGraph> getGraphProducer() {

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/BunchMapContractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/BunchMapContractTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/BunchMapContractTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/BunchMapContractTest.java Sun Oct 27 11:35:20 2013
@@ -42,35 +42,32 @@ public class BunchMapContractTest {
 	private BunchMap map;
 
 	private IProducer<? extends BunchMap> producer;
-	
-//	public BunchMapContractTest()
-//	{
-//		producer = new IProducer<BunchMap>(){
-//
-//			@Override
-//			public BunchMap newInstance() {
-//				return new HashedBunchMap();
-//			}
-//
-//			@Override
-//			public void cleanUp() {
-//				// TODO Auto-generated method stub
-//				
-//			}};
-//	}
+
+	// public BunchMapContractTest()
+	// {
+	// producer = new IProducer<BunchMap>(){
+	//
+	// @Override
+	// public BunchMap newInstance() {
+	// return new HashedBunchMap();
+	// }
+	//
+	// @Override
+	// public void cleanUp() {
+	// // TODO Auto-generated method stub
+	//
+	// }};
+	// }
 
 	@Contract.Inject
-	public final void setBunchMapProducer(IProducer<? extends BunchMap> producer)
-	{
+	public final void setBunchMapProducer(IProducer<? extends BunchMap> producer) {
 		this.producer = producer;
 	}
 
-	protected final IProducer<? extends BunchMap> getBunchMapProducer()
-	{
+	protected final IProducer<? extends BunchMap> getBunchMapProducer() {
 		return producer;
 	}
 
-	
 	@Before
 	public final void beforeAbstractBunchMapTest() {
 		map = getBunchMapProducer().newInstance();

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemSuite.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemSuite.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemSuite.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/GraphMemSuite.java Sun Oct 27 11:35:20 2013
@@ -16,38 +16,31 @@
     limitations under the License.
  */
 package com.hp.hpl.jena.mem;
-
-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 org.xenei.junit.contract.IProducer;
-
-import com.hp.hpl.jena.graph.AbstractGraphSuite;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.impl.WrappedGraph;
-import com.hp.hpl.jena.testing_framework.AbstractGraphProducer;
-
-@RunWith( ContractSuite.class )
-@ContractImpl( GraphMem.class )
-public class GraphMemSuite extends AbstractGraphSuite {
-
-	
-	private AbstractGraphProducer<GraphMem> producer = 
-			new AbstractGraphProducer<GraphMem>(){
-		@Override
-		protected GraphMem createNewGraph() {
-			return new GraphMem();
-		}
-	};
-	
-	@Dynamic.Inject
-	public IProducer<? extends Graph> getCollectionGraphSuiteProducer() {
-		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 org.xenei.junit.contract.IProducer;
+//
+//import com.hp.hpl.jena.graph.AbstractGraphSuite;
+//import com.hp.hpl.jena.graph.Graph;
+//import com.hp.hpl.jena.testing_framework.AbstractGraphProducer;
+//
+//@RunWith(ContractSuite.class)
+//@ContractImpl(GraphMem.class)
+//public class GraphMemSuite extends AbstractGraphSuite {
+//
+//	private AbstractGraphProducer<GraphMem> producer = new AbstractGraphProducer<GraphMem>() {
+//		@Override
+//		protected GraphMem createNewGraph() {
+//			return new GraphMem();
+//		}
+//	};
+//
+//	@Dynamic.Inject
+//	public IProducer<? extends Graph> getCollectionGraphSuiteProducer() {
+//		return producer;
+//	}
+//
+//}

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/TripleBunchContractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/TripleBunchContractTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/TripleBunchContractTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/mem/TripleBunchContractTest.java Sun Oct 27 11:35:20 2013
@@ -45,31 +45,30 @@ import com.hp.hpl.jena.util.iterator.Ext
 @Contract(TripleBunch.class)
 public class TripleBunchContractTest {
 	private IProducer<? extends TripleBunch> producer;
-	
-//	public TripleBunchContractTest()
-//	{
-//		producer = new IProducer<ArrayBunch>(){
-//
-//			@Override
-//			public ArrayBunch newInstance() {
-//				return new ArrayBunch();
-//			}
-//
-//			@Override
-//			public void cleanUp() {
-//				// TODO Auto-generated method stub
-//				
-//			}};
-//	}
+
+	// public TripleBunchContractTest()
+	// {
+	// producer = new IProducer<ArrayBunch>(){
+	//
+	// @Override
+	// public ArrayBunch newInstance() {
+	// return new ArrayBunch();
+	// }
+	//
+	// @Override
+	// public void cleanUp() {
+	// // TODO Auto-generated method stub
+	//
+	// }};
+	// }
 
 	@Contract.Inject
-	public final void setTripleBunchProducer( IProducer<? extends TripleBunch> producer )
-	{
+	public final void setTripleBunchProducer(
+			IProducer<? extends TripleBunch> producer) {
 		this.producer = producer;
 	}
-	
-	protected final IProducer<? extends TripleBunch> getTripleBunchProducer()
-	{
+
+	protected final IProducer<? extends TripleBunch> getTripleBunchProducer() {
 		return producer;
 	}
 

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=1536104&r1=1536103&r2=1536104&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 Sun Oct 27 11:35:20 2013
@@ -1,706 +1,692 @@
 package com.hp.hpl.jena.rdf.model;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.xenei.junit.contract.Contract;
-import org.xenei.junit.contract.ContractImpl;
-import org.xenei.junit.contract.ContractSuite;
-import org.xenei.junit.contract.Dynamic;
-import org.xenei.junit.contract.IProducer;
-import org.xenei.junit.contract.Contract.Inject;
-
-import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
-
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.testing_framework.IContainerProducer;
-import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
-import com.hp.hpl.jena.testing_framework.IIteratorProducer;
-import com.hp.hpl.jena.testing_framework.INodeProducer;
-import com.hp.hpl.jena.testing_framework.IResourceProducer;
-import com.hp.hpl.jena.testing_framework.IStatementProducer;
-import com.hp.hpl.jena.vocabulary.RDF;
-
-@Ignore
-public abstract class AbstractModelContractSuite implements Dynamic {
-
-	public List<Class<?>> getSuiteClasses() {
-		Class<?>[] classes = {
-				AbstractModelContractSuite.ModelContractTests.class,
-				AbstractModelContractSuite.AltMethodsTests.class,
-				AbstractModelContractSuite.BagMethodsTests.class,
-				AbstractModelContractSuite.SeqMethodsTests.class,
-				// AbstractModelContractSuite.ResourceTests.class,
-				AbstractModelContractSuite.StatementTests.class,
-				AbstractModelContractSuite.StatementIterTests.class,
-				AbstractModelContractSuite.NodeIterTests.class,
-				AbstractModelContractSuite.NameSpaceIteratorTests.class,
-		// AbstractModelContractSuite.ReifiedStatementIteratorTests.class
-		};
-		return Arrays.asList(classes);
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(Model.class)
-	public static class ModelContractTests {
-
-		private AbstractModelProducer<Model> producer;
-		
-		@Contract.Inject
-		public AbstractModelProducer<Model> getModelProducer() {
-			return producer;
-		}
-		
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.producer = producer;
-		}
-
-	}
-
-	public interface A extends Alt {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(A.class)
-	public static class AltMethodsTests {
-
-		private AbstractModelProducer<Model> modelProducer;
-		
-		private IContainerProducer<Alt> producer = new IContainerProducer<Alt>() {
-			private Model model = null;
-
-			@Override
-			public Alt newInstance() {
-				return getModel().createAlt();
-			}
-
-			@Override
-			public void cleanUp() {
-				modelProducer.cleanUp();
-				model = null;
-			}
-
-			@Override
-			public Alt newInstance(String uri) {
-				return getModel().createAlt(uri);
-			}
-
-			@Override
-			public Model getModel() {
-				if (model == null) {
-					model = modelProducer.newInstance();
-				}
-				return model;
-			}
-
-			@Override
-			public Resource getContainerType() {
-				return RDF.Alt;
-			}
-
-			@Override
-			public Class<? extends Container> getContainerClass() {
-				return Alt.class;
-			}
-
-			@Override
-			public boolean supportsAnonymous() {
-				return true;
-			}
-		};
-
-		@Contract.Inject
-		public IContainerProducer<Alt> getAltProducer() {
-			return producer;
-		}
-
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-	}
-
-	public interface B extends Bag {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(B.class)
-	public static class BagMethodsTests {
-
-		private AbstractModelProducer<Model> modelProducer;
-		
-		private IContainerProducer<Bag> producer = new IContainerProducer<Bag>() {
-			private Model model = null;
-
-			@Override
-			public Bag newInstance() {
-				return getModel().createBag();
-			}
-
-			@Override
-			public void cleanUp() {
-				modelProducer.cleanUp();
-				model = null;
-			}
-
-			@Override
-			public Bag newInstance(String uri) {
-				return getModel().createBag(uri);
-			}
-
-			@Override
-			public Model getModel() {
-				if (model == null) {
-					model = modelProducer.newInstance();
-				}
-				return model;
-			}
-
-			@Override
-			public Resource getContainerType() {
-				return RDF.Bag;
-			}
-
-			@Override
-			public Class<? extends Container> getContainerClass() {
-				return Bag.class;
-			}
-
-			@Override
-			public boolean supportsAnonymous() {
-				return true;
-			}
-		};
-
-		@Contract.Inject
-		public IContainerProducer<Bag> getBagProducer() {
-			return producer;
-		}
-		
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-	}
-
-	public interface S extends Seq {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(S.class)
-	public static class SeqMethodsTests {
-		
-		private AbstractModelProducer<Model> modelProducer;
-		
-		private IContainerProducer<Seq> producer = new IContainerProducer<Seq>() {
-			private Model model = null;
-
-			@Override
-			public Seq newInstance() {
-				return getModel().createSeq();
-			}
-
-			@Override
-			public void cleanUp() {
-				modelProducer.cleanUp();
-				model = null;
-			}
-
-			@Override
-			public Seq newInstance(String uri) {
-				return getModel().createSeq(uri);
-			}
-
-			@Override
-			public Model getModel() {
-				if (model == null) {
-					model = modelProducer.newInstance();
-				}
-				return model;
-			}
-
-			@Override
-			public Resource getContainerType() {
-				return RDF.Seq;
-			}
-
-			@Override
-			public Class<? extends Container> getContainerClass() {
-				return Seq.class;
-			}
-
-			@Override
-			public boolean supportsAnonymous() {
-				return true;
-			}
-		};
-
-		@Contract.Inject
-		public IContainerProducer<Seq> getSeqProducer() {
-			return producer;
-		}
-
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-
-	}
-
-	public interface R extends Resource {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(R.class)
-	public static class ResourceTests {
-		
-		private AbstractModelProducer<Model> modelProducer;
-		
-		private INodeProducer<Resource> producer = new INodeProducer<Resource>() {
-			private Model model;
-
-			@Override
-			public Resource newInstance() {
-				return getModel().createResource();
-			}
-
-			@Override
-			public void cleanUp() {
-				modelProducer.cleanUp();
-				model = null;
-			}
-
-			@Override
-			public Resource newInstance(String uri) {
-				return getModel().createResource(uri);
-			}
-
-			@Override
-			public Model getModel() {
-				if (model == null) {
-					model = modelProducer.newInstance();
-				}
-				return model;
-			}
-		};
-
-		@Contract.Inject
-		public INodeProducer<Resource> getNodeProducer() {
-			return producer;
-		}
-		
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-
-	}
-
-	public interface Stmt extends Statement {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(Stmt.class)
-	public static class StatementTests {
-		
-		private AbstractModelProducer<Model> modelProducer;
-		
-		private IStatementProducer<Statement> producer = new IStatementProducer<Statement>() {
-
-			private Model model;
-
-			@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();
-				model = null;
-			}
-
-			@Override
-			public AbstractModelProducer<Model> getModelProducer() {
-				return modelProducer;
-			}
-		};
-
-		@Contract.Inject
-		public IStatementProducer<Statement> getStatementProducer() {
-			return producer;
-		}
-		
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-	}
-
-	public interface StmtIter extends StmtIterator {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(StmtIter.class)
-	public static class StatementIterTests {
-
-		private AbstractModelProducer<Model> modelProducer;		
-		
-		private IIteratorProducer<Statement> producer = new IIteratorProducer<Statement>() {
-
-			Model m = null;
-
-			Statement[] objs = { statement("s p o"), statement("s p2 o2"),
-					statement("s p3 o3 "), statement("s p o4") };
-
-			@Override
-			public List<Statement> getList() {
-				return Arrays.asList(objs);
-			}
-
-			@Override
-			public StmtIterator newInstance() {
-				return getModel().listStatements();
-			}
-
-			private Model getModel() {
-				if (m == null) {
-					m = modelProducer.newInstance();
-					for (Statement s : objs) {
-						m.add(s);
-					}
-				}
-				return m;
-			}
-
-			@Override
-			public void cleanUp() {
-			}
-
-			@Override
-			public boolean supportsDelete() {
-				return true;
-			}
-
-			@Override
-			public boolean isCopy() {
-				return false;
-			}
-
-		};
-
-		@Inject
-		public IIteratorProducer<Statement> getIteratorProducer() {
-			return producer;
-		}
-
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-	}
-
-	public interface NodeIter extends NodeIterator {
-	}
-	@RunWith(ContractSuite.class)
-	@ContractImpl(NodeIter.class)
-	public static class NodeIterTests {
-		
-		private AbstractModelProducer<Model> modelProducer;		
-		
-		private IIteratorProducer<RDFNode> producer = new IIteratorProducer<RDFNode>() {
-
-			Model m = null;
-
-			RDFNode[] objs = { rdfNode("p"), rdfNode("p2"), rdfNode("p3"),
-					rdfNode("o3"), rdfNode("o4") };
-
-			@Override
-			public List<RDFNode> getList() {
-				return Arrays.asList(objs);
-			}
-
-			@Override
-			public NodeIterator newInstance() {
-				return getModel().listObjects();
-			}
-
-			private Model getModel() {
-				if (m == null) {
-					m = modelProducer.newInstance();
-					Resource s = resource("s");
-					Property p = property("p");
-					for (RDFNode o : objs) {
-						m.add(s, p, o);
-					}
-				}
-				return m;
-			}
-
-			@Override
-			public void cleanUp() {
-			}
-
-			@Override
-			public boolean supportsDelete() {
-				return false;
-			}
-
-			@Override
-			public boolean isCopy() {
-				return false;
-			}
-
-		};
-
-		@Contract.Inject
-		public IIteratorProducer<RDFNode> getIteratorProducer() {
-			return producer;
-		}
-
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-	}
-
-	public interface NSIter extends NsIterator {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(NSIter.class)
-	public static class NameSpaceIteratorTests {
-		
-		private AbstractModelProducer<Model> modelProducer;		
-		
-		private IIteratorProducer<String> producer = new IIteratorProducer<String>() {
-
-			Model m = null;
-
-			String[] uris = { "http://example.com/one/",
-					"http://example.com/two/", "http://example.com/three/",
-					"http://example.com/four/", "http://example.com/five/",
-					RDF.type.getNameSpace() };
-
-			@Override
-			public List<String> getList() {
-				return Arrays.asList(uris);
-			}
-
-			@Override
-			public NsIterator newInstance() {
-				return getModel().listNameSpaces();
-			}
-
-			private Model getModel() {
-				if (m == null) {
-					m = modelProducer.newInstance();
-					m.setNsPrefix("one", uris[0]);
-					Resource s = m.createResource("http://example.com/res/s");
-					Property p = m.createProperty(uris[0], "uno");
-					RDFNode o = m.createLiteral("first");
-					m.add(s, p, o);
-					p = m.createProperty(uris[1], "dos");
-					o = m.createLiteral("second");
-					m.add(s, p, o);
-					p = m.createProperty(uris[2], "tres");
-					o = m.createLiteral("third");
-					m.add(s, p, o);
-					p = m.createProperty(uris[3], "quatro");
-					o = m.createLiteral("fourth");
-					m.add(s, p, o);
-					p = RDF.type;
-					o = m.createResource(uris[4] + "cinco");
-					m.add(s, p, o);
-				}
-				return m;
-			}
-
-			@Override
-			public void cleanUp() {
-				if (m != null) {
-					m.close();
-					m = null;
-				}
-			}
-
-			@Override
-			public boolean supportsDelete() {
-				return true;
-			}
-
-			@Override
-			public boolean isCopy() {
-				return true;
-			}
-
-		};
-
-		@Inject
-		public IIteratorProducer<String> getIteratorProducer() {
-			return producer;
-		}
-
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-	}
-
-	public interface ReifiedIterator extends RSIterator {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(ReifiedIterator.class)
-	public static class ReifiedStatementIteratorTests {
-		
-		private AbstractModelProducer<Model> modelProducer;		
-		
-		private IIteratorProducer<ReifiedStatement> producer = new IIteratorProducer<ReifiedStatement>() {
-
-			Model m = null;
-			List<ReifiedStatement> stmts;
-
-			@Override
-			public List<ReifiedStatement> getList() {
-				return stmts;
-			}
-
-			@Override
-			public RSIterator newInstance() {
-				return getModel().listReifiedStatements();
-			}
-
-			private Model getModel() {
-				if (m == null) {
-					m = modelProducer.newInstance();
-					stmts.add(m.createReifiedStatement(statement("P S O")));
-					stmts.add(m.createReifiedStatement(statement("P S O2")));
-					stmts.add(m.createReifiedStatement(statement("P S2 O")));
-					stmts.add(m.createReifiedStatement(statement("P2 S O")));
-				}
-				return m;
-			}
-
-			@Override
-			public void cleanUp() {
-				if (m != null) {
-					m.close();
-					m = null;
-				}
-			}
-
-			@Override
-			public boolean supportsDelete() {
-				return true;
-			}
-
-			@Override
-			public boolean isCopy() {
-				return true;
-			}
-
-		};
-
-		@Inject
-		public IIteratorProducer<ReifiedStatement> getIteratorProducer() {
-			return producer;
-		}
-
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-	}
-
-	public interface P extends Property {
-	}
-
-	@RunWith(ContractSuite.class)
-	@ContractImpl(P.class)
-	public static class PropertyTests {
-		
-		private AbstractModelProducer<Model> modelProducer;		
-		
-		private IResourceProducer<Property> producer = new IResourceProducer<Property>() {
-
-			private Model m = null;
-
-			@Override
-			public Property newInstance() {
-				return getModel().createProperty("");
-			}
-
-			@Override
-			public void cleanUp() {
-				if (m != null) {
-					m.close();
-					m = null;
-				}
-			}
-
-			@Override
-			public Property newInstance(String uri) {
-				return getModel().createProperty(uri);
-			}
-
-			@Override
-			public Model getModel() {
-				if (m == null) {
-					m = modelProducer.newInstance();
-				}
-				return m;
-			}
-
-			@Override
-			public boolean supportsAnonymous() {
-				// TODO Auto-generated method stub
-				return false;
-			}
-
-		};
-
-		@Contract.Inject
-		public IResourceProducer<Property> getIteratorProducer() {
-			return producer;
-		}
-
-		@Contract.Inject
-		public void setProducer(AbstractModelProducer<Model> producer)
-		{
-			this.modelProducer = producer;
-		}
-	}
-}
+//
+//import java.util.Arrays;
+//import java.util.List;
+//import java.util.StringTokenizer;
+//
+//import org.junit.Ignore;
+//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.Dynamic;
+//import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
+//
+//import com.hp.hpl.jena.testing_framework.IContainerProducer;
+//import com.hp.hpl.jena.testing_framework.AbstractModelProducer;
+//import com.hp.hpl.jena.testing_framework.IIteratorProducer;
+//import com.hp.hpl.jena.testing_framework.INodeProducer;
+//import com.hp.hpl.jena.testing_framework.IResourceProducer;
+//import com.hp.hpl.jena.testing_framework.IStatementProducer;
+//import com.hp.hpl.jena.vocabulary.RDF;
+//
+//@Ignore
+//public abstract class AbstractModelContractSuite implements Dynamic {
+//
+//	@Override
+//	public List<Class<?>> getSuiteClasses() {
+//		Class<?>[] classes = {
+//				AbstractModelContractSuite.ModelContractTests.class,
+//				AbstractModelContractSuite.AltMethodsTests.class,
+//				AbstractModelContractSuite.BagMethodsTests.class,
+//				AbstractModelContractSuite.SeqMethodsTests.class,
+//				// AbstractModelContractSuite.ResourceTests.class,
+//				AbstractModelContractSuite.StatementTests.class,
+//				AbstractModelContractSuite.StatementIterTests.class,
+//				AbstractModelContractSuite.NodeIterTests.class,
+//				AbstractModelContractSuite.NameSpaceIteratorTests.class,
+//		// AbstractModelContractSuite.ReifiedStatementIteratorTests.class
+//		};
+//		return Arrays.asList(classes);
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(Model.class)
+//	public static class ModelContractTests {
+//
+//		private AbstractModelProducer<Model> producer;
+//
+//		@Contract.Inject
+//		public AbstractModelProducer<Model> getModelProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.producer = producer;
+//		}
+//
+//	}
+//
+//	public interface A extends Alt {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(A.class)
+//	public static class AltMethodsTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IContainerProducer<Alt> producer = new IContainerProducer<Alt>() {
+//			private Model model = null;
+//
+//			@Override
+//			public Alt newInstance() {
+//				return getModel().createAlt();
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//				modelProducer.cleanUp();
+//				model = null;
+//			}
+//
+//			@Override
+//			public Alt newInstance(String uri) {
+//				return getModel().createAlt(uri);
+//			}
+//
+//			@Override
+//			public Model getModel() {
+//				if (model == null) {
+//					model = modelProducer.newInstance();
+//				}
+//				return model;
+//			}
+//
+//			@Override
+//			public Resource getContainerType() {
+//				return RDF.Alt;
+//			}
+//
+//			@Override
+//			public Class<? extends Container> getContainerClass() {
+//				return Alt.class;
+//			}
+//
+//			@Override
+//			public boolean supportsAnonymous() {
+//				return true;
+//			}
+//		};
+//
+//		@Contract.Inject
+//		public IContainerProducer<Alt> getAltProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//	}
+//
+//	public interface B extends Bag {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(B.class)
+//	public static class BagMethodsTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IContainerProducer<Bag> producer = new IContainerProducer<Bag>() {
+//			private Model model = null;
+//
+//			@Override
+//			public Bag newInstance() {
+//				return getModel().createBag();
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//				modelProducer.cleanUp();
+//				model = null;
+//			}
+//
+//			@Override
+//			public Bag newInstance(String uri) {
+//				return getModel().createBag(uri);
+//			}
+//
+//			@Override
+//			public Model getModel() {
+//				if (model == null) {
+//					model = modelProducer.newInstance();
+//				}
+//				return model;
+//			}
+//
+//			@Override
+//			public Resource getContainerType() {
+//				return RDF.Bag;
+//			}
+//
+//			@Override
+//			public Class<? extends Container> getContainerClass() {
+//				return Bag.class;
+//			}
+//
+//			@Override
+//			public boolean supportsAnonymous() {
+//				return true;
+//			}
+//		};
+//
+//		@Contract.Inject
+//		public IContainerProducer<Bag> getBagProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//	}
+//
+//	public interface S extends Seq {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(S.class)
+//	public static class SeqMethodsTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IContainerProducer<Seq> producer = new IContainerProducer<Seq>() {
+//			private Model model = null;
+//
+//			@Override
+//			public Seq newInstance() {
+//				return getModel().createSeq();
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//				modelProducer.cleanUp();
+//				model = null;
+//			}
+//
+//			@Override
+//			public Seq newInstance(String uri) {
+//				return getModel().createSeq(uri);
+//			}
+//
+//			@Override
+//			public Model getModel() {
+//				if (model == null) {
+//					model = modelProducer.newInstance();
+//				}
+//				return model;
+//			}
+//
+//			@Override
+//			public Resource getContainerType() {
+//				return RDF.Seq;
+//			}
+//
+//			@Override
+//			public Class<? extends Container> getContainerClass() {
+//				return Seq.class;
+//			}
+//
+//			@Override
+//			public boolean supportsAnonymous() {
+//				return true;
+//			}
+//		};
+//
+//		@Contract.Inject
+//		public IContainerProducer<Seq> getSeqProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//
+//	}
+//
+//	public interface R extends Resource {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(R.class)
+//	public static class ResourceTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private INodeProducer<Resource> producer = new INodeProducer<Resource>() {
+//			private Model model;
+//
+//			@Override
+//			public Resource newInstance() {
+//				return getModel().createResource();
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//				modelProducer.cleanUp();
+//				model = null;
+//			}
+//
+//			@Override
+//			public Resource newInstance(String uri) {
+//				return getModel().createResource(uri);
+//			}
+//
+//			@Override
+//			public Model getModel() {
+//				if (model == null) {
+//					model = modelProducer.newInstance();
+//				}
+//				return model;
+//			}
+//		};
+//
+//		@Contract.Inject
+//		public INodeProducer<Resource> getNodeProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//
+//	}
+//
+//	public interface Stmt extends Statement {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(Stmt.class)
+//	public static class StatementTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IStatementProducer<Statement> producer = new IStatementProducer<Statement>() {
+//
+//			private Model model;
+//
+//			@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();
+//				model = null;
+//			}
+//
+//			@Override
+//			public AbstractModelProducer<Model> getModelProducer() {
+//				return modelProducer;
+//			}
+//		};
+//
+//		@Contract.Inject
+//		public IStatementProducer<Statement> getStatementProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//	}
+//
+//	public interface StmtIter extends StmtIterator {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(StmtIter.class)
+//	public static class StatementIterTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IIteratorProducer<Statement> producer = new IIteratorProducer<Statement>() {
+//
+//			Model m = null;
+//
+//			Statement[] objs = { statement("s p o"), statement("s p2 o2"),
+//					statement("s p3 o3 "), statement("s p o4") };
+//
+//			@Override
+//			public List<Statement> getList() {
+//				return Arrays.asList(objs);
+//			}
+//
+//			@Override
+//			public StmtIterator newInstance() {
+//				return getModel().listStatements();
+//			}
+//
+//			private Model getModel() {
+//				if (m == null) {
+//					m = modelProducer.newInstance();
+//					for (Statement s : objs) {
+//						m.add(s);
+//					}
+//				}
+//				return m;
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//			}
+//
+//			@Override
+//			public boolean supportsDelete() {
+//				return true;
+//			}
+//
+//			@Override
+//			public boolean isCopy() {
+//				return false;
+//			}
+//
+//		};
+//
+//		@Inject
+//		public IIteratorProducer<Statement> getIteratorProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//	}
+//
+//	public interface NodeIter extends NodeIterator {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(NodeIter.class)
+//	public static class NodeIterTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IIteratorProducer<RDFNode> producer = new IIteratorProducer<RDFNode>() {
+//
+//			Model m = null;
+//
+//			RDFNode[] objs = { rdfNode("p"), rdfNode("p2"), rdfNode("p3"),
+//					rdfNode("o3"), rdfNode("o4") };
+//
+//			@Override
+//			public List<RDFNode> getList() {
+//				return Arrays.asList(objs);
+//			}
+//
+//			@Override
+//			public NodeIterator newInstance() {
+//				return getModel().listObjects();
+//			}
+//
+//			private Model getModel() {
+//				if (m == null) {
+//					m = modelProducer.newInstance();
+//					Resource s = resource("s");
+//					Property p = property("p");
+//					for (RDFNode o : objs) {
+//						m.add(s, p, o);
+//					}
+//				}
+//				return m;
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//			}
+//
+//			@Override
+//			public boolean supportsDelete() {
+//				return false;
+//			}
+//
+//			@Override
+//			public boolean isCopy() {
+//				return false;
+//			}
+//
+//		};
+//
+//		@Contract.Inject
+//		public IIteratorProducer<RDFNode> getIteratorProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//	}
+//
+//	public interface NSIter extends NsIterator {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(NSIter.class)
+//	public static class NameSpaceIteratorTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IIteratorProducer<String> producer = new IIteratorProducer<String>() {
+//
+//			Model m = null;
+//
+//			String[] uris = { "http://example.com/one/",
+//					"http://example.com/two/", "http://example.com/three/",
+//					"http://example.com/four/", "http://example.com/five/",
+//					RDF.type.getNameSpace() };
+//
+//			@Override
+//			public List<String> getList() {
+//				return Arrays.asList(uris);
+//			}
+//
+//			@Override
+//			public NsIterator newInstance() {
+//				return getModel().listNameSpaces();
+//			}
+//
+//			private Model getModel() {
+//				if (m == null) {
+//					m = modelProducer.newInstance();
+//					m.setNsPrefix("one", uris[0]);
+//					Resource s = m.createResource("http://example.com/res/s");
+//					Property p = m.createProperty(uris[0], "uno");
+//					RDFNode o = m.createLiteral("first");
+//					m.add(s, p, o);
+//					p = m.createProperty(uris[1], "dos");
+//					o = m.createLiteral("second");
+//					m.add(s, p, o);
+//					p = m.createProperty(uris[2], "tres");
+//					o = m.createLiteral("third");
+//					m.add(s, p, o);
+//					p = m.createProperty(uris[3], "quatro");
+//					o = m.createLiteral("fourth");
+//					m.add(s, p, o);
+//					p = RDF.type;
+//					o = m.createResource(uris[4] + "cinco");
+//					m.add(s, p, o);
+//				}
+//				return m;
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//				if (m != null) {
+//					m.close();
+//					m = null;
+//				}
+//			}
+//
+//			@Override
+//			public boolean supportsDelete() {
+//				return true;
+//			}
+//
+//			@Override
+//			public boolean isCopy() {
+//				return true;
+//			}
+//
+//		};
+//
+//		@Inject
+//		public IIteratorProducer<String> getIteratorProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//	}
+//
+//	public interface ReifiedIterator extends RSIterator {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(ReifiedIterator.class)
+//	public static class ReifiedStatementIteratorTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IIteratorProducer<ReifiedStatement> producer = new IIteratorProducer<ReifiedStatement>() {
+//
+//			Model m = null;
+//			List<ReifiedStatement> stmts;
+//
+//			@Override
+//			public List<ReifiedStatement> getList() {
+//				return stmts;
+//			}
+//
+//			@Override
+//			public RSIterator newInstance() {
+//				return getModel().listReifiedStatements();
+//			}
+//
+//			private Model getModel() {
+//				if (m == null) {
+//					m = modelProducer.newInstance();
+//					stmts.add(m.createReifiedStatement(statement("P S O")));
+//					stmts.add(m.createReifiedStatement(statement("P S O2")));
+//					stmts.add(m.createReifiedStatement(statement("P S2 O")));
+//					stmts.add(m.createReifiedStatement(statement("P2 S O")));
+//				}
+//				return m;
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//				if (m != null) {
+//					m.close();
+//					m = null;
+//				}
+//			}
+//
+//			@Override
+//			public boolean supportsDelete() {
+//				return true;
+//			}
+//
+//			@Override
+//			public boolean isCopy() {
+//				return true;
+//			}
+//
+//		};
+//
+//		@Inject
+//		public IIteratorProducer<ReifiedStatement> getIteratorProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//	}
+//
+//	public interface P extends Property {
+//	}
+//
+//	@RunWith(ContractSuite.class)
+//	@ContractImpl(P.class)
+//	public static class PropertyTests {
+//
+//		private AbstractModelProducer<Model> modelProducer;
+//
+//		private IResourceProducer<Property> producer = new IResourceProducer<Property>() {
+//
+//			private Model m = null;
+//
+//			@Override
+//			public Property newInstance() {
+//				return getModel().createProperty("");
+//			}
+//
+//			@Override
+//			public void cleanUp() {
+//				if (m != null) {
+//					m.close();
+//					m = null;
+//				}
+//			}
+//
+//			@Override
+//			public Property newInstance(String uri) {
+//				return getModel().createProperty(uri);
+//			}
+//
+//			@Override
+//			public Model getModel() {
+//				if (m == null) {
+//					m = modelProducer.newInstance();
+//				}
+//				return m;
+//			}
+//
+//			@Override
+//			public boolean supportsAnonymous() {
+//				// TODO Auto-generated method stub
+//				return false;
+//			}
+//
+//		};
+//
+//		@Contract.Inject
+//		public IResourceProducer<Property> getIteratorProducer() {
+//			return producer;
+//		}
+//
+//		@Contract.Inject
+//		public void setProducer(AbstractModelProducer<Model> producer) {
+//			this.modelProducer = producer;
+//		}
+//	}
+//}

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AltContractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AltContractTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AltContractTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/AltContractTest.java Sun Oct 27 11:35:20 2013
@@ -28,73 +28,21 @@ import com.hp.hpl.jena.rdf.model.Literal
 import com.hp.hpl.jena.rdf.model.Resource;
 import com.hp.hpl.jena.rdf.model.Seq;
 import com.hp.hpl.jena.testing_framework.IContainerProducer;
-import com.hp.hpl.jena.vocabulary.RDF;
-
 import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
 import static org.junit.Assert.*;
 
 @Ignore
 @Contract(Alt.class)
 public class AltContractTest<T extends Alt> {
-	
+
 	private IContainerProducer<T> producer;
-	
-	
-//	@SuppressWarnings("unchecked")
-//	public AltContractTest()
-//	{
-//		IContainerProducer<T> p = (IContainerProducer<T>) new IContainerProducer<Alt>() {
-//			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 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;
-//			}
-//		};
-//		producer = p;
-//	}
-	
+
 	@Contract.Inject
-	public final void setAltContractTestProducer(IContainerProducer<T> producer)
-	{
+	public final void setAltContractTestProducer(IContainerProducer<T> producer) {
 		this.producer = producer;
 	}
-	
-	protected final IContainerProducer<T> getAltProducer()
-	{
+
+	protected final IContainerProducer<T> getAltProducer() {
 		return producer;
 	}
 

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/BagContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/BagContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/BagContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/BagContractTests.java Sun Oct 27 11:35:20 2013
@@ -28,14 +28,12 @@ import com.hp.hpl.jena.testing_framework
 @Contract(Bag.class)
 public class BagContractTests<T extends Bag> {
 	private IContainerProducer<T> producer;
-	
+
 	@Contract.Inject
-	public final void setBagContractTestsBag(IContainerProducer<T> producer)
-	{
+	public final void setBagContractTestsBag(IContainerProducer<T> producer) {
 		this.producer = producer;
 	}
 
-
 	@Test
 	public void dummyTestBecauseThereAreNoRealTests() {
 

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ContainerContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ContainerContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ContainerContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ContainerContractTests.java Sun Oct 27 11:35:20 2013
@@ -36,15 +36,15 @@ import org.xenei.junit.contract.Contract
 @Ignore
 @Contract(Container.class)
 public class ContainerContractTests<T extends Container> {
-	
+
 	private IContainerProducer<T> producer;
-	
+
 	@Contract.Inject
-	public final void setContainerContractTestsProducer(IContainerProducer<T> producer)
-	{
+	public final void setContainerContractTestsProducer(
+			IContainerProducer<T> producer) {
 		this.producer = producer;
 	}
-	
+
 	protected final IContainerProducer<T> getContainerProducer() {
 		return producer;
 	}

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LiteralContractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LiteralContractTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LiteralContractTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LiteralContractTest.java Sun Oct 27 11:35:20 2013
@@ -1279,7 +1279,7 @@ public abstract class LiteralContractTes
 				.getLexicalForm());
 		l = Integer.MIN_VALUE;
 		assertEquals(Integer.toString(Integer.MIN_VALUE), lp.newInstance(l)
-				.getLexicalForm());	
+				.getLexicalForm());
 	}
 
 	@Test
@@ -2279,12 +2279,15 @@ public abstract class LiteralContractTes
 	//
 	// @Test
 	// public void testStringLiteralEquality() {
-	// Assert.assertEquals(model.createLiteral("Foo"), model.createLiteral("Foo"));
+	// Assert.assertEquals(model.createLiteral("Foo"),
+	// model.createLiteral("Foo"));
 	// Assert.assertEquals(model.createLiteral("Alpha"),
 	// model.createLiteral("Alpha"));
 	// assertDiffer(model.createLiteral("Alpha"), model.createLiteral("Beta"));
-	// assertDiffer(model.createLiteral("Foo", "en"), model.createLiteral("Foo"));
-	// assertDiffer(model.createLiteral("Foo"), model.createLiteral("Foo", "en"));
+	// assertDiffer(model.createLiteral("Foo", "en"),
+	// model.createLiteral("Foo"));
+	// assertDiffer(model.createLiteral("Foo"), model.createLiteral("Foo",
+	// "en"));
 	// assertDiffer(model.createLiteral("Foo", "en"),
 	// model.createLiteral("Foo", "fr"));
 	// Assert.assertEquals(model.createLiteral("Foo", "en"),

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LockContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LockContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LockContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/LockContractTests.java Sun Oct 27 11:35:20 2013
@@ -41,29 +41,26 @@ import org.xenei.junit.contract.IProduce
 @Ignore
 @Contract(Lock.class)
 public class LockContractTests<T extends Lock> extends ContractTemplate<T> {
-	
-	
-//	@SuppressWarnings("unchecked")
-//	public LockContractTests() {
-//		setProducer( (IProducer<T>) new IProducer<Model>() {
-//			@Override
-//			public Model newInstance() {
-//				return ModelFactory.createDefaultModel();
-//			}
-//
-//			@Override
-//			public void cleanUp() {
-//				// do nothing
-//			}
-//
-//		} );
-//	}
+
+	// @SuppressWarnings("unchecked")
+	// public LockContractTests() {
+	// setProducer( (IProducer<T>) new IProducer<Model>() {
+	// @Override
+	// public Model newInstance() {
+	// return ModelFactory.createDefaultModel();
+	// }
+	//
+	// @Override
+	// public void cleanUp() {
+	// // do nothing
+	// }
+	//
+	// } );
+	// }
 	@Contract.Inject
-	public final void setLockContractTestsProducer( IProducer<T> producer )
-	{
-		setProducer( producer );
+	public final void setLockContractTestsProducer(IProducer<T> producer) {
+		setProducer(producer);
 	}
-	
 
 	private static Logger log = LoggerFactory
 			.getLogger(LockContractTests.class);

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelConContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelConContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelConContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelConContractTests.java Sun Oct 27 11:35:20 2013
@@ -56,18 +56,18 @@ import com.hp.hpl.jena.vocabulary.RDF;
  */
 @Ignore
 @Contract(ModelCon.class)
-public class ModelConContractTests<T extends ModelCon> extends ContractTemplate<T> {
+public class ModelConContractTests<T extends ModelCon> extends
+		ContractTemplate<T> {
 
 	private ModelCon modelCon;
 	private Model model;
 	private RecordingModelListener SL;
 
 	@Contract.Inject
-	public final void setModelConContractTests( IProducer<T> producer )
-	{
+	public final void setModelConContractTests(IProducer<T> producer) {
 		super.setProducer(producer);
 	}
-	
+
 	private static Logger LOG = LoggerFactory
 			.getLogger(ModelConContractTests.class);
 
@@ -671,8 +671,6 @@ public class ModelConContractTests<T ext
 		assertEquals("must be associated with model", modelCon, s.getModel());
 		assertFalse("Should not be in model", model.contains(s));
 	}
-	
-	
 
 	@Test
 	public void testCreateProperty_String() {
@@ -961,9 +959,6 @@ public class ModelConContractTests<T ext
 	@Test
 	public void testCreateTypedLiteral_Object() {
 		model.register(SL);
-		
-		
-		
 
 		try {
 			final LitTestObj ra = new LitTestObj("r11");
@@ -979,22 +974,27 @@ public class ModelConContractTests<T ext
 			final Literal lb = model.createTypedLiteral(rb);
 			txnCommit(model);
 			SL.assertEmpty();
-			assertEquals("must be associated with model", modelCon, la.getModel());
-			assertEquals("must be associated with model", modelCon, lb.getModel());
-			assertFalse("Found literal in model", model.contains(null, null, la));
-			assertFalse("Found literal in model", model.contains(null, null, lb));
+			assertEquals("must be associated with model", modelCon,
+					la.getModel());
+			assertEquals("must be associated with model", modelCon,
+					lb.getModel());
+			assertFalse("Found literal in model",
+					model.contains(null, null, la));
+			assertFalse("Found literal in model",
+					model.contains(null, null, lb));
 			assertInstanceOf(AdhocDatatype.class, la.getDatatype());
 			Assert.assertSame(la.getDatatype(), lb.getDatatype());
 			Assert.assertNotNull(TypeMapper.getInstance().getTypeByValue(ra));
 			RDFDatatype dt = TypeMapper.getInstance().getTypeByValue(ra);
-			assertEquals("wrong type of literal", dt.getURI(), la.getDatatypeURI());
+			assertEquals("wrong type of literal", dt.getURI(),
+					la.getDatatypeURI());
 			assertEquals("wrong value", ra.toString(), la.getString());
 			assertEquals("wrong value", rb.toString(), lb.getString());
-		
+
 		} finally {
 			TypeMapper.reset();
 		}
-		
+
 	}
 
 	@Test

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelContractTests.java Sun Oct 27 11:35:20 2013
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.*;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
@@ -73,40 +74,38 @@ import com.hp.hpl.jena.vocabulary.RDFS;
 @Contract(Model.class)
 public class ModelContractTests<T extends Model> {
 	private AbstractModelProducer<T> producer;
-	
+
 	private Model model;
 	private RecordingModelListener SL;
 
 	private static Logger LOG = LoggerFactory
 			.getLogger(ModelContractTests.class);
-	
-	
-//	public ModelContractTests()
-//	{
-//		@SuppressWarnings("unchecked")
-//		AbstractModelProducer<T> p = (AbstractModelProducer<T>) new AbstractModelProducer<Model>() {
-//			@Override
-//			protected Model createNewModel() {
-//				return ModelFactory.createDefaultModel();
-//			}
-//
-//			@Override
-//			public boolean areIndependent() {
-//				return true;
-//			}
-//
-//		};
-//		producer = p;
-//	}
+
+	// public ModelContractTests()
+	// {
+	// @SuppressWarnings("unchecked")
+	// AbstractModelProducer<T> p = (AbstractModelProducer<T>) new
+	// AbstractModelProducer<Model>() {
+	// @Override
+	// protected Model createNewModel() {
+	// return ModelFactory.createDefaultModel();
+	// }
+	//
+	// @Override
+	// public boolean areIndependent() {
+	// return true;
+	// }
+	//
+	// };
+	// producer = p;
+	// }
 
 	@Contract.Inject
-	public final void setProducer( AbstractModelProducer<T> producer )
-	{
+	public final void setProducer(AbstractModelProducer<T> producer) {
 		this.producer = producer;
 	}
-	
-	protected final AbstractModelProducer<T> getProducer()
-	{
+
+	protected final AbstractModelProducer<T> getProducer() {
 		return producer;
 	}
 
@@ -935,7 +934,7 @@ public class ModelContractTests<T extend
 				rs.hasProperty(RDF.object, rdfNode("O")));
 
 	}
-		
+
 	/**
 	 * Test that a uri in a different model does not reifiy the statment.
 	 */
@@ -943,14 +942,14 @@ public class ModelContractTests<T extend
 	public void testCreateReifiedStatement_String_Statement_ForeignFails() {
 		final String uri = "spoo:rubbish";
 		final Model m2 = getProducer().newInstance();
-		model.createReifiedStatement(uri, statement( "S P O" ));
+		model.createReifiedStatement(uri, statement("S P O"));
 		try {
 			m2.createResource(uri).as(ReifiedStatement.class);
 			fail("Should have thrown Does Not Reify Exception");
 		} catch (final DoesNotReifyException e) { /* that's what we expect */
 		}
 	}
-	
+
 	@Test
 	public void testAs_ReifiedStatement_UnknownFails() {
 		try {
@@ -959,25 +958,24 @@ public class ModelContractTests<T extend
 		} catch (final DoesNotReifyException e) { /* that's what we expect */
 		}
 	}
-	
+
 	/**
 	 * "dirty" reifications - those with conflicting quadlets - should fail.
 	 */
 	@Test
 	public void testAs_ReifiedStatement_Fails() {
-		txnBegin( model );
-		final Resource R = model
-				.createResource("http://example.com/foo");
+		txnBegin(model);
+		final Resource R = model.createResource("http://example.com/foo");
 		model.add(R, RDF.type, RDF.Statement);
-		model.add(R, RDF.subject, resource( "S"));
-		model.add(R, RDF.subject, resource( "P"));
-		txnCommit( model );
+		model.add(R, RDF.subject, resource("S"));
+		model.add(R, RDF.subject, resource("P"));
+		txnCommit(model);
 		try {
 			R.as(ReifiedStatement.class);
 			fail("Should have thrown Does Not Reify Exception");
 		} catch (final DoesNotReifyException e) { /* that's what we expect */
 		}
-	}	
+	}
 
 	/**
 	 * check that, from a model with any combination of the statements given, we
@@ -986,11 +984,11 @@ public class ModelContractTests<T extend
 	 */
 	@Test
 	public void testReificationCombinations() {
-		txnBegin( model );
-		final Resource RR = model.createResource( "http://example.com/rr"); 
-		final Resource SS =  model.createResource("http://example.com/ss");
+		txnBegin(model);
+		final Resource RR = model.createResource("http://example.com/rr");
+		final Resource SS = model.createResource("http://example.com/ss");
 		final Property PP = RR.as(Property.class);
-		final RDFNode O = rdfNode( "O" );
+		final RDFNode O = rdfNode("O");
 		final Object[][] statements = {
 				{ model.createStatement(RR, RDF.type, RDF.Statement),
 						new Integer(1) },
@@ -1007,7 +1005,7 @@ public class ModelContractTests<T extend
 						new Integer(512) } };
 		testCombinations(model, RR, 0, statements, statements.length);
 	}
-	
+
 	/**
 	 * walk down the set of statements (represented as an array), recursing with
 	 * and without each statement being present. The mask bits record those
@@ -1024,10 +1022,10 @@ public class ModelContractTests<T extend
 				// System.err.println( "+  we constructed " + rs );
 
 				if ((mask & 15) != 15) {
-					LOG.warn( "mask error");
+					LOG.warn("mask error");
 					StringWriter sw = new StringWriter();
 					m.write(sw, "TTL");
-					LOG.warn( sw.getBuffer().toString() );
+					LOG.warn(sw.getBuffer().toString());
 				}
 
 				assertTrue("should not reify: not all components present ["
@@ -1048,13 +1046,13 @@ public class ModelContractTests<T extend
 		}
 	}
 
-//	@Test
-//	public void testThisWillBreak() {
-//		final Resource R = model
-//				.createResource(AbstractReifiedStatementsTest.aURI);
-//		SPO.createReifiedStatement(AbstractReifiedStatementsTest.aURI);
-//		model.add(R, RDF.subject, R);
-//	}
+	// @Test
+	// public void testThisWillBreak() {
+	// final Resource R = model
+	// .createResource(AbstractReifiedStatementsTest.aURI);
+	// SPO.createReifiedStatement(AbstractReifiedStatementsTest.aURI);
+	// model.add(R, RDF.subject, R);
+	// }
 	/**
 	 * Test the creation of a reified statement using a URI and a statement.
 	 * 
@@ -1347,9 +1345,11 @@ public class ModelContractTests<T extend
 		assertEquals("not same reified URI", rs.getURI(), rs2.getURI());
 
 		assertEquals("not same reified statement", rs, rs2);
-		
-		assertEquals( "Should get statement", s, ((ReifiedStatement)rs).getStatement());
-		assertEquals( "Should get statement", s, ((ReifiedStatement)rs2).getStatement());
+
+		assertEquals("Should get statement", s,
+				((ReifiedStatement) rs).getStatement());
+		assertEquals("Should get statement", s,
+				((ReifiedStatement) rs2).getStatement());
 	}
 
 	@Test
@@ -1634,7 +1634,7 @@ public class ModelContractTests<T extend
 		txnCommit(model);
 		assertTrue("Statement was not reified", model.isReified(s));
 	}
-	
+
 	/**
 	 * Leo Bard spotted a problem whereby removing a reified statement from a
 	 * model with style Standard didn't leave the model empty. Here's a test for
@@ -1648,8 +1648,6 @@ public class ModelContractTests<T extend
 		assertIsoModels(ModelFactory.createDefaultModel(), model);
 	}
 
-	
-
 	/**
 	 * this test appeared when TestStatementResources crashed using reified
 	 * statements as a step-0 implementation for asSubject()/asObject(). Looks
@@ -1658,8 +1656,8 @@ public class ModelContractTests<T extend
 	 */
 	@Test
 	public void testListDoesntCrash() {
-		model.createReifiedStatement(statement( "S P O"));
-		model.createReifiedStatement(statement( "S P O2"));
+		model.createReifiedStatement(statement("S P O"));
+		model.createReifiedStatement(statement("S P O2"));
 		assertTrue("should be non-empty", model.listReifiedStatements()
 				.hasNext());
 	}
@@ -1804,8 +1802,8 @@ public class ModelContractTests<T extend
 		List<ReifiedStatement> rsList = model.listReifiedStatements(s).toList();
 
 		assertEquals("Statement was not reified", 1, rsList.size());
-		assertEquals("Wrong reified statement was returned", "foo:bar", 
-				rsList.get(0).getURI());
+		assertEquals("Wrong reified statement was returned", "foo:bar", rsList
+				.get(0).getURI());
 	}
 
 	/**
@@ -2722,9 +2720,10 @@ public class ModelContractTests<T extend
 	 * <li>if the "base" is not provided no conversion to relative URIs will be
 	 * performed.</li>
 	 * </ul>
+	 * @throws IOException 
 	 */
 	@Test
-	public void testRead_InputStream_String() {
+	public void testRead_InputStream_String() throws IOException {
 		InputStream is = TestFileData.getRDFInput();
 
 		model.register(SL);
@@ -3720,7 +3719,5 @@ public class ModelContractTests<T extend
 		// "<eh:/S> <eh:/P3> <foo://bar/Foo>"));
 
 	}
-	
-	
 
 }

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelExtractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelExtractTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelExtractTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelExtractTest.java Sun Oct 27 11:35:20 2013
@@ -40,7 +40,7 @@ public class ModelExtractTest {
 	 * Foo ModelExtract implementation for testing.
 	 * 
 	 * with access to root, result and subject values
-	 *
+	 * 
 	 */
 	static class MockModelExtract extends ModelExtract {
 		Node root;
@@ -92,17 +92,17 @@ public class ModelExtractTest {
 	@Test
 	public void testAsTripleBoundary() {
 		final Model m = ModelFactory.createDefaultModel();
-		Assert.assertTrue(ModelExtractTest.sbTrue.asTripleBoundary(m)
-				.stopAt(triple("x R y")));
-		Assert.assertFalse(ModelExtractTest.sbFalse.asTripleBoundary(m)
-				.stopAt(triple("x R y")));
+		Assert.assertTrue(ModelExtractTest.sbTrue.asTripleBoundary(m).stopAt(
+				triple("x R y")));
+		Assert.assertFalse(ModelExtractTest.sbFalse.asTripleBoundary(m).stopAt(
+				triple("x R y")));
 	}
 
 	@Test
 	public void testInvokesExtract() {
 		final MockModelExtract mock = new MockModelExtract(
 				ModelExtractTest.sbTrue);
-		final Model source = memModel( "a R b");
+		final Model source = memModel("a R b");
 		final Model m = mock.extract(resource("a"), source);
 		Assert.assertEquals(node("a"), mock.root);
 		Assert.assertSame(mock.result, m.getGraph());
@@ -111,12 +111,10 @@ public class ModelExtractTest {
 
 	@Test
 	public void testRemembersBoundary() {
-		Assert.assertSame(ModelExtractTest.sbTrue,
-				new MockModelExtract(ModelExtractTest.sbTrue)
-						.getStatementBoundary());
-		Assert.assertSame(ModelExtractTest.sbFalse,
-				new MockModelExtract(ModelExtractTest.sbFalse)
-						.getStatementBoundary());
+		Assert.assertSame(ModelExtractTest.sbTrue, new MockModelExtract(
+				ModelExtractTest.sbTrue).getStatementBoundary());
+		Assert.assertSame(ModelExtractTest.sbFalse, new MockModelExtract(
+				ModelExtractTest.sbFalse).getStatementBoundary());
 	}
 
 	@Test

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelFactoryTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelFactoryTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelFactoryTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelFactoryTest.java Sun Oct 27 11:35:20 2013
@@ -18,6 +18,7 @@
 
 package com.hp.hpl.jena.rdf.model;
 
+import static com.hp.hpl.jena.testing_framework.ModelHelper.*;
 import com.hp.hpl.jena.graph.compose.Union;
 import com.hp.hpl.jena.rdf.model.InfModel;
 import com.hp.hpl.jena.rdf.model.Model;
@@ -28,7 +29,6 @@ import com.hp.hpl.jena.reasoner.Reasoner
 import com.hp.hpl.jena.reasoner.rulesys.GenericRuleReasoner;
 import com.hp.hpl.jena.reasoner.rulesys.Rule;
 import com.hp.hpl.jena.shared.PrefixMapping;
-import com.hp.hpl.jena.test.JenaTestBase;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -74,7 +74,7 @@ public class ModelFactoryTest {
 		final Reasoner r = new GenericRuleReasoner(Rule.parseRules(rule));
 		final InfGraph ig = r.bind(model.getGraph());
 		final InfModel im = ModelFactory.createInfModel(ig);
-		JenaTestBase.assertInstanceOf(InfModel.class, im);
+		assertInstanceOf(InfModel.class, im);
 		Assert.assertEquals(1, im.size());
 	}
 
@@ -87,7 +87,7 @@ public class ModelFactoryTest {
 		final Model m1 = ModelFactory.createDefaultModel();
 		final Model m2 = ModelFactory.createDefaultModel();
 		final Model m = ModelFactory.createUnion(m1, m2);
-		JenaTestBase.assertInstanceOf(Union.class, m.getGraph());
+		assertInstanceOf(Union.class, m.getGraph());
 		Assert.assertSame(m1.getGraph(), ((Union) m.getGraph()).getL());
 		Assert.assertSame(m2.getGraph(), ((Union) m.getGraph()).getR());
 	}

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelGraphInterfaceContractTests.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelGraphInterfaceContractTests.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelGraphInterfaceContractTests.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/ModelGraphInterfaceContractTests.java Sun Oct 27 11:35:20 2013
@@ -12,46 +12,30 @@ import org.xenei.junit.contract.Contract
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.graph.NodeFactory;
 import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.test.NodeCreateUtils;
+import com.hp.hpl.jena.testing_framework.NodeCreateUtils;
 import com.hp.hpl.jena.testing_framework.ContractTemplate;
 
 import org.xenei.junit.contract.IProducer;
 
 @Ignore
 @Contract(ModelGraphInterface.class)
-public class ModelGraphInterfaceContractTests<T extends ModelGraphInterface> extends ContractTemplate<T> {
+public class ModelGraphInterfaceContractTests<T extends ModelGraphInterface>
+		extends ContractTemplate<T> {
 
 	private static Logger log = LoggerFactory
 			.getLogger(ModelGraphInterfaceContractTests.class);
 
-//	@SuppressWarnings("unchecked")
-//	public ModelGraphInterfaceContractTests() {
-//		setProducer( (IProducer<T>) new IProducer<Model>() {
-//
-//			@Override
-//			public Model newInstance() {
-//				return ModelFactory.createDefaultModel();
-//			}
-//
-//			@Override
-//			public void cleanUp() {
-//			}
-//
-//		});
-//		
-//	}
-	
 	@Contract.Inject
-	public final void setModelGraphInterfaceContractTestsProducer( IProducer<T> producer )
-	{
+	public final void setModelGraphInterfaceContractTestsProducer(
+			IProducer<T> producer) {
 		super.setProducer(producer);
 	}
-	
+
 	@After
 	final public void afterModelGraphInterfaceTest() {
 		getProducer().cleanUp();
 	}
-	
+
 	@Test
 	public void testAsRDFNode() {
 		// check URI resource
@@ -93,8 +77,7 @@ public class ModelGraphInterfaceContract
 		Triple t = new Triple(NodeFactory.createAnon(),
 				NodeCreateUtils.create("Foo"), NodeFactory.createLiteral("B"));
 
-		Statement s = getProducer().newInstance()
-				.asStatement(t);
+		Statement s = getProducer().newInstance().asStatement(t);
 
 		assertEquals(t.getSubject(), s.getSubject().asNode());
 		assertEquals(t.getPredicate(), s.getPredicate().asNode());
@@ -110,8 +93,8 @@ public class ModelGraphInterfaceContract
 	@Test
 	public void testWrapAsResource() {
 		// check URI resource
-		Resource r = getProducer().newInstance()
-				.wrapAsResource(NodeCreateUtils.create("Foo"));
+		Resource r = getProducer().newInstance().wrapAsResource(
+				NodeCreateUtils.create("Foo"));
 
 		assertTrue("Should have been a URI resource", r.isURIResource());
 		assertEquals("Does not have the proper resource", "eh:/Foo", r

Modified: jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/PropertyContractTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/PropertyContractTest.java?rev=1536104&r1=1536103&r2=1536104&view=diff
==============================================================================
--- jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/PropertyContractTest.java (original)
+++ jena/Experimental/new-test/src/test/java/com/hp/hpl/jena/rdf/model/PropertyContractTest.java Sun Oct 27 11:35:20 2013
@@ -31,22 +31,18 @@ import org.xenei.junit.contract.Contract
 @Ignore
 @Contract(Property.class)
 public class PropertyContractTest<T extends Property> {
-	
-	private  IResourceProducer<T> producer;
+
+	private IResourceProducer<T> producer;
 
 	@Contract.Inject
-	public final void setProducer( IResourceProducer<T> producer )
-	{
+	public final void setProducer(IResourceProducer<T> producer) {
 		this.producer = producer;
 	}
-	
-	
-	protected final IResourceProducer<T> getProducer() 
-	{
+
+	protected final IResourceProducer<T> getProducer() {
 		return producer;
 	}
 
-
 	// {
 	// return new PropertyImpl(uri);
 	// }
@@ -72,7 +68,8 @@ public class PropertyContractTest<T exte
 	private void testOrdinalValue(final int i, final String URI) {
 		final String message = "property should have expected ordinal value for "
 				+ URI;
-		Assert.assertEquals(message, i, getProducer().newInstance(URI).getOrdinal());
+		Assert.assertEquals(message, i, getProducer().newInstance(URI)
+				.getOrdinal());
 	}
 
 	@Test