Chnage tests for the removal of GraphCollection

Author: afs

jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java

@@ -20,13 +20,11 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.graph.Triple;
 import org.apache.jena.query.Dataset;
 import org.apache.jena.query.DatasetFactory;
 import org.apache.jena.rdf.model.*;
@@ -50,17 +48,14 @@ public class UpdateBuilderExampleTests {
 
     private static final String NS_prefix = "http://example.org/ns#";
 
-    private List<Triple> triples;
     private Model m;
 
     public UpdateBuilderExampleTests() {
-        triples = new ArrayList<Triple>();
         m = ModelFactory.createDefaultModel();
     }
 
     @Before
     public void setup() {
-        triples.clear();
         m.clearNsPrefixMap();
     }
 
@@ -88,7 +83,7 @@ public void example1() {
         assertTrue(m.contains(r, price, priceV));
         assertTrue(m.contains(r, DC_11.title, "A new book"));
         assertTrue(m.contains(r, DC_11.creator, "A.N.Other"));
-        assertEquals(3, triples.size());
+        assertEquals(3, m.size());
         assertEquals(2, m.getNsPrefixMap().size());
         assertEquals(NS_prefix, m.getNsPrefixMap().get("ns"));
         assertEquals(DC_11.NS, m.getNsPrefixMap().get("dc"));
@@ -118,7 +113,7 @@ public void example2() {
 
         assertTrue(m.contains(r, price, priceV));
         assertTrue(m.contains(r, DC_11.title, "Fundamentals of Compiler Design"));
-        assertEquals(2, triples.size());
+        assertEquals(2, m.size());
         // assertEquals( 2, m.getNsPrefixMap().size());
         // assertEquals( NS_prefix, m.getNsPrefixMap().get("ns"));
         assertEquals(DC_11.NS, m.getNsPrefixMap().get("dc"));
@@ -149,7 +144,7 @@ public void example3() {
         UpdateAction.execute(builder.buildRequest(), m);
 
         assertTrue(m.contains(r, price, priceV));
-        assertEquals(1, triples.size());
+        assertEquals(1, m.size());
         assertEquals(2, m.getNsPrefixMap().size());
         assertEquals(NS_prefix, m.getNsPrefixMap().get("ns"));
         assertEquals(DC_11.NS, m.getNsPrefixMap().get("dc"));
@@ -284,10 +279,9 @@ public void example6() {
         assertTrue(m.contains(book2, DC_11.title, "David Copperfield"));
         assertTrue(m.contains(book2, DC_11.creator, "Edmund Wells"));
         assertTrue(m.contains(book2, DC_11.date, d1948));
-
         assertTrue(m.contains(book3, DC_11.title, "SPARQL 1.1 Tutorial"));
 
-        assertEquals(5, triples.size());
+        assertEquals(5, m.size());
     }
 
     /**

jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java

@@ -525,9 +525,8 @@ public void example1() {
         UpdateBuilder builder = new UpdateBuilder().addPrefix("dc", DC_11.NS).addInsert(n, DC_11.title, "A new book")
                 .addInsert(n, DC_11.creator, "A.N.Other");
 
-        List<Triple> triples = new ArrayList<Triple>();
-        triples.add(Triple.create(n, priceN, priceV));
         Model m = ModelFactory.createDefaultModel();
+        m.getGraph().add(n, priceN, priceV);
         m.setNsPrefix("dc", DC_11.NS);
         m.setNsPrefix("ns", "http://example.org/ns#");
 
@@ -539,8 +538,7 @@ public void example1() {
         assertTrue(m.contains(r, rPriceP, rPriceV));
         assertTrue(m.contains(r, DC_11.title, "A new book"));
         assertTrue(m.contains(r, DC_11.creator, "A.N.Other"));
-        assertEquals(3, triples.size());
-
+        assertEquals(3, m.size());
     }
 
     @Test