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 2022/12/03 18:00:51 UTC
[jena] branch main updated: GH-1615: Place LATERAL syntax tests in their own directory
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new e778f6b228 GH-1615: Place LATERAL syntax tests in their own directory
new d22b23f1fd Merge pull request #1660 from afs/lateral-tests
e778f6b228 is described below
commit e778f6b228560f3908e20d82ef580751edcf3f0a
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Dec 3 15:49:27 2022 +0000
GH-1615: Place LATERAL syntax tests in their own directory
---
.../testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl | 164 ++++++---------------
.../testing/ARQ/Syntax/Syntax-Lateral/manifest.ttl | 109 ++++++++++++++
.../syntax-lateral-01.arq | 0
.../syntax-lateral-02.arq | 0
.../syntax-lateral-03.arq | 0
.../syntax-lateral-04.arq | 0
.../syntax-lateral-05.arq | 0
.../syntax-lateral-bad-01.arq | 0
.../syntax-lateral-bad-02.arq | 0
.../syntax-lateral-bad-03.arq | 0
.../syntax-lateral-bad-04.arq | 0
.../syntax-lateral-bad-05.arq | 0
.../syntax-lateral-bad-06.arq | 0
.../syntax-lateral-bad-07.arq | 0
.../syntax-lateral-bad-08.arq | 0
jena-arq/testing/ARQ/Syntax/manifest-syntax.ttl | 12 +-
jena-arq/testing/ARQ/Syntax/syn-arq.sh | 81 +---------
jena-arq/testing/ARQ/Syntax/syn-lateral.sh | 80 ++++++++++
jena-arq/testing/ARQ/Syntax/syn.sh | 8 +
19 files changed, 248 insertions(+), 206 deletions(-)
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl b/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl
index f7fea62bae..cc02540b09 100644
--- a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl
+++ b/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/manifest.ttl
@@ -70,302 +70,224 @@
:test_42
:test_43
:test_44
-:test_45
-:test_46
-:test_47
-:test_48
-:test_49
-:test_50
-:test_51
-:test_52
-:test_53
-:test_54
-:test_55
-:test_56
-:test_57
) .
:test_1 rdf:type mfx:PositiveSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-01.arq" ;
- mf:action <syntax-lateral-01.arq> ;.
-
-:test_2 rdf:type mfx:PositiveSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-02.arq" ;
- mf:action <syntax-lateral-02.arq> ;.
-
-:test_3 rdf:type mfx:PositiveSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-03.arq" ;
- mf:action <syntax-lateral-03.arq> ;.
-
-:test_4 rdf:type mfx:PositiveSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-04.arq" ;
- mf:action <syntax-lateral-04.arq> ;.
-
-:test_5 rdf:type mfx:PositiveSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-05.arq" ;
- mf:action <syntax-lateral-05.arq> ;.
-
-:test_6 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-01.arq" ;
mf:action <syntax-select-expr-01.arq> ;.
-:test_7 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_2 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-02.arq" ;
mf:action <syntax-select-expr-02.arq> ;.
-:test_8 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_3 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-03.arq" ;
mf:action <syntax-select-expr-03.arq> ;.
-:test_9 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_4 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-04.arq" ;
mf:action <syntax-select-expr-04.arq> ;.
-:test_10 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_5 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-05.arq" ;
mf:action <syntax-select-expr-05.arq> ;.
-:test_11 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_6 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-06.arq" ;
mf:action <syntax-select-expr-06.arq> ;.
-:test_12 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_7 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-select-expr-07.arq" ;
mf:action <syntax-select-expr-07.arq> ;.
-:test_13 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_8 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-service-01.arq" ;
mf:action <syntax-service-01.arq> ;.
-:test_14 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_9 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-group-01.arq" ;
mf:action <syntax-group-01.arq> ;.
-:test_15 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_10 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-group-02.arq" ;
mf:action <syntax-group-02.arq> ;.
-:test_16 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_11 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-group-03.arq" ;
mf:action <syntax-group-03.arq> ;.
-:test_17 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_12 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-group-04.arq" ;
mf:action <syntax-group-04.arq> ;.
-:test_18 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_13 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-count-01.arq" ;
mf:action <syntax-count-01.arq> ;.
-:test_19 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_14 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-count-02.arq" ;
mf:action <syntax-count-02.arq> ;.
-:test_20 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_15 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-count-03.arq" ;
mf:action <syntax-count-03.arq> ;.
-:test_21 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_16 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-count-04.arq" ;
mf:action <syntax-count-04.arq> ;.
-:test_22 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_17 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-01.arq" ;
mf:action <syntax-subquery-01.arq> ;.
-:test_23 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_18 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-02.arq" ;
mf:action <syntax-subquery-02.arq> ;.
-:test_24 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_19 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-03.arq" ;
mf:action <syntax-subquery-03.arq> ;.
-:test_25 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_20 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-04.arq" ;
mf:action <syntax-subquery-04.arq> ;.
-:test_26 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_21 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-let-01.arq" ;
mf:action <syntax-let-01.arq> ;.
-:test_27 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_22 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-let-02.arq" ;
mf:action <syntax-let-02.arq> ;.
-:test_28 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_23 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-quad-construct-01.arq" ;
mf:action <syntax-quad-construct-01.arq> ;.
-:test_29 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_24 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-quad-construct-02.arq" ;
mf:action <syntax-quad-construct-02.arq> ;.
-:test_30 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_25 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-quad-construct-03.arq" ;
mf:action <syntax-quad-construct-03.arq> ;.
-:test_31 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_26 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-quad-construct-04.arq" ;
mf:action <syntax-quad-construct-04.arq> ;.
-:test_32 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_27 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-quad-construct-05.arq" ;
mf:action <syntax-quad-construct-05.arq> ;.
-:test_33 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_28 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-quad-construct-06.arq" ;
mf:action <syntax-quad-construct-06.arq> ;.
-:test_34 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_29 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-quad-construct-07.arq" ;
mf:action <syntax-quad-construct-07.arq> ;.
-:test_35 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_30 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-quad-construct-08.arq" ;
mf:action <syntax-quad-construct-08.arq> ;.
-:test_36 rdf:type mfx:PositiveSyntaxTestARQ ;
+: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_37 rdf:type mfx:PositiveSyntaxTestARQ ;
+: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_38 rdf:type mfx:PositiveSyntaxTestARQ ;
+: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_39 rdf:type mfx:PositiveSyntaxTestARQ ;
+: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_40 rdf:type mfx:PositiveSyntaxTestARQ ;
+:test_35 rdf:type mfx:PositiveSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-median-01.arq" ;
mf:action <syntax-median-01.arq> ;.
-:test_41 rdf:type mfx:NegativeSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-bad-01.arq" ;
- mf:action <syntax-lateral-bad-01.arq> ;.
-
-:test_42 rdf:type mfx:NegativeSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-bad-02.arq" ;
- mf:action <syntax-lateral-bad-02.arq> ;.
-
-:test_43 rdf:type mfx:NegativeSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-bad-03.arq" ;
- mf:action <syntax-lateral-bad-03.arq> ;.
-
-:test_44 rdf:type mfx:NegativeSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-bad-04.arq" ;
- mf:action <syntax-lateral-bad-04.arq> ;.
-
-:test_45 rdf:type mfx:NegativeSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-bad-05.arq" ;
- mf:action <syntax-lateral-bad-05.arq> ;.
-
-:test_46 rdf:type mfx:NegativeSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-bad-06.arq" ;
- mf:action <syntax-lateral-bad-06.arq> ;.
-
-:test_47 rdf:type mfx:NegativeSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-bad-07.arq" ;
- mf:action <syntax-lateral-bad-07.arq> ;.
-
-:test_48 rdf:type mfx:NegativeSyntaxTestARQ ;
- dawgt:approval dawgt:NotClassified ;
- mf:name "syntax-lateral-bad-08.arq" ;
- mf:action <syntax-lateral-bad-08.arq> ;.
-
-:test_49 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_36 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-scope-bad-01.arq" ;
mf:action <syntax-scope-bad-01.arq> ;.
-:test_50 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_37 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-scope-bad-02.arq" ;
mf:action <syntax-scope-bad-02.arq> ;.
-:test_51 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_38 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-agg-expr-bad-01.arq" ;
mf:action <syntax-agg-expr-bad-01.arq> ;.
-:test_52 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_39 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-agg-expr-bad-02.arq" ;
mf:action <syntax-agg-expr-bad-02.arq> ;.
-:test_53 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_40 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-agg-expr-bad-03.arq" ;
mf:action <syntax-agg-expr-bad-03.arq> ;.
-:test_54 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_41 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-bad-01.arq" ;
mf:action <syntax-subquery-bad-01.arq> ;.
-:test_55 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_42 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-subquery-bad-02.arq" ;
mf:action <syntax-subquery-bad-02.arq> ;.
-:test_56 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_43 rdf:type mfx:NegativeSyntaxTestARQ ;
dawgt:approval dawgt:NotClassified ;
mf:name "syntax-let-bad-01.arq" ;
mf:action <syntax-let-bad-01.arq> ;.
-:test_57 rdf:type mfx:NegativeSyntaxTestARQ ;
+:test_44 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-Lateral/manifest.ttl b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/manifest.ttl
new file mode 100644
index 0000000000..3731777f8f
--- /dev/null
+++ b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/manifest.ttl
@@ -0,0 +1,109 @@
+# 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#> .
+@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-Lateral" ;
+ mf:entries
+ (
+
+:test_1
+:test_2
+:test_3
+:test_4
+:test_5
+:test_6
+:test_7
+:test_8
+:test_9
+:test_10
+:test_11
+:test_12
+:test_13
+) .
+
+:test_1 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-01.arq" ;
+ mf:action <syntax-lateral-01.arq> ;.
+
+:test_2 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-02.arq" ;
+ mf:action <syntax-lateral-02.arq> ;.
+
+:test_3 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-03.arq" ;
+ mf:action <syntax-lateral-03.arq> ;.
+
+:test_4 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-04.arq" ;
+ mf:action <syntax-lateral-04.arq> ;.
+
+:test_5 rdf:type mfx:PositiveSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-05.arq" ;
+ mf:action <syntax-lateral-05.arq> ;.
+
+:test_6 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-bad-01.arq" ;
+ mf:action <syntax-lateral-bad-01.arq> ;.
+
+:test_7 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-bad-02.arq" ;
+ mf:action <syntax-lateral-bad-02.arq> ;.
+
+:test_8 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-bad-03.arq" ;
+ mf:action <syntax-lateral-bad-03.arq> ;.
+
+:test_9 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-bad-04.arq" ;
+ mf:action <syntax-lateral-bad-04.arq> ;.
+
+:test_10 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-bad-05.arq" ;
+ mf:action <syntax-lateral-bad-05.arq> ;.
+
+:test_11 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-bad-06.arq" ;
+ mf:action <syntax-lateral-bad-06.arq> ;.
+
+:test_12 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-bad-07.arq" ;
+ mf:action <syntax-lateral-bad-07.arq> ;.
+
+:test_13 rdf:type mfx:NegativeSyntaxTestARQ ;
+ dawgt:approval dawgt:NotClassified ;
+ mf:name "syntax-lateral-bad-08.arq" ;
+ mf:action <syntax-lateral-bad-08.arq> ;.
+
+
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-01.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-01.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-01.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-01.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-02.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-02.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-02.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-02.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-03.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-03.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-03.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-03.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-04.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-04.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-04.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-04.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-05.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-05.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-05.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-05.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-01.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-01.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-01.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-01.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-02.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-02.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-02.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-02.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-03.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-03.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-03.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-03.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-04.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-04.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-04.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-04.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-05.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-05.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-05.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-05.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-06.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-06.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-06.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-06.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-07.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-07.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-07.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-07.arq
diff --git a/jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-08.arq b/jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-08.arq
similarity index 100%
rename from jena-arq/testing/ARQ/Syntax/Syntax-ARQ/syntax-lateral-bad-08.arq
rename to jena-arq/testing/ARQ/Syntax/Syntax-Lateral/syntax-lateral-bad-08.arq
diff --git a/jena-arq/testing/ARQ/Syntax/manifest-syntax.ttl b/jena-arq/testing/ARQ/Syntax/manifest-syntax.ttl
index 481f798c8a..ef842d8b99 100644
--- a/jena-arq/testing/ARQ/Syntax/manifest-syntax.ttl
+++ b/jena-arq/testing/ARQ/Syntax/manifest-syntax.ttl
@@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-@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#> .
-@prefix qt: <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+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#>
+PREFIX qt: <http://www.w3.org/2001/sw/DataAccess/tests/test-query#>
<> rdf:type mf:Manifest ;
rdfs:label "Syntax" ;
@@ -25,7 +25,9 @@
<Syntax-SPARQL_10_2/manifest.ttl>
<Syntax-SPARQL_10_3/manifest.ttl>
<Syntax-SPARQL_11/manifest.ttl> ## SPARQL 1.1
- <Syntax-SPARQL-Fed/manifest.ttl>
+ <Syntax-SPARQL-Fed/manifest.ttl>
+
+ <Syntax-Lateral/manifest.ttl>
<Syntax-ARQ/manifest.ttl>
## SPARQL 1.1 Update
diff --git a/jena-arq/testing/ARQ/Syntax/syn-arq.sh b/jena-arq/testing/ARQ/Syntax/syn-arq.sh
index 53543e3794..17479777b3 100644
--- a/jena-arq/testing/ARQ/Syntax/syn-arq.sh
+++ b/jena-arq/testing/ARQ/Syntax/syn-arq.sh
@@ -1,85 +1,6 @@
#!/bin/bash
-## ---- LATERAL
-
-N=0
-
-N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
-SELECT * { LATERAL {} }
-EOF
-
-N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
-SELECT * {
- ?s ?p ?o
- LATERAL { SELECT ?x { ?s ?q ?x } LIMIT 2 }
-}
-EOF
-
-N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
-SELECT * { LATERAL {} }
-EOF
-
-N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
-SELECT * {
- ?s ?p ?o
- LATERAL { OPTIONAL { ?s ?q ?x } }
-}
-EOF
-
-## Scoping rules.
-N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
-SELECT * { ?s ?p ?o LATERAL { SELECT ?s { BIND(123 AS ?o) } } }
-EOF
-
-## Scoping rules.
-
-N=0
-
-N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
-SELECT * { LATERAL }
-EOF
-
-N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
-SELECT * { LATERAL OPTIONAL { ?s ?p ?o } }
-EOF
-
-N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
-SELECT * { OPTIONAL LATERAL { ?s ?p ?o } }
-EOF
-
-N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
-SELECT * {
- ?s ?p ?o
- LATERAL { BIND( 123 AS ?o) }
-}
-EOF
-
-N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
-SELECT * {
- ?s ?p ?o
- LATERAL { OPTIONAL { BIND( 123 AS ?o) } }
-}
-EOF
-
-N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
-SELECT * {
- ?s ?p ?o
- LATERAL { ?s ?p ?o VALUES ?o {123 456} }
-}
-EOF
-
-N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
-SELECT * {
- ?s ?p ?o
- LATERAL { SELECT (123 As ?o) {} }
-}
-EOF
-
-N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
-SELECT * { ?s ?p ?o LATERAL { SELECT * { BIND(123 AS ?o) } } }
-EOF
-
-## ---- Additional tests
+## ---- ARQ tests
N=0
diff --git a/jena-arq/testing/ARQ/Syntax/syn-lateral.sh b/jena-arq/testing/ARQ/Syntax/syn-lateral.sh
new file mode 100644
index 0000000000..249b81c7ae
--- /dev/null
+++ b/jena-arq/testing/ARQ/Syntax/syn-lateral.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+## ---- LATERAL
+
+N=0
+
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
+SELECT * { LATERAL {} }
+EOF
+
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
+SELECT * {
+ ?s ?p ?o
+ LATERAL { SELECT ?x { ?s ?q ?x } LIMIT 2 }
+}
+EOF
+
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
+SELECT * { LATERAL {} }
+EOF
+
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
+SELECT * {
+ ?s ?p ?o
+ LATERAL { OPTIONAL { ?s ?q ?x } }
+}
+EOF
+
+## Scoping rules.
+N=$((N+1)) ; testGood $ARQ $(fname "syntax-lateral-" $N arq) <<EOF
+SELECT * { ?s ?p ?o LATERAL { SELECT ?s { BIND(123 AS ?o) } } }
+EOF
+
+## Scoping rules.
+
+N=0
+
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
+SELECT * { LATERAL }
+EOF
+
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
+SELECT * { LATERAL OPTIONAL { ?s ?p ?o } }
+EOF
+
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
+SELECT * { OPTIONAL LATERAL { ?s ?p ?o } }
+EOF
+
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
+SELECT * {
+ ?s ?p ?o
+ LATERAL { BIND( 123 AS ?o) }
+}
+EOF
+
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
+SELECT * {
+ ?s ?p ?o
+ LATERAL { OPTIONAL { BIND( 123 AS ?o) } }
+}
+EOF
+
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
+SELECT * {
+ ?s ?p ?o
+ LATERAL { ?s ?p ?o VALUES ?o {123 456} }
+}
+EOF
+
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
+SELECT * {
+ ?s ?p ?o
+ LATERAL { SELECT (123 As ?o) {} }
+}
+EOF
+
+N=$((N+1)) ; testBad $ARQ $(fname "syntax-lateral-bad-" $N arq) <<EOF
+SELECT * { ?s ?p ?o LATERAL { SELECT * { BIND(123 AS ?o) } } }
+EOF
diff --git a/jena-arq/testing/ARQ/Syntax/syn.sh b/jena-arq/testing/ARQ/Syntax/syn.sh
index e414ba55ed..0fdaae5bef 100755
--- a/jena-arq/testing/ARQ/Syntax/syn.sh
+++ b/jena-arq/testing/ARQ/Syntax/syn.sh
@@ -50,6 +50,14 @@ source syn-func.sh
'<http://www.w3.org/2009/sparql/docs/tests/data-sparql11/syntax-service/manifest#>'
)
+# Lateral
+(
+ cd Syntax-Lateral
+ clean
+ source ../syn-lateral.sh
+ createManifest "Syntax-Lateral" '<manifest#>'
+)
+
# ARQ
(
cd Syntax-ARQ