You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by aj...@apache.org on 2018/01/06 15:17:28 UTC
[04/44] jena git commit: Further test coverage
Further test coverage
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e280c2a3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e280c2a3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e280c2a3
Branch: refs/heads/master
Commit: e280c2a3f1b9f8ccc25126d9f284b5aa5aac20d4
Parents: 82acf1b
Author: ajs6f <aj...@apache.org>
Authored: Fri Dec 29 09:29:40 2017 -0500
Committer: ajs6f <aj...@apache.org>
Committed: Fri Jan 5 09:26:07 2018 -0500
----------------------------------------------------------------------
.../sparql/util/TestDifferenceDatasetGraph.java | 35 ++++++++++++++++++++
.../util/TestIntersectionDatasetGraph.java | 2 +-
.../jena/sparql/util/TestUnionDatasetGraph.java | 4 +--
.../jena/sparql/util/TestViewDatasetGraph.java | 6 ++--
4 files changed, 41 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e280c2a3/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDifferenceDatasetGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDifferenceDatasetGraph.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDifferenceDatasetGraph.java
new file mode 100644
index 0000000..f775efd
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDifferenceDatasetGraph.java
@@ -0,0 +1,35 @@
+package org.apache.jena.sparql.util;
+
+import static org.apache.jena.sparql.sse.SSE.parseGraph;
+
+import org.apache.jena.graph.*;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.core.DatasetGraphFactory;
+import org.junit.Test;
+
+public class TestDifferenceDatasetGraph extends TestViewDatasetGraph {
+
+ @Override
+ public DifferenceDatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c) {
+ return new DifferenceDatasetGraph(left, right, c);
+ }
+
+ @Test
+ public void testDifference() {
+ final Graph g1 = parseGraph("(graph (triple <s1> <p1> <o1> ))");
+ final DatasetGraph dsg1 = DatasetGraphFactory.create(g1);
+ final Node graphName1 = NodeFactory.createBlankNode();
+ dsg1.addGraph(graphName1, g1);
+ final Graph g2 = parseGraph("(graph (triple <s2> <p2> <o2> ))");
+ final DatasetGraph dsg2 = DatasetGraphFactory.create(g2);
+ final Node graphName2 = NodeFactory.createBlankNode();
+ dsg2.addGraph(graphName2, g2);
+ DatasetGraph dsg = testInstance(dsg1, dsg2, Context.emptyContext);
+
+ assertEquals(1, dsg.size());
+ assertTrue(g1.isIsomorphicWith(dsg.getGraph(graphName1)));
+ assertTrue(g1.isIsomorphicWith(dsg.getDefaultGraph()));
+ assertTrue(dsg.getGraph(graphName2).isEmpty());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/e280c2a3/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIntersectionDatasetGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIntersectionDatasetGraph.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIntersectionDatasetGraph.java
index 4c04baf..d1c30e1 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIntersectionDatasetGraph.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIntersectionDatasetGraph.java
@@ -7,7 +7,7 @@ import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.DatasetGraphFactory;
import org.junit.Test;
-public class TestIntersectionDatasetGraph extends TestViewDatasetGraph<IntersectionDatasetGraph> {
+public class TestIntersectionDatasetGraph extends TestViewDatasetGraph {
@Override
public IntersectionDatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c) {
http://git-wip-us.apache.org/repos/asf/jena/blob/e280c2a3/jena-arq/src/test/java/org/apache/jena/sparql/util/TestUnionDatasetGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestUnionDatasetGraph.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestUnionDatasetGraph.java
index 463e1ff..6ca5a02 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestUnionDatasetGraph.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestUnionDatasetGraph.java
@@ -8,10 +8,10 @@ import org.apache.jena.sparql.core.DatasetGraphFactory;
import org.junit.Assert;
import org.junit.Test;
-public class TestUnionDatasetGraph extends TestViewDatasetGraph<UnionDatasetGraph> {
+public class TestUnionDatasetGraph extends TestViewDatasetGraph {
@Override
- public UnionDatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c) {
+ public DatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c) {
return new UnionDatasetGraph(left, right, c);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e280c2a3/jena-arq/src/test/java/org/apache/jena/sparql/util/TestViewDatasetGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestViewDatasetGraph.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestViewDatasetGraph.java
index b6415db..4f3390e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestViewDatasetGraph.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestViewDatasetGraph.java
@@ -6,11 +6,11 @@ import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.DatasetGraphZero;
import org.junit.Test;
-public abstract class TestViewDatasetGraph<T extends ViewDatasetGraph> extends BaseTest {
+public abstract class TestViewDatasetGraph extends BaseTest {
- public abstract T testInstance(DatasetGraph left, DatasetGraph right, Context c);
+ public abstract DatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c);
- private T emptyDsg() {
+ private DatasetGraph emptyDsg() {
return testInstance(new DatasetGraphZero(), new DatasetGraphZero(), Context.emptyContext);
}