You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/05/23 16:34:47 UTC
[3/3] jena git commit: JENA-380 : Resolve merge
JENA-380 : Resolve merge
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/13473453
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/13473453
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/13473453
Branch: refs/heads/master
Commit: 13473453583ccf8ff8a81d434aff868c5d2f6ba4
Parents: 1e2ea5e b9be4e0
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 23 15:34:19 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 23 15:34:19 2015 +0100
----------------------------------------------------------------------
.../apache/jena/graph/GraphContractTest.java | 269 ++++++++++---------
.../graph/GraphEventManagerContractTest.java | 12 +-
.../graph/GraphWithPerformContractTest.java | 19 +-
.../graph/impl/TripleStoreContractTest.java | 12 +-
.../testing_framework/ContractTemplate.java | 35 ---
5 files changed, 163 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/13473453/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
----------------------------------------------------------------------
diff --cc jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
index d724e6b,5a43f74..6f02750
--- a/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
@@@ -18,44 -18,44 +18,56 @@@
package org.apache.jena.graph;
--import java.io.InputStream;
--import java.net.MalformedURLException;
--import java.net.URISyntaxException;
--import java.util.Arrays;
--import java.util.Iterator;
--import java.util.List;
--import java.util.Set;
--import java.util.function.Function;
--
--import org.junit.After;
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
--import org.xenei.junit.contract.Contract;
--import org.xenei.junit.contract.ContractTest;
-import org.xenei.junit.contract.IProducer;
--
--import static org.junit.Assert.*;
--
--import org.apache.jena.graph.Capabilities;
--import org.apache.jena.graph.Graph;
--import org.apache.jena.graph.GraphStatisticsHandler;
--import org.apache.jena.graph.GraphUtil;
--import org.apache.jena.graph.Node;
--import org.apache.jena.graph.Triple;
--import org.apache.jena.graph.impl.LiteralLabelFactory;
--import org.apache.jena.mem.TrackingTripleIterator;
--import org.apache.jena.rdf.model.Model;
--import org.apache.jena.rdf.model.ModelFactory;
--import org.apache.jena.rdf.model.impl.ReifierStd;
--import org.apache.jena.shared.ClosedException;
--import org.apache.jena.shared.DeleteDeniedException;
--import org.apache.jena.shared.PrefixMapping;
--import org.apache.jena.testing_framework.AbstractGraphProducer;
- import org.apache.jena.testing_framework.ContractTemplate;
--import org.apache.jena.testing_framework.NodeCreateUtils;
--import org.apache.jena.util.iterator.ClosableIterator;
--import org.apache.jena.util.iterator.ExtendedIterator;
--
--import static org.apache.jena.testing_framework.GraphHelper.*;
++import static org.apache.jena.testing_framework.GraphHelper.assertContainsAll ;
++import static org.apache.jena.testing_framework.GraphHelper.assertIsomorphic ;
++import static org.apache.jena.testing_framework.GraphHelper.assertOmitsAll ;
++import static org.apache.jena.testing_framework.GraphHelper.graphAddTxn ;
++import static org.apache.jena.testing_framework.GraphHelper.graphWith ;
++import static org.apache.jena.testing_framework.GraphHelper.iteratorToSet ;
++import static org.apache.jena.testing_framework.GraphHelper.memGraph ;
++import static org.apache.jena.testing_framework.GraphHelper.node ;
++import static org.apache.jena.testing_framework.GraphHelper.nodeSet ;
++import static org.apache.jena.testing_framework.GraphHelper.triple ;
++import static org.apache.jena.testing_framework.GraphHelper.tripleArray ;
++import static org.apache.jena.testing_framework.GraphHelper.tripleSet ;
++import static org.apache.jena.testing_framework.GraphHelper.txnBegin ;
++import static org.apache.jena.testing_framework.GraphHelper.txnCommit ;
++import static org.apache.jena.testing_framework.GraphHelper.txnRollback ;
++import static org.apache.jena.testing_framework.TestUtils.assertDiffer ;
++import static org.junit.Assert.assertEquals ;
++import static org.junit.Assert.assertFalse ;
++import static org.junit.Assert.assertNotEquals ;
++import static org.junit.Assert.assertNotNull ;
++import static org.junit.Assert.assertSame ;
++import static org.junit.Assert.assertTrue ;
++import static org.junit.Assert.fail ;
++
++import java.io.InputStream ;
++import java.net.MalformedURLException ;
++import java.net.URISyntaxException ;
++import java.util.Arrays ;
++import java.util.Iterator ;
++import java.util.List ;
++import java.util.Set ;
++import java.util.function.Function ;
++
++import org.apache.jena.graph.impl.LiteralLabelFactory ;
++import org.apache.jena.mem.TrackingTripleIterator ;
++import org.apache.jena.rdf.model.Model ;
++import org.apache.jena.rdf.model.ModelFactory ;
++import org.apache.jena.rdf.model.impl.ReifierStd ;
++import org.apache.jena.shared.ClosedException ;
++import org.apache.jena.shared.DeleteDeniedException ;
++import org.apache.jena.shared.PrefixMapping ;
++import org.apache.jena.testing_framework.AbstractGraphProducer ;
++import org.apache.jena.testing_framework.NodeCreateUtils ;
++import org.apache.jena.util.iterator.ClosableIterator ;
++import org.apache.jena.util.iterator.ExtendedIterator ;
++import org.junit.After ;
++import org.slf4j.Logger ;
++import org.slf4j.LoggerFactory ;
++import org.xenei.junit.contract.Contract ;
++import org.xenei.junit.contract.ContractTest ;
/**
* Graph contract test.
@@@ -1244,9 -1249,11 +1257,9 @@@ public class GraphContractTest<T extend
urlStr);
}
- private void testIsomorphismFile(int n, String lang, String suffix,
- boolean result) throws URISyntaxException, MalformedURLException {
-
+ private void testIsomorphismFile(int n, String lang, String suffix, boolean result) {
- Graph g1 = getProducer().newInstance();
- Graph g2 = getProducer().newInstance();
+ Graph g1 = producer.newInstance();
+ Graph g2 = producer.newInstance();
Model m1 = ModelFactory.createModelForGraph(g1);
Model m2 = ModelFactory.createModelForGraph(g2);