Add the execution test files from syntax tests Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6f397404 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6f397404 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6f397404
Branch: refs/heads/master Commit: 6f397404e69d9da10ea456c977d44ef52b899968 Parents: fcbbf9b Author: confidencesun <[email protected]> Authored: Sat Aug 15 16:31:54 2015 +0800 Committer: confidencesun <[email protected]> Committed: Sat Aug 15 16:31:54 2015 +0800 ---------------------------------------------------------------------- .../org/apache/jena/sparql/api/TestAPI.java | 11 ++++ jena-arq/testing/ARQ/Construct/manifest.ttl | 64 ++++++++++++++++++++ .../ARQ/Construct/q-construct-quad-syntax-1.arq | 3 + .../ARQ/Construct/q-construct-quad-syntax-2.arq | 3 + .../ARQ/Construct/q-construct-quad-syntax-3.arq | 4 ++ .../ARQ/Construct/q-construct-quad-syntax-4.arq | 9 +++ .../ARQ/Construct/q-construct-quad-syntax-5.arq | 9 +++ .../ARQ/Construct/q-construct-quad-syntax-6.arq | 14 +++++ .../ARQ/Construct/q-construct-quad-syntax-7.arq | 7 +++ .../ARQ/Construct/q-construct-quad-syntax-8.arq | 9 +++ .../Construct/results-construct-quad-data-2.ttl | 2 + .../results-construct-quad-syntax-1.trig | 2 + .../results-construct-quad-syntax-2.trig | 0 .../results-construct-quad-syntax-3.ttl | 2 + .../results-construct-quad-syntax-4.trig | 6 ++ .../results-construct-quad-syntax-5.trig | 6 ++ .../results-construct-quad-syntax-6.trig | 6 ++ .../results-construct-quad-syntax-7.ttl | 2 + .../results-construct-quad-syntax-8.trig | 0 19 files changed, 159 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java index 5630804..6b6d203 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java @@ -519,6 +519,17 @@ public class TestAPI extends BaseTest assertTrue(IsoMatcher.isomorphic( expected.asDatasetGraph(), result.asDatasetGraph()) ); } + // Test construct triple and quad short form: + @Test public void testARQConstructQuad_ShortForm_3() { + String queryString = "CONSTRUCT WHERE { ?s ?p ?o. GRAPH ?g1 {?s1 ?p1 ?o1} }"; + Query q = QueryFactory.create(queryString, Syntax.syntaxARQ); + + QueryExecution qExec = QueryExecutionFactory.create(q, d); + Dataset result = qExec.execConstructDataset(); + + assertTrue(IsoMatcher.isomorphic( d.asDatasetGraph(), result.asDatasetGraph()) ); + } + // Test bad construct quad short form: @Test public void testARQConstructQuad_ShortForm_bad() { String queryString = "CONSTRUCT WHERE { GRAPH ?g {?s ?p ?o. FILTER isIRI(?o)} }"; http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/manifest.ttl ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/manifest.ttl b/jena-arq/testing/ARQ/Construct/manifest.ttl index 09d5038..7e9e660 100644 --- a/jena-arq/testing/ARQ/Construct/manifest.ttl +++ b/jena-arq/testing/ARQ/Construct/manifest.ttl @@ -105,4 +105,68 @@ qt:graphData <g2.ttl> ] ; mf:result <results-construct-quad-short-form-3.trig> ] + [ mf:name "Construct Quad: Syntax 1" ; + mf:action + [ qt:query <q-construct-quad-syntax-1.arq> ; + qt:data <dft.ttl> ; + qt:graphData <g1.ttl> ; + qt:graphData <g2.ttl> ] ; + mf:result <results-construct-quad-syntax-1.trig> + ] + [ mf:name "Construct Quad: Syntax 2" ; + mf:action + [ qt:query <q-construct-quad-syntax-2.arq> ; + qt:data <dft.ttl> ; + qt:graphData <g1.ttl> ; + qt:graphData <g2.ttl> ] ; + mf:result <results-construct-quad-syntax-2.trig> + ] + [ mf:name "Construct Quad: Syntax 3" ; + mf:action + [ qt:query <q-construct-quad-syntax-3.arq> ; + qt:data <dft.ttl> ; + qt:graphData <g1.ttl> ; + qt:graphData <g2.ttl> ] ; + mf:result <results-construct-quad-syntax-3.ttl> + ] + [ mf:name "Construct Quad: Syntax 4" ; + mf:action + [ qt:query <q-construct-quad-syntax-4.arq> ; + qt:data <dft.ttl> ; + qt:graphData <g1.ttl> ; + qt:graphData <g2.ttl> ] ; + mf:result <results-construct-quad-syntax-4.trig> + ] + [ mf:name "Construct Quad: Syntax 5" ; + mf:action + [ qt:query <q-construct-quad-syntax-5.arq> ; + qt:data <dft.ttl> ; + qt:graphData <g1.ttl> ; + qt:graphData <g2.ttl> ] ; + mf:result <results-construct-quad-syntax-5.trig> + ] + [ mf:name "Construct Quad: Syntax 6" ; + mf:action + [ qt:query <q-construct-quad-syntax-6.arq> ; + qt:data <dft.ttl> ; + qt:graphData <g1.ttl> ; + qt:graphData <g2.ttl> ] ; + mf:result <results-construct-quad-syntax-6.trig> + ] + [ mf:name "Construct Quad: Syntax 7" ; + mf:action + [ qt:query <q-construct-quad-syntax-7.arq> ; + qt:data <dft.ttl> ; + qt:graphData <g1.ttl> ; + qt:graphData <g2.ttl> ] ; + mf:result <results-construct-quad-syntax-7.ttl> + ] + [ mf:name "Construct Quad: Syntax 7" ; + mf:action + [ qt:query <q-construct-quad-syntax-7.arq> ; + qt:data <dft.ttl> ; + qt:graphData <g1.ttl> ; + qt:graphData <g2.ttl> ] ; + mf:result <results-construct-quad-syntax-7.ttl> + ] ). http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-1.arq ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-1.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-1.arq new file mode 100644 index 0000000..32eb189 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-1.arq @@ -0,0 +1,3 @@ +PREFIX : <http://example.org/ns#> + +CONSTRUCT { GRAPH :g { :s :p :o } } WHERE {} http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-2.arq ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-2.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-2.arq new file mode 100644 index 0000000..340c047 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-2.arq @@ -0,0 +1,3 @@ +PREFIX : <http://example.org/ns#> + +CONSTRUCT { GRAPH ?g { ?s ?p ?o } } WHERE { ?s ?p ?o } http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-3.arq ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-3.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-3.arq new file mode 100644 index 0000000..bef7c4f --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-3.arq @@ -0,0 +1,4 @@ +PREFIX : <http://example.org/ns#> + +CONSTRUCT { :s :p :o } WHERE {} + http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-4.arq ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-4.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-4.arq new file mode 100644 index 0000000..929b602 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-4.arq @@ -0,0 +1,9 @@ +PREFIX : <http://example.org/ns#> + +CONSTRUCT { + GRAPH ?g { :s :p :o } + ?s ?p ?o + } +WHERE + { GRAPH ?g { ?s ?p ?o } } + http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-5.arq ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-5.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-5.arq new file mode 100644 index 0000000..a9a8b61 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-5.arq @@ -0,0 +1,9 @@ +PREFIX : <http://example.org/ns#> + +CONSTRUCT { + ?s ?p ?o + GRAPH ?g { :s :p :o } + } +WHERE + { GRAPH ?g { ?s ?p ?o } } + http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-6.arq ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-6.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-6.arq new file mode 100644 index 0000000..921a44b --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-6.arq @@ -0,0 +1,14 @@ +PREFIX : <http://example.org/ns#> + +CONSTRUCT { + GRAPH ?g { :s :p :o } + ?s ?p ?o . + ?s ?p ?o . + GRAPH ?g { ?s ?p ?o } + ?s ?p ?o . + ?s ?p ?o + GRAPH ?g { ?s ?p ?o } + } +WHERE + { GRAPH ?g { ?s ?p ?o } } + http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-7.arq ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-7.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-7.arq new file mode 100644 index 0000000..fedde3c --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-7.arq @@ -0,0 +1,7 @@ +PREFIX : <http://example.org/ns#> + +CONSTRUCT { + GRAPH <urn:x-arq:DefaultGraphNode> {:s :p :o .} + } +WHERE {} + http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-8.arq ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-8.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-8.arq new file mode 100644 index 0000000..b5c0b40 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-8.arq @@ -0,0 +1,9 @@ +PREFIX : <http://example.org/ns#> + +CONSTRUCT { + GRAPH ?g { :s :p :o } + GRAPH ?g1 { :s :p :o } + } +WHERE + { } + http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-data-2.ttl ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-data-2.ttl b/jena-arq/testing/ARQ/Construct/results-construct-quad-data-2.ttl new file mode 100644 index 0000000..9a434a5 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/results-construct-quad-data-2.ttl @@ -0,0 +1,2 @@ +@prefix : <http://example.org/ns#> . +:s :p :o . \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-1.trig ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-1.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-1.trig new file mode 100644 index 0000000..ee42de7 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-1.trig @@ -0,0 +1,2 @@ +@prefix : <http://example.org/ns#> . +:g {:s :p :o } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-2.trig ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-2.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-2.trig new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-3.ttl ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-3.ttl b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-3.ttl new file mode 100644 index 0000000..8914bbe --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-3.ttl @@ -0,0 +1,2 @@ +@prefix : <http://example.org/ns#> . +:s :p :o \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-4.trig ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-4.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-4.trig new file mode 100644 index 0000000..eb40f00 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-4.trig @@ -0,0 +1,6 @@ +@prefix : <http://example.org/ns#> . +:s1 :p :o1 . +:s2 :p :o2 . +:a1 :b1 :c1 . +<g1.ttl> {:s :p :o} +<g2.ttl> {:s :p :o} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-5.trig ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-5.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-5.trig new file mode 100644 index 0000000..eb40f00 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-5.trig @@ -0,0 +1,6 @@ +@prefix : <http://example.org/ns#> . +:s1 :p :o1 . +:s2 :p :o2 . +:a1 :b1 :c1 . +<g1.ttl> {:s :p :o} +<g2.ttl> {:s :p :o} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-6.trig ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-6.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-6.trig new file mode 100644 index 0000000..9ddbf74 --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-6.trig @@ -0,0 +1,6 @@ +@prefix : <http://example.org/ns#> . +:s1 :p :o1 . +:s2 :p :o2 . +:a1 :b1 :c1 . +<g1.ttl> {:s :p :o. :s1 :p :o1 . :a1 :b1 :c1 .} +<g2.ttl> {:s :p :o. :s2 :p :o2 .} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-7.ttl ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-7.ttl b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-7.ttl new file mode 100644 index 0000000..8914bbe --- /dev/null +++ b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-7.ttl @@ -0,0 +1,2 @@ +@prefix : <http://example.org/ns#> . +:s :p :o \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/6f397404/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-8.trig ---------------------------------------------------------------------- diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-8.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-8.trig new file mode 100644 index 0000000..e69de29
