jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [5/6] jena git commit: RDF 1.0 and 1.1 results
Date Sun, 21 Dec 2014 20:07:43 GMT
RDF 1.0 and 1.1 results


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6d304fc2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6d304fc2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6d304fc2

Branch: refs/heads/master
Commit: 6d304fc28177129ba3657cc35b270dbc6585783a
Parents: 046d195
Author: Andy Seaborne <andy@apache.org>
Authored: Sun Dec 21 20:04:14 2014 +0000
Committer: Andy Seaborne <andy@apache.org>
Committed: Sun Dec 21 20:05:03 2014 +0000

----------------------------------------------------------------------
 .../ARQ/BasicPatterns/result-B-01-RDF_10.n3     |  19 ++++
 .../ARQ/BasicPatterns/result-B-01-RDF_11.n3     |  24 ++++
 .../ARQ/Distinct/distinct-all_RDF_10.srx        | 111 +++++++++++++++++++
 .../ARQ/Distinct/distinct-all_RDF_11.srx        |  93 ++++++++++++++++
 .../ARQ/Distinct/distinct-str_RDF_10.srx        |  56 ++++++++++
 .../ARQ/Distinct/distinct-str_RDF_11.srx        |  38 +++++++
 jena-arq/testing/ARQ/SPARQL11_RDF11.txt         |  24 ++++
 jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt  |  15 +++
 .../DAWG-Final/distinct/distinct-all_RDF_10.srx | 111 +++++++++++++++++++
 .../DAWG-Final/distinct/distinct-all_RDF_11.srx |  93 ++++++++++++++++
 .../DAWG-Final/distinct/distinct-str_RDF_10.srx |  56 ++++++++++
 .../DAWG-Final/distinct/distinct-str_RDF_11.srx |  38 +++++++
 12 files changed, 678 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3
new file mode 100644
index 0000000..cadd099
--- /dev/null
+++ b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3
@@ -0,0 +1,19 @@
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+
+[] rdf:type rs:ResultSet ;
+    rs:resultVariable "x" ;
+    rs:resultVariable "y" ;
+    rs:size "0" ;
+
+## Exact graph match - "string" != "string"^^xsd:string
+
+##     rs:size "1" ;
+##     rs:solution
+##         [ rdf:type rs:ResultSolution ; 
+##           rs:binding [ rdf:type rs:ResultBinding ;
+##                        rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
+##           rs:binding [ rdf:type rs:ResultBinding ;
+##                        rs:variable "y" ; rs:value <http://rdf.hp.com/p1> ] ;
+##         ] ;
+    .

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3
new file mode 100644
index 0000000..df95b9e
--- /dev/null
+++ b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3
@@ -0,0 +1,24 @@
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+
+## RDF 1.-0 results.
+## [] rdf:type rs:ResultSet ;
+##     rs:resultVariable "x" ;
+##     rs:resultVariable "y" ;
+##     rs:size "0" ;
+
+## Exact graph match - "string" != "string"^^xsd:string
+
+## RDF 1.1
+[] rdf:type rs:ResultSet ;
+    rs:resultVariable "x" ;
+    rs:resultVariable "y" ;
+    rs:size "1" ;
+    rs:solution
+        [ rdf:type rs:ResultSolution ; 
+          rs:binding [ rdf:type rs:ResultBinding ;
+                       rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
+          rs:binding [ rdf:type rs:ResultBinding ;
+                       rs:variable "y" ; rs:value <http://rdf.hp.com/p1> ] ;
+        ] ;
+    .

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_10.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_10.srx b/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_10.srx
new file mode 100644
index 0000000..963d208
--- /dev/null
+++ b/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_10.srx
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_11.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_11.srx b/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_11.srx
new file mode 100644
index 0000000..aff9f9d
--- /dev/null
+++ b/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_11.srx
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+  </results>
+</sparql>

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_10.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_10.srx b/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_10.srx
new file mode 100644
index 0000000..a836754
--- /dev/null
+++ b/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_10.srx
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_11.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_11.srx b/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_11.srx
new file mode 100644
index 0000000..b4cb595
--- /dev/null
+++ b/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_11.srx
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/SPARQL11_RDF11.txt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/SPARQL11_RDF11.txt b/jena-arq/testing/ARQ/SPARQL11_RDF11.txt
new file mode 100644
index 0000000..f48fdfa
--- /dev/null
+++ b/jena-arq/testing/ARQ/SPARQL11_RDF11.txt
@@ -0,0 +1,24 @@
+The following changes are needed for RDF 1.1 where xsd:strings and simple
+literals are the same term.
+
+In both case, the results are alterted.  See the two results files
+("RDF_11", "RDF_10"); copy the right one to the base results file.
+the appropriate one to the on used by the 
+
+1/ BasicPatterns/test-B-01
+
+2/ ARQ/Sort/sort-2.rq => sort-result-2.ttl
+3/ ARQ/Sort/sort-3.rq => sort-result-3.ttl
+
+query and results changed (data must be changed for stable results).
+
+
+4/ "Strings: Distinct"
+ARQ/Distinct/
+  distinct-1.rq + <data-str.ttl>
+  => distinct-str.srx
+
+5/ "All: Distinct"
+ARQ/Distinct/
+  distinct-1.rq + <data-num.ttl> , <data-str.ttl> , <data-node.ttl> 
+  => <distinct-all.srx>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt b/jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt
new file mode 100644
index 0000000..a491417
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt
@@ -0,0 +1,15 @@
+RDF 1.1 makes 
+   simple literals and xsd:strings the same term.
+
+The following changes are needed to the DAWG test suite:
+
+
+
+Changes due to SPARQL 1.1
+SPARQL 1.1:
+  18. => 18.0
+
+syntax-sparql1/syntax-lit-08.rq
+basic/term-6.rq
+basic/term-7.rq
+basic/data-4.ttl

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_10.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_10.srx b/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_10.srx
new file mode 100644
index 0000000..963d208
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_10.srx
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_11.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_11.srx b/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_11.srx
new file mode 100644
index 0000000..aff9f9d
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_11.srx
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <uri>http://example/z1</uri>
+      </binding>
+    </result>
+  </results>
+</sparql>

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_10.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_10.srx b/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_10.srx
new file mode 100644
index 0000000..a836754
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_10.srx
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal>abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_11.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_11.srx b/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_11.srx
new file mode 100644
index 0000000..b4cb595
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_11.srx
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+  <head>
+    <variable name="v"/>
+  </head>
+  <results>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+      </binding>
+    </result>
+    <result>
+      <binding name="v">
+        <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"></literal>
+      </binding>
+    </result>
+  </results>
+</sparql>


Mime
View raw message