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 2014/12/23 18:59:05 UTC
[09/15] jena git commit: RDf 1.0/1.1 :: Presentation form of strings.
RDf 1.0/1.1 :: Presentation form of strings.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4f303458
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4f303458
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4f303458
Branch: refs/heads/master
Commit: 4f303458d22cde79f8edaa1520ad02c3cab54e60
Parents: 8d209fa
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 23 15:36:07 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 23 15:36:07 2014 +0000
----------------------------------------------------------------------
.../arq/querybuilder/SelectBuilderTest.java | 3 +-
.../querybuilder/clauses/WhereClauseTest.java | 79 +++++---------------
.../querybuilder/handlers/WhereHandlerTest.java | 2 +-
3 files changed, 22 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4f303458/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 e301599..f90aba0 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
@@ -86,8 +86,7 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest {
+ node("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")
+ SPACE + "foaf:Person" + OPT_SPACE + DOT + SPACE + OPTIONAL
+ OPEN_CURLY + var("s") + SPACE + "foaf:name" + SPACE
- + quote("Smith") + "\\^\\^"
- + node("http://www.w3.org/2001/XMLSchema#string") + SPACE + DOT
+ + quote("Smith") + presentStringType() + SPACE + DOT
+ OPT_SPACE + CLOSE_CURLY + CLOSE_CURLY, query);
assertContainsRegex(ORDER_BY + var("s"), query);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4f303458/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 f663732..e642bcb 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
@@ -17,22 +17,18 @@
*/
package org.apache.jena.arq.querybuilder.clauses;
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.jena.arq.querybuilder.AbstractQueryBuilder;
-import org.apache.jena.arq.querybuilder.SelectBuilder;
-import org.apache.jena.arq.querybuilder.clauses.WhereClause;
-import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
-import org.junit.After;
-import org.xenei.junit.contract.Contract;
-import org.xenei.junit.contract.ContractTest;
-import org.xenei.junit.contract.IProducer;
-
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.impl.LiteralLabelFactory;
-import com.hp.hpl.jena.sparql.core.Var;
-import com.hp.hpl.jena.sparql.lang.sparql_11.ParseException;
+import org.apache.jena.arq.querybuilder.AbstractQueryBuilder ;
+import org.apache.jena.arq.querybuilder.SelectBuilder ;
+import org.junit.After ;
+import org.xenei.junit.contract.Contract ;
+import org.xenei.junit.contract.ContractTest ;
+import org.xenei.junit.contract.IProducer ;
+
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.impl.LiteralLabelFactory ;
+import com.hp.hpl.jena.sparql.core.Var ;
+import com.hp.hpl.jena.sparql.lang.sparql_11.ParseException ;
@Contract(WhereClause.class)
public class WhereClauseTest<T extends WhereClause<?>> extends
@@ -57,55 +53,21 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
}
@ContractTest
- public void testGetWhereHandler() {
- WhereClause<?> whereClause = getProducer().newInstance();
- WhereHandler handler = whereClause.getWhereHandler();
- assertNotNull(handler);
- }
-
- @ContractTest
- public void testAddWhereTriple() {
- WhereClause<?> whereClause = getProducer().newInstance();
- AbstractQueryBuilder<?> builder = whereClause.addWhere(new Triple(
- NodeFactory.createURI("one"), NodeFactory.createURI("two"),
- NodeFactory.createURI("three")));
-
- String[] s = byLine(builder);
- assertContainsRegex("<one>\\s+<two>\\s+<three>\\s*\\.", s);
- }
-
- @ContractTest
- public void testAddWhereObjects() {
- WhereClause<?> whereClause = getProducer().newInstance();
- AbstractQueryBuilder<?> builder = whereClause.addWhere(
- NodeFactory.createURI("one"), NodeFactory.createURI("two"),
- NodeFactory.createURI("three"));
-
- String[] s = byLine(builder);
- assertContainsRegex("<one>\\s+<two>\\s+<three>\\s*\\.", s);
- }
-
- @ContractTest
public void testAddWhereStrings() {
WhereClause<?> whereClause = getProducer().newInstance();
- AbstractQueryBuilder<?> builder = whereClause.addWhere("<one>",
- "<two>", "three");
+ AbstractQueryBuilder<?> builder = whereClause.addWhere("<one>", "<two>", "three");
assertContainsRegex(WHERE + OPEN_CURLY + node("one") + SPACE
- + node("two") + SPACE + quote("three") + "\\^\\^"
- + node("http://www.w3.org/2001/XMLSchema#string") + OPT_SPACE
+ + node("two") + SPACE + quote("three") + presentStringType() + OPT_SPACE
+ DOT + CLOSE_CURLY, builder.buildString());
}
@ContractTest
public void testAddOptionalString() {
WhereClause<?> whereClause = getProducer().newInstance();
- AbstractQueryBuilder<?> builder = whereClause.addOptional("<one>",
- "<two>", "three");
-
+ AbstractQueryBuilder<?> builder = whereClause.addOptional("<one>", "<two>", "three");
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
- + quote("three") + "\\^\\^"
- + node("http://www.w3.org/2001/XMLSchema#string") + OPT_SPACE
+ + quote("three") + presentStringType() + OPT_SPACE
+ DOT + CLOSE_CURLY + CLOSE_CURLY, builder.buildString());
}
@@ -114,7 +76,8 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
public void testAddOptionalObjects() {
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause.addOptional(
- NodeFactory.createURI("one"), NodeFactory.createURI("two"),
+ NodeFactory.createURI("one"),
+ NodeFactory.createURI("two"),
NodeFactory.createURI("three"));
assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE
+ OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
@@ -173,8 +136,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
assertContainsRegex(PREFIX + "pfx:" + SPACE + node("uri") + ".+"
+ UNION + OPEN_CURLY + SELECT + var("x") + SPACE + WHERE
+ OPEN_CURLY + node("one") + SPACE + node("two") + SPACE
- + quote("three") + "\\^\\^"
- + node("http://www.w3.org/2001/XMLSchema#string") + OPT_SPACE
+ + quote("three") + presentStringType() + OPT_SPACE
+ DOT + CLOSE_CURLY + CLOSE_CURLY, builder.buildString());
}
@@ -219,7 +181,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
+ var("v") + CLOSE_PAREN + CLOSE_CURLY, builder.buildString());
builder.setVar(Var.alloc("v"),
- NodeFactory.createLiteral(LiteralLabelFactory.create(10)));
+ NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral(10)));
assertContainsRegex(WHERE + OPEN_CURLY + "FILTER" + OPT_SPACE
+ OPEN_PAREN + var("one") + OPT_SPACE + LT + OPT_SPACE
@@ -281,5 +243,4 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
+ node("one") + ".+" + node("two") + ".+" + node("three")
+ ".+" + CLOSE_CURLY, builder.buildString());
}
-
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4f303458/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 ef6ff94..9897e30 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
@@ -231,7 +231,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
Map<Var, Node> values = new HashMap<Var, Node>();
values.put(Var.alloc("v"),
- NodeFactory.createLiteral(LiteralLabelFactory.create(10)));
+ NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral(10)));
handler.setVars(values);
assertContainsRegex(WHERE + OPEN_CURLY + "FILTER" + OPT_SPACE
+ OPEN_PAREN + var("one") + OPT_SPACE + LT + OPT_SPACE