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/24 23:02:08 UTC
jena git commit: JENA-974: Fixup regexs to align to pretty printing
Repository: jena
Updated Branches:
refs/heads/master a51455e2b -> dd59e063a
JENA-974: Fixup regexs to align to pretty printing
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dd59e063
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dd59e063
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dd59e063
Branch: refs/heads/master
Commit: dd59e063a562c9bc067d57f4760497d2130f75a6
Parents: a51455e
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jun 24 22:01:58 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jun 24 22:01:58 2015 +0100
----------------------------------------------------------------------
.../arq/querybuilder/SelectBuilderTest.java | 18 ++++++------
.../querybuilder/clauses/WhereClauseTest.java | 24 ++++++++--------
.../querybuilder/handlers/WhereHandlerTest.java | 30 ++++++++++----------
3 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/dd59e063/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 5b7d2f0..d3b16ff 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
@@ -39,14 +39,14 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
assertContainsRegex(SELECT + "\\*" + SPACE + WHERE + OPEN_CURLY
+ var("s") + SPACE + var("p") + SPACE + var("o") + OPT_SPACE
- + DOT + CLOSE_CURLY, builder.buildString());
+ + CLOSE_CURLY, builder.buildString());
builder.setVar(Var.alloc("p"), RDF.type);
assertContainsRegex(SELECT + "\\*" + SPACE + WHERE + OPEN_CURLY
+ var("s") + SPACE
+ regexRDFtype
- + SPACE + var("o") + OPT_SPACE + DOT + CLOSE_CURLY,
+ + SPACE + var("o") + OPT_SPACE + CLOSE_CURLY,
builder.buildString());
}
@@ -69,9 +69,9 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
assertContainsRegex(SELECT + var("s"), query);
assertContainsRegex(WHERE + OPEN_CURLY + var("s") + SPACE
+ regexRDFtype
- + SPACE + "foaf:Person" + OPT_SPACE + DOT + SPACE + OPTIONAL
+ + SPACE + "foaf:Person" + SPACE + OPTIONAL
+ OPEN_CURLY + var("s") + SPACE + "foaf:name" + SPACE
- + var("name") + SPACE + DOT + OPT_SPACE + CLOSE_CURLY
+ + var("name") + OPT_SPACE + CLOSE_CURLY
+ CLOSE_CURLY, query);
assertContainsRegex(ORDER_BY + var("s"), query);
@@ -83,9 +83,9 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
assertContainsRegex(SELECT + var("s"), query);
assertContainsRegex(WHERE + OPEN_CURLY + var("s") + SPACE
+ regexRDFtype
- + SPACE + "foaf:Person" + OPT_SPACE + DOT + SPACE + OPTIONAL
+ + SPACE + "foaf:Person" + SPACE + OPTIONAL
+ OPEN_CURLY + var("s") + SPACE + "foaf:name" + SPACE
- + quote("Smith") + presentStringType() + SPACE + DOT
+ + quote("Smith") + presentStringType()
+ OPT_SPACE + CLOSE_CURLY + CLOSE_CURLY, query);
assertContainsRegex(ORDER_BY + var("s"), query);
}
@@ -97,7 +97,7 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
String query = builder.buildString();
assertContainsRegex(WHERE + OPEN_CURLY + ":S" + SPACE + var("p")
- + SPACE + ":O" + OPT_SPACE + DOT + CLOSE_CURLY, query);
+ + SPACE + ":O" + OPT_SPACE + CLOSE_CURLY, query);
}
@Test
@@ -107,7 +107,7 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
String query = builder.buildString();
assertContainsRegex(WHERE + OPEN_CURLY + var("s") + SPACE + ":P"
- + SPACE + ":O" + OPT_SPACE + DOT + CLOSE_CURLY, query);
+ + SPACE + ":O" + OPT_SPACE + CLOSE_CURLY, query);
}
@Test
@@ -117,7 +117,7 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
String query = builder.buildString();
assertContainsRegex(WHERE + OPEN_CURLY + ":S" + SPACE + ":P" + SPACE
- + var("o") + OPT_SPACE + DOT + CLOSE_CURLY, query);
+ + var("o") + OPT_SPACE + CLOSE_CURLY, query);
}
@Test
http://git-wip-us.apache.org/repos/asf/jena/blob/dd59e063/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 ac3a385..50e6420 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
@@ -68,7 +68,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
"<two>", "three");
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ uri("two") + SPACE + quote("three") + presentStringType()
- + OPT_SPACE + DOT + CLOSE_CURLY, builder.buildString());
+ + OPT_SPACE + CLOSE_CURLY, builder.buildString());
}
@ContractTest
@@ -78,7 +78,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
"<two>", "three");
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + quote("three") + presentStringType() + OPT_SPACE + DOT
+ + quote("three") + presentStringType() + OPT_SPACE
+ CLOSE_CURLY + CLOSE_CURLY, builder.buildString());
}
@@ -91,7 +91,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
NodeFactory.createURI("three"));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY,
+ + uri("three") + OPT_SPACE + CLOSE_CURLY,
builder.buildString());
}
@@ -104,7 +104,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY,
+ + uri("three") + OPT_SPACE + CLOSE_CURLY,
builder.buildString());
}
@@ -129,7 +129,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
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,
+ + SPACE + "pfx:three" + OPT_SPACE + CLOSE_CURLY,
builder.buildString());
}
@@ -146,7 +146,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
assertContainsRegex(PREFIX + "pfx:" + SPACE + uri("uri") + ".+"
+ UNION + OPEN_CURLY + SELECT + var("x") + SPACE + WHERE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + quote("three") + presentStringType() + OPT_SPACE + DOT
+ + quote("three") + presentStringType() + OPT_SPACE
+ CLOSE_CURLY + CLOSE_CURLY, builder.buildString());
}
@@ -158,25 +158,25 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
AbstractQueryBuilder<?> builder = whereClause.addWhere(new Triple(
NodeFactory.createURI("one"), NodeFactory.createURI("two"), v));
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + var("v") + OPT_SPACE + DOT
+ + uri("two") + SPACE + var("v") + OPT_SPACE
+ CLOSE_CURLY, builder.buildString());
builder.setVar(v, NodeFactory.createURI("three"));
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ + uri("two") + SPACE + uri("three") + OPT_SPACE
+ CLOSE_CURLY, builder.buildString());
builder.setVar(v, NodeFactory.createURI("four"));
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + uri("four") + OPT_SPACE + DOT
+ + uri("two") + SPACE + uri("four") + OPT_SPACE
+ CLOSE_CURLY, builder.buildString());
builder.setVar(v, null);
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + var("v") + OPT_SPACE + DOT
+ + uri("two") + SPACE + var("v") + OPT_SPACE
+ CLOSE_CURLY, builder.buildString());
}
@@ -208,13 +208,13 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
NodeFactory.createURI("one"), NodeFactory.createURI("two"), v));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + var("v") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + var("v") + OPT_SPACE + CLOSE_CURLY + CLOSE_CURLY,
builder.buildString());
builder.setVar(v, NodeFactory.createURI("three"));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + uri("three") + OPT_SPACE + CLOSE_CURLY + CLOSE_CURLY,
builder.buildString());
}
http://git-wip-us.apache.org/repos/asf/jena/blob/dd59e063/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 3e926d1..2a093e1 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
@@ -55,7 +55,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addAll(handler2);
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + quote("three") + OPT_SPACE + DOT
+ + uri("two") + SPACE + quote("three") + OPT_SPACE
+ CLOSE_CURLY, query.toString());
}
@@ -64,7 +64,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addWhere(new Triple(NodeFactory.createURI("one"), NodeFactory
.createURI("two"), NodeFactory.createURI("three")));
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ + uri("two") + SPACE + uri("three") + OPT_SPACE
+ CLOSE_CURLY, query.toString());
}
@@ -75,7 +75,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
.createLangLiteral("three", "en-US").asNode()));
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
+ uri("two") + SPACE + quote("three") + "@en-US" + OPT_SPACE
- + DOT + CLOSE_CURLY, query.toString());
+ + CLOSE_CURLY, query.toString());
}
@Test
@@ -83,7 +83,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addWhere(new Triple(Node.ANY, RDF.first.asNode(), Node.ANY));
assertContainsRegex(WHERE + OPEN_CURLY + "ANY" + SPACE
+ uri("http://www\\.w3\\.org/1999/02/22-rdf-syntax-ns#first")
- + SPACE + "ANY" + OPT_SPACE + DOT + CLOSE_CURLY,
+ + SPACE + "ANY" + OPT_SPACE + CLOSE_CURLY,
query.toString());
}
@@ -93,7 +93,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
NodeFactory.createURI("two"), NodeFactory.createURI("three")));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + uri("three") + OPT_SPACE + CLOSE_CURLY + CLOSE_CURLY,
query.toString());
}
@@ -103,7 +103,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + "ANY" + SPACE
+ uri("http://www\\.w3\\.org/1999/02/22-rdf-syntax-ns#first")
- + SPACE + "ANY" + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + SPACE + "ANY" + OPT_SPACE + CLOSE_CURLY + CLOSE_CURLY,
query.toString());
}
@@ -114,7 +114,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
.createLangLiteral("three", "en-US").asNode()));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + quote("three") + "@en-US" + OPT_SPACE + DOT + CLOSE_CURLY
+ + quote("three") + "@en-US" + OPT_SPACE + CLOSE_CURLY
+ CLOSE_CURLY, query.toString());
}
@@ -123,7 +123,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addWhere(new Triple(NodeFactory.createURI("one"), NodeFactory
.createURI("two"), NodeFactory.createURI("three")));
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ + uri("two") + SPACE + uri("three") + OPT_SPACE
+ CLOSE_CURLY, query.toString());
}
@@ -186,7 +186,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addUnion(sb);
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY
+ uri("one") + SPACE + uri("two") + SPACE + uri("three")
- + OPT_SPACE + DOT + CLOSE_CURLY, query.toString());
+ + OPT_SPACE + CLOSE_CURLY, query.toString());
}
@Test
@@ -198,7 +198,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addUnion(sb);
assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY + SELECT
+ var("x") + SPACE + WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ + uri("two") + SPACE + uri("three") + OPT_SPACE
+ CLOSE_CURLY, query.toString());
}
@@ -212,7 +212,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addGraph(NodeFactory.createURI("graph"), handler2);
assertContainsRegex(WHERE + OPEN_CURLY + "GRAPH" + SPACE
+ uri("graph") + SPACE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ + uri("two") + SPACE + uri("three") + OPT_SPACE
+ CLOSE_CURLY + CLOSE_CURLY, query.toString());
}
@@ -223,13 +223,13 @@ public class WhereHandlerTest extends AbstractHandlerTest {
handler.addWhere(new Triple(NodeFactory.createURI("one"), NodeFactory
.createURI("two"), v));
assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + SPACE
- + uri("two") + SPACE + var("v") + OPT_SPACE + DOT
+ + uri("two") + SPACE + var("v") + OPT_SPACE
+ 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 + uri("one") + SPACE
- + uri("two") + SPACE + uri("three") + OPT_SPACE + DOT
+ + uri("two") + SPACE + uri("three") + OPT_SPACE
+ CLOSE_CURLY, query.toString());
}
@@ -259,14 +259,14 @@ public class WhereHandlerTest extends AbstractHandlerTest {
NodeFactory.createURI("two"), v));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE
- + var("v") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + var("v") + OPT_SPACE + 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 + uri("one") + SPACE + uri("two") + SPACE
- + uri("three") + OPT_SPACE + DOT + CLOSE_CURLY + CLOSE_CURLY,
+ + uri("three") + OPT_SPACE + CLOSE_CURLY + CLOSE_CURLY,
query.toString());
}