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 2013/02/05 13:23:09 UTC
svn commit: r1442559 -
/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
Author: andy
Date: Tue Feb 5 12:23:08 2013
New Revision: 1442559
URL: http://svn.apache.org/viewvc?rev=1442559&view=rev
Log:
remove initial binding + update tests.
Modified:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java?rev=1442559&r1=1442558&r2=1442559&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java Tue Feb 5 12:23:08 2013
@@ -31,15 +31,15 @@ import com.hp.hpl.jena.query.QueryFactor
import com.hp.hpl.jena.query.QueryParseException ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.core.Var ;
-import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.modify.request.* ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.syntax.Element ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;
-import com.hp.hpl.jena.update.* ;
+import com.hp.hpl.jena.update.GraphStore ;
+import com.hp.hpl.jena.update.UpdateAction ;
+import com.hp.hpl.jena.update.UpdateExecutionFactory ;
+import com.hp.hpl.jena.update.UpdateProcessor ;
public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
{
@@ -349,59 +349,60 @@ public abstract class AbstractTestUpdate
private static long countQuads(DatasetGraph dsg) { return Iter.count(dsg.find()); }
-
- private Graph testUpdateInitialBindingWorker(Var v, Node n)
- {
- GraphStore gStore = getEmptyGraphStore() ;
-
- UpdateRequest req = UpdateFactory.create() ;
-
- {
- QuadDataAcc acc = new QuadDataAcc() ;
- acc.addTriple(triple1) ;
- acc.addTriple(triple2) ;
- UpdateDataInsert ins = new UpdateDataInsert(acc) ;
- req.add(ins) ;
- }
- {
- UpdateModify mod = new UpdateModify() ;
- mod.getDeleteAcc().addTriple(new Triple(s,p, Var.alloc("o"))) ;
- req.add(mod) ;
- }
- Binding b = BindingFactory.binding(null, v, n) ;
- UpdateAction.execute(req, gStore, b) ;
-
- return gStore.getDefaultGraph() ;
- }
-
- @Test public void testUpdateInitialBinding1()
- {
- Graph graph = testUpdateInitialBindingWorker(Var.alloc("o"), o1) ;
- assertEquals(graph.size(), 1) ;
- assertFalse(graphContains(graph, triple1)) ;
- assertTrue(graphContains(graph, triple2)) ;
- }
-
- @Test public void testUpdateInitialBinding2()
- {
- Graph graph = testUpdateInitialBindingWorker(Var.alloc("o"), o2) ;
- assertEquals(graph.size(), 1) ;
- assertTrue(graphContains(graph, triple1)) ;
- assertFalse(graphContains(graph, triple2)) ;
- }
-
- @Test public void testUpdateInitialBinding3()
- {
- GraphStore gStore = getEmptyGraphStore() ;
- defaultGraphData(gStore, graph1) ;
- String update = "DELETE WHERE { ?x <http://example/p> 2007 } ; INSERT { ?x <http://example/p> 1999 } WHERE {}" ;
- UpdateRequest req = UpdateFactory.create(update) ;
-
- Binding b = BindingFactory.binding(Var.alloc("x"), s) ;
- UpdateAction.execute(req, gStore, b) ;
- assertEquals(1, gStore.getDefaultGraph().size()) ;
- assertTrue(gStore.getDefaultGraph().contains(s, p, NodeFactory.parseNode("1999"))) ;
- }
+ // Jena 2.10.0 -- support for initial bindings in updates removed.
+ // If you see this commented section post-JEna 2.10.0, please remove these comments completely.
+// private Graph testUpdateInitialBindingWorker(Var v, Node n)
+// {
+// GraphStore gStore = getEmptyGraphStore() ;
+//
+// UpdateRequest req = UpdateFactory.create() ;
+//
+// {
+// QuadDataAcc acc = new QuadDataAcc() ;
+// acc.addTriple(triple1) ;
+// acc.addTriple(triple2) ;
+// UpdateDataInsert ins = new UpdateDataInsert(acc) ;
+// req.add(ins) ;
+// }
+// {
+// UpdateModify mod = new UpdateModify() ;
+// mod.getDeleteAcc().addTriple(new Triple(s,p, Var.alloc("o"))) ;
+// req.add(mod) ;
+// }
+// Binding b = BindingFactory.binding(null, v, n) ;
+// UpdateAction.execute(req, gStore, b) ;
+//
+// return gStore.getDefaultGraph() ;
+// }
+//
+// @Test public void testUpdateInitialBinding1()
+// {
+// Graph graph = testUpdateInitialBindingWorker(Var.alloc("o"), o1) ;
+// assertEquals(graph.size(), 1) ;
+// assertFalse(graphContains(graph, triple1)) ;
+// assertTrue(graphContains(graph, triple2)) ;
+// }
+//
+// @Test public void testUpdateInitialBinding2()
+// {
+// Graph graph = testUpdateInitialBindingWorker(Var.alloc("o"), o2) ;
+// assertEquals(graph.size(), 1) ;
+// assertTrue(graphContains(graph, triple1)) ;
+// assertFalse(graphContains(graph, triple2)) ;
+// }
+//
+// @Test public void testUpdateInitialBinding3()
+// {
+// GraphStore gStore = getEmptyGraphStore() ;
+// defaultGraphData(gStore, graph1) ;
+// String update = "DELETE WHERE { ?x <http://example/p> 2007 } ; INSERT { ?x <http://example/p> 1999 } WHERE {}" ;
+// UpdateRequest req = UpdateFactory.create(update) ;
+//
+// Binding b = BindingFactory.binding(Var.alloc("x"), s) ;
+// UpdateAction.execute(req, gStore, b) ;
+// assertEquals(1, gStore.getDefaultGraph().size()) ;
+// assertTrue(gStore.getDefaultGraph().contains(s, p, NodeFactory.parseNode("1999"))) ;
+// }
private static Graph data1()
{