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 18:11:33 UTC
[1/2] jena git commit: Put back old, ilegal format for UNION-of-one
Repository: jena
Updated Branches:
refs/heads/master f89025a83 -> 0154222aa
Put back old, ilegal format for UNION-of-one
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c84b270d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c84b270d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c84b270d
Branch: refs/heads/master
Commit: c84b270dac43875b36c8392226a2e1473f81b23a
Parents: f89025a
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 20 19:09:59 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jun 20 19:09:59 2017 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/serializer/FormatterElement.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c84b270d/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
index 4770fce..8be7df4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
@@ -246,13 +246,13 @@ public class FormatterElement extends FormatterBase implements ElementVisitor {
if ( el.getElements().size() == 1 ) {
// If this is an element of just one, just do it inplace
// Can't happen from a parsed query in SPARQL.
+ //visitAsGroup(el.getElements().get(0));
+ // Same as OPTIONAL, MINUS
+ out.print("UNION");
+ out.incIndent(INDENT);
+ out.newline();
visitAsGroup(el.getElements().get(0));
-// // Same as OPTIONAL, MINUS
-// out.print("UNION");
-// out.incIndent(INDENT);
-// out.newline();
-// visitAsGroup(el.getElements().get(0));
-// out.decIndent(INDENT);
+ out.decIndent(INDENT);
return;
}
[2/2] jena git commit: Adapt querybuilder tests for new RDF list
formatting
Posted by an...@apache.org.
Adapt querybuilder tests for new RDF list formatting
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0154222a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0154222a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0154222a
Branch: refs/heads/master
Commit: 0154222aa2c54b37cd03a5cc3800a3a17f3c8949
Parents: c84b270
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jun 20 19:10:43 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jun 20 19:10:43 2017 +0100
----------------------------------------------------------------------
.../apache/jena/arq/AbstractRegexpBasedTest.java | 2 ++
.../jena/arq/querybuilder/AskBuilderTest.java | 16 +++++-----------
.../arq/querybuilder/ConstructBuilderTest.java | 16 +++++-----------
.../jena/arq/querybuilder/SelectBuilderTest.java | 14 +++++---------
.../querybuilder/clauses/WhereClauseTest.java | 19 +++++++------------
.../querybuilder/handlers/WhereHandlerTest.java | 12 +++---------
6 files changed, 27 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0154222a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
index 0021b8b..c890326 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
@@ -53,6 +53,8 @@ public abstract class AbstractRegexpBasedTest {
protected static final String SEMI = OPT_SPACE+"\\;";
protected static final String VALUES = "VALUES" + SPACE;
protected static final String MINUS = "MINUS" + SPACE;
+ protected static final String PAREN_OPEN = "\\(";
+ protected static final String PAREN_CLOSE = "\\)";
protected static String quote(String s) {
return String.format("%s%s%s", QUOTE, s, QUOTE);
http://git-wip-us.apache.org/repos/asf/jena/blob/0154222a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
index a94dc17..53e46c4 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
@@ -111,17 +111,11 @@ public class AskBuilderTest extends AbstractRegexpBasedTest {
.addWhere( builder.list( "<one>", "?two", "'three'"), "<foo>", "<bar>");
String query = builder.buildString();
- 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("two") + 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);
-
- assertContainsRegex(
- "_:b0"+SPACE+ uri("foo") + SPACE + uri("bar"), query);
+ assertContainsRegex(PAREN_OPEN + SPACE + uri("one") + SPACE + var("two") + SPACE + quote("three") + SPACE + PAREN_CLOSE,
+ builder.buildString());
+
+ assertContainsRegex(PAREN_CLOSE + "." + SPACE + uri("foo") + SPACE + uri("bar") + SPACE + CLOSE_CURLY,
+ builder.buildString());
}
@Test
http://git-wip-us.apache.org/repos/asf/jena/blob/0154222a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
index cd0f407..c397541 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
@@ -115,17 +115,11 @@ public class ConstructBuilderTest extends AbstractRegexpBasedTest {
.addWhere( builder.list( "<one>", "?two", "'three'"), "<foo>", "<bar>");
String query = builder.buildString();
- 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("two") + 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);
-
- assertContainsRegex(
- "_:b0"+SPACE+ uri("foo") + SPACE + uri("bar"), query);
+ assertContainsRegex(PAREN_OPEN + SPACE + uri("one") + SPACE + var("two") + SPACE + quote("three") + SPACE + PAREN_CLOSE,
+ builder.buildString());
+
+ assertContainsRegex(PAREN_CLOSE + "." + SPACE + uri("foo") + SPACE + uri("bar") + SPACE + CLOSE_CURLY,
+ builder.buildString());
}
@Test
http://git-wip-us.apache.org/repos/asf/jena/blob/0154222a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
index ce3284e..d53aa59 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
@@ -131,15 +131,11 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
builder.addVar("*").addWhere(builder.list("<one>", "?two", "'three'"), "<foo>", "<bar>");
String query = builder.buildString();
- 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("two") + 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);
-
- assertContainsRegex("_:b0" + SPACE + uri("foo") + SPACE + uri("bar"), query);
+ assertContainsRegex(PAREN_OPEN + SPACE + uri("one") + SPACE + var("two") + SPACE + quote("three") + SPACE + PAREN_CLOSE,
+ builder.buildString());
+
+ assertContainsRegex(PAREN_CLOSE + "." + SPACE + uri("foo") + SPACE + uri("bar") + SPACE + CLOSE_CURLY,
+ builder.buildString());
}
@Test
http://git-wip-us.apache.org/repos/asf/jena/blob/0154222a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
index 6264222..63d3fa1 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
@@ -319,6 +319,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
sb.addPrefix("pfx", "uri").addWhere("<one>", "<two>", v);
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause.addUnion(sb);
+
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY
+ uri("one") + SPACE + uri("two") + SPACE + var("v")
+ CLOSE_CURLY, builder.buildString());
@@ -375,19 +376,13 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
public void testList() {
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause.addWhere(whereClause.list( "<one>", "?two", "'three'"),
- "<foo>", "<bar>");
+ "<foo>", "<bar>");
- 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("two") + 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")
- , builder.buildString());
-
- assertContainsRegex(
- "_:b0"+SPACE+ uri("foo") + SPACE + uri("bar"), builder.buildString());
+ assertContainsRegex(PAREN_OPEN + SPACE + uri("one") + SPACE + var("two") + SPACE + quote("three") + SPACE + PAREN_CLOSE,
+ builder.buildString());
+
+ assertContainsRegex(PAREN_CLOSE + "." + SPACE + uri("foo") + SPACE + uri("bar") + SPACE + CLOSE_CURLY,
+ builder.buildString());
}
@ContractTest
http://git-wip-us.apache.org/repos/asf/jena/blob/0154222a/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 7a717b2..9002f1c 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
@@ -401,15 +401,9 @@ public class WhereHandlerTest extends AbstractHandlerTest {
public void testList() {
Node n = handler.list("<one>", "?var", "'three'");
- 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());
-
+ assertContainsRegex(WHERE + OPEN_CURLY + "("+SPACE+uri("one")+SPACE+var("var")+SPACE+quote("three")+")"+CLOSE_CURLY,
+ query.toString());
+
assertTrue(n.isBlank());
}