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:18:05 UTC
[41/44] jena git commit: Rename TestViewDatasetGraph ->
TestDyadicDatasetGraph
Rename TestViewDatasetGraph -> TestDyadicDatasetGraph
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/18543c2d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/18543c2d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/18543c2d
Branch: refs/heads/master
Commit: 18543c2d36d7bb42777a140ee0b3b15bf037c2a5
Parents: 09e4769
Author: ajs6f <aj...@apache.org>
Authored: Fri Jan 5 10:49:49 2018 -0500
Committer: ajs6f <aj...@apache.org>
Committed: Fri Jan 5 10:49:49 2018 -0500
----------------------------------------------------------------------
.../sparql/util/TestDifferenceDatasetGraph.java | 2 +-
.../sparql/util/TestDyadicDatasetGraph.java | 169 +++++++++++++++++++
.../util/TestIntersectionDatasetGraph.java | 2 +-
.../jena/sparql/util/TestUnionDatasetGraph.java | 2 +-
.../jena/sparql/util/TestViewDatasetGraph.java | 169 -------------------
5 files changed, 172 insertions(+), 172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/18543c2d/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
index 41510d0..f365600 100644
--- 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
@@ -25,7 +25,7 @@ import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.DatasetGraphFactory;
import org.junit.Test;
-public class TestDifferenceDatasetGraph extends TestViewDatasetGraph {
+public class TestDifferenceDatasetGraph extends TestDyadicDatasetGraph {
@Override
public DifferenceDatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c) {
http://git-wip-us.apache.org/repos/asf/jena/blob/18543c2d/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDyadicDatasetGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDyadicDatasetGraph.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDyadicDatasetGraph.java
new file mode 100644
index 0000000..b84d15e
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestDyadicDatasetGraph.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.util;
+
+import static org.apache.jena.sparql.core.DatasetGraphFactory.createTxnMem;
+
+import org.apache.jena.atlas.junit.BaseTest;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.query.ReadWrite;
+import org.apache.jena.sparql.core.*;
+import org.junit.Test;
+
+public abstract class TestDyadicDatasetGraph extends BaseTest {
+
+ public abstract DatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c);
+
+ private DatasetGraph emptyDsg() {
+ return testInstance(createTxnMem(), createTxnMem(), Context.emptyContext);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void nullDatasetGraphsNotAllowed() {
+ testInstance(null, null, Context.emptyContext);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void nullContextNotAllowed() {
+ testInstance(new DatasetGraphZero(), new DatasetGraphZero(), null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noAddingQuads() {
+ emptyDsg().add(null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noAddingQuads2() {
+ emptyDsg().add(null, null, null, null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noDeletingQuads() {
+ emptyDsg().delete(null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noDeletingQuads2() {
+ emptyDsg().delete(null, null, null, null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noDeletingAnyQuads() {
+ emptyDsg().deleteAny(null, null, null, null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noAddingGraphs() {
+ emptyDsg().addGraph(null, null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noDeletingGraphs() {
+ emptyDsg().removeGraph(null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noClearing() {
+ emptyDsg().clear();
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noAddingToDefaultGraph() {
+ emptyDsg().getDefaultGraph().add(null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noDeletingFromDefaultGraph() {
+ emptyDsg().getDefaultGraph().delete(null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noAddingToANamedGraph() {
+ Node graphName = NodeFactory.createBlankNode();
+ emptyDsg().getGraph(graphName).add(null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noDeletingFromANamedGraph() {
+ Node graphName = NodeFactory.createBlankNode();
+ emptyDsg().getGraph(graphName).delete(null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noClearingDefaultGraph() {
+ emptyDsg().getDefaultGraph().clear();
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noClearingANamedGraph() {
+ Node graphName = NodeFactory.createBlankNode();
+ emptyDsg().getGraph(graphName).clear();
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noRemovingFromANamedGraph() {
+ Node graphName = NodeFactory.createBlankNode();
+ emptyDsg().getGraph(graphName).remove(null, null, null);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noWriting() {
+ emptyDsg().begin(ReadWrite.WRITE);
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void noCommitting() {
+ final DatasetGraph dsg = emptyDsg();
+ assertFalse(dsg.isInTransaction());
+ dsg.begin(ReadWrite.READ);
+ assertTrue(dsg.isInTransaction());
+ dsg.commit();
+ }
+
+ @Test
+ public void canUseEndToFinishTransaction() {
+ try {
+ DatasetGraph dsg = emptyDsg();
+ assertFalse(dsg.isInTransaction());
+ dsg.begin(ReadWrite.READ);
+ assertTrue(dsg.isInTransaction());
+ dsg.end();
+ assertFalse(dsg.isInTransaction());
+ } catch (UnsupportedOperationException e) {
+ fail();
+ }
+ }
+
+ @Test
+ public void canUseAbortToFinishTransaction() {
+ try {
+ DatasetGraph dsg = emptyDsg();
+ assertFalse(dsg.isInTransaction());
+ dsg.begin(ReadWrite.READ);
+ assertTrue(dsg.isInTransaction());
+ dsg.abort();
+ assertFalse(dsg.isInTransaction());
+ } catch (UnsupportedOperationException e) {
+ fail();
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/18543c2d/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 df52959..b76e7c3 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
@@ -25,7 +25,7 @@ import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.DatasetGraphFactory;
import org.junit.Test;
-public class TestIntersectionDatasetGraph extends TestViewDatasetGraph {
+public class TestIntersectionDatasetGraph extends TestDyadicDatasetGraph {
@Override
public IntersectionDatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c) {
http://git-wip-us.apache.org/repos/asf/jena/blob/18543c2d/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 9571bdb..e35f4d0 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
@@ -26,7 +26,7 @@ import org.apache.jena.sparql.core.DatasetGraphFactory;
import org.junit.Assert;
import org.junit.Test;
-public class TestUnionDatasetGraph extends TestViewDatasetGraph {
+public class TestUnionDatasetGraph extends TestDyadicDatasetGraph {
@Override
public DatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c) {
http://git-wip-us.apache.org/repos/asf/jena/blob/18543c2d/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
deleted file mode 100644
index 68a60d3..0000000
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestViewDatasetGraph.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.sparql.util;
-
-import static org.apache.jena.sparql.core.DatasetGraphFactory.createTxnMem;
-
-import org.apache.jena.atlas.junit.BaseTest;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.query.ReadWrite;
-import org.apache.jena.sparql.core.*;
-import org.junit.Test;
-
-public abstract class TestViewDatasetGraph extends BaseTest {
-
- public abstract DatasetGraph testInstance(DatasetGraph left, DatasetGraph right, Context c);
-
- private DatasetGraph emptyDsg() {
- return testInstance(createTxnMem(), createTxnMem(), Context.emptyContext);
- }
-
- @Test(expected = NullPointerException.class)
- public void nullDatasetGraphsNotAllowed() {
- testInstance(null, null, Context.emptyContext);
- }
-
- @Test(expected = NullPointerException.class)
- public void nullContextNotAllowed() {
- testInstance(new DatasetGraphZero(), new DatasetGraphZero(), null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noAddingQuads() {
- emptyDsg().add(null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noAddingQuads2() {
- emptyDsg().add(null, null, null, null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noDeletingQuads() {
- emptyDsg().delete(null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noDeletingQuads2() {
- emptyDsg().delete(null, null, null, null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noDeletingAnyQuads() {
- emptyDsg().deleteAny(null, null, null, null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noAddingGraphs() {
- emptyDsg().addGraph(null, null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noDeletingGraphs() {
- emptyDsg().removeGraph(null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noClearing() {
- emptyDsg().clear();
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noAddingToDefaultGraph() {
- emptyDsg().getDefaultGraph().add(null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noDeletingFromDefaultGraph() {
- emptyDsg().getDefaultGraph().delete(null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noAddingToANamedGraph() {
- Node graphName = NodeFactory.createBlankNode();
- emptyDsg().getGraph(graphName).add(null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noDeletingFromANamedGraph() {
- Node graphName = NodeFactory.createBlankNode();
- emptyDsg().getGraph(graphName).delete(null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noClearingDefaultGraph() {
- emptyDsg().getDefaultGraph().clear();
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noClearingANamedGraph() {
- Node graphName = NodeFactory.createBlankNode();
- emptyDsg().getGraph(graphName).clear();
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noRemovingFromANamedGraph() {
- Node graphName = NodeFactory.createBlankNode();
- emptyDsg().getGraph(graphName).remove(null, null, null);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noWriting() {
- emptyDsg().begin(ReadWrite.WRITE);
- }
-
- @Test(expected = UnsupportedOperationException.class)
- public void noCommitting() {
- final DatasetGraph dsg = emptyDsg();
- assertFalse(dsg.isInTransaction());
- dsg.begin(ReadWrite.READ);
- assertTrue(dsg.isInTransaction());
- dsg.commit();
- }
-
- @Test
- public void canUseEndToFinishTransaction() {
- try {
- DatasetGraph dsg = emptyDsg();
- assertFalse(dsg.isInTransaction());
- dsg.begin(ReadWrite.READ);
- assertTrue(dsg.isInTransaction());
- dsg.end();
- assertFalse(dsg.isInTransaction());
- } catch (UnsupportedOperationException e) {
- fail();
- }
- }
-
- @Test
- public void canUseAbortToFinishTransaction() {
- try {
- DatasetGraph dsg = emptyDsg();
- assertFalse(dsg.isInTransaction());
- dsg.begin(ReadWrite.READ);
- assertTrue(dsg.isInTransaction());
- dsg.abort();
- assertFalse(dsg.isInTransaction());
- } catch (UnsupportedOperationException e) {
- fail();
- }
- }
-
-}