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 2019/05/20 18:22:17 UTC
[jena] 01/03: Update and maintain syntax tests
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 17274fa1413d8107ffab21f77c137af3b9a4bbf4
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Mon May 20 19:17:23 2019 +0100
Update and maintain syntax tests
---
.../testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl | 63 ++++++++++++++-
.../ARQ/Syntax/Syntax-SPARQL-Update/manifest.ttl | 17 +++-
.../ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl | 92 +++++++++++++++++-----
.../ARQ/Syntax/Syntax-SPARQL_11/syntax-bind-01.rq | 1 -
.../Syntax/Syntax-SPARQL_11/syntax-values-01.rq | 5 +-
.../Syntax/Syntax-SPARQL_11/syntax-values-02.rq | 6 --
.../Syntax/Syntax-SPARQL_11/syntax-values-03.rq | 3 -
.../Syntax/Syntax-SPARQL_11/syntax-values-04.rq | 6 --
.../Syntax/Syntax-SPARQL_11/syntax-values-05.rq | 3 -
.../Syntax/Syntax-SPARQL_11/syntax-values-09.rq | 2 +-
jena-arq/testing/ARQ/Syntax/syn-arq.sh | 51 ++++++++++++
jena-arq/testing/ARQ/Syntax/syn-func.sh | 25 +++++-
jena-arq/testing/ARQ/Syntax/syn-sparql_11_1.sh | 29 +++----
13 files changed, 240 insertions(+), 63 deletions(-)
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl b/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl
index 3478a61..b0a9acf 100644
--- a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl
+++ b/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
@prefix : <manifest#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -44,6 +59,13 @@
:test_31
:test_32
:test_33
+:test_34
+:test_35
+:test_36
+:test_37
+:test_38
+:test_39
+:test_40
) .
:test_1 rdf:type mfx:PositiveSyntaxTestARQ ;
@@ -196,19 +218,54 @@
mf:name "syntax-quad-construct-08.arq" ;
mf:action <syntax-quad-construct-08.arq> ;.
-:test_31 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_31 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-quad-construct-09.arq" ;
+ mf:action <syntax-quad-construct-09.arq> ;.
+
+:test_32 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-quad-construct-10.arq" ;
+ mf:action <syntax-quad-construct-10.arq> ;.
+
+:test_33 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-quad-construct-11.arq" ;
+ mf:action <syntax-quad-construct-11.arq> ;.
+
+:test_34 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-quad-construct-12.arq" ;
+ mf:action <syntax-quad-construct-12.arq> ;.
+
+:test_35 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-scope-bad-01.arq" ;
+ mf:action <syntax-scope-bad-01.arq> ;.
+
+:test_36 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-scope-bad-02.arq" ;
+ mf:action <syntax-scope-bad-02.arq> ;.
+
+:test_37 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-bad-01.arq" ;
mf:action <syntax-subquery-bad-01.arq> ;.
-:test_32 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_38 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-bad-02.arq" ;
mf:action <syntax-subquery-bad-02.arq> ;.
-:test_33 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_39 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-let-bad-01.arq" ;
mf:action <syntax-let-bad-01.arq> ;.
+:test_40 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-quad-construct-bad-01.arq" ;
+ mf:action <syntax-quad-construct-bad-01.arq> ;.
+
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL-Update/manifest.ttl b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL-Update/manifest.ttl
index fa188a1..eec803d 100644
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL-Update/manifest.ttl
+++ b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL-Update/manifest.ttl
@@ -1,4 +1,19 @@
-@prefix : <manifest#> .
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+@prefix : <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/syntax-update-1/manifest#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl
index f7015f5..15a3750 100644
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl
+++ b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl
@@ -19,6 +19,7 @@
@prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
@prefix mfx: <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
@prefix qt: <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+@prefix dawgt: <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
<> rdf:type mf:Manifest ;
rdfs:comment "Syntax tests Syntax SPARQL 1.1" ;
@@ -79,206 +80,257 @@
) .
:test_1 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-01.rq" ;
mf:action <syntax-select-expr-01.rq> ;.
:test_2 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-02.rq" ;
mf:action <syntax-select-expr-02.rq> ;.
:test_3 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-03.rq" ;
mf:action <syntax-select-expr-03.rq> ;.
:test_4 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-04.rq" ;
mf:action <syntax-select-expr-04.rq> ;.
:test_5 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-05.rq" ;
mf:action <syntax-select-expr-05.rq> ;.
:test_6 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-01.rq" ;
mf:action <syntax-aggregate-01.rq> ;.
:test_7 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-02.rq" ;
mf:action <syntax-aggregate-02.rq> ;.
:test_8 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-03.rq" ;
mf:action <syntax-aggregate-03.rq> ;.
:test_9 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-04.rq" ;
mf:action <syntax-aggregate-04.rq> ;.
:test_10 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-05.rq" ;
mf:action <syntax-aggregate-05.rq> ;.
:test_11 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-06.rq" ;
mf:action <syntax-aggregate-06.rq> ;.
:test_12 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-07.rq" ;
mf:action <syntax-aggregate-07.rq> ;.
:test_13 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-08.rq" ;
mf:action <syntax-aggregate-08.rq> ;.
:test_14 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-09.rq" ;
mf:action <syntax-aggregate-09.rq> ;.
:test_15 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-10.rq" ;
mf:action <syntax-aggregate-10.rq> ;.
:test_16 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-11.rq" ;
mf:action <syntax-aggregate-11.rq> ;.
:test_17 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-12.rq" ;
mf:action <syntax-aggregate-12.rq> ;.
:test_18 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-13.rq" ;
mf:action <syntax-aggregate-13.rq> ;.
:test_19 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-14.rq" ;
mf:action <syntax-aggregate-14.rq> ;.
:test_20 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-aggregate-15.rq" ;
mf:action <syntax-aggregate-15.rq> ;.
:test_21 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-01.rq" ;
mf:action <syntax-subquery-01.rq> ;.
:test_22 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-02.rq" ;
mf:action <syntax-subquery-02.rq> ;.
:test_23 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-03.rq" ;
mf:action <syntax-subquery-03.rq> ;.
:test_24 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-not-exists-01.rq" ;
mf:action <syntax-not-exists-01.rq> ;.
:test_25 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-not-exists-02.rq" ;
mf:action <syntax-not-exists-02.rq> ;.
:test_26 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-not-exists-03.rq" ;
mf:action <syntax-not-exists-03.rq> ;.
:test_27 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-exists-01.rq" ;
mf:action <syntax-exists-01.rq> ;.
:test_28 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-exists-02.rq" ;
mf:action <syntax-exists-02.rq> ;.
:test_29 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-exists-03.rq" ;
mf:action <syntax-exists-03.rq> ;.
:test_30 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-minus-01.rq" ;
mf:action <syntax-minus-01.rq> ;.
:test_31 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-oneof-01.rq" ;
mf:action <syntax-oneof-01.rq> ;.
:test_32 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-oneof-02.rq" ;
mf:action <syntax-oneof-02.rq> ;.
:test_33 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-oneof-03.rq" ;
mf:action <syntax-oneof-03.rq> ;.
:test_34 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-values-01.rq" ;
mf:action <syntax-values-01.rq> ;.
:test_35 rdf:type mf:PositiveSyntaxTest11 ;
- mf:name "syntax-values-02.rq" ;
- mf:action <syntax-values-02.rq> ;.
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-values-01.rq" ;
+ mf:action <syntax-values-01.rq> ;.
:test_36 rdf:type mf:PositiveSyntaxTest11 ;
- mf:name "syntax-values-03.rq" ;
- mf:action <syntax-values-03.rq> ;.
-
-:test_37 rdf:type mf:PositiveSyntaxTest11 ;
- mf:name "syntax-values-04.rq" ;
- mf:action <syntax-values-04.rq> ;.
-
-:test_38 rdf:type mf:PositiveSyntaxTest11 ;
- mf:name "syntax-values-05.rq" ;
- mf:action <syntax-values-05.rq> ;.
-
-:test_39 rdf:type mf:PositiveSyntaxTest11 ;
- mf:name "syntax-bind-01.rq" ;
- mf:action <syntax-bind-01.rq> ;.
-
-:test_40 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-bind-02.rq" ;
mf:action <syntax-bind-02.rq> ;.
-:test_41 rdf:type mf:PositiveSyntaxTest11 ;
+:test_37 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-construct-where-01.rq" ;
mf:action <syntax-construct-where-01.rq> ;.
-:test_42 rdf:type mf:PositiveSyntaxTest11 ;
+:test_38 rdf:type mf:PositiveSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-construct-where-02.rq" ;
mf:action <syntax-construct-where-02.rq> ;.
+:test_39 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-values-bad-01.rq" ;
+ mf:action <syntax-values-bad-01.rq> ;.
+
+:test_40 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-values-bad-02.rq" ;
+ mf:action <syntax-values-bad-02.rq> ;.
+
+:test_41 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-values-bad-03.rq" ;
+ mf:action <syntax-values-bad-03.rq> ;.
+
+:test_42 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-values-bad-04.rq" ;
+ mf:action <syntax-values-bad-04.rq> ;.
+
:test_43 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syn-bad-01.rq" ;
mf:action <syn-bad-01.rq> ;.
:test_44 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syn-bad-02.rq" ;
mf:action <syn-bad-02.rq> ;.
:test_45 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syn-bad-03.rq" ;
mf:action <syn-bad-03.rq> ;.
:test_46 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syn-bad-04.rq" ;
mf:action <syn-bad-04.rq> ;.
:test_47 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syn-bad-05.rq" ;
mf:action <syn-bad-05.rq> ;.
:test_48 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syn-bad-06.rq" ;
mf:action <syn-bad-06.rq> ;.
:test_49 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syn-bad-07.rq" ;
mf:action <syn-bad-07.rq> ;.
:test_50 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syn-bad-08.rq" ;
mf:action <syn-bad-08.rq> ;.
:test_51 rdf:type mf:NegativeSyntaxTest11 ;
+ dawgt:approval dawgt:NotClassified ;
mf:name "syntax-values-09.rq" ;
mf:action <syntax-values-09.rq> ;.
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bind-01.rq b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bind-01.rq
deleted file mode 100644
index 3528f1b..0000000
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bind-01.rq
+++ /dev/null
@@ -1 +0,0 @@
-SELECT ?Z { ?s ?p ?o . BIND(?o+1 AS ?Z) }
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-01.rq b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-01.rq
index 7a35cd4..3528f1b 100644
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-01.rq
+++ b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-01.rq
@@ -1,4 +1 @@
-SELECT *
-{
- VALUES ?x { 1 2 3 UNDEF }
-}
+SELECT ?Z { ?s ?p ?o . BIND(?o+1 AS ?Z) }
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-02.rq b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-02.rq
deleted file mode 100644
index 944d82d..0000000
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-02.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT * {
- VALUES (?x ?y)
- {
- (1 2) (<x> <y>) (UNDEF <z>)
- }
-}
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-03.rq b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-03.rq
deleted file mode 100644
index 4772db3..0000000
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-03.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT * {
- VALUES () { () }
-}
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-04.rq b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-04.rq
deleted file mode 100644
index 1f711dc..0000000
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-04.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT *
-{ }
-VALUES (?x ?y) {
- (1 2 )
-}
-
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-05.rq b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-05.rq
deleted file mode 100644
index 4f46296..0000000
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-05.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT * { }
-VALUES ?x { }
-
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-09.rq b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-09.rq
index 5ad4833..0925f21 100644
--- a/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-09.rq
+++ b/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-09.rq
@@ -1 +1 @@
-SELECT * { } VALUES (?x ?y) { (1 2) (3) }
+SELECT * { } VALUES ?x ?y { (1 2) (3) }
diff --git a/jena-arq/testing/ARQ/Syntax/syn-arq.sh b/jena-arq/testing/ARQ/Syntax/syn-arq.sh
index c028144..bcf5440 100644
--- a/jena-arq/testing/ARQ/Syntax/syn-arq.sh
+++ b/jena-arq/testing/ARQ/Syntax/syn-arq.sh
@@ -277,3 +277,54 @@ CONSTRUCT {
WHERE
{ }
EOF
+
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-quad-construct-" $N arq) <<EOF
+PREFIX : <http://example/>
+
+CONSTRUCT {
+ { ?s ?p ?o }
+ }
+WHERE
+ { }
+EOF
+
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-quad-construct-" $N arq) <<EOF
+PREFIX : <http://example/>
+
+CONSTRUCT
+WHERE
+ {
+ ?s ?p ?o
+ }
+EOF
+
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-quad-construct-" $N arq) <<EOF
+PREFIX : <http://example/>
+
+CONSTRUCT
+WHERE
+ {
+ GRAPH ?g { ?s ?p ?o }
+ }
+EOF
+
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-quad-construct-" $N arq) <<EOF
+PREFIX : <http://example/>
+
+CONSTRUCT
+WHERE
+ {
+ { ?s ?p ?o }
+ }
+EOF
+
+N=0
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-quad-construct-bad-" $N arq) <<EOF
+PREFIX : <http://example/>
+
+CONSTRUCT
+WHERE
+ {
+ GRAPH ?g { ?s ?p ?o. FILTER isIRI(?o) }
+ }
+EOF
diff --git a/jena-arq/testing/ARQ/Syntax/syn-func.sh b/jena-arq/testing/ARQ/Syntax/syn-func.sh
index 16532da..f66c771 100644
--- a/jena-arq/testing/ARQ/Syntax/syn-func.sh
+++ b/jena-arq/testing/ARQ/Syntax/syn-func.sh
@@ -94,7 +94,27 @@ function output
ITEMS="$ITEMS\n$N"
}
+function outputLicense
+{
+ cat <<EOF
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+EOF
+}
function createManifest
{
@@ -107,7 +127,9 @@ function createManifest
local LABEL="$1"
local URI="$2"
## Header
- cat > manifest.ttl <<EOF
+ (
+ outputLicense
+ cat <<EOF
@prefix : $URI .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -122,6 +144,7 @@ function createManifest
(
EOF
+ )> manifest.ttl
# Build the manifest list.
# Build the manifest items.
diff --git a/jena-arq/testing/ARQ/Syntax/syn-sparql_11_1.sh b/jena-arq/testing/ARQ/Syntax/syn-sparql_11_1.sh
index c8a5b10..b763f4d 100755
--- a/jena-arq/testing/ARQ/Syntax/syn-sparql_11_1.sh
+++ b/jena-arq/testing/ARQ/Syntax/syn-sparql_11_1.sh
@@ -159,32 +159,33 @@ N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-oneof-" $N) <<EOF
SELECT * { ?s ?p ?o FILTER(?o IN(1,<x>)) }
EOF
-## ---- BINDINGS
+## ---- VALUES
N=0
-N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-bindings-" $N) <<EOF
-SELECT * { } BINDINGS ?x ?y { }
+N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-values-" $N) <<EOF
+SELECT * { } VALUES ?x ?y { }
EOF
-N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-bindings-" $N) <<EOF
-SELECT * { } BINDINGS { }
+N=0
+N=$((N+1)) ; testBad $SPARQL11 $(fname "syntax-values-bad-" $N) <<EOF
+SELECT * { } VALUES { }
EOF
-N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-bindings-" $N) <<EOF
-SELECT * { } BINDINGS { () }
+N=$((N+1)) ; testBad $SPARQL11 $(fname "syntax-values-bad-" $N) <<EOF
+SELECT * { } VALUES { () }
EOF
-N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-bindings-" $N) <<EOF
-SELECT * { } BINDINGS { }
+N=$((N+1)) ; testBad $SPARQL11 $(fname "syntax-values-bad-" $N) <<EOF
+SELECT * { } VALUES { }
EOF
-N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-bindings-" $N) <<EOF
-SELECT * { } BINDINGS ?x ?y { (1 2) }
+N=$((N+1)) ; testBad $SPARQL11 $(fname "syntax-values-bad-" $N) <<EOF
+SELECT * { } VALUES ?x ?y { (1 2) }
EOF
## ---- BIND
N=0
-N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-bindings-" $N) <<EOF
+N=$((N+1)) ; testGood $SPARQL11 $(fname "syntax-values-" $N) <<EOF
SELECT ?Z { ?s ?p ?o . BIND(?o+1 AS ?Z) }
EOF
@@ -245,6 +246,6 @@ N=$((N+1)) ; testBad $SPARQL11 $(fname "syn-bad-" $N) <<EOF
SELECT * { ?s ?p ?o UNION ?s ?p ?o }
EOF
-N=$((N+1)) ; testBad $SPARQL11 $(fname "syntax-bindings-" $N) <<EOF
-SELECT * { } BINDINGS ?x ?y { (1 2) (3) }
+N=$((N+1)) ; testBad $SPARQL11 $(fname "syntax-values-" $N) <<EOF
+SELECT * { } VALUES ?x ?y { (1 2) (3) }
EOF