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 2015/06/18 00:31:14 UTC
[1/2] jena git commit: JENA-969 : Regex for rdf:type as URI or as
abbreviation 'a'.
Repository: jena
Updated Branches:
refs/heads/master 9e93ae9bb -> 0847481f8
JENA-969 : Regex for rdf:type as URI or as abbreviation 'a'.
Rename node(..) as uri(..) for consistency.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/69d8469b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/69d8469b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/69d8469b
Branch: refs/heads/master
Commit: 69d8469b64b8abab3b9e5c647deace41e21d5ae9
Parents: 9e93ae9
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jun 17 23:29:53 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jun 17 23:29:53 2015 +0100
----------------------------------------------------------------------
.../jena/arq/AbstractRegexpBasedTest.java | 7 +-
.../arq/querybuilder/SelectBuilderTest.java | 14 ++--
.../querybuilder/clauses/WhereClauseTest.java | 56 ++++++++--------
.../handlers/PrologHandlerTest.java | 12 ++--
.../querybuilder/handlers/WhereHandlerTest.java | 70 ++++++++++----------
5 files changed, 81 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/69d8469b/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 c2af399..ab0df63 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
@@ -48,14 +48,17 @@ public abstract class AbstractRegexpBasedTest {
protected static final String OPTIONAL = "OPTIONAL" + SPACE;
protected static final String BIND = "BIND";
- protected final String quote(String s) {
+ protected static String quote(String s) {
return String.format("%s%s%s", QUOTE, s, QUOTE);
}
- protected final String node(String s) {
+ protected static String uri(String s) {
return String.format("%s%s%s", LT, s, GT);
}
+ /** Regex for rdf:type as a URI or the abbreviation 'a' */
+ protected static String regexRDFtype = "("+uri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")+"|a)" ;
+
protected final String var(String s) {
return "\\?" + s;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/69d8469b/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 15dd5b9..5b7d2f0 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
@@ -27,8 +27,8 @@ import org.junit.Test;
public class SelectBuilderTest extends AbstractRegexpBasedTest {
private SelectBuilder builder;
-
- @Before
+
+ @Before
public void setup() {
builder = new SelectBuilder();
}
@@ -45,7 +45,7 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
assertContainsRegex(SELECT + "\\*" + SPACE + WHERE + OPEN_CURLY
+ var("s") + SPACE
- + node("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
+ + regexRDFtype
+ SPACE + var("o") + OPT_SPACE + DOT + CLOSE_CURLY,
builder.buildString());
}
@@ -65,10 +65,10 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
* OPTIONAL { ?s foaf:name ?name .} } ORDER BY ?s
*/
assertContainsRegex(PREFIX + "foaf:" + SPACE
- + node("http://xmlns.com/foaf/0.1/"), query);
+ + uri("http://xmlns.com/foaf/0.1/"), query);
assertContainsRegex(SELECT + var("s"), query);
assertContainsRegex(WHERE + OPEN_CURLY + var("s") + SPACE
- + node("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
+ + regexRDFtype
+ SPACE + "foaf:Person" + OPT_SPACE + DOT + SPACE + OPTIONAL
+ OPEN_CURLY + var("s") + SPACE + "foaf:name" + SPACE
+ var("name") + SPACE + DOT + OPT_SPACE + CLOSE_CURLY
@@ -79,10 +79,10 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
query = builder.buildString();
assertContainsRegex(PREFIX + "foaf:" + SPACE
- + node("http://xmlns.com/foaf/0.1/"), query);
+ + uri("http://xmlns.com/foaf/0.1/"), query);
assertContainsRegex(SELECT + var("s"), query);
assertContainsRegex(WHERE + OPEN_CURLY + var("s") + SPACE
- + node("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
+ + regexRDFtype
+ SPACE + "foaf:Person" + OPT_SPACE + DOT + SPACE + OPTIONAL
+ OPEN_CURLY + var("s") + SPACE + "foaf:name" + SPACE
+ quote("Smith") + presentStringType() + SPACE + DOT
http://git-wip-us.apache.org/repos/asf/jena/blob/69d8469b/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 3963779..ac3a385 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
@@ -66,8 +66,8 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause.addWhere("<one>",
"<two>", "three");
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + quote("three") + presentStringType()
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + quote("three") + presentStringType()
+ OPT_SPACE + DOT + CLOSE_CURLY, builder.buildString());
}
@@ -77,7 +77,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
AbstractQueryBuilder<?> builder = whereClause.addOptional("<one>",
"<two>", "three");
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ quote("three") + presentStringType() + OPT_SPACE + DOT
+ CLOSE_CURLY + CLOSE_CURLY, builder.buildString());
@@ -90,8 +90,8 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
NodeFactory.createURI("one"), NodeFactory.createURI("two"),
NodeFactory.createURI("three"));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
- + node("three") + OPT_SPACE + DOT + CLOSE_CURLY,
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY,
builder.buildString());
}
@@ -103,8 +103,8 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
NodeFactory.createURI("three")));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
- + node("three") + OPT_SPACE + DOT + CLOSE_CURLY,
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY,
builder.buildString());
}
@@ -126,7 +126,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause.addSubQuery(sb);
- assertContainsRegex(PREFIX + "pfx:" + SPACE + node("urn:uri") + SPACE
+ assertContainsRegex(PREFIX + "pfx:" + SPACE + uri("urn:uri") + SPACE
+ ".*" + WHERE + OPEN_CURLY + OPEN_CURLY + SELECT + var("x")
+ SPACE + WHERE + OPEN_CURLY + "pfx:one" + SPACE + "pfx:two"
+ SPACE + "pfx:three" + OPT_SPACE + DOT + CLOSE_CURLY,
@@ -143,9 +143,9 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
whereClause.getWhereHandler().addWhere(Triple.ANY);
AbstractQueryBuilder<?> builder = whereClause.addUnion(sb);
- assertContainsRegex(PREFIX + "pfx:" + SPACE + node("uri") + ".+"
+ assertContainsRegex(PREFIX + "pfx:" + SPACE + uri("uri") + ".+"
+ UNION + OPEN_CURLY + SELECT + var("x") + SPACE + WHERE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ quote("three") + presentStringType() + OPT_SPACE + DOT
+ CLOSE_CURLY + CLOSE_CURLY, builder.buildString());
@@ -157,26 +157,26 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause.addWhere(new Triple(
NodeFactory.createURI("one"), NodeFactory.createURI("two"), v));
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + var("v") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + var("v") + OPT_SPACE + DOT
+ CLOSE_CURLY, builder.buildString());
builder.setVar(v, NodeFactory.createURI("three"));
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + node("three") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ CLOSE_CURLY, builder.buildString());
builder.setVar(v, NodeFactory.createURI("four"));
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + node("four") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + uri("four") + OPT_SPACE + DOT
+ CLOSE_CURLY, builder.buildString());
builder.setVar(v, null);
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + var("v") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + var("v") + OPT_SPACE + DOT
+ CLOSE_CURLY, builder.buildString());
}
@@ -195,7 +195,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
assertContainsRegex(WHERE + OPEN_CURLY + "FILTER" + OPT_SPACE
+ OPEN_PAREN + var("one") + OPT_SPACE + LT + OPT_SPACE
+ quote("10") + "\\^\\^"
- + node("http://www.w3.org/2001/XMLSchema#int") + CLOSE_PAREN
+ + uri("http://www.w3.org/2001/XMLSchema#int") + CLOSE_PAREN
+ CLOSE_CURLY, builder.buildString());
}
@@ -207,14 +207,14 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
AbstractQueryBuilder<?> builder = whereClause.addOptional(new Triple(
NodeFactory.createURI("one"), NodeFactory.createURI("two"), v));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ var("v") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
builder.buildString());
builder.setVar(v, NodeFactory.createURI("three"));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
- + node("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
builder.buildString());
}
@@ -226,13 +226,13 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause.addSubQuery(sb);
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + ".+"
- + node("two") + ".+" + var("v") + ".+" + CLOSE_CURLY,
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + ".+"
+ + uri("two") + ".+" + var("v") + ".+" + CLOSE_CURLY,
builder.buildString());
builder.setVar(v, NodeFactory.createURI("three"));
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + ".+"
- + node("two") + ".+" + node("three") + ".+" + CLOSE_CURLY,
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + ".+"
+ + uri("two") + ".+" + uri("three") + ".+" + CLOSE_CURLY,
builder.buildString());
}
@@ -244,12 +244,12 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause.addUnion(sb);
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY
- + node("one") + ".+" + node("two") + ".+" + var("v") + ".+"
+ + uri("one") + ".+" + uri("two") + ".+" + var("v") + ".+"
+ CLOSE_CURLY, builder.buildString());
builder.setVar(v, NodeFactory.createURI("three"));
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY
- + node("one") + ".+" + node("two") + ".+" + node("three")
+ + uri("one") + ".+" + uri("two") + ".+" + uri("three")
+ ".+" + CLOSE_CURLY, builder.buildString());
}
http://git-wip-us.apache.org/repos/asf/jena/blob/69d8469b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
index d9bbb34..a63a59a 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
@@ -40,14 +40,14 @@ public class PrologHandlerTest extends AbstractHandlerTest {
public void testAddPrefixString() {
handler.addPrefix("pfx", "uri");
String[] lst = byLine(query.toString());
- assertContainsRegex(PREFIX+"pfx:"+SPACE+node("uri"), lst);
+ assertContainsRegex(PREFIX+"pfx:"+SPACE+uri("uri"), lst);
}
@Test
public void testAddPrefixStringWithColon() {
handler.addPrefix("pfx:", "uri");
String[] lst = byLine(query.toString());
- assertContainsRegex(PREFIX+"pfx:"+SPACE+node("uri"), lst);
+ assertContainsRegex(PREFIX+"pfx:"+SPACE+uri("uri"), lst);
}
@Test
@@ -66,8 +66,8 @@ public class PrologHandlerTest extends AbstractHandlerTest {
map.put("pfx2", "uri2");
handler.addPrefixes(map);
String[] lst = byLine(query.toString());
- assertContainsRegex(PREFIX+"pfx:"+SPACE+node("uri"), lst);
- assertContainsRegex(PREFIX+"pfx2:"+SPACE+node("uri2"), lst);
+ assertContainsRegex(PREFIX+"pfx:"+SPACE+uri("uri"), lst);
+ assertContainsRegex(PREFIX+"pfx2:"+SPACE+uri("uri2"), lst);
}
@Test
@@ -77,8 +77,8 @@ public class PrologHandlerTest extends AbstractHandlerTest {
map.put("pfx2", "uri2");
handler.addPrefixes(map);
String[] lst = byLine(query.toString());
- assertContainsRegex(PREFIX+"pfx:"+SPACE+node("uri"), lst);
- assertContainsRegex(PREFIX+"pfx2:"+SPACE+node("uri2"), lst);
+ assertContainsRegex(PREFIX+"pfx:"+SPACE+uri("uri"), lst);
+ assertContainsRegex(PREFIX+"pfx2:"+SPACE+uri("uri2"), lst);
}
@Test
http://git-wip-us.apache.org/repos/asf/jena/blob/69d8469b/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 f678fd8..3e926d1 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
@@ -54,8 +54,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
.createURI("two"), NodeFactory.createLiteral("three")));
handler.addAll(handler2);
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + quote("three") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + quote("three") + OPT_SPACE + DOT
+ CLOSE_CURLY, query.toString());
}
@@ -63,8 +63,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
public void addWhereTriple() {
handler.addWhere(new Triple(NodeFactory.createURI("one"), NodeFactory
.createURI("two"), NodeFactory.createURI("three")));
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + node("three") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ CLOSE_CURLY, query.toString());
}
@@ -73,8 +73,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addWhere(new Triple(NodeFactory.createURI("one"),
ResourceFactory.createResource("two").asNode(), ResourceFactory
.createLangLiteral("three", "en-US").asNode()));
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + quote("three") + "@en-US" + OPT_SPACE
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + quote("three") + "@en-US" + OPT_SPACE
+ DOT + CLOSE_CURLY, query.toString());
}
@@ -82,7 +82,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
public void testAddWhereAnonymous() {
handler.addWhere(new Triple(Node.ANY, RDF.first.asNode(), Node.ANY));
assertContainsRegex(WHERE + OPEN_CURLY + "ANY" + SPACE
- + node("http://www\\.w3\\.org/1999/02/22-rdf-syntax-ns#first")
+ + uri("http://www\\.w3\\.org/1999/02/22-rdf-syntax-ns#first")
+ SPACE + "ANY" + OPT_SPACE + DOT + CLOSE_CURLY,
query.toString());
}
@@ -92,8 +92,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addOptional(new Triple(NodeFactory.createURI("one"),
NodeFactory.createURI("two"), NodeFactory.createURI("three")));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
- + node("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
query.toString());
}
@@ -102,7 +102,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addOptional(new Triple(Node.ANY, RDF.first.asNode(), Node.ANY));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + "ANY" + SPACE
- + node("http://www\\.w3\\.org/1999/02/22-rdf-syntax-ns#first")
+ + uri("http://www\\.w3\\.org/1999/02/22-rdf-syntax-ns#first")
+ SPACE + "ANY" + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
query.toString());
}
@@ -113,7 +113,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
ResourceFactory.createResource("two").asNode(), ResourceFactory
.createLangLiteral("three", "en-US").asNode()));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ quote("three") + "@en-US" + OPT_SPACE + DOT + CLOSE_CURLY
+ CLOSE_CURLY, query.toString());
}
@@ -122,8 +122,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
public void testAddWhereStrings() {
handler.addWhere(new Triple(NodeFactory.createURI("one"), NodeFactory
.createURI("two"), NodeFactory.createURI("three")));
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + node("three") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ CLOSE_CURLY, query.toString());
}
@@ -163,7 +163,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
.addWhere("<one>", "<two>", "three");
handler.addSubQuery(sb);
assertContainsRegex("SELECT" + SPACE + var("x") + SPACE + WHERE
- + OPEN_CURLY + node("one") + ".+" + node("two") + ".+"
+ + OPEN_CURLY + uri("one") + ".+" + uri("two") + ".+"
+ quote("three") + ".+" + CLOSE_CURLY, query.toString());
}
@@ -172,8 +172,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
SelectBuilder sb = new SelectBuilder();
sb.addPrefix("pfx", "uri").addWhere("<one>", "<two>", "three");
handler.addSubQuery(sb);
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + ".+"
- + node("two") + ".+" + quote("three") + ".+" + CLOSE_CURLY,
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + ".+"
+ + uri("two") + ".+" + quote("three") + ".+" + CLOSE_CURLY,
query.toString());
}
@@ -185,7 +185,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addUnion(sb);
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY
- + node("one") + SPACE + node("two") + SPACE + node("three")
+ + uri("one") + SPACE + uri("two") + SPACE + uri("three")
+ OPT_SPACE + DOT + CLOSE_CURLY, query.toString());
}
@@ -197,8 +197,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addUnion(sb);
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY + SELECT
- + var("x") + SPACE + WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + node("three") + OPT_SPACE + DOT
+ + var("x") + SPACE + WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ CLOSE_CURLY, query.toString());
}
@@ -211,8 +211,8 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addGraph(NodeFactory.createURI("graph"), handler2);
assertContainsRegex(WHERE + OPEN_CURLY + "GRAPH" + SPACE
- + node("graph") + SPACE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + node("three") + OPT_SPACE + DOT
+ + uri("graph") + SPACE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ CLOSE_CURLY + CLOSE_CURLY, query.toString());
}
@@ -222,14 +222,14 @@ public class WhereHandlerTest extends AbstractHandlerTest {
Var v = Var.alloc("v");
handler.addWhere(new Triple(NodeFactory.createURI("one"), NodeFactory
.createURI("two"), v));
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + var("v") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + var("v") + OPT_SPACE + DOT
+ CLOSE_CURLY, query.toString());
Map<Var, Node> values = new HashMap<Var, Node>();
values.put(v, NodeFactory.createURI("three"));
handler.setVars(values);
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + node("three") + OPT_SPACE + DOT
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ CLOSE_CURLY, query.toString());
}
@@ -247,7 +247,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
assertContainsRegex(WHERE + OPEN_CURLY + "FILTER" + OPT_SPACE
+ OPEN_PAREN + var("one") + OPT_SPACE + LT + OPT_SPACE
+ quote("10") + "\\^\\^"
- + node("http://www.w3.org/2001/XMLSchema#int") + CLOSE_PAREN
+ + uri("http://www.w3.org/2001/XMLSchema#int") + CLOSE_PAREN
+ CLOSE_CURLY, query.toString());
}
@@ -258,15 +258,15 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addOptional(new Triple(NodeFactory.createURI("one"),
NodeFactory.createURI("two"), v));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ var("v") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
query.toString());
Map<Var, Node> values = new HashMap<Var, Node>();
values.put(v, NodeFactory.createURI("three"));
handler.setVars(values);
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
- + OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
- + node("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
+ + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
query.toString());
}
@@ -276,14 +276,14 @@ public class WhereHandlerTest extends AbstractHandlerTest {
SelectBuilder sb = new SelectBuilder();
sb.addPrefix("pfx", "uri").addWhere("<one>", "<two>", v);
handler.addSubQuery(sb);
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + ".+"
- + node("two") + ".+" + var("v") + ".+" + CLOSE_CURLY,
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + ".+"
+ + uri("two") + ".+" + var("v") + ".+" + CLOSE_CURLY,
query.toString());
Map<Var, Node> values = new HashMap<Var, Node>();
values.put(v, NodeFactory.createURI("three"));
handler.setVars(values);
- assertContainsRegex(WHERE + OPEN_CURLY + node("one") + ".+"
- + node("two") + ".+" + node("three") + ".+" + CLOSE_CURLY,
+ assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + ".+"
+ + uri("two") + ".+" + uri("three") + ".+" + CLOSE_CURLY,
query.toString());
}
@@ -294,13 +294,13 @@ public class WhereHandlerTest extends AbstractHandlerTest {
sb.addPrefix("pfx", "uri").addWhere("<one>", "<two>", v);
handler.addUnion(sb);
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY
- + node("one") + ".+" + node("two") + ".+" + var("v") + ".+"
+ + uri("one") + ".+" + uri("two") + ".+" + var("v") + ".+"
+ CLOSE_CURLY, query.toString());
Map<Var, Node> values = new HashMap<Var, Node>();
values.put(v, NodeFactory.createURI("three"));
handler.setVars(values);
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY
- + node("one") + ".+" + node("two") + ".+" + node("three")
+ + uri("one") + ".+" + uri("two") + ".+" + uri("three")
+ ".+" + CLOSE_CURLY, query.toString());
}
[2/2] jena git commit: This closes #78.
Posted by an...@apache.org.
This closes #78.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0847481f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0847481f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0847481f
Branch: refs/heads/master
Commit: 0847481f8bad2652d114110d611b6154328e4959
Parents: 69d8469
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jun 17 23:31:08 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jun 17 23:31:08 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------