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 2017/06/20 19:43:08 UTC
jena git commit: Adapt tests to outcomes for different ways to create
lists.
Repository: jena
Updated Branches:
refs/heads/master 0154222aa -> 777381250
Adapt tests to outcomes for different ways to create lists.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/77738125
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/77738125
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/77738125
Branch: refs/heads/master
Commit: 777381250bbfca89a4aec10878df89103df67274
Parents: 0154222
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 20 20:43:03 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jun 20 20:43:03 2017 +0100
----------------------------------------------------------------------
.../querybuilder/handlers/WhereHandlerTest.java | 28 +++++++++++---------
1 file changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/77738125/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
index 9002f1c..584d3a3 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
@@ -400,9 +400,20 @@ public class WhereHandlerTest extends AbstractHandlerTest {
@Test
public void testList() {
Node n = handler.list("<one>", "?var", "'three'");
-
- assertContainsRegex(WHERE + OPEN_CURLY + "("+SPACE+uri("one")+SPACE+var("var")+SPACE+quote("three")+")"+CLOSE_CURLY,
- query.toString());
+
+ // HAndler.addList, unlike adding a WhereClause, ends up with ElementPathBlock and TriplePath.
+ assertContainsRegex(WHERE + OPEN_CURLY + "_:b0" + SPACE
+ + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first") + SPACE + uri("one") + SEMI + SPACE
+ + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest") + SPACE + "_:b1" + DOT + SPACE + "_:b1" + SPACE
+ + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first") + SPACE + var("var") + SEMI + SPACE
+ + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest") + SPACE + "_:b2" + DOT + SPACE + "_:b2" + SPACE
+ + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first") + SPACE + quote("three") + SEMI + SPACE
+ + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest") + SPACE
+ + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil") + CLOSE_CURLY, query.toString());
+
+ // If it were a basic graph pattern...
+// assertContainsRegex(WHERE + OPEN_CURLY + "("+SPACE+uri("one")+SPACE+var("var")+SPACE+quote("three")+")"+CLOSE_CURLY,
+// query.toString());
assertTrue(n.isBlank());
}
@@ -412,15 +423,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addWhere(new TriplePath(new Triple(handler.list("<one>", "?var", "'three'"),
ResourceFactory.createResource("foo").asNode(), ResourceFactory.createResource("bar").asNode())));
- assertContainsRegex("_:b0" + SPACE + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first") + SPACE
- + uri("one") + SEMI + SPACE + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest") + SPACE + "_:b1"
- + DOT + SPACE + "_:b1" + SPACE + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first") + SPACE
- + var("var") + SEMI + SPACE + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest") + SPACE + "_:b2"
- + DOT + SPACE + "_:b2" + SPACE + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first") + SPACE
- + quote("three") + SEMI + SPACE + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest") + SPACE
- + uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"), query.toString());
-
- assertContainsRegex("_:b0" + SPACE + uri("foo") + SPACE + uri("bar"), query.toString());
+ assertContainsRegex(WHERE + OPEN_CURLY + PAREN_OPEN+SPACE+uri("one")+SPACE+var("var")+SPACE+quote("three")+SPACE+PAREN_CLOSE ,
+ query.toString());
}