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 2018/06/16 10:30:49 UTC
[2/3] jena git commit: JENA-1563: Tests
JENA-1563: Tests
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/aab46d43
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/aab46d43
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/aab46d43
Branch: refs/heads/master
Commit: aab46d434912d751c7e86cbf28c708812cb1001e
Parents: 79a04c0
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jun 14 11:30:02 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 14 11:48:04 2018 +0100
----------------------------------------------------------------------
.../jena/sparql/resultset/TestResultSet.java | 21 ++++++++++++++++++++
jena-arq/testing/ResultSet/output2.srj | 0
jena-arq/testing/ResultSet/output2.srx | 12 -----------
.../testing/ResultSet/rs-datatype-string.srj | 16 +++++++++++++++
.../testing/ResultSet/rs-xmllang-datatype-1.srj | 16 +++++++++++++++
.../testing/ResultSet/rs-xmllang-datatype-2.srj | 16 +++++++++++++++
.../org/apache/jena/datatypes/TypeMapper.java | 2 +-
7 files changed, 70 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/aab46d43/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java b/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java
index bff88a9..85db33b 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java
@@ -194,6 +194,27 @@ public class TestResultSet extends BaseTest
assertFalse(rs.hasNext());
}
+ // Test reading "variations". Things that are accepted but not in the form Jena writes.
+
+ // JENA-1563: xml:lang= and datatype=rdf:langString
+ @Test
+ public void rs_xmllang_datatype_1() {
+ ResultSetFactory.load(DIR + "rs-xmllang-datatype-1.srj");
+ }
+
+ // JENA-1563: xml:lang= and incompatible datatype
+ @Test(expected=ResultSetException.class)
+ public void rs_xmllang_datatype_2() {
+ // Bad: datatype is not rdf:langString (it is xsd:string in the test data)
+ ResultSetFactory.load(DIR + "rs-xmllang-datatype-2.srj");
+ }
+
+ // Explicit (unnecessary) datatype=xsd:string
+ @Test
+ public void rs_datatype_string() {
+ ResultSet rs = ResultSetFactory.load(DIR + "rs-datatype-string.srj");
+ }
+
@Test public void test_RS_union_1()
{
ResultSet rs1 = make("x", org.apache.jena.graph.NodeFactory.createURI("tag:local")) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/aab46d43/jena-arq/testing/ResultSet/output2.srj
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ResultSet/output2.srj b/jena-arq/testing/ResultSet/output2.srj
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/jena/blob/aab46d43/jena-arq/testing/ResultSet/output2.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ResultSet/output2.srx b/jena-arq/testing/ResultSet/output2.srx
deleted file mode 100644
index 98e9aa7..0000000
--- a/jena-arq/testing/ResultSet/output2.srx
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.w3.org/2001/sw/DataAccess/rf1/result2.xsd">
-
- <head>
- <link href="example2.rq" />
- </head>
-
- <boolean>true</boolean>
-
-</sparql>
http://git-wip-us.apache.org/repos/asf/jena/blob/aab46d43/jena-arq/testing/ResultSet/rs-datatype-string.srj
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ResultSet/rs-datatype-string.srj b/jena-arq/testing/ResultSet/rs-datatype-string.srj
new file mode 100644
index 0000000..9d49058
--- /dev/null
+++ b/jena-arq/testing/ResultSet/rs-datatype-string.srj
@@ -0,0 +1,16 @@
+{
+ "head": {
+ "vars": [ "s" , "p" , "o" ]
+ } ,
+ "results": {
+ "bindings": [
+ {
+ "s": { "type": "uri" , "value": "http://example/s" } ,
+ "p": { "type": "uri" , "value": "http://example/p" } ,
+ "o": { "type": "literal" ,
+ "datatype": "http://www.w3.org/2001/XMLSchema#string",
+ "value": "foo" }
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/aab46d43/jena-arq/testing/ResultSet/rs-xmllang-datatype-1.srj
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ResultSet/rs-xmllang-datatype-1.srj b/jena-arq/testing/ResultSet/rs-xmllang-datatype-1.srj
new file mode 100644
index 0000000..700aa7a
--- /dev/null
+++ b/jena-arq/testing/ResultSet/rs-xmllang-datatype-1.srj
@@ -0,0 +1,16 @@
+{
+ "head": {
+ "vars": [ "s" , "p" , "o" ]
+ } ,
+ "results": {
+ "bindings": [
+ {
+ "s": { "type": "uri" , "value": "http://example/s" } ,
+ "p": { "type": "uri" , "value": "http://example/p" } ,
+ "o": { "type": "literal" ,
+ "xml:lang": "en" ,
+ "datatype" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString",
+ "value": "foo" }
+ } ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/aab46d43/jena-arq/testing/ResultSet/rs-xmllang-datatype-2.srj
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ResultSet/rs-xmllang-datatype-2.srj b/jena-arq/testing/ResultSet/rs-xmllang-datatype-2.srj
new file mode 100644
index 0000000..a3a878f
--- /dev/null
+++ b/jena-arq/testing/ResultSet/rs-xmllang-datatype-2.srj
@@ -0,0 +1,16 @@
+{
+ "head": {
+ "vars": [ "s" , "p" , "o" ]
+ } ,
+ "results": {
+ "bindings": [
+ {
+ "s": { "type": "uri" , "value": "http://example/s" } ,
+ "p": { "type": "uri" , "value": "http://example/p" } ,
+ "o": { "type": "literal" ,
+ "xml:lang": "en" ,
+ "datatype" : "http://www.w3.org/2001/XMLSchema#string",
+ "value": "foo" }
+ } ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/aab46d43/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java b/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java
index 30d41ab..1da6913 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java
@@ -109,7 +109,7 @@ public class TypeMapper {
* Version of getTypeByName which will treat unknown URIs as typed literals but with
* just the default implementation
* <p>
- * RDF 1.1: null for {@code uri} returns null and it wil mean {@code xsd:string}
+ * RDF 1.1: null for {@code uri} returns null and it will mean {@code xsd:string}
* because plain literals (no lang tag) and xsd:strings are now the same.
*
* @param uri