Author: rvesse
Date: Wed Nov 27 10:36:16 2013
New Revision: 1545985
URL: http://svn.apache.org/r1545985
Log:
Add test cases for calculating graph deltas by negation in SPARQL, may possibly
be illustrating a bug in the ARQ implementation of LeftJoin (see email I will
send to [email protected] shortly)
Added:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TS_Negation.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TestGraphDeltas.java
Modified:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
Modified:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java?rev=1545985&r1=1545984&r2=1545985&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
(original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/TC_General.java
Wed Nov 27 10:36:16 2013
@@ -38,6 +38,7 @@ import com.hp.hpl.jena.sparql.function.u
import com.hp.hpl.jena.sparql.graph.TS_Graph ;
import com.hp.hpl.jena.sparql.lang.TS_Lang ;
import com.hp.hpl.jena.sparql.modify.TS_Update ;
+import com.hp.hpl.jena.sparql.negation.TS_Negation;
import com.hp.hpl.jena.sparql.path.TS_Path ;
import com.hp.hpl.jena.sparql.resultset.TS_ResultSet ;
import com.hp.hpl.jena.sparql.solver.TS_Solver ;
@@ -60,6 +61,7 @@ import com.hp.hpl.jena.sparql.util.TS_Ut
, TS_ResultSet.class
, TS_Binding.class
, TS_Engine.class
+ , TS_Negation.class
, TS_Solver.class
, TS_Algebra.class
, TS_ResultSet.class
Added:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TS_Negation.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TS_Negation.java?rev=1545985&view=auto
==============================================================================
---
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TS_Negation.java
(added)
+++
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TS_Negation.java
Wed Nov 27 10:36:16 2013
@@ -0,0 +1,32 @@
+/**
+ * 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 com.hp.hpl.jena.sparql.negation;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+@RunWith(Suite.class)
+@SuiteClasses( {
+ TestGraphDeltas.class
+})
+public class TS_Negation
+{
+}
+
Added:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TestGraphDeltas.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TestGraphDeltas.java?rev=1545985&view=auto
==============================================================================
---
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TestGraphDeltas.java
(added)
+++
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/negation/TestGraphDeltas.java
Wed Nov 27 10:36:16 2013
@@ -0,0 +1,251 @@
+package com.hp.hpl.jena.sparql.negation;
+
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.query.ARQ;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.DatasetFactory;
+import com.hp.hpl.jena.query.QueryException;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.ResultSetFactory;
+import com.hp.hpl.jena.query.ResultSetFormatter;
+import com.hp.hpl.jena.query.ResultSetRewindable;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+
+/**
+ * Tests for calculating graph deltas using SPARQL
+ *
+ */
+@RunWith(Parameterized.class)
+public class TestGraphDeltas {
+
+ private static final String testData = StrUtils.strjoinNL("<http://r1>
<http://r1> <http://r1> .",
+ "<http://r2> <http://r2> <http://r2> .");
+
+ private static final String testData2 = StrUtils.strjoinNL("<http://r1>
<http://r1> <http://r1> , <http://r2> .",
+ "<http://r2> <http://r2> <http://r2> .");
+
+ private static final String testData3 = StrUtils.strjoinNL("<http://r1>
<http://r1> <http://r1> , \"value\" .",
+ "<http://r2> <http://r2> <http://r2> , 1234 .");
+
+ private static final String testData4 = StrUtils.strjoinNL(
+ "<http://r1> <http://r1> <http://r1> , \"value\" , 1234, 123e4,
123.4, true, false .",
+ "<http://r2> <http://r2> <http://r2> .");
+
+//@formatter:off
+ private static final String MinusQuery = StrUtils.strjoinNL("SELECT *",
+"WHERE",
+"{",
+"GRAPH <http://a>",
+"{",
+" ?s ?p ?o .",
+"}",
+"MINUS",
+"{",
+" GRAPH <http://b> { ?s ?p ?o }",
+"}",
+"}");
+
+ private static final String OptionalSameTermQuery1 =
StrUtils.strjoinNL("SELECT *",
+"WHERE",
+"{",
+"GRAPH <http://a>",
+"{",
+" ?s ?p ?o .",
+"}",
+"OPTIONAL",
+"{",
+" GRAPH <http://b> { ?s0 ?p0 ?o0 . }",
+" FILTER (SAMETERM(?s, ?s0) && SAMETERM(?p, ?p0) && SAMETERM(?o, ?o0))",
+"}",
+"FILTER(!BOUND(?s0))",
+"}");
+
+ private static final String OptionalSameTermQuery2 =
StrUtils.strjoinNL("SELECT *",
+"WHERE",
+"{",
+"GRAPH <http://a>",
+"{",
+" ?s ?p ?o .",
+"}",
+"OPTIONAL",
+"{",
+" GRAPH <http://b> { ?s ?p ?o0 . }",
+" FILTER (SAMETERM(?o, ?o0))",
+"}",
+"FILTER(!BOUND(?o0))",
+"}");
+
+ private static final String NotExistsQuery = StrUtils.strjoinNL("SELECT *",
+"WHERE",
+"{",
+"GRAPH <http://a>",
+"{",
+" ?s ?p ?o .",
+"}",
+"FILTER NOT EXISTS { GRAPH <http://b> { ?s ?p ?o } }",
+"}");
+//@formatter:on
+
+ @AfterClass
+ public static void afterTests() {
+ ARQ.getContext().set(ARQ.optimization, true);
+ }
+
+ static boolean[] $enabled = new boolean[] { true }, $disabled = new
boolean[] { false };
+
+ /**
+ * Data for parameters
+ * @return
+ */
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { $enabled }, { $disabled } });
+ }
+
+ /**
+ * Creates new tests
+ *
+ * @param optimized
+ * Whether to enable the ARQ optimizer
+ */
+ public TestGraphDeltas(boolean[] optimized) {
+ ARQ.getContext().set(ARQ.optimization, optimized[0]);
+ }
+
+ private void testQuery(Dataset ds, String query, String queryName, int
differences) {
+ QueryExecution qe = QueryExecutionFactory.create(query, ds);
+ try {
+ ResultSetRewindable results =
ResultSetFactory.makeRewindable(qe.execSelect());
+ Assert.assertEquals(queryName + " gave incorrect results",
differences, results.size());
+ } finally {
+ qe.close();
+ }
+ }
+
+ /**
+ * Tests the delta queries which calculate deltas correctly i.e. finds
+ * triples in {@code a} which are not present in {@code b}
+ *
+ * @param a
+ * Model A
+ * @param b
+ * Model B
+ * @param differences
+ * Expected number of differences
+ */
+ private void testDeltas(Model a, Model b, int differences) {
+ Dataset ds = DatasetFactory.createMem();
+ ds.addNamedModel("http://a";, a);
+ ds.addNamedModel("http://b";, b);
+
+ this.testQuery(ds, MinusQuery, "Minus", differences);
+ this.testQuery(ds, OptionalSameTermQuery1, "OptionalSameTerm1",
differences);
+ this.testQuery(ds, OptionalSameTermQuery2, "OptionalSameTerm2",
differences);
+ this.testQuery(ds, NotExistsQuery, "NotExists", differences);
+ }
+
+ /**
+ * Tests graph deltas calculate with SPARQL
+ */
+ @Test
+ public void sparql_graph_delta_01() {
+ Model a = ModelFactory.createDefaultModel();
+ Model b = ModelFactory.createDefaultModel();
+
+ a.read(new StringReader(testData), null, "TTL");
+ b.read(new StringReader(testData), null, "TTL");
+
+ this.testDeltas(a, b, 0);
+ this.testDeltas(b, a, 0);
+ }
+
+ /**
+ * Tests graph deltas calculate with SPARQL
+ */
+ @Test
+ public void sparql_graph_delta_02() {
+ Model a = ModelFactory.createDefaultModel();
+ Model b = ModelFactory.createDefaultModel();
+
+ a.read(new StringReader(testData), null, "TTL");
+ b.read(new StringReader(testData2), null, "TTL");
+
+ this.testDeltas(a, b, 0);
+ this.testDeltas(b, a, 1);
+ }
+
+ /**
+ * Tests graph deltas calculate with SPARQL
+ */
+ @Test
+ public void sparql_graph_delta_03() {
+ Model a = ModelFactory.createDefaultModel();
+ Model b = ModelFactory.createDefaultModel();
+
+ a.read(new StringReader(testData), null, "TTL");
+ b.read(new StringReader(testData2), null, "TTL");
+ b.removeAll(b.createResource("http://r1";), null, null);
+ Assert.assertEquals(1, b.size());
+
+ this.testDeltas(a, b, 1);
+ this.testDeltas(b, a, 0);
+ }
+
+ /**
+ * Tests graph deltas calculate with SPARQL
+ */
+ @Test
+ public void sparql_graph_delta_04() {
+ Model a = ModelFactory.createDefaultModel();
+ Model b = ModelFactory.createDefaultModel();
+
+ a.read(new StringReader(testData), null, "TTL");
+
+ this.testDeltas(a, b, 2);
+ this.testDeltas(b, a, 0);
+ }
+
+ /**
+ * Tests graph deltas calculate with SPARQL
+ */
+ @Test
+ public void sparql_graph_delta_05() {
+ Model a = ModelFactory.createDefaultModel();
+ Model b = ModelFactory.createDefaultModel();
+
+ a.read(new StringReader(testData3), null, "TTL");
+ b.read(new StringReader(testData), null, "TTL");
+
+ this.testDeltas(a, b, 2);
+ this.testDeltas(b, a, 0);
+ }
+
+ /**
+ * Tests graph deltas calculate with SPARQL
+ */
+ @Test
+ public void sparql_graph_delta_06() {
+ Model a = ModelFactory.createDefaultModel();
+ Model b = ModelFactory.createDefaultModel();
+
+ a.read(new StringReader(testData4), null, "TTL");
+ b.read(new StringReader(testData), null, "TTL");
+
+ this.testDeltas(a, b, 6);
+ this.testDeltas(b, a, 0);
+ }
+}
