This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 8f4ee32bea2be598b19e0c2ce0aa4ff3ccc12ea0 Author: Andy Seaborne <[email protected]> AuthorDate: Fri May 23 16:08:18 2025 +0100 Chnage tests for the removal of GraphCollection --- .../jena/arq/querybuilder/UpdateBuilderExampleTests.java | 14 ++++---------- .../apache/jena/arq/querybuilder/UpdateBuilderTest.java | 6 ++---- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java index b53b3818f7..3a27d1bd76 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java @@ -20,13 +20,11 @@ package org.apache.jena.arq.querybuilder; 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 class UpdateBuilderExampleTests { 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 class UpdateBuilderExampleTests { 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 class UpdateBuilderExampleTests { 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 class UpdateBuilderExampleTests { 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()); } /** diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java index fcdfb9de39..a8be017a99 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java @@ -525,9 +525,8 @@ public class UpdateBuilderTest { 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 class UpdateBuilderTest { 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
