From e5f3f1fbb9c7c86a150abcaab1753b53aee0688c Mon Sep 17 00:00:00 2001 From: asejal <55681645+asejal@users.noreply.github.com> Date: Fri, 13 May 2022 22:32:06 +0530 Subject: [PATCH 01/19] Added test for example at CBD definition. Fixes #1914. (#1915) We have added a test for the example at the definition for Concise Bounded Definition [here](https://www.w3.org/Submission/CBD/#example). Fixes #1914 --- test/data/spec/cbd/example_graph.rdf | 78 ++++++++++++++++++++++++ test/data/spec/cbd/example_graph_cbd.rdf | 44 +++++++++++++ test/test_graph/test_graph_cbd.py | 27 ++++++++ 3 files changed, 149 insertions(+) create mode 100644 test/data/spec/cbd/example_graph.rdf create mode 100644 test/data/spec/cbd/example_graph_cbd.rdf diff --git a/test/data/spec/cbd/example_graph.rdf b/test/data/spec/cbd/example_graph.rdf new file mode 100644 index 000000000..06dcef15e --- /dev/null +++ b/test/data/spec/cbd/example_graph.rdf @@ -0,0 +1,78 @@ + + + + + + A Really Great Book + Examples-R-Us + + + + John Doe + john@example.com + + + + image/jpeg + 1234 + + + + + + + + + Jane Doe + + + en + application/pdf + Copyright (C) 2004 Examples-R-Us. All rights reserved. + 2004-01-19 + + + + + + + application/pdf + + + + + + + image/jpeg + + + + + Another Great Book + Examples-R-Us + June Doe (june@example.com) + application/pdf + en + Copyright (C) 2004 Examples-R-Us. All rights reserved. + 2004-05-03 + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/data/spec/cbd/example_graph_cbd.rdf b/test/data/spec/cbd/example_graph_cbd.rdf new file mode 100644 index 000000000..a535fc76f --- /dev/null +++ b/test/data/spec/cbd/example_graph_cbd.rdf @@ -0,0 +1,44 @@ + + + + + + A Really Great Book + Examples-R-Us + + + + John Doe + john@example.com + + + + + + + + Jane Doe + + + en + application/pdf + Copyright (C) 2004 Examples-R-Us. All rights reserved. + 2004-01-19 + + + + + + + application/pdf + + + + \ No newline at end of file diff --git a/test/test_graph/test_graph_cbd.py b/test/test_graph/test_graph_cbd.py index 2a42dd0ac..485109225 100644 --- a/test/test_graph/test_graph_cbd.py +++ b/test/test_graph/test_graph_cbd.py @@ -1,6 +1,15 @@ +import os +from test.data import TEST_DATA_DIR +from test.utils import GraphHelper + import pytest from rdflib import Graph, Namespace +from rdflib.compare import isomorphic +from rdflib.term import URIRef + +EXAMPLE_GRAPH_FILE_PATH = TEST_DATA_DIR / "spec" / "cbd" / "example_graph.rdf" +EXAMPLE_GRAPH_CBD_FILE_PATH = TEST_DATA_DIR / "spec" / "cbd" / "example_graph_cbd.rdf" """Tests the Graph class' cbd() function""" @@ -109,3 +118,21 @@ def testCbdReified(get_graph): ) assert len(g.cbd(EX.R6)) == (3 + 5 + 5), "cbd() for R6 should return 12 triples" + + +def test_cbd_example(): + """ + Example from Concise Bounded Description definition at https://www.w3.org/Submission/CBD/#example + """ + g = Graph() + g.parse(EXAMPLE_GRAPH_FILE_PATH) + + g_cbd = Graph() + g_cbd.parse(EXAMPLE_GRAPH_CBD_FILE_PATH) + + query = "http://example.com/aReallyGreatBook" + GraphHelper.assert_isomorphic(g.cbd(URIRef(query)), g_cbd) + GraphHelper.assert_sets_equals(g.cbd(URIRef(query)), g_cbd, exclude_blanks=True) + assert len(g.cbd(URIRef(query))) == ( + 21 + ), "cbd() for aReallyGreatBook should return 21 triples" From 90f2989e779c7e2b647df460534711ee253695dd Mon Sep 17 00:00:00 2001 From: Graham Higgins Date: Fri, 13 May 2022 20:30:05 +0200 Subject: [PATCH 02/19] Switch to latest DAWG test suite This patch changes `test/test_w3c_spec/test_sparql_w3c.py` to use the final DAWG data-r2 test suite instead of an older version. --- test/skipped_sparql_tests.py | 80 +++++++++++++++++++++++++++ test/skiptests.list | 27 ++++++--- test/test_w3c_spec/test_sparql_w3c.py | 13 +---- test/utils/manifest.py | 1 + 4 files changed, 103 insertions(+), 18 deletions(-) create mode 100644 test/skipped_sparql_tests.py diff --git a/test/skipped_sparql_tests.py b/test/skipped_sparql_tests.py new file mode 100644 index 000000000..863385e66 --- /dev/null +++ b/test/skipped_sparql_tests.py @@ -0,0 +1,80 @@ +from rdflib import URIRef + +# Avoid in-this-case-tedious black reformatting ... + +testlist = { + "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-6": "allegedly “NOT SPARQL 1.1”", + "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-7": "allegedly “NOT SPARQL 1.1”", + "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-2": "“remove test - changes for SPARQL 1.1 and RDF 1.1 (rdf:langString)”", + "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-2": "xsd:date not supported", + "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-3": "xsd:date not supported", + "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional-filter/manifest#dawg-optional-filter-005-simplified": "The extra two are mutually exclusive : same query, same data, diferent reading of spec. ARQ implements the intent: simplify after all algebra generation done.", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-bool": "known issue with casting to/from Python", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-decimal": "known issue with casting to/from Python", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-double": "known issue with casting to/from Python", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-float": "known issue with casting to/from Python", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-int": "known issue with casting to/from Python", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-string": "known issue with casting to/from Python", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-02a": "known issue with update and datasets", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-06a": "known issue with update and datasets", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1-rdfs": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q2": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q3": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q4": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent10": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent3": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent4": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent5": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent6": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent7": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent8": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent9": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf01": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf02": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs01": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs02": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs03": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs04": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs05": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs06": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs07": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs08": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs09": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs10": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs11": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs12": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif01": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif03": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif04": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif06": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple1": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple2": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple3": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple4": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple5": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple6": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple7": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple8": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-02": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-03": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-06": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-07": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-08": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-10": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-11": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-12": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-13": "entailment not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/functions/manifest#strlang03-rdf11": "unexplored fault", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service1": "service not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service2": "service not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service3": "service not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service4a": "service not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service5": "service not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service6": "service not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service7": "service not implemented", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/subquery/manifest#subquery13": "unexplored fault", + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/syntax-query/manifest#test_codepoint_escape_02": "unexplored fault", +} + +skiptests = dict([(URIRef(k), v) for k, v in testlist.items()]) diff --git a/test/skiptests.list b/test/skiptests.list index 7103aff23..878cb30b9 100644 --- a/test/skiptests.list +++ b/test/skiptests.list @@ -1,14 +1,17 @@ +http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-6 allegedly “NOT SPARQL 1.1” +http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-7 allegedly “NOT SPARQL 1.1” +http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-2 “remove test - changes for SPARQL 1.1 and RDF 1.1 (rdf:langString)” http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-2 xsd:date not supported http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-3 xsd:date not supported +http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional-filter/manifest#dawg-optional-filter-005-simplified The extra two are mutually exclusive ;same query same data diferent reading of spec. ARQ implements the intent;simplify after all algebra generation done. +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-bool known issue with casting to/from Python +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-decimal known issue with casting to/from Python +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-double known issue with casting to/from Python +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-float known issue with casting to/from Python +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-int known issue with casting to/from Python +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-string known issue with casting to/from Python http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-02a known issue with update and datasets http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-06a known issue with update and datasets -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service1 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service2 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service3 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service4a service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service5 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service6 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service7 service not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf01 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf02 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs01 entailment not implemented @@ -23,16 +26,22 @@ http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs0 http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs10 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs11 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs12 entailment not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif01 entailment not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif03 entailment not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif04 entailment not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif06 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1-rdfs entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q2 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q3 entailment not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q4 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-02 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-03 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-06 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-07 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-08 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-10 entailment not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-11 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-12 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-13 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent3 entailment not implemented @@ -40,6 +49,7 @@ http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paren http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent5 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent6 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent7 entailment not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent8 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent9 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent10 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple1 entailment not implemented @@ -50,6 +60,7 @@ http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simpl http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple6 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple7 entailment not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple8 entailment not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/functions/manifest#strlang03-rdf11 unexplored fault http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service1 service not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service2 service not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service3 service not implemented @@ -57,3 +68,5 @@ http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service4 http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service5 service not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service6 service not implemented http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service7 service not implemented +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/subquery/manifest#subquery13 unexplored fault +http://www.w3.org/2009/sparql/docs/tests/data-sparql11/syntax-query/manifest#test_codepoint_escape_02 unexplored fault diff --git a/test/test_w3c_spec/test_sparql_w3c.py b/test/test_w3c_spec/test_sparql_w3c.py index cae365f20..30f9159ae 100644 --- a/test/test_w3c_spec/test_sparql_w3c.py +++ b/test/test_w3c_spec/test_sparql_w3c.py @@ -101,16 +101,7 @@ def bopen_read_close(fn): return f.read() -try: - with open("skiptests.list") as skip_tests_f: - skiptests = dict( - [ - (URIRef(x.strip().split("\t")[0]), x.strip().split("\t")[1]) - for x in skip_tests_f - ] - ) -except IOError: - skiptests = dict() +from test.skipped_sparql_tests import skiptests def _fmt(f): @@ -546,7 +537,7 @@ def handle_flags(): @pytest.mark.parametrize( "rdf_test_uri, type, rdf_test", - read_manifest("test/data/suites/DAWG/data-r2/manifest-evaluation.ttl"), + read_manifest("test/data/suites/w3c/dawg-data-r2/manifest-evaluation.ttl"), ) def test_dawg_data_sparql10(rdf_test_uri: URIRef, type: Node, rdf_test: RDFTest): testers[type](rdf_test) diff --git a/test/utils/manifest.py b/test/utils/manifest.py index abaaf551b..dc29bdf98 100644 --- a/test/utils/manifest.py +++ b/test/utils/manifest.py @@ -85,6 +85,7 @@ def _str(x): # run proposed tests # approved |= (e, RDFT.approval, RDFT.Proposed) in g + approved |= (e, DAWG.approval, DAWG.Proposed) in g # run legacy tests with no approval set if legacy: From 3fa13c33da67f8eddec612b7aece1f0c50fe2526 Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Fri, 13 May 2022 20:44:07 +0200 Subject: [PATCH 03/19] Minor changes - Remove `DAWG.Proposed`. This is not defined in the DAWG vocab or used in any tests as far as I can tell. - Rename `test/skipped_sparql_tests.py` to `test/test_w3c_spec/test_sparql_w3c_skipped.py`. This is so it is closer to the file that uses it. - removed `skiptests.list` and `test/skiptests.list` These are now replaced by `test/test_w3c_spec/test_sparql_w3c_skipped.py` - Remove test that pass from skipped tests. --- skiptests.list | 59 --------------- test/skiptests.list | 72 ------------------- test/test_w3c_spec/test_sparql_w3c.py | 2 +- .../test_sparql_w3c_skipped.py} | 22 ------ test/utils/manifest.py | 1 - 5 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 skiptests.list delete mode 100644 test/skiptests.list rename test/{skipped_sparql_tests.py => test_w3c_spec/test_sparql_w3c_skipped.py} (68%) diff --git a/skiptests.list b/skiptests.list deleted file mode 100644 index 7103aff23..000000000 --- a/skiptests.list +++ /dev/null @@ -1,59 +0,0 @@ -http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-2 xsd:date not supported -http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-3 xsd:date not supported -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-02a known issue with update and datasets -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-06a known issue with update and datasets -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service1 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service2 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service3 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service4a service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service5 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service6 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service7 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf01 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf02 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs01 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs02 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs03 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs04 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs05 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs06 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs07 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs08 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs09 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs10 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs11 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs12 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1-rdfs entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q2 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q3 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-02 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-03 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-06 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-07 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-08 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-10 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-12 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-13 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent3 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent4 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent5 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent6 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent7 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent9 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent10 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple1 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple2 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple3 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple4 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple5 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple6 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple7 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple8 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service1 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service2 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service3 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service4a service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service5 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service6 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service7 service not implemented diff --git a/test/skiptests.list b/test/skiptests.list deleted file mode 100644 index 878cb30b9..000000000 --- a/test/skiptests.list +++ /dev/null @@ -1,72 +0,0 @@ -http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-6 allegedly “NOT SPARQL 1.1” -http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-7 allegedly “NOT SPARQL 1.1” -http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-2 “remove test - changes for SPARQL 1.1 and RDF 1.1 (rdf:langString)” -http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-2 xsd:date not supported -http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-3 xsd:date not supported -http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional-filter/manifest#dawg-optional-filter-005-simplified The extra two are mutually exclusive ;same query same data diferent reading of spec. ARQ implements the intent;simplify after all algebra generation done. -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-bool known issue with casting to/from Python -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-decimal known issue with casting to/from Python -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-double known issue with casting to/from Python -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-float known issue with casting to/from Python -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-int known issue with casting to/from Python -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-string known issue with casting to/from Python -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-02a known issue with update and datasets -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-06a known issue with update and datasets -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf01 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf02 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs01 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs02 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs03 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs04 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs05 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs06 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs07 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs08 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs09 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs10 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs11 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs12 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif01 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif03 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif04 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif06 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1-rdfs entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q2 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q3 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q4 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-02 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-03 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-06 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-07 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-08 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-10 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-11 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-12 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-13 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent3 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent4 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent5 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent6 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent7 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent8 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent9 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent10 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple1 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple2 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple3 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple4 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple5 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple6 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple7 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple8 entailment not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/functions/manifest#strlang03-rdf11 unexplored fault -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service1 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service2 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service3 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service4a service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service5 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service6 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service7 service not implemented -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/subquery/manifest#subquery13 unexplored fault -http://www.w3.org/2009/sparql/docs/tests/data-sparql11/syntax-query/manifest#test_codepoint_escape_02 unexplored fault diff --git a/test/test_w3c_spec/test_sparql_w3c.py b/test/test_w3c_spec/test_sparql_w3c.py index 30f9159ae..87e2f9da8 100644 --- a/test/test_w3c_spec/test_sparql_w3c.py +++ b/test/test_w3c_spec/test_sparql_w3c.py @@ -101,7 +101,7 @@ def bopen_read_close(fn): return f.read() -from test.skipped_sparql_tests import skiptests +from test.test_w3c_spec.test_sparql_w3c_skipped import skiptests def _fmt(f): diff --git a/test/skipped_sparql_tests.py b/test/test_w3c_spec/test_sparql_w3c_skipped.py similarity index 68% rename from test/skipped_sparql_tests.py rename to test/test_w3c_spec/test_sparql_w3c_skipped.py index 863385e66..536ddb1ba 100644 --- a/test/skipped_sparql_tests.py +++ b/test/test_w3c_spec/test_sparql_w3c_skipped.py @@ -7,31 +7,20 @@ "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/basic/manifest#term-7": "allegedly “NOT SPARQL 1.1”", "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#dawg-datatype-2": "“remove test - changes for SPARQL 1.1 and RDF 1.1 (rdf:langString)”", "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-2": "xsd:date not supported", - "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/open-world/manifest#date-3": "xsd:date not supported", - "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/optional-filter/manifest#dawg-optional-filter-005-simplified": "The extra two are mutually exclusive : same query, same data, diferent reading of spec. ARQ implements the intent: simplify after all algebra generation done.", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-bool": "known issue with casting to/from Python", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-decimal": "known issue with casting to/from Python", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-double": "known issue with casting to/from Python", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-float": "known issue with casting to/from Python", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-int": "known issue with casting to/from Python", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/cast/manifest#cast-string": "known issue with casting to/from Python", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-02a": "known issue with update and datasets", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/delete/manifest#dawg-delete-using-06a": "known issue with update and datasets", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q1-rdfs": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q2": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q3": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#paper-sparqldl-Q4": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent10": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent3": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent4": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent5": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent6": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent7": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent8": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#parent9": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf01": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdf02": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs01": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs02": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs03": "entailment not implemented", @@ -44,10 +33,6 @@ "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs10": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs11": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rdfs12": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif01": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif03": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif04": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#rif06": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple1": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple2": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple3": "entailment not implemented", @@ -58,14 +43,9 @@ "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#simple8": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-02": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-03": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-06": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-07": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-08": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-10": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-11": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-12": "entailment not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/entailment/manifest#sparqldl-13": "entailment not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/functions/manifest#strlang03-rdf11": "unexplored fault", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service1": "service not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service2": "service not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service3": "service not implemented", @@ -73,8 +53,6 @@ "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service5": "service not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service6": "service not implemented", "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/service/manifest#service7": "service not implemented", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/subquery/manifest#subquery13": "unexplored fault", - "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/syntax-query/manifest#test_codepoint_escape_02": "unexplored fault", } skiptests = dict([(URIRef(k), v) for k, v in testlist.items()]) diff --git a/test/utils/manifest.py b/test/utils/manifest.py index dc29bdf98..abaaf551b 100644 --- a/test/utils/manifest.py +++ b/test/utils/manifest.py @@ -85,7 +85,6 @@ def _str(x): # run proposed tests # approved |= (e, RDFT.approval, RDFT.Proposed) in g - approved |= (e, DAWG.approval, DAWG.Proposed) in g # run legacy tests with no approval set if legacy: From 6778311d0d5e0595cd298570ea472ec96aac772f Mon Sep 17 00:00:00 2001 From: Graham Higgins Date: Fri, 13 May 2022 19:40:18 +0200 Subject: [PATCH 04/19] Move `test/data/suites/DAWG/rdflib` This patch moves `test/data/suites/DAWG/rdflib` to a more appropriate location `test/data/rdflib-sparql`. --- test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope.srx | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope.ttl | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope2.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope2.tsv | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-a.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-b.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-c.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-d.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-e.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-f.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-g.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-h.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix.srx | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix.ttl | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/filteroptional.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/filtersubquery.tsv | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/filtersubquery1.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/filtersubquery2.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/filtersubquery3.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/manifest.ttl | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/minusfilter.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/minusfilter.srx | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/minusfilter.ttl | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/nestedbnode.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/nestedbnode.srx | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/notexistsfilter.rq | 0 .../{suites/DAWG/rdflib => rdflib-sparql}/notexistsfilter.srx | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery.tsv | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery.ttl | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery1.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery2.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery3.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subqueryagg.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subqueryagg.tsv | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subqueryagg.ttl | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/subqueryagg1.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/unicode.rq | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/unicode.srx | 0 test/data/{suites/DAWG/rdflib => rdflib-sparql}/unicode.ttl | 0 .../data/{suites/DAWG/rdflib => rdflib-sparql}/whitespacedot.rq | 0 test/test_w3c_spec/test_sparql_w3c.py | 2 +- 42 files changed, 1 insertion(+), 1 deletion(-) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope.srx (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope.ttl (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope2.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bindscope2.tsv (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-a.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-b.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-c.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-d.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-e.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-f.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-g.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix-h.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix.srx (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/bnode-ppath-mix.ttl (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/filteroptional.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/filtersubquery.tsv (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/filtersubquery1.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/filtersubquery2.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/filtersubquery3.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/manifest.ttl (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/minusfilter.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/minusfilter.srx (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/minusfilter.ttl (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/nestedbnode.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/nestedbnode.srx (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/notexistsfilter.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/notexistsfilter.srx (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery.tsv (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery.ttl (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery1.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery2.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subquery3.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subqueryagg.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subqueryagg.tsv (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subqueryagg.ttl (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/subqueryagg1.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/unicode.rq (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/unicode.srx (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/unicode.ttl (100%) rename test/data/{suites/DAWG/rdflib => rdflib-sparql}/whitespacedot.rq (100%) diff --git a/test/data/suites/DAWG/rdflib/bindscope.rq b/test/data/rdflib-sparql/bindscope.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bindscope.rq rename to test/data/rdflib-sparql/bindscope.rq diff --git a/test/data/suites/DAWG/rdflib/bindscope.srx b/test/data/rdflib-sparql/bindscope.srx similarity index 100% rename from test/data/suites/DAWG/rdflib/bindscope.srx rename to test/data/rdflib-sparql/bindscope.srx diff --git a/test/data/suites/DAWG/rdflib/bindscope.ttl b/test/data/rdflib-sparql/bindscope.ttl similarity index 100% rename from test/data/suites/DAWG/rdflib/bindscope.ttl rename to test/data/rdflib-sparql/bindscope.ttl diff --git a/test/data/suites/DAWG/rdflib/bindscope2.rq b/test/data/rdflib-sparql/bindscope2.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bindscope2.rq rename to test/data/rdflib-sparql/bindscope2.rq diff --git a/test/data/suites/DAWG/rdflib/bindscope2.tsv b/test/data/rdflib-sparql/bindscope2.tsv similarity index 100% rename from test/data/suites/DAWG/rdflib/bindscope2.tsv rename to test/data/rdflib-sparql/bindscope2.tsv diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix-a.rq b/test/data/rdflib-sparql/bnode-ppath-mix-a.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix-a.rq rename to test/data/rdflib-sparql/bnode-ppath-mix-a.rq diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix-b.rq b/test/data/rdflib-sparql/bnode-ppath-mix-b.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix-b.rq rename to test/data/rdflib-sparql/bnode-ppath-mix-b.rq diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix-c.rq b/test/data/rdflib-sparql/bnode-ppath-mix-c.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix-c.rq rename to test/data/rdflib-sparql/bnode-ppath-mix-c.rq diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix-d.rq b/test/data/rdflib-sparql/bnode-ppath-mix-d.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix-d.rq rename to test/data/rdflib-sparql/bnode-ppath-mix-d.rq diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix-e.rq b/test/data/rdflib-sparql/bnode-ppath-mix-e.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix-e.rq rename to test/data/rdflib-sparql/bnode-ppath-mix-e.rq diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix-f.rq b/test/data/rdflib-sparql/bnode-ppath-mix-f.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix-f.rq rename to test/data/rdflib-sparql/bnode-ppath-mix-f.rq diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix-g.rq b/test/data/rdflib-sparql/bnode-ppath-mix-g.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix-g.rq rename to test/data/rdflib-sparql/bnode-ppath-mix-g.rq diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix-h.rq b/test/data/rdflib-sparql/bnode-ppath-mix-h.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix-h.rq rename to test/data/rdflib-sparql/bnode-ppath-mix-h.rq diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix.srx b/test/data/rdflib-sparql/bnode-ppath-mix.srx similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix.srx rename to test/data/rdflib-sparql/bnode-ppath-mix.srx diff --git a/test/data/suites/DAWG/rdflib/bnode-ppath-mix.ttl b/test/data/rdflib-sparql/bnode-ppath-mix.ttl similarity index 100% rename from test/data/suites/DAWG/rdflib/bnode-ppath-mix.ttl rename to test/data/rdflib-sparql/bnode-ppath-mix.ttl diff --git a/test/data/suites/DAWG/rdflib/filteroptional.rq b/test/data/rdflib-sparql/filteroptional.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/filteroptional.rq rename to test/data/rdflib-sparql/filteroptional.rq diff --git a/test/data/suites/DAWG/rdflib/filtersubquery.tsv b/test/data/rdflib-sparql/filtersubquery.tsv similarity index 100% rename from test/data/suites/DAWG/rdflib/filtersubquery.tsv rename to test/data/rdflib-sparql/filtersubquery.tsv diff --git a/test/data/suites/DAWG/rdflib/filtersubquery1.rq b/test/data/rdflib-sparql/filtersubquery1.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/filtersubquery1.rq rename to test/data/rdflib-sparql/filtersubquery1.rq diff --git a/test/data/suites/DAWG/rdflib/filtersubquery2.rq b/test/data/rdflib-sparql/filtersubquery2.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/filtersubquery2.rq rename to test/data/rdflib-sparql/filtersubquery2.rq diff --git a/test/data/suites/DAWG/rdflib/filtersubquery3.rq b/test/data/rdflib-sparql/filtersubquery3.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/filtersubquery3.rq rename to test/data/rdflib-sparql/filtersubquery3.rq diff --git a/test/data/suites/DAWG/rdflib/manifest.ttl b/test/data/rdflib-sparql/manifest.ttl similarity index 100% rename from test/data/suites/DAWG/rdflib/manifest.ttl rename to test/data/rdflib-sparql/manifest.ttl diff --git a/test/data/suites/DAWG/rdflib/minusfilter.rq b/test/data/rdflib-sparql/minusfilter.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/minusfilter.rq rename to test/data/rdflib-sparql/minusfilter.rq diff --git a/test/data/suites/DAWG/rdflib/minusfilter.srx b/test/data/rdflib-sparql/minusfilter.srx similarity index 100% rename from test/data/suites/DAWG/rdflib/minusfilter.srx rename to test/data/rdflib-sparql/minusfilter.srx diff --git a/test/data/suites/DAWG/rdflib/minusfilter.ttl b/test/data/rdflib-sparql/minusfilter.ttl similarity index 100% rename from test/data/suites/DAWG/rdflib/minusfilter.ttl rename to test/data/rdflib-sparql/minusfilter.ttl diff --git a/test/data/suites/DAWG/rdflib/nestedbnode.rq b/test/data/rdflib-sparql/nestedbnode.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/nestedbnode.rq rename to test/data/rdflib-sparql/nestedbnode.rq diff --git a/test/data/suites/DAWG/rdflib/nestedbnode.srx b/test/data/rdflib-sparql/nestedbnode.srx similarity index 100% rename from test/data/suites/DAWG/rdflib/nestedbnode.srx rename to test/data/rdflib-sparql/nestedbnode.srx diff --git a/test/data/suites/DAWG/rdflib/notexistsfilter.rq b/test/data/rdflib-sparql/notexistsfilter.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/notexistsfilter.rq rename to test/data/rdflib-sparql/notexistsfilter.rq diff --git a/test/data/suites/DAWG/rdflib/notexistsfilter.srx b/test/data/rdflib-sparql/notexistsfilter.srx similarity index 100% rename from test/data/suites/DAWG/rdflib/notexistsfilter.srx rename to test/data/rdflib-sparql/notexistsfilter.srx diff --git a/test/data/suites/DAWG/rdflib/subquery.tsv b/test/data/rdflib-sparql/subquery.tsv similarity index 100% rename from test/data/suites/DAWG/rdflib/subquery.tsv rename to test/data/rdflib-sparql/subquery.tsv diff --git a/test/data/suites/DAWG/rdflib/subquery.ttl b/test/data/rdflib-sparql/subquery.ttl similarity index 100% rename from test/data/suites/DAWG/rdflib/subquery.ttl rename to test/data/rdflib-sparql/subquery.ttl diff --git a/test/data/suites/DAWG/rdflib/subquery1.rq b/test/data/rdflib-sparql/subquery1.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/subquery1.rq rename to test/data/rdflib-sparql/subquery1.rq diff --git a/test/data/suites/DAWG/rdflib/subquery2.rq b/test/data/rdflib-sparql/subquery2.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/subquery2.rq rename to test/data/rdflib-sparql/subquery2.rq diff --git a/test/data/suites/DAWG/rdflib/subquery3.rq b/test/data/rdflib-sparql/subquery3.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/subquery3.rq rename to test/data/rdflib-sparql/subquery3.rq diff --git a/test/data/suites/DAWG/rdflib/subqueryagg.rq b/test/data/rdflib-sparql/subqueryagg.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/subqueryagg.rq rename to test/data/rdflib-sparql/subqueryagg.rq diff --git a/test/data/suites/DAWG/rdflib/subqueryagg.tsv b/test/data/rdflib-sparql/subqueryagg.tsv similarity index 100% rename from test/data/suites/DAWG/rdflib/subqueryagg.tsv rename to test/data/rdflib-sparql/subqueryagg.tsv diff --git a/test/data/suites/DAWG/rdflib/subqueryagg.ttl b/test/data/rdflib-sparql/subqueryagg.ttl similarity index 100% rename from test/data/suites/DAWG/rdflib/subqueryagg.ttl rename to test/data/rdflib-sparql/subqueryagg.ttl diff --git a/test/data/suites/DAWG/rdflib/subqueryagg1.rq b/test/data/rdflib-sparql/subqueryagg1.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/subqueryagg1.rq rename to test/data/rdflib-sparql/subqueryagg1.rq diff --git a/test/data/suites/DAWG/rdflib/unicode.rq b/test/data/rdflib-sparql/unicode.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/unicode.rq rename to test/data/rdflib-sparql/unicode.rq diff --git a/test/data/suites/DAWG/rdflib/unicode.srx b/test/data/rdflib-sparql/unicode.srx similarity index 100% rename from test/data/suites/DAWG/rdflib/unicode.srx rename to test/data/rdflib-sparql/unicode.srx diff --git a/test/data/suites/DAWG/rdflib/unicode.ttl b/test/data/rdflib-sparql/unicode.ttl similarity index 100% rename from test/data/suites/DAWG/rdflib/unicode.ttl rename to test/data/rdflib-sparql/unicode.ttl diff --git a/test/data/suites/DAWG/rdflib/whitespacedot.rq b/test/data/rdflib-sparql/whitespacedot.rq similarity index 100% rename from test/data/suites/DAWG/rdflib/whitespacedot.rq rename to test/data/rdflib-sparql/whitespacedot.rq diff --git a/test/test_w3c_spec/test_sparql_w3c.py b/test/test_w3c_spec/test_sparql_w3c.py index 87e2f9da8..f723ab2a2 100644 --- a/test/test_w3c_spec/test_sparql_w3c.py +++ b/test/test_w3c_spec/test_sparql_w3c.py @@ -553,7 +553,7 @@ def test_dawg_data_sparql11(rdf_test_uri: URIRef, type: Node, rdf_test: RDFTest) @pytest.mark.parametrize( "rdf_test_uri, type, rdf_test", - read_manifest("test/data/suites/DAWG/rdflib/manifest.ttl"), + read_manifest("test/data/rdflib-sparql/manifest.ttl"), ) def test_dawg_rdflib(rdf_test_uri: URIRef, type: Node, rdf_test: RDFTest): testers[type](rdf_test) From 7d496bc916bffef5a79aa7f958f5af3a5b96454e Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Fri, 13 May 2022 19:43:32 +0200 Subject: [PATCH 05/19] Rename `test/data/rdflib-sparql` This patch moves `test/data/rdflib-sparql` to `test/data/suites/rdflib/sparql` as it technically contains a test suite. --- test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope.rq | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope.srx | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope.ttl | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope2.rq | 0 .../data/{rdflib-sparql => suites/rdflib/sparql}/bindscope2.tsv | 0 .../rdflib/sparql}/bnode-ppath-mix-a.rq | 0 .../rdflib/sparql}/bnode-ppath-mix-b.rq | 0 .../rdflib/sparql}/bnode-ppath-mix-c.rq | 0 .../rdflib/sparql}/bnode-ppath-mix-d.rq | 0 .../rdflib/sparql}/bnode-ppath-mix-e.rq | 0 .../rdflib/sparql}/bnode-ppath-mix-f.rq | 0 .../rdflib/sparql}/bnode-ppath-mix-g.rq | 0 .../rdflib/sparql}/bnode-ppath-mix-h.rq | 0 .../{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix.srx | 0 .../{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix.ttl | 0 .../{rdflib-sparql => suites/rdflib/sparql}/filteroptional.rq | 0 .../{rdflib-sparql => suites/rdflib/sparql}/filtersubquery.tsv | 0 .../{rdflib-sparql => suites/rdflib/sparql}/filtersubquery1.rq | 0 .../{rdflib-sparql => suites/rdflib/sparql}/filtersubquery2.rq | 0 .../{rdflib-sparql => suites/rdflib/sparql}/filtersubquery3.rq | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/manifest.ttl | 0 .../data/{rdflib-sparql => suites/rdflib/sparql}/minusfilter.rq | 0 .../{rdflib-sparql => suites/rdflib/sparql}/minusfilter.srx | 0 .../{rdflib-sparql => suites/rdflib/sparql}/minusfilter.ttl | 0 .../data/{rdflib-sparql => suites/rdflib/sparql}/nestedbnode.rq | 0 .../{rdflib-sparql => suites/rdflib/sparql}/nestedbnode.srx | 0 .../{rdflib-sparql => suites/rdflib/sparql}/notexistsfilter.rq | 0 .../{rdflib-sparql => suites/rdflib/sparql}/notexistsfilter.srx | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery.tsv | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery.ttl | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery1.rq | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery2.rq | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery3.rq | 0 .../data/{rdflib-sparql => suites/rdflib/sparql}/subqueryagg.rq | 0 .../{rdflib-sparql => suites/rdflib/sparql}/subqueryagg.tsv | 0 .../{rdflib-sparql => suites/rdflib/sparql}/subqueryagg.ttl | 0 .../{rdflib-sparql => suites/rdflib/sparql}/subqueryagg1.rq | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/unicode.rq | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/unicode.srx | 0 test/data/{rdflib-sparql => suites/rdflib/sparql}/unicode.ttl | 0 .../{rdflib-sparql => suites/rdflib/sparql}/whitespacedot.rq | 0 test/test_w3c_spec/test_sparql_w3c.py | 2 +- 42 files changed, 1 insertion(+), 1 deletion(-) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope.srx (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope.ttl (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope2.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bindscope2.tsv (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix-a.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix-b.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix-c.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix-d.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix-e.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix-f.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix-g.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix-h.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix.srx (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/bnode-ppath-mix.ttl (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/filteroptional.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/filtersubquery.tsv (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/filtersubquery1.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/filtersubquery2.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/filtersubquery3.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/manifest.ttl (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/minusfilter.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/minusfilter.srx (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/minusfilter.ttl (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/nestedbnode.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/nestedbnode.srx (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/notexistsfilter.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/notexistsfilter.srx (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery.tsv (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery.ttl (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery1.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery2.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subquery3.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subqueryagg.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subqueryagg.tsv (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subqueryagg.ttl (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/subqueryagg1.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/unicode.rq (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/unicode.srx (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/unicode.ttl (100%) rename test/data/{rdflib-sparql => suites/rdflib/sparql}/whitespacedot.rq (100%) diff --git a/test/data/rdflib-sparql/bindscope.rq b/test/data/suites/rdflib/sparql/bindscope.rq similarity index 100% rename from test/data/rdflib-sparql/bindscope.rq rename to test/data/suites/rdflib/sparql/bindscope.rq diff --git a/test/data/rdflib-sparql/bindscope.srx b/test/data/suites/rdflib/sparql/bindscope.srx similarity index 100% rename from test/data/rdflib-sparql/bindscope.srx rename to test/data/suites/rdflib/sparql/bindscope.srx diff --git a/test/data/rdflib-sparql/bindscope.ttl b/test/data/suites/rdflib/sparql/bindscope.ttl similarity index 100% rename from test/data/rdflib-sparql/bindscope.ttl rename to test/data/suites/rdflib/sparql/bindscope.ttl diff --git a/test/data/rdflib-sparql/bindscope2.rq b/test/data/suites/rdflib/sparql/bindscope2.rq similarity index 100% rename from test/data/rdflib-sparql/bindscope2.rq rename to test/data/suites/rdflib/sparql/bindscope2.rq diff --git a/test/data/rdflib-sparql/bindscope2.tsv b/test/data/suites/rdflib/sparql/bindscope2.tsv similarity index 100% rename from test/data/rdflib-sparql/bindscope2.tsv rename to test/data/suites/rdflib/sparql/bindscope2.tsv diff --git a/test/data/rdflib-sparql/bnode-ppath-mix-a.rq b/test/data/suites/rdflib/sparql/bnode-ppath-mix-a.rq similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix-a.rq rename to test/data/suites/rdflib/sparql/bnode-ppath-mix-a.rq diff --git a/test/data/rdflib-sparql/bnode-ppath-mix-b.rq b/test/data/suites/rdflib/sparql/bnode-ppath-mix-b.rq similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix-b.rq rename to test/data/suites/rdflib/sparql/bnode-ppath-mix-b.rq diff --git a/test/data/rdflib-sparql/bnode-ppath-mix-c.rq b/test/data/suites/rdflib/sparql/bnode-ppath-mix-c.rq similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix-c.rq rename to test/data/suites/rdflib/sparql/bnode-ppath-mix-c.rq diff --git a/test/data/rdflib-sparql/bnode-ppath-mix-d.rq b/test/data/suites/rdflib/sparql/bnode-ppath-mix-d.rq similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix-d.rq rename to test/data/suites/rdflib/sparql/bnode-ppath-mix-d.rq diff --git a/test/data/rdflib-sparql/bnode-ppath-mix-e.rq b/test/data/suites/rdflib/sparql/bnode-ppath-mix-e.rq similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix-e.rq rename to test/data/suites/rdflib/sparql/bnode-ppath-mix-e.rq diff --git a/test/data/rdflib-sparql/bnode-ppath-mix-f.rq b/test/data/suites/rdflib/sparql/bnode-ppath-mix-f.rq similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix-f.rq rename to test/data/suites/rdflib/sparql/bnode-ppath-mix-f.rq diff --git a/test/data/rdflib-sparql/bnode-ppath-mix-g.rq b/test/data/suites/rdflib/sparql/bnode-ppath-mix-g.rq similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix-g.rq rename to test/data/suites/rdflib/sparql/bnode-ppath-mix-g.rq diff --git a/test/data/rdflib-sparql/bnode-ppath-mix-h.rq b/test/data/suites/rdflib/sparql/bnode-ppath-mix-h.rq similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix-h.rq rename to test/data/suites/rdflib/sparql/bnode-ppath-mix-h.rq diff --git a/test/data/rdflib-sparql/bnode-ppath-mix.srx b/test/data/suites/rdflib/sparql/bnode-ppath-mix.srx similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix.srx rename to test/data/suites/rdflib/sparql/bnode-ppath-mix.srx diff --git a/test/data/rdflib-sparql/bnode-ppath-mix.ttl b/test/data/suites/rdflib/sparql/bnode-ppath-mix.ttl similarity index 100% rename from test/data/rdflib-sparql/bnode-ppath-mix.ttl rename to test/data/suites/rdflib/sparql/bnode-ppath-mix.ttl diff --git a/test/data/rdflib-sparql/filteroptional.rq b/test/data/suites/rdflib/sparql/filteroptional.rq similarity index 100% rename from test/data/rdflib-sparql/filteroptional.rq rename to test/data/suites/rdflib/sparql/filteroptional.rq diff --git a/test/data/rdflib-sparql/filtersubquery.tsv b/test/data/suites/rdflib/sparql/filtersubquery.tsv similarity index 100% rename from test/data/rdflib-sparql/filtersubquery.tsv rename to test/data/suites/rdflib/sparql/filtersubquery.tsv diff --git a/test/data/rdflib-sparql/filtersubquery1.rq b/test/data/suites/rdflib/sparql/filtersubquery1.rq similarity index 100% rename from test/data/rdflib-sparql/filtersubquery1.rq rename to test/data/suites/rdflib/sparql/filtersubquery1.rq diff --git a/test/data/rdflib-sparql/filtersubquery2.rq b/test/data/suites/rdflib/sparql/filtersubquery2.rq similarity index 100% rename from test/data/rdflib-sparql/filtersubquery2.rq rename to test/data/suites/rdflib/sparql/filtersubquery2.rq diff --git a/test/data/rdflib-sparql/filtersubquery3.rq b/test/data/suites/rdflib/sparql/filtersubquery3.rq similarity index 100% rename from test/data/rdflib-sparql/filtersubquery3.rq rename to test/data/suites/rdflib/sparql/filtersubquery3.rq diff --git a/test/data/rdflib-sparql/manifest.ttl b/test/data/suites/rdflib/sparql/manifest.ttl similarity index 100% rename from test/data/rdflib-sparql/manifest.ttl rename to test/data/suites/rdflib/sparql/manifest.ttl diff --git a/test/data/rdflib-sparql/minusfilter.rq b/test/data/suites/rdflib/sparql/minusfilter.rq similarity index 100% rename from test/data/rdflib-sparql/minusfilter.rq rename to test/data/suites/rdflib/sparql/minusfilter.rq diff --git a/test/data/rdflib-sparql/minusfilter.srx b/test/data/suites/rdflib/sparql/minusfilter.srx similarity index 100% rename from test/data/rdflib-sparql/minusfilter.srx rename to test/data/suites/rdflib/sparql/minusfilter.srx diff --git a/test/data/rdflib-sparql/minusfilter.ttl b/test/data/suites/rdflib/sparql/minusfilter.ttl similarity index 100% rename from test/data/rdflib-sparql/minusfilter.ttl rename to test/data/suites/rdflib/sparql/minusfilter.ttl diff --git a/test/data/rdflib-sparql/nestedbnode.rq b/test/data/suites/rdflib/sparql/nestedbnode.rq similarity index 100% rename from test/data/rdflib-sparql/nestedbnode.rq rename to test/data/suites/rdflib/sparql/nestedbnode.rq diff --git a/test/data/rdflib-sparql/nestedbnode.srx b/test/data/suites/rdflib/sparql/nestedbnode.srx similarity index 100% rename from test/data/rdflib-sparql/nestedbnode.srx rename to test/data/suites/rdflib/sparql/nestedbnode.srx diff --git a/test/data/rdflib-sparql/notexistsfilter.rq b/test/data/suites/rdflib/sparql/notexistsfilter.rq similarity index 100% rename from test/data/rdflib-sparql/notexistsfilter.rq rename to test/data/suites/rdflib/sparql/notexistsfilter.rq diff --git a/test/data/rdflib-sparql/notexistsfilter.srx b/test/data/suites/rdflib/sparql/notexistsfilter.srx similarity index 100% rename from test/data/rdflib-sparql/notexistsfilter.srx rename to test/data/suites/rdflib/sparql/notexistsfilter.srx diff --git a/test/data/rdflib-sparql/subquery.tsv b/test/data/suites/rdflib/sparql/subquery.tsv similarity index 100% rename from test/data/rdflib-sparql/subquery.tsv rename to test/data/suites/rdflib/sparql/subquery.tsv diff --git a/test/data/rdflib-sparql/subquery.ttl b/test/data/suites/rdflib/sparql/subquery.ttl similarity index 100% rename from test/data/rdflib-sparql/subquery.ttl rename to test/data/suites/rdflib/sparql/subquery.ttl diff --git a/test/data/rdflib-sparql/subquery1.rq b/test/data/suites/rdflib/sparql/subquery1.rq similarity index 100% rename from test/data/rdflib-sparql/subquery1.rq rename to test/data/suites/rdflib/sparql/subquery1.rq diff --git a/test/data/rdflib-sparql/subquery2.rq b/test/data/suites/rdflib/sparql/subquery2.rq similarity index 100% rename from test/data/rdflib-sparql/subquery2.rq rename to test/data/suites/rdflib/sparql/subquery2.rq diff --git a/test/data/rdflib-sparql/subquery3.rq b/test/data/suites/rdflib/sparql/subquery3.rq similarity index 100% rename from test/data/rdflib-sparql/subquery3.rq rename to test/data/suites/rdflib/sparql/subquery3.rq diff --git a/test/data/rdflib-sparql/subqueryagg.rq b/test/data/suites/rdflib/sparql/subqueryagg.rq similarity index 100% rename from test/data/rdflib-sparql/subqueryagg.rq rename to test/data/suites/rdflib/sparql/subqueryagg.rq diff --git a/test/data/rdflib-sparql/subqueryagg.tsv b/test/data/suites/rdflib/sparql/subqueryagg.tsv similarity index 100% rename from test/data/rdflib-sparql/subqueryagg.tsv rename to test/data/suites/rdflib/sparql/subqueryagg.tsv diff --git a/test/data/rdflib-sparql/subqueryagg.ttl b/test/data/suites/rdflib/sparql/subqueryagg.ttl similarity index 100% rename from test/data/rdflib-sparql/subqueryagg.ttl rename to test/data/suites/rdflib/sparql/subqueryagg.ttl diff --git a/test/data/rdflib-sparql/subqueryagg1.rq b/test/data/suites/rdflib/sparql/subqueryagg1.rq similarity index 100% rename from test/data/rdflib-sparql/subqueryagg1.rq rename to test/data/suites/rdflib/sparql/subqueryagg1.rq diff --git a/test/data/rdflib-sparql/unicode.rq b/test/data/suites/rdflib/sparql/unicode.rq similarity index 100% rename from test/data/rdflib-sparql/unicode.rq rename to test/data/suites/rdflib/sparql/unicode.rq diff --git a/test/data/rdflib-sparql/unicode.srx b/test/data/suites/rdflib/sparql/unicode.srx similarity index 100% rename from test/data/rdflib-sparql/unicode.srx rename to test/data/suites/rdflib/sparql/unicode.srx diff --git a/test/data/rdflib-sparql/unicode.ttl b/test/data/suites/rdflib/sparql/unicode.ttl similarity index 100% rename from test/data/rdflib-sparql/unicode.ttl rename to test/data/suites/rdflib/sparql/unicode.ttl diff --git a/test/data/rdflib-sparql/whitespacedot.rq b/test/data/suites/rdflib/sparql/whitespacedot.rq similarity index 100% rename from test/data/rdflib-sparql/whitespacedot.rq rename to test/data/suites/rdflib/sparql/whitespacedot.rq diff --git a/test/test_w3c_spec/test_sparql_w3c.py b/test/test_w3c_spec/test_sparql_w3c.py index f723ab2a2..570ac5e9a 100644 --- a/test/test_w3c_spec/test_sparql_w3c.py +++ b/test/test_w3c_spec/test_sparql_w3c.py @@ -553,7 +553,7 @@ def test_dawg_data_sparql11(rdf_test_uri: URIRef, type: Node, rdf_test: RDFTest) @pytest.mark.parametrize( "rdf_test_uri, type, rdf_test", - read_manifest("test/data/rdflib-sparql/manifest.ttl"), + read_manifest("test/data/suites/rdflib/sparql/manifest.ttl"), ) def test_dawg_rdflib(rdf_test_uri: URIRef, type: Node, rdf_test: RDFTest): testers[type](rdf_test) From c30cc3c2997fc97ec41225010104b4c761ec1591 Mon Sep 17 00:00:00 2001 From: Graham Higgins Date: Sat, 14 May 2022 19:40:23 +0200 Subject: [PATCH 06/19] Added SPARQL unicode numeric codepoint escape tests Added four (marked-as-xfail) unicode numeric codepoint escape tests to the RDFLib-specific SPARQL test suite `test/data/suites/rdflib/sparql`. Also: - Fix the base URI in the RDFLib SPARQL test manifest. --- test/data/suites/rdflib/sparql/manifest.ttl | 40 ++++++++++++++++++- .../rdflib/sparql/syn-codepoint-escape-01.rq | 3 ++ .../rdflib/sparql/syn-codepoint-escape-02.rq | 3 ++ .../rdflib/sparql/syn-codepoint-escape-03.rq | 3 ++ .../rdflib/sparql/syn-codepoint-escape-04.rq | 3 ++ .../rdflib/sparql/syn-codepoint-escape-bad.rq | 3 ++ test/test_w3c_spec/test_sparql_w3c.py | 13 ++++++ 7 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 test/data/suites/rdflib/sparql/syn-codepoint-escape-01.rq create mode 100644 test/data/suites/rdflib/sparql/syn-codepoint-escape-02.rq create mode 100644 test/data/suites/rdflib/sparql/syn-codepoint-escape-03.rq create mode 100644 test/data/suites/rdflib/sparql/syn-codepoint-escape-04.rq create mode 100644 test/data/suites/rdflib/sparql/syn-codepoint-escape-bad.rq diff --git a/test/data/suites/rdflib/sparql/manifest.ttl b/test/data/suites/rdflib/sparql/manifest.ttl index bf3a4d1e4..5fe53956e 100644 --- a/test/data/suites/rdflib/sparql/manifest.ttl +++ b/test/data/suites/rdflib/sparql/manifest.ttl @@ -5,7 +5,7 @@ @prefix dawgt: . -@prefix : . +@prefix : . <> a mf:Manifest ; rdfs:label "RDFLib Extra SPARQL tests" ; @@ -41,6 +41,12 @@ :bnode-ppath-mix-g :bnode-ppath-mix-h + :test-codepoint-escape-01 + :test-codepoint-escape-02 + :test-codepoint-escape-03 + :test-codepoint-escape-04 + :test-codepoint-escape-bad + ) . @@ -363,3 +369,35 @@ From https://github.com/RDFLib/rdflib/issues/615, contributed by https://github. qt:data ] ; mf:result . + +:test-codepoint-escape-01 rdf:type mf:PositiveSyntaxTest11 ; + dawgt:approval dawgt:Proposed ; + mf:name "\\U unicode codepoint escaping in literal" ; + rdfs:comment """From https://github.com/RDFLib/rdflib/issues/1884, contributed by https://github.com/gjhiggins""" ; + mf:action ;. + +:test-codepoint-escape-02 rdf:type mf:PositiveSyntaxTest11 ; + dawgt:approval dawgt:Proposed ; + rdfs:comment """From https://github.com/RDFLib/rdflib/issues/1884, contributed by https://github.com/gjhiggins""" ; + mf:name "\\u unicode codepoint escaping in literal" ; + mf:action ;. + +:test-codepoint-escape-03 rdf:type mf:PositiveSyntaxTest11 ; + dawgt:approval dawgt:Proposed ; + rdfs:comment """From https://github.com/RDFLib/rdflib/issues/1884, contributed by https://github.com/gjhiggins""" ; + mf:name "\\u and \\U unicode codepoint escaping in literal" ; + mf:action ;. + +:test-codepoint-escape-04 rdf:type mf:PositiveSyntaxTest11 ; + dawgt:approval dawgt:Proposed ; + rdfs:comment """From https://github.com/RDFLib/rdflib/issues/1884, contributed by https://github.com/gjhiggins""" ; + mf:name "\\U and \\U unicode codepoints escaping in literal" ; + mf:action ;. + +:test-codepoint-escape-bad rdf:type mf:NegativeSyntaxTest11 ; + dawgt:approval dawgt:Proposed ; + rdfs:comment """From https://github.com/RDFLib/rdflib/issues/1884, contributed by https://github.com/gjhiggins""" ; + mf:name "Invalid multi-pass codepoint escaping (\\u then \\U)" ; + mf:description "Unescaping one escape sequence must not produce content that is used in another escape sequence" ; + mf:action ;. + diff --git a/test/data/suites/rdflib/sparql/syn-codepoint-escape-01.rq b/test/data/suites/rdflib/sparql/syn-codepoint-escape-01.rq new file mode 100644 index 000000000..d858a7684 --- /dev/null +++ b/test/data/suites/rdflib/sparql/syn-codepoint-escape-01.rq @@ -0,0 +1,3 @@ +SELECT * WHERE { + ?s ?p "\U0001f46a" . +} diff --git a/test/data/suites/rdflib/sparql/syn-codepoint-escape-02.rq b/test/data/suites/rdflib/sparql/syn-codepoint-escape-02.rq new file mode 100644 index 000000000..3cc7c69df --- /dev/null +++ b/test/data/suites/rdflib/sparql/syn-codepoint-escape-02.rq @@ -0,0 +1,3 @@ +SELECT * WHERE { + ?s ?p "\u00a71234" . +} diff --git a/test/data/suites/rdflib/sparql/syn-codepoint-escape-03.rq b/test/data/suites/rdflib/sparql/syn-codepoint-escape-03.rq new file mode 100644 index 000000000..7c70b29aa --- /dev/null +++ b/test/data/suites/rdflib/sparql/syn-codepoint-escape-03.rq @@ -0,0 +1,3 @@ +SELECT * WHERE { + ?s ?p "\U0001f46a\u00a71234" . +} diff --git a/test/data/suites/rdflib/sparql/syn-codepoint-escape-04.rq b/test/data/suites/rdflib/sparql/syn-codepoint-escape-04.rq new file mode 100644 index 000000000..055071ddb --- /dev/null +++ b/test/data/suites/rdflib/sparql/syn-codepoint-escape-04.rq @@ -0,0 +1,3 @@ +SELECT * WHERE { + ?s ?p "\U0001f46afoo\U0000005c" . +} diff --git a/test/data/suites/rdflib/sparql/syn-codepoint-escape-bad.rq b/test/data/suites/rdflib/sparql/syn-codepoint-escape-bad.rq new file mode 100644 index 000000000..63c73c90c --- /dev/null +++ b/test/data/suites/rdflib/sparql/syn-codepoint-escape-bad.rq @@ -0,0 +1,3 @@ +SELECT * WHERE { + ?s ?p "\U0001HHHH" . +} \ No newline at end of file diff --git a/test/test_w3c_spec/test_sparql_w3c.py b/test/test_w3c_spec/test_sparql_w3c.py index 570ac5e9a..9fab6f95e 100644 --- a/test/test_w3c_spec/test_sparql_w3c.py +++ b/test/test_w3c_spec/test_sparql_w3c.py @@ -551,9 +551,22 @@ def test_dawg_data_sparql11(rdf_test_uri: URIRef, type: Node, rdf_test: RDFTest) testers[type](rdf_test) +EXPECTED_FAILURES: Dict[str, str] = {} + +for test in [ + "test-codepoint-escape-02", + "test-codepoint-escape-03", + "test-codepoint-escape-04", +]: + EXPECTED_FAILURES[test] = "known codepoint escape issue" + + @pytest.mark.parametrize( "rdf_test_uri, type, rdf_test", read_manifest("test/data/suites/rdflib/sparql/manifest.ttl"), ) def test_dawg_rdflib(rdf_test_uri: URIRef, type: Node, rdf_test: RDFTest): + suffix = rdf_test_uri.split("#")[1] + if suffix in EXPECTED_FAILURES: + pytest.xfail(EXPECTED_FAILURES[suffix]) testers[type](rdf_test) From b99d022a57eec144e7c9d2ce2a58b68757f22216 Mon Sep 17 00:00:00 2001 From: Graham Higgins Date: Sat, 14 May 2022 19:48:19 +0200 Subject: [PATCH 07/19] Removed old and unused `test/data/suites/DAWG/data-r2` `test/data/suites/DAWG/data-r2` is an older version of `test/data/suites/w3c/dawg-data-r2` and is no longer in use as the newer version is now being used. --- test/data/suites/DAWG/data-r2/LICENSE | 21 - test/data/suites/DAWG/data-r2/README | 16 - .../suites/DAWG/data-r2/algebra/data-1.ttl | 5 - .../suites/DAWG/data-r2/algebra/data-2.ttl | 11 - .../DAWG/data-r2/algebra/filter-nested-1.rq | 4 - .../DAWG/data-r2/algebra/filter-nested-1.srx | 16 - .../DAWG/data-r2/algebra/filter-nested-2.rq | 4 - .../DAWG/data-r2/algebra/filter-nested-2.srx | 11 - .../data-r2/algebra/filter-placement-1.rq | 7 - .../data-r2/algebra/filter-placement-1.srx | 16 - .../data-r2/algebra/filter-placement-2.rq | 7 - .../data-r2/algebra/filter-placement-2.srx | 16 - .../data-r2/algebra/filter-placement-3.rq | 9 - .../data-r2/algebra/filter-placement-3.srx | 20 - .../DAWG/data-r2/algebra/filter-scope-1.rq | 9 - .../DAWG/data-r2/algebra/filter-scope-1.srx | 109 --- .../DAWG/data-r2/algebra/join-combo-1.rq | 7 - .../DAWG/data-r2/algebra/join-combo-1.srx | 36 - .../DAWG/data-r2/algebra/join-combo-2.rq | 6 - .../DAWG/data-r2/algebra/join-combo-2.srx | 21 - .../data-r2/algebra/join-combo-graph-1.ttl | 5 - .../data-r2/algebra/join-combo-graph-2.ttl | 15 - .../suites/DAWG/data-r2/algebra/manifest.ttl | 175 ----- .../DAWG/data-r2/algebra/opt-filter-1.rq | 11 - .../DAWG/data-r2/algebra/opt-filter-1.srx | 50 -- .../DAWG/data-r2/algebra/opt-filter-1.ttl | 9 - .../DAWG/data-r2/algebra/opt-filter-2.rq | 12 - .../DAWG/data-r2/algebra/opt-filter-2.srx | 36 - .../DAWG/data-r2/algebra/opt-filter-2.ttl | 9 - .../DAWG/data-r2/algebra/opt-filter-3.rq | 10 - .../DAWG/data-r2/algebra/opt-filter-3.srx | 13 - .../DAWG/data-r2/algebra/opt-filter-3.ttl | 9 - .../data-r2/algebra/two-nested-opt-alt.rq | 10 - .../data-r2/algebra/two-nested-opt-alt.srx | 28 - .../DAWG/data-r2/algebra/two-nested-opt.rq | 11 - .../DAWG/data-r2/algebra/two-nested-opt.srx | 17 - .../DAWG/data-r2/algebra/two-nested-opt.ttl | 7 - .../DAWG/data-r2/algebra/var-scope-join-1.rq | 8 - .../DAWG/data-r2/algebra/var-scope-join-1.srx | 13 - .../DAWG/data-r2/algebra/var-scope-join-1.ttl | 15 - test/data/suites/DAWG/data-r2/ask/ask-1.rq | 3 - test/data/suites/DAWG/data-r2/ask/ask-1.srx | 6 - test/data/suites/DAWG/data-r2/ask/ask-4.rq | 3 - test/data/suites/DAWG/data-r2/ask/ask-4.srx | 6 - test/data/suites/DAWG/data-r2/ask/ask-7.rq | 3 - test/data/suites/DAWG/data-r2/ask/ask-7.srx | 6 - test/data/suites/DAWG/data-r2/ask/ask-8.rq | 3 - test/data/suites/DAWG/data-r2/ask/ask-8.srx | 6 - test/data/suites/DAWG/data-r2/ask/data.ttl | 9 - .../data/suites/DAWG/data-r2/ask/manifest.ttl | 61 -- .../DAWG/data-r2/basic/base-prefix-1.rq | 4 - .../DAWG/data-r2/basic/base-prefix-1.srx | 28 - .../DAWG/data-r2/basic/base-prefix-2.rq | 4 - .../DAWG/data-r2/basic/base-prefix-2.srx | 20 - .../DAWG/data-r2/basic/base-prefix-3.rq | 4 - .../DAWG/data-r2/basic/base-prefix-3.srx | 16 - .../DAWG/data-r2/basic/base-prefix-4.rq | 3 - .../DAWG/data-r2/basic/base-prefix-4.srx | 16 - .../DAWG/data-r2/basic/base-prefix-5.rq | 3 - .../DAWG/data-r2/basic/base-prefix-5.srx | 16 - .../suites/DAWG/data-r2/basic/bgp-no-match.rq | 8 - .../DAWG/data-r2/basic/bgp-no-match.srx | 10 - .../data/suites/DAWG/data-r2/basic/data-1.ttl | 8 - .../data/suites/DAWG/data-r2/basic/data-2.ttl | 8 - .../data/suites/DAWG/data-r2/basic/data-3.ttl | 12 - .../data/suites/DAWG/data-r2/basic/data-4.ttl | 14 - .../data/suites/DAWG/data-r2/basic/data-5.ttl | 5 - .../data/suites/DAWG/data-r2/basic/data-6.ttl | 5 - .../data/suites/DAWG/data-r2/basic/data-7.ttl | 7 - test/data/suites/DAWG/data-r2/basic/list-1.rq | 5 - .../data/suites/DAWG/data-r2/basic/list-1.srx | 16 - test/data/suites/DAWG/data-r2/basic/list-2.rq | 5 - .../data/suites/DAWG/data-r2/basic/list-2.srx | 16 - test/data/suites/DAWG/data-r2/basic/list-3.rq | 5 - .../data/suites/DAWG/data-r2/basic/list-3.srx | 20 - test/data/suites/DAWG/data-r2/basic/list-4.rq | 5 - .../data/suites/DAWG/data-r2/basic/list-4.srx | 24 - .../suites/DAWG/data-r2/basic/manifest.ttl | 314 -------- .../DAWG/data-r2/basic/prefix-name-1.rq | 4 - .../DAWG/data-r2/basic/prefix-name-1.srx | 16 - .../suites/DAWG/data-r2/basic/quotes-1.rq | 6 - .../suites/DAWG/data-r2/basic/quotes-1.srx | 16 - .../suites/DAWG/data-r2/basic/quotes-2.rq | 6 - .../suites/DAWG/data-r2/basic/quotes-2.srx | 16 - .../suites/DAWG/data-r2/basic/quotes-3.rq | 8 - .../suites/DAWG/data-r2/basic/quotes-3.srx | 16 - .../suites/DAWG/data-r2/basic/quotes-4.rq | 9 - .../suites/DAWG/data-r2/basic/quotes-4.srx | 16 - test/data/suites/DAWG/data-r2/basic/spoo-1.rq | 7 - .../data/suites/DAWG/data-r2/basic/spoo-1.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-1.rq | 4 - .../data/suites/DAWG/data-r2/basic/term-1.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-2.rq | 4 - .../data/suites/DAWG/data-r2/basic/term-2.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-3.rq | 4 - .../data/suites/DAWG/data-r2/basic/term-3.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-4.rq | 4 - .../data/suites/DAWG/data-r2/basic/term-4.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-5.rq | 4 - .../data/suites/DAWG/data-r2/basic/term-5.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-6.rq | 7 - .../data/suites/DAWG/data-r2/basic/term-6.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-7.rq | 5 - .../data/suites/DAWG/data-r2/basic/term-7.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-8.rq | 5 - .../data/suites/DAWG/data-r2/basic/term-8.srx | 16 - test/data/suites/DAWG/data-r2/basic/term-9.rq | 5 - .../data/suites/DAWG/data-r2/basic/term-9.srx | 16 - test/data/suites/DAWG/data-r2/basic/var-1.rq | 4 - test/data/suites/DAWG/data-r2/basic/var-1.srx | 28 - test/data/suites/DAWG/data-r2/basic/var-2.rq | 4 - test/data/suites/DAWG/data-r2/basic/var-2.srx | 28 - .../DAWG/data-r2/bnode-coreference/data.ttl | 29 - .../data-r2/bnode-coreference/manifest.ttl | 22 - .../DAWG/data-r2/bnode-coreference/query.rq | 7 - .../DAWG/data-r2/bnode-coreference/result.ttl | 27 - .../boolean-effective-value/data-1.ttl | 14 - .../boolean-effective-value/data-2.ttl | 19 - .../boolean-effective-value/manifest.ttl | 81 -- .../boolean-effective-value/query-bev-1.rq | 7 - .../boolean-effective-value/query-bev-2.rq | 7 - .../boolean-effective-value/query-bev-3.rq | 7 - .../boolean-effective-value/query-bev-4.rq | 7 - .../boolean-effective-value/query-bev-5.rq | 9 - .../boolean-effective-value/query-bev-6.rq | 9 - .../query-boolean-literal.rq | 5 - .../boolean-effective-value/result-bev-1.ttl | 27 - .../boolean-effective-value/result-bev-2.ttl | 27 - .../boolean-effective-value/result-bev-3.ttl | 27 - .../boolean-effective-value/result-bev-4.ttl | 27 - .../boolean-effective-value/result-bev-5.ttl | 12 - .../boolean-effective-value/result-bev-6.ttl | 16 - .../result-boolean-literal.ttl | 12 - .../DAWG/data-r2/bound/bound1-result.ttl | 20 - test/data/suites/DAWG/data-r2/bound/bound1.rq | 8 - test/data/suites/DAWG/data-r2/bound/data.ttl | 5 - .../suites/DAWG/data-r2/bound/manifest.ttl | 22 - .../suites/DAWG/data-r2/cast/cast-bool.rq | 7 - .../suites/DAWG/data-r2/cast/cast-bool.srx | 16 - test/data/suites/DAWG/data-r2/cast/cast-dT.rq | 7 - .../data/suites/DAWG/data-r2/cast/cast-dT.srx | 16 - .../data/suites/DAWG/data-r2/cast/cast-dbl.rq | 7 - .../suites/DAWG/data-r2/cast/cast-dbl.srx | 26 - .../data/suites/DAWG/data-r2/cast/cast-dec.rq | 7 - .../suites/DAWG/data-r2/cast/cast-dec.srx | 21 - .../data/suites/DAWG/data-r2/cast/cast-flt.rq | 7 - .../suites/DAWG/data-r2/cast/cast-flt.srx | 26 - .../data/suites/DAWG/data-r2/cast/cast-int.rq | 7 - .../suites/DAWG/data-r2/cast/cast-int.srx | 16 - .../data/suites/DAWG/data-r2/cast/cast-str.rq | 7 - .../suites/DAWG/data-r2/cast/cast-str.srx | 46 -- test/data/suites/DAWG/data-r2/cast/data.ttl | 9 - .../suites/DAWG/data-r2/cast/manifest.ttl | 83 -- .../DAWG/data-r2/construct/data-ident.ttl | 18 - .../DAWG/data-r2/construct/data-opt.ttl | 12 - .../DAWG/data-r2/construct/data-reif.ttl | 17 - .../DAWG/data-r2/construct/manifest.ttl | 77 -- .../construct/query-construct-optional.rq | 10 - .../DAWG/data-r2/construct/query-ident.rq | 7 - .../DAWG/data-r2/construct/query-reif-1.rq | 9 - .../DAWG/data-r2/construct/query-reif-2.rq | 9 - .../DAWG/data-r2/construct/query-subgraph.rq | 7 - .../construct/result-construct-optional.ttl | 4 - .../DAWG/data-r2/construct/result-ident.ttl | 17 - .../DAWG/data-r2/construct/result-reif.ttl | 34 - .../data-r2/construct/result-subgraph.ttl | 6 - .../DAWG/data-r2/dataset/data-g1-dup.ttl | 5 - .../suites/DAWG/data-r2/dataset/data-g1.ttl | 5 - .../DAWG/data-r2/dataset/data-g2-dup.ttl | 4 - .../suites/DAWG/data-r2/dataset/data-g2.ttl | 4 - .../DAWG/data-r2/dataset/data-g3-dup.ttl | 5 - .../suites/DAWG/data-r2/dataset/data-g3.ttl | 5 - .../DAWG/data-r2/dataset/data-g4-dup.ttl | 4 - .../suites/DAWG/data-r2/dataset/data-g4.ttl | 4 - .../suites/DAWG/data-r2/dataset/dataset-01.rq | 5 - .../DAWG/data-r2/dataset/dataset-01.ttl | 29 - .../suites/DAWG/data-r2/dataset/dataset-02.rq | 5 - .../DAWG/data-r2/dataset/dataset-02.ttl | 8 - .../suites/DAWG/data-r2/dataset/dataset-03.rq | 8 - .../DAWG/data-r2/dataset/dataset-03.ttl | 36 - .../suites/DAWG/data-r2/dataset/dataset-04.rq | 8 - .../DAWG/data-r2/dataset/dataset-04.ttl | 9 - .../suites/DAWG/data-r2/dataset/dataset-05.rq | 6 - .../DAWG/data-r2/dataset/dataset-05.ttl | 29 - .../suites/DAWG/data-r2/dataset/dataset-06.rq | 9 - .../DAWG/data-r2/dataset/dataset-06.ttl | 23 - .../suites/DAWG/data-r2/dataset/dataset-07.rq | 10 - .../DAWG/data-r2/dataset/dataset-07.ttl | 43 - .../suites/DAWG/data-r2/dataset/dataset-08.rq | 9 - .../DAWG/data-r2/dataset/dataset-08.ttl | 31 - .../suites/DAWG/data-r2/dataset/dataset-09.rq | 8 - .../DAWG/data-r2/dataset/dataset-09.ttl | 11 - .../DAWG/data-r2/dataset/dataset-09b.rq | 8 - .../suites/DAWG/data-r2/dataset/dataset-10.rq | 9 - .../DAWG/data-r2/dataset/dataset-10.ttl | 11 - .../DAWG/data-r2/dataset/dataset-10b.rq | 9 - .../suites/DAWG/data-r2/dataset/dataset-11.rq | 13 - .../DAWG/data-r2/dataset/dataset-11.ttl | 108 --- .../suites/DAWG/data-r2/dataset/dataset-12.rq | 16 - .../DAWG/data-r2/dataset/dataset-12.ttl | 148 ---- .../DAWG/data-r2/dataset/dataset-12b.rq | 16 - .../suites/DAWG/data-r2/dataset/manifest.ttl | 177 ----- .../suites/DAWG/data-r2/distinct/data-all.ttl | 74 -- .../DAWG/data-r2/distinct/data-node.ttl | 9 - .../suites/DAWG/data-r2/distinct/data-num.ttl | 35 - .../suites/DAWG/data-r2/distinct/data-opt.ttl | 13 - .../DAWG/data-r2/distinct/data-star.ttl | 8 - .../suites/DAWG/data-r2/distinct/data-str.ttl | 29 - .../data-r2/distinct/distinct-1-results.srx | 61 -- .../DAWG/data-r2/distinct/distinct-1.rq | 7 - .../DAWG/data-r2/distinct/distinct-2.rq | 8 - .../DAWG/data-r2/distinct/distinct-all.srx | 111 --- .../DAWG/data-r2/distinct/distinct-node.srx | 21 - .../DAWG/data-r2/distinct/distinct-num.srx | 56 -- .../DAWG/data-r2/distinct/distinct-opt.srx | 23 - .../DAWG/data-r2/distinct/distinct-star-1.rq | 7 - .../DAWG/data-r2/distinct/distinct-star-1.srx | 20 - .../DAWG/data-r2/distinct/distinct-str.srx | 56 -- .../suites/DAWG/data-r2/distinct/manifest.ttl | 128 --- .../DAWG/data-r2/distinct/no-distinct-1.rq | 4 - .../DAWG/data-r2/distinct/no-distinct-2.rq | 8 - .../DAWG/data-r2/distinct/no-distinct-all.srx | 231 ------ .../data-r2/distinct/no-distinct-node.srx | 31 - .../DAWG/data-r2/distinct/no-distinct-num.srx | 121 --- .../DAWG/data-r2/distinct/no-distinct-opt.srx | 35 - .../DAWG/data-r2/distinct/no-distinct-str.srx | 101 --- .../data-r2/expr-builtin/data-builtin-1.ttl | 20 - .../data-r2/expr-builtin/data-builtin-2.ttl | 14 - .../expr-builtin/data-langMatches-de.ttl | 8 - .../data-r2/expr-builtin/data-langMatches.ttl | 7 - .../expr-builtin/lang-case-insensitive-eq.srx | 98 --- .../expr-builtin/lang-case-insensitive-ne.srx | 17 - .../expr-builtin/lang-case-sensitivity-eq.rq | 11 - .../expr-builtin/lang-case-sensitivity-ne.rq | 12 - .../expr-builtin/lang-case-sensitivity.ttl | 7 - .../DAWG/data-r2/expr-builtin/manifest.ttl | 276 ------- .../DAWG/data-r2/expr-builtin/q-blank-1.rq | 7 - .../DAWG/data-r2/expr-builtin/q-datatype-1.rq | 7 - .../DAWG/data-r2/expr-builtin/q-datatype-2.rq | 9 - .../DAWG/data-r2/expr-builtin/q-datatype-3.rq | 9 - .../DAWG/data-r2/expr-builtin/q-iri-1.rq | 7 - .../data-r2/expr-builtin/q-isliteral-1.rq | 7 - .../DAWG/data-r2/expr-builtin/q-lang-1.rq | 9 - .../DAWG/data-r2/expr-builtin/q-lang-2.rq | 7 - .../DAWG/data-r2/expr-builtin/q-lang-3.rq | 6 - .../data-r2/expr-builtin/q-langMatches-1.rq | 4 - .../data-r2/expr-builtin/q-langMatches-2.rq | 4 - .../data-r2/expr-builtin/q-langMatches-3.rq | 4 - .../data-r2/expr-builtin/q-langMatches-4.rq | 4 - .../expr-builtin/q-langMatches-de-de.rq | 7 - .../DAWG/data-r2/expr-builtin/q-str-1.rq | 7 - .../DAWG/data-r2/expr-builtin/q-str-2.rq | 7 - .../DAWG/data-r2/expr-builtin/q-str-3.rq | 7 - .../DAWG/data-r2/expr-builtin/q-str-4.rq | 7 - .../DAWG/data-r2/expr-builtin/q-uri-1.rq | 7 - .../data-r2/expr-builtin/result-blank-1.ttl | 16 - .../expr-builtin/result-datatype-1.ttl | 32 - .../expr-builtin/result-datatype-2.srx | 31 - .../expr-builtin/result-datatype-3.srx | 21 - .../data-r2/expr-builtin/result-iri-1.ttl | 16 - .../expr-builtin/result-isliteral-1.ttl | 28 - .../data-r2/expr-builtin/result-lang-1.srx | 36 - .../data-r2/expr-builtin/result-lang-2.srx | 31 - .../data-r2/expr-builtin/result-lang-3.srx | 16 - .../expr-builtin/result-langMatches-1.ttl | 14 - .../expr-builtin/result-langMatches-2.ttl | 21 - .../expr-builtin/result-langMatches-3.ttl | 28 - .../expr-builtin/result-langMatches-4.ttl | 14 - .../expr-builtin/result-langMatches-de.ttl | 16 - .../expr-builtin/result-sameTerm-eq.ttl | 188 ----- .../expr-builtin/result-sameTerm-not-eq.ttl | 370 --------- .../data-r2/expr-builtin/result-sameTerm.ttl | 188 ----- .../data-r2/expr-builtin/result-str-1.ttl | 40 - .../data-r2/expr-builtin/result-str-2.ttl | 16 - .../data-r2/expr-builtin/result-str-3.ttl | 24 - .../data-r2/expr-builtin/result-str-4.ttl | 15 - .../data-r2/expr-builtin/result-uri-1.ttl | 16 - .../DAWG/data-r2/expr-builtin/sameTerm-eq.rq | 11 - .../data-r2/expr-builtin/sameTerm-not-eq.rq | 11 - .../DAWG/data-r2/expr-builtin/sameTerm.rq | 11 - .../DAWG/data-r2/expr-equals/data-eq.ttl | 23 - .../DAWG/data-r2/expr-equals/manifest.ttl | 143 ---- .../DAWG/data-r2/expr-equals/query-eq-1.rq | 7 - .../DAWG/data-r2/expr-equals/query-eq-2.rq | 7 - .../DAWG/data-r2/expr-equals/query-eq-3.rq | 7 - .../DAWG/data-r2/expr-equals/query-eq-4.rq | 7 - .../DAWG/data-r2/expr-equals/query-eq-5.rq | 7 - .../data-r2/expr-equals/query-eq-graph-1.rq | 6 - .../data-r2/expr-equals/query-eq-graph-2.rq | 6 - .../data-r2/expr-equals/query-eq-graph-3.rq | 6 - .../data-r2/expr-equals/query-eq-graph-4.rq | 6 - .../data-r2/expr-equals/query-eq-graph-5.rq | 7 - .../DAWG/data-r2/expr-equals/query-eq2-1.rq | 8 - .../DAWG/data-r2/expr-equals/query-eq2-2.rq | 8 - .../data-r2/expr-equals/query-eq2-graph-1.rq | 7 - .../DAWG/data-r2/expr-equals/result-eq-1.ttl | 37 - .../DAWG/data-r2/expr-equals/result-eq-2.ttl | 37 - .../DAWG/data-r2/expr-equals/result-eq-3.ttl | 12 - .../DAWG/data-r2/expr-equals/result-eq-4.ttl | 12 - .../DAWG/data-r2/expr-equals/result-eq-5.ttl | 12 - .../data-r2/expr-equals/result-eq-graph-1.ttl | 20 - .../data-r2/expr-equals/result-eq-graph-2.ttl | 22 - .../data-r2/expr-equals/result-eq-graph-3.ttl | 11 - .../data-r2/expr-equals/result-eq-graph-4.ttl | 11 - .../data-r2/expr-equals/result-eq-graph-5.ttl | 11 - .../DAWG/data-r2/expr-equals/result-eq2-1.ttl | 288 ------- .../DAWG/data-r2/expr-equals/result-eq2-2.ttl | 104 --- .../expr-equals/result-eq2-graph-1.ttl | 229 ------ .../suites/DAWG/data-r2/expr-ops/data.ttl | 7 - .../suites/DAWG/data-r2/expr-ops/manifest.ttl | 87 -- .../DAWG/data-r2/expr-ops/query-ge-1.rq | 5 - .../DAWG/data-r2/expr-ops/query-le-1.rq | 5 - .../DAWG/data-r2/expr-ops/query-minus-1.rq | 6 - .../DAWG/data-r2/expr-ops/query-mul-1.rq | 6 - .../DAWG/data-r2/expr-ops/query-plus-1.rq | 6 - .../DAWG/data-r2/expr-ops/query-unminus-1.rq | 5 - .../DAWG/data-r2/expr-ops/query-unplus-1.rq | 5 - .../DAWG/data-r2/expr-ops/result-ge-1.srx | 21 - .../DAWG/data-r2/expr-ops/result-le-1.srx | 21 - .../DAWG/data-r2/expr-ops/result-minus-1.srx | 16 - .../DAWG/data-r2/expr-ops/result-mul-1.srx | 26 - .../DAWG/data-r2/expr-ops/result-plus-1.srx | 21 - .../data-r2/expr-ops/result-unminus-1.srx | 16 - .../DAWG/data-r2/expr-ops/result-unplus-1.srx | 16 - .../data-r2/extended-manifest-evaluation.ttl | 13 - .../suites/DAWG/data-r2/graph/data-g1.ttl | 5 - .../suites/DAWG/data-r2/graph/data-g2.ttl | 4 - .../suites/DAWG/data-r2/graph/data-g3-dup.ttl | 5 - .../suites/DAWG/data-r2/graph/data-g3.ttl | 5 - .../suites/DAWG/data-r2/graph/data-g4.ttl | 4 - .../suites/DAWG/data-r2/graph/graph-01.rq | 3 - .../suites/DAWG/data-r2/graph/graph-01.ttl | 29 - .../suites/DAWG/data-r2/graph/graph-02.rq | 3 - .../suites/DAWG/data-r2/graph/graph-02.ttl | 8 - .../suites/DAWG/data-r2/graph/graph-03.rq | 6 - .../suites/DAWG/data-r2/graph/graph-03.ttl | 36 - .../suites/DAWG/data-r2/graph/graph-04.rq | 6 - .../suites/DAWG/data-r2/graph/graph-04.ttl | 9 - .../suites/DAWG/data-r2/graph/graph-05.rq | 3 - .../suites/DAWG/data-r2/graph/graph-05.ttl | 29 - .../suites/DAWG/data-r2/graph/graph-06.rq | 6 - .../suites/DAWG/data-r2/graph/graph-06.ttl | 23 - .../suites/DAWG/data-r2/graph/graph-07.rq | 8 - .../suites/DAWG/data-r2/graph/graph-07.ttl | 43 - .../suites/DAWG/data-r2/graph/graph-08.rq | 7 - .../suites/DAWG/data-r2/graph/graph-08.ttl | 31 - .../suites/DAWG/data-r2/graph/graph-09.rq | 7 - .../suites/DAWG/data-r2/graph/graph-09.ttl | 11 - .../suites/DAWG/data-r2/graph/graph-10.rq | 7 - .../suites/DAWG/data-r2/graph/graph-10.ttl | 11 - .../suites/DAWG/data-r2/graph/graph-11.rq | 8 - .../suites/DAWG/data-r2/graph/graph-11.ttl | 108 --- .../suites/DAWG/data-r2/graph/manifest.ttl | 180 ----- test/data/suites/DAWG/data-r2/i18n/.htaccess | 6 - .../DAWG/data-r2/i18n/kanji-01-results.ttl | 22 - .../data/suites/DAWG/data-r2/i18n/kanji-01.rq | 7 - .../DAWG/data-r2/i18n/kanji-02-results.ttl | 11 - .../data/suites/DAWG/data-r2/i18n/kanji-02.rq | 7 - test/data/suites/DAWG/data-r2/i18n/kanji.ttl | 20 - .../suites/DAWG/data-r2/i18n/manifest.ttl | 78 -- .../data-r2/i18n/normalization-01-results.ttl | 15 - .../DAWG/data-r2/i18n/normalization-01.rq | 6 - .../DAWG/data-r2/i18n/normalization-01.ttl | 23 - .../data-r2/i18n/normalization-02-results.ttl | 14 - .../DAWG/data-r2/i18n/normalization-02.rq | 8 - .../DAWG/data-r2/i18n/normalization-02.ttl | 8 - .../data-r2/i18n/normalization-03-results.ttl | 14 - .../DAWG/data-r2/i18n/normalization-03.rq | 8 - .../DAWG/data-r2/i18n/normalization-03.ttl | 9 - .../DAWG/data-r2/manifest-evaluation.ttl | 40 - .../suites/DAWG/data-r2/manifest-syntax.ttl | 14 - .../suites/DAWG/data-r2/open-world/data-1.ttl | 17 - .../suites/DAWG/data-r2/open-world/data-2.ttl | 20 - .../suites/DAWG/data-r2/open-world/data-3.ttl | 15 - .../suites/DAWG/data-r2/open-world/data-4.ttl | 15 - .../DAWG/data-r2/open-world/date-1-result.srx | 20 - .../suites/DAWG/data-r2/open-world/date-1.rq | 8 - .../DAWG/data-r2/open-world/date-2-result.srx | 36 - .../suites/DAWG/data-r2/open-world/date-2.rq | 8 - .../DAWG/data-r2/open-world/date-3-result.srx | 36 - .../suites/DAWG/data-r2/open-world/date-3.rq | 8 - .../DAWG/data-r2/open-world/date-4-result.srx | 36 - .../suites/DAWG/data-r2/open-world/date-4.rq | 8 - .../DAWG/data-r2/open-world/manifest.ttl | 223 ------ .../data-r2/open-world/open-cmp-01-result.srx | 24 - .../DAWG/data-r2/open-world/open-cmp-01.rq | 8 - .../data-r2/open-world/open-cmp-02-result.srx | 46 -- .../DAWG/data-r2/open-world/open-cmp-02.rq | 8 - .../data-r2/open-world/open-eq-01-result.srx | 11 - .../DAWG/data-r2/open-world/open-eq-01.rq | 13 - .../data-r2/open-world/open-eq-02-result.srx | 16 - .../DAWG/data-r2/open-world/open-eq-02.rq | 8 - .../data-r2/open-world/open-eq-03-result.srx | 28 - .../DAWG/data-r2/open-world/open-eq-03.rq | 14 - .../data-r2/open-world/open-eq-04-result.srx | 28 - .../DAWG/data-r2/open-world/open-eq-04.rq | 14 - .../data-r2/open-world/open-eq-05-result.srx | 20 - .../DAWG/data-r2/open-world/open-eq-05.rq | 11 - .../data-r2/open-world/open-eq-06-result.srx | 12 - .../DAWG/data-r2/open-world/open-eq-06.rq | 12 - .../data-r2/open-world/open-eq-07-result.srx | 182 ----- .../DAWG/data-r2/open-world/open-eq-07.rq | 9 - .../data-r2/open-world/open-eq-08-result.srx | 602 -------------- .../DAWG/data-r2/open-world/open-eq-08.rq | 9 - .../data-r2/open-world/open-eq-09-result.srx | 14 - .../DAWG/data-r2/open-world/open-eq-09.rq | 9 - .../data-r2/open-world/open-eq-10-result.srx | 742 ------------------ .../DAWG/data-r2/open-world/open-eq-10.rq | 9 - .../data-r2/open-world/open-eq-11-result.srx | 742 ------------------ .../DAWG/data-r2/open-world/open-eq-11.rq | 9 - .../data-r2/open-world/open-eq-12-result.srx | 154 ---- .../DAWG/data-r2/open-world/open-eq-12.rq | 10 - .../sameTerm-StringSimpleLiteralCmp.srx | 56 -- .../sameTerm-eq-StringSimpleLiteralCmp.srx | 56 -- .../DAWG/data-r2/open-world/sameTerm-eq.srx | 56 -- .../data-r2/open-world/sameTerm-manifest.ttl | 61 -- ...sameTerm-not-eq-StringSimpleLiteralCmp.srx | 56 -- .../data-r2/open-world/sameTerm-not-eq.srx | 17 - .../DAWG/data-r2/open-world/sameTerm.srx | 56 -- .../DAWG/data-r2/open-world/sameTerm.ttl | 8 - .../DAWG/data-r2/optional-filter/data-1.ttl | 12 - .../data-r2/optional-filter/expr-1-result.ttl | 27 - .../DAWG/data-r2/optional-filter/expr-1.rq | 10 - .../data-r2/optional-filter/expr-2-result.ttl | 17 - .../DAWG/data-r2/optional-filter/expr-2.rq | 9 - .../data-r2/optional-filter/expr-3-result.ttl | 22 - .../DAWG/data-r2/optional-filter/expr-3.rq | 9 - .../data-r2/optional-filter/expr-4-result.ttl | 24 - .../DAWG/data-r2/optional-filter/expr-4.rq | 10 - .../expr-5-result-not-simplified.ttl | 24 - .../expr-5-result-simplified.ttl | 27 - .../DAWG/data-r2/optional-filter/expr-5.rq | 13 - .../DAWG/data-r2/optional-filter/manifest.ttl | 75 -- .../DAWG/data-r2/optional/complex-data-1.ttl | 21 - .../DAWG/data-r2/optional/complex-data-2.ttl | 32 - .../suites/DAWG/data-r2/optional/data.ttl | 11 - .../suites/DAWG/data-r2/optional/manifest.ttl | 99 --- .../suites/DAWG/data-r2/optional/q-opt-1.rq | 7 - .../suites/DAWG/data-r2/optional/q-opt-2.rq | 8 - .../suites/DAWG/data-r2/optional/q-opt-3.rq | 8 - .../DAWG/data-r2/optional/q-opt-complex-1.rq | 11 - .../DAWG/data-r2/optional/q-opt-complex-2.rq | 16 - .../DAWG/data-r2/optional/q-opt-complex-3.rq | 17 - .../DAWG/data-r2/optional/q-opt-complex-4.rq | 15 - .../DAWG/data-r2/optional/result-opt-1.ttl | 25 - .../DAWG/data-r2/optional/result-opt-2.ttl | 32 - .../DAWG/data-r2/optional/result-opt-3.ttl | 33 - .../data-r2/optional/result-opt-complex-1.ttl | 34 - .../data-r2/optional/result-opt-complex-2.ttl | 16 - .../data-r2/optional/result-opt-complex-3.ttl | 33 - .../data-r2/optional/result-opt-complex-4.ttl | 48 -- .../suites/DAWG/data-r2/reduced/manifest.ttl | 38 - .../suites/DAWG/data-r2/reduced/reduced-1.rq | 7 - .../suites/DAWG/data-r2/reduced/reduced-1.srx | 24 - .../suites/DAWG/data-r2/reduced/reduced-2.rq | 7 - .../suites/DAWG/data-r2/reduced/reduced-2.srx | 101 --- .../DAWG/data-r2/reduced/reduced-star.ttl | 8 - .../DAWG/data-r2/reduced/reduced-str.ttl | 29 - .../suites/DAWG/data-r2/regex/manifest.ttl | 57 -- .../DAWG/data-r2/regex/regex-data-01.ttl | 5 - .../DAWG/data-r2/regex/regex-query-001.rq | 8 - .../DAWG/data-r2/regex/regex-query-002.rq | 8 - .../DAWG/data-r2/regex/regex-query-003.rq | 8 - .../DAWG/data-r2/regex/regex-query-004.rq | 7 - .../DAWG/data-r2/regex/regex-result-001.ttl | 10 - .../DAWG/data-r2/regex/regex-result-002.ttl | 14 - .../DAWG/data-r2/regex/regex-result-003.ttl | 10 - .../DAWG/data-r2/regex/regex-result-004.ttl | 14 - .../suites/DAWG/data-r2/solution-seq/data.ttl | 18 - .../DAWG/data-r2/solution-seq/manifest.ttl | 117 --- .../DAWG/data-r2/solution-seq/slice-01.rq | 6 - .../DAWG/data-r2/solution-seq/slice-02.rq | 7 - .../DAWG/data-r2/solution-seq/slice-03.rq | 6 - .../DAWG/data-r2/solution-seq/slice-04.rq | 6 - .../DAWG/data-r2/solution-seq/slice-10.rq | 6 - .../DAWG/data-r2/solution-seq/slice-11.rq | 6 - .../DAWG/data-r2/solution-seq/slice-12.rq | 6 - .../DAWG/data-r2/solution-seq/slice-13.rq | 6 - .../DAWG/data-r2/solution-seq/slice-20.rq | 8 - .../DAWG/data-r2/solution-seq/slice-21.rq | 7 - .../DAWG/data-r2/solution-seq/slice-22.rq | 7 - .../DAWG/data-r2/solution-seq/slice-23.rq | 7 - .../DAWG/data-r2/solution-seq/slice-24.rq | 7 - .../data-r2/solution-seq/slice-results-01.ttl | 12 - .../data-r2/solution-seq/slice-results-02.ttl | 47 -- .../data-r2/solution-seq/slice-results-03.ttl | 6 - .../data-r2/solution-seq/slice-results-04.ttl | 32 - .../data-r2/solution-seq/slice-results-10.ttl | 42 - .../data-r2/solution-seq/slice-results-11.ttl | 47 -- .../data-r2/solution-seq/slice-results-12.ttl | 6 - .../data-r2/solution-seq/slice-results-13.ttl | 22 - .../data-r2/solution-seq/slice-results-20.ttl | 12 - .../data-r2/solution-seq/slice-results-21.ttl | 18 - .../data-r2/solution-seq/slice-results-22.ttl | 6 - .../data-r2/solution-seq/slice-results-23.ttl | 32 - .../data-r2/solution-seq/slice-results-24.ttl | 22 - .../DAWG/data-r2/sort/.manifest.ttl.swp | Bin 20480 -> 0 bytes .../suites/DAWG/data-r2/sort/data-sort-1.ttl | 7 - .../suites/DAWG/data-r2/sort/data-sort-11.ttl | 15 - .../suites/DAWG/data-r2/sort/data-sort-3.ttl | 17 - .../suites/DAWG/data-r2/sort/data-sort-4.ttl | 22 - .../suites/DAWG/data-r2/sort/data-sort-6.ttl | 20 - .../suites/DAWG/data-r2/sort/data-sort-7.ttl | 19 - .../suites/DAWG/data-r2/sort/data-sort-8.ttl | 13 - .../suites/DAWG/data-r2/sort/data-sort-9.ttl | 10 - .../DAWG/data-r2/sort/data-sort-builtin.ttl | 7 - .../DAWG/data-r2/sort/data-sort-function.ttl | 6 - .../DAWG/data-r2/sort/data-sort-numbers.ttl | 7 - .../DAWG/data-r2/sort/extended-manifest.ttl | 19 - .../suites/DAWG/data-r2/sort/manifest.ttl | 148 ---- .../suites/DAWG/data-r2/sort/query-sort-1.rq | 4 - .../suites/DAWG/data-r2/sort/query-sort-10.rq | 4 - .../suites/DAWG/data-r2/sort/query-sort-2.rq | 4 - .../suites/DAWG/data-r2/sort/query-sort-3.rq | 6 - .../suites/DAWG/data-r2/sort/query-sort-4.rq | 8 - .../suites/DAWG/data-r2/sort/query-sort-5.rq | 8 - .../suites/DAWG/data-r2/sort/query-sort-6.rq | 5 - .../suites/DAWG/data-r2/sort/query-sort-9.rq | 4 - .../DAWG/data-r2/sort/query-sort-builtin.rq | 4 - .../DAWG/data-r2/sort/query-sort-function.rq | 5 - .../DAWG/data-r2/sort/query-sort-numbers.rq | 4 - .../DAWG/data-r2/sort/result-sort-1.rdf | 38 - .../DAWG/data-r2/sort/result-sort-10.rdf | 38 - .../DAWG/data-r2/sort/result-sort-11.ttl | 49 -- .../DAWG/data-r2/sort/result-sort-2.rdf | 38 - .../DAWG/data-r2/sort/result-sort-3.rdf | 56 -- .../DAWG/data-r2/sort/result-sort-4.rdf | 71 -- .../DAWG/data-r2/sort/result-sort-5.rdf | 72 -- .../DAWG/data-r2/sort/result-sort-6.rdf | 42 - .../DAWG/data-r2/sort/result-sort-7.rdf | 59 -- .../DAWG/data-r2/sort/result-sort-8.rdf | 48 -- .../DAWG/data-r2/sort/result-sort-9.rdf | 38 - .../DAWG/data-r2/sort/result-sort-builtin.ttl | 25 - .../data-r2/sort/result-sort-function.ttl | 25 - .../DAWG/data-r2/sort/result-sort-numbers.ttl | 25 - .../DAWG/data-r2/syntax-sparql1/manifest.ttl | 524 ------------- .../data-r2/syntax-sparql1/syntax-basic-01.rq | 2 - .../data-r2/syntax-sparql1/syntax-basic-02.rq | 1 - .../data-r2/syntax-sparql1/syntax-basic-03.rq | 4 - .../data-r2/syntax-sparql1/syntax-basic-04.rq | 3 - .../data-r2/syntax-sparql1/syntax-basic-05.rq | 3 - .../data-r2/syntax-sparql1/syntax-basic-06.rq | 3 - .../syntax-sparql1/syntax-bnodes-01.rq | 2 - .../syntax-sparql1/syntax-bnodes-02.rq | 2 - .../syntax-sparql1/syntax-bnodes-03.rq | 2 - .../syntax-sparql1/syntax-bnodes-04.rq | 3 - .../syntax-sparql1/syntax-bnodes-05.rq | 5 - .../data-r2/syntax-sparql1/syntax-expr-01.rq | 2 - .../data-r2/syntax-sparql1/syntax-expr-02.rq | 2 - .../data-r2/syntax-sparql1/syntax-expr-03.rq | 2 - .../data-r2/syntax-sparql1/syntax-expr-04.rq | 3 - .../data-r2/syntax-sparql1/syntax-expr-05.rq | 4 - .../data-r2/syntax-sparql1/syntax-forms-01.rq | 2 - .../data-r2/syntax-sparql1/syntax-forms-02.rq | 2 - .../syntax-sparql1/syntax-limit-offset-01.rq | 5 - .../syntax-sparql1/syntax-limit-offset-02.rq | 7 - .../syntax-sparql1/syntax-limit-offset-03.rq | 7 - .../syntax-sparql1/syntax-limit-offset-04.rq | 5 - .../data-r2/syntax-sparql1/syntax-lists-01.rq | 2 - .../data-r2/syntax-sparql1/syntax-lists-02.rq | 2 - .../data-r2/syntax-sparql1/syntax-lists-03.rq | 1 - .../data-r2/syntax-sparql1/syntax-lists-04.rq | 1 - .../data-r2/syntax-sparql1/syntax-lists-05.rq | 1 - .../data-r2/syntax-sparql1/syntax-lit-01.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-02.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-03.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-04.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-05.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-06.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-07.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-08.rq | 11 - .../data-r2/syntax-sparql1/syntax-lit-09.rq | 6 - .../data-r2/syntax-sparql1/syntax-lit-10.rq | 5 - .../data-r2/syntax-sparql1/syntax-lit-11.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-12.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-13.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-14.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-15.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-16.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-17.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-18.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-19.rq | 3 - .../data-r2/syntax-sparql1/syntax-lit-20.rq | 3 - .../data-r2/syntax-sparql1/syntax-order-01.rq | 4 - .../data-r2/syntax-sparql1/syntax-order-02.rq | 4 - .../data-r2/syntax-sparql1/syntax-order-03.rq | 4 - .../data-r2/syntax-sparql1/syntax-order-04.rq | 4 - .../data-r2/syntax-sparql1/syntax-order-05.rq | 4 - .../data-r2/syntax-sparql1/syntax-order-06.rq | 5 - .../data-r2/syntax-sparql1/syntax-order-07.rq | 4 - .../data-r2/syntax-sparql1/syntax-pat-01.rq | 3 - .../data-r2/syntax-sparql1/syntax-pat-02.rq | 4 - .../data-r2/syntax-sparql1/syntax-pat-03.rq | 7 - .../data-r2/syntax-sparql1/syntax-pat-04.rq | 8 - .../data-r2/syntax-sparql1/syntax-qname-01.rq | 3 - .../data-r2/syntax-sparql1/syntax-qname-02.rq | 3 - .../data-r2/syntax-sparql1/syntax-qname-03.rq | 3 - .../data-r2/syntax-sparql1/syntax-qname-04.rq | 4 - .../data-r2/syntax-sparql1/syntax-qname-05.rq | 3 - .../data-r2/syntax-sparql1/syntax-qname-06.rq | 3 - .../data-r2/syntax-sparql1/syntax-qname-07.rq | 4 - .../data-r2/syntax-sparql1/syntax-qname-08.rq | 5 - .../syntax-sparql1/syntax-struct-01.rq | 4 - .../syntax-sparql1/syntax-struct-02.rq | 4 - .../syntax-sparql1/syntax-struct-03.rq | 4 - .../syntax-sparql1/syntax-struct-05.rq | 4 - .../syntax-sparql1/syntax-struct-06.rq | 4 - .../syntax-sparql1/syntax-struct-07.rq | 4 - .../syntax-sparql1/syntax-struct-08.rq | 4 - .../syntax-sparql1/syntax-struct-09.rq | 4 - .../syntax-sparql1/syntax-struct-10.rq | 4 - .../syntax-sparql1/syntax-struct-11.rq | 4 - .../syntax-sparql1/syntax-struct-12.rq | 4 - .../syntax-sparql1/syntax-struct-13.rq | 6 - .../syntax-sparql1/syntax-struct-14.rq | 6 - .../data-r2/syntax-sparql1/syntax-union-01.rq | 5 - .../data-r2/syntax-sparql1/syntax-union-02.rq | 5 - .../DAWG/data-r2/syntax-sparql2/manifest.ttl | 348 -------- .../data-r2/syntax-sparql2/syntax-bnode-01.rq | 2 - .../data-r2/syntax-sparql2/syntax-bnode-02.rq | 4 - .../data-r2/syntax-sparql2/syntax-bnode-03.rq | 3 - .../syntax-sparql2/syntax-dataset-01.rq | 4 - .../syntax-sparql2/syntax-dataset-02.rq | 4 - .../syntax-sparql2/syntax-dataset-03.rq | 5 - .../syntax-sparql2/syntax-dataset-04.rq | 7 - .../data-r2/syntax-sparql2/syntax-esc-01.rq | 2 - .../data-r2/syntax-sparql2/syntax-esc-02.rq | 2 - .../data-r2/syntax-sparql2/syntax-esc-03.rq | 2 - .../data-r2/syntax-sparql2/syntax-esc-04.rq | 3 - .../data-r2/syntax-sparql2/syntax-esc-05.rq | 5 - .../syntax-sparql2/syntax-form-ask-02.rq | 1 - .../syntax-sparql2/syntax-form-construct01.rq | 1 - .../syntax-sparql2/syntax-form-construct02.rq | 1 - .../syntax-sparql2/syntax-form-construct03.rq | 5 - .../syntax-sparql2/syntax-form-construct04.rq | 5 - .../syntax-sparql2/syntax-form-construct06.rq | 1 - .../syntax-sparql2/syntax-form-describe01.rq | 1 - .../syntax-sparql2/syntax-form-describe02.rq | 1 - .../syntax-sparql2/syntax-form-select-01.rq | 1 - .../syntax-sparql2/syntax-form-select-02.rq | 1 - .../syntax-sparql2/syntax-function-01.rq | 2 - .../syntax-sparql2/syntax-function-02.rq | 2 - .../syntax-sparql2/syntax-function-03.rq | 3 - .../syntax-sparql2/syntax-function-04.rq | 4 - .../syntax-sparql2/syntax-general-01.rq | 1 - .../syntax-sparql2/syntax-general-02.rq | 1 - .../syntax-sparql2/syntax-general-03.rq | 1 - .../syntax-sparql2/syntax-general-04.rq | 1 - .../syntax-sparql2/syntax-general-05.rq | 1 - .../syntax-sparql2/syntax-general-06.rq | 1 - .../syntax-sparql2/syntax-general-07.rq | 1 - .../syntax-sparql2/syntax-general-08.rq | 1 - .../syntax-sparql2/syntax-general-09.rq | 1 - .../syntax-sparql2/syntax-general-10.rq | 1 - .../syntax-sparql2/syntax-general-11.rq | 1 - .../syntax-sparql2/syntax-general-12.rq | 2 - .../syntax-sparql2/syntax-general-13.rq | 3 - .../syntax-sparql2/syntax-general-14.rq | 3 - .../data-r2/syntax-sparql2/syntax-graph-01.rq | 6 - .../data-r2/syntax-sparql2/syntax-graph-02.rq | 6 - .../data-r2/syntax-sparql2/syntax-graph-03.rq | 6 - .../data-r2/syntax-sparql2/syntax-graph-04.rq | 7 - .../data-r2/syntax-sparql2/syntax-graph-05.rq | 7 - .../syntax-sparql2/syntax-keywords-01.rq | 4 - .../syntax-sparql2/syntax-keywords-02.rq | 4 - .../syntax-sparql2/syntax-keywords-03.rq | 4 - .../data-r2/syntax-sparql2/syntax-lists-01.rq | 2 - .../data-r2/syntax-sparql2/syntax-lists-02.rq | 2 - .../data-r2/syntax-sparql2/syntax-lists-03.rq | 3 - .../data-r2/syntax-sparql2/syntax-lists-04.rq | 3 - .../data-r2/syntax-sparql2/syntax-lists-05.rq | 3 - .../DAWG/data-r2/syntax-sparql3/manifest.ttl | 329 -------- .../DAWG/data-r2/syntax-sparql3/syn-01.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-02.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-03.rq | 2 - .../DAWG/data-r2/syntax-sparql3/syn-04.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-05.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-06.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-07.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-08.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-01.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-02.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-03.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-04.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-05.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-06.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-07.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-08.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-09.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-10.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-11.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-12.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-13.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-14.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-15.rq | 3 - .../DAWG/data-r2/syntax-sparql3/syn-bad-16.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-17.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-18.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-19.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-20.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-21.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-22.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-23.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-24.rq | 4 - .../DAWG/data-r2/syntax-sparql3/syn-bad-25.rq | 1 - .../DAWG/data-r2/syntax-sparql3/syn-bad-26.rq | 5 - .../DAWG/data-r2/syntax-sparql3/syn-bad-27.rq | 2 - .../DAWG/data-r2/syntax-sparql3/syn-bad-28.rq | 2 - .../DAWG/data-r2/syntax-sparql3/syn-bad-29.rq | 2 - .../DAWG/data-r2/syntax-sparql3/syn-bad-30.rq | 2 - .../DAWG/data-r2/syntax-sparql3/syn-bad-31.rq | 6 - .../syntax-sparql3/syn-bad-bnode-dot.rq | 2 - .../syn-bad-bnodes-missing-pvalues-01.rq | 3 - .../syn-bad-bnodes-missing-pvalues-02.rq | 2 - .../syn-bad-empty-optional-01.rq | 2 - .../syn-bad-empty-optional-02.rq | 2 - .../syn-bad-filter-missing-parens.rq | 2 - .../syntax-sparql3/syn-bad-lone-list.rq | 2 - .../syntax-sparql3/syn-bad-lone-node.rq | 2 - .../syntax-sparql3/syn-blabel-cross-filter.rq | 7 - .../syn-blabel-cross-graph-bad.rq | 7 - .../syn-blabel-cross-optional-bad.rq | 9 - .../syn-blabel-cross-union-bad.rq | 11 - .../DAWG/data-r2/syntax-sparql4/manifest.ttl | 91 --- .../DAWG/data-r2/syntax-sparql4/syn-09.rq | 6 - .../DAWG/data-r2/syntax-sparql4/syn-10.rq | 6 - .../DAWG/data-r2/syntax-sparql4/syn-11.rq | 6 - .../DAWG/data-r2/syntax-sparql4/syn-bad-34.rq | 6 - .../DAWG/data-r2/syntax-sparql4/syn-bad-35.rq | 6 - .../DAWG/data-r2/syntax-sparql4/syn-bad-36.rq | 6 - .../DAWG/data-r2/syntax-sparql4/syn-bad-37.rq | 6 - .../DAWG/data-r2/syntax-sparql4/syn-bad-38.rq | 6 - .../syn-bad-GRAPH-breaks-BGP.rq | 9 - .../syntax-sparql4/syn-bad-OPT-breaks-BGP.rq | 9 - .../syn-bad-UNION-breaks-BGP.rq | 11 - .../syn-leading-digits-in-prefixed-names.rq | 8 - .../DAWG/data-r2/syntax-sparql5/manifest.ttl | 27 - .../syntax-sparql5/syntax-reduced-01.rq | 1 - .../syntax-sparql5/syntax-reduced-02.rq | 1 - .../DAWG/data-r2/triple-match/data-01.ttl | 4 - .../DAWG/data-r2/triple-match/data-02.ttl | 7 - .../DAWG/data-r2/triple-match/data-03.ttl | 4 - .../data-r2/triple-match/dawg-data-01.ttl | 29 - .../DAWG/data-r2/triple-match/dawg-tp-01.rq | 4 - .../DAWG/data-r2/triple-match/dawg-tp-02.rq | 5 - .../DAWG/data-r2/triple-match/dawg-tp-03.rq | 2 - .../DAWG/data-r2/triple-match/dawg-tp-04.rq | 8 - .../DAWG/data-r2/triple-match/dawg-tp-05.rq | 5 - .../DAWG/data-r2/triple-match/manifest.ttl | 60 -- .../data-r2/triple-match/result-tp-01.ttl | 20 - .../data-r2/triple-match/result-tp-02.ttl | 20 - .../data-r2/triple-match/result-tp-03.ttl | 13 - .../data-r2/triple-match/result-tp-04.ttl | 18 - .../DAWG/data-r2/type-promotion/false.ttl | 9 - .../DAWG/data-r2/type-promotion/manifest.ttl | 406 ---------- .../type-promotion/tP-byte-short-fail.rq | 10 - .../data-r2/type-promotion/tP-byte-short.rq | 10 - .../type-promotion/tP-decimal-decimal.rq | 10 - .../type-promotion/tP-double-decimal-fail.rq | 10 - .../type-promotion/tP-double-decimal.rq | 10 - .../type-promotion/tP-double-double.rq | 10 - .../type-promotion/tP-double-float-fail.rq | 10 - .../data-r2/type-promotion/tP-double-float.rq | 10 - .../type-promotion/tP-float-decimal-fail.rq | 10 - .../type-promotion/tP-float-decimal.rq | 10 - .../data-r2/type-promotion/tP-float-float.rq | 10 - .../data-r2/type-promotion/tP-int-short.rq | 10 - .../type-promotion/tP-integer-short.rq | 10 - .../data-r2/type-promotion/tP-long-short.rq | 10 - .../tP-negativeInteger-short.rq | 10 - .../tP-nonNegativeInteger-short.rq | 10 - .../tP-nonPositiveInteger-short.rq | 10 - .../tP-positiveInteger-short.rq | 10 - .../type-promotion/tP-short-byte-fail.rq | 10 - .../type-promotion/tP-short-decimal.rq | 10 - .../data-r2/type-promotion/tP-short-double.rq | 10 - .../data-r2/type-promotion/tP-short-float.rq | 10 - .../type-promotion/tP-short-int-fail.rq | 10 - .../type-promotion/tP-short-long-fail.rq | 10 - .../type-promotion/tP-short-short-fail.rq | 10 - .../data-r2/type-promotion/tP-short-short.rq | 10 - .../type-promotion/tP-unsignedByte-short.rq | 10 - .../type-promotion/tP-unsignedInt-short.rq | 10 - .../type-promotion/tP-unsignedLong-short.rq | 10 - .../type-promotion/tP-unsignedShort-short.rq | 10 - .../suites/DAWG/data-r2/type-promotion/tP.ttl | 28 - .../DAWG/data-r2/type-promotion/true.ttl | 9 - 787 files changed, 18169 deletions(-) delete mode 100644 test/data/suites/DAWG/data-r2/LICENSE delete mode 100644 test/data/suites/DAWG/data-r2/README delete mode 100644 test/data/suites/DAWG/data-r2/algebra/data-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/data-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-nested-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-nested-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-nested-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-nested-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-placement-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-placement-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-placement-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-placement-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-placement-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-placement-3.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-scope-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/filter-scope-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/join-combo-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/join-combo-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/join-combo-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/join-combo-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/join-combo-graph-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/join-combo-graph-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-3.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/opt-filter-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/two-nested-opt-alt.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/two-nested-opt-alt.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/two-nested-opt.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/two-nested-opt.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/two-nested-opt.ttl delete mode 100644 test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/ask/ask-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/ask/ask-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/ask/ask-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/ask/ask-4.srx delete mode 100644 test/data/suites/DAWG/data-r2/ask/ask-7.rq delete mode 100644 test/data/suites/DAWG/data-r2/ask/ask-7.srx delete mode 100644 test/data/suites/DAWG/data-r2/ask/ask-8.rq delete mode 100644 test/data/suites/DAWG/data-r2/ask/ask-8.srx delete mode 100644 test/data/suites/DAWG/data-r2/ask/data.ttl delete mode 100644 test/data/suites/DAWG/data-r2/ask/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-3.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-4.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-5.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/base-prefix-5.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/bgp-no-match.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/bgp-no-match.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/data-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/data-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/data-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/data-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/data-5.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/data-6.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/data-7.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/list-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/list-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/list-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/list-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/list-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/list-3.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/list-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/list-4.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/basic/prefix-name-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/prefix-name-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/quotes-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/quotes-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/quotes-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/quotes-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/quotes-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/quotes-3.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/quotes-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/quotes-4.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/spoo-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/spoo-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-3.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-4.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-5.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-5.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-6.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-6.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-7.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-7.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-8.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-8.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-9.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/term-9.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/var-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/var-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/basic/var-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/basic/var-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/bnode-coreference/data.ttl delete mode 100644 test/data/suites/DAWG/data-r2/bnode-coreference/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/bnode-coreference/query.rq delete mode 100644 test/data/suites/DAWG/data-r2/bnode-coreference/result.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/data-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/data-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-5.rq delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-6.rq delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/query-boolean-literal.rq delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-5.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-6.ttl delete mode 100644 test/data/suites/DAWG/data-r2/boolean-effective-value/result-boolean-literal.ttl delete mode 100644 test/data/suites/DAWG/data-r2/bound/bound1-result.ttl delete mode 100644 test/data/suites/DAWG/data-r2/bound/bound1.rq delete mode 100644 test/data/suites/DAWG/data-r2/bound/data.ttl delete mode 100644 test/data/suites/DAWG/data-r2/bound/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-bool.rq delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-bool.srx delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-dT.rq delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-dT.srx delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-dbl.rq delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-dbl.srx delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-dec.rq delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-dec.srx delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-flt.rq delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-flt.srx delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-int.rq delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-int.srx delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-str.rq delete mode 100644 test/data/suites/DAWG/data-r2/cast/cast-str.srx delete mode 100644 test/data/suites/DAWG/data-r2/cast/data.ttl delete mode 100644 test/data/suites/DAWG/data-r2/cast/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/construct/data-ident.ttl delete mode 100644 test/data/suites/DAWG/data-r2/construct/data-opt.ttl delete mode 100644 test/data/suites/DAWG/data-r2/construct/data-reif.ttl delete mode 100644 test/data/suites/DAWG/data-r2/construct/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/construct/query-construct-optional.rq delete mode 100644 test/data/suites/DAWG/data-r2/construct/query-ident.rq delete mode 100644 test/data/suites/DAWG/data-r2/construct/query-reif-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/construct/query-reif-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/construct/query-subgraph.rq delete mode 100644 test/data/suites/DAWG/data-r2/construct/result-construct-optional.ttl delete mode 100644 test/data/suites/DAWG/data-r2/construct/result-ident.ttl delete mode 100644 test/data/suites/DAWG/data-r2/construct/result-reif.ttl delete mode 100644 test/data/suites/DAWG/data-r2/construct/result-subgraph.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/data-g1-dup.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/data-g1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/data-g2-dup.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/data-g2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/data-g3-dup.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/data-g3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/data-g4-dup.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/data-g4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-01.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-02.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-03.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-04.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-05.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-06.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-07.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-08.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-09.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-09.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-09b.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-10.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-10b.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-11.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-12.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-12.ttl delete mode 100644 test/data/suites/DAWG/data-r2/dataset/dataset-12b.rq delete mode 100644 test/data/suites/DAWG/data-r2/dataset/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/distinct/data-all.ttl delete mode 100644 test/data/suites/DAWG/data-r2/distinct/data-node.ttl delete mode 100644 test/data/suites/DAWG/data-r2/distinct/data-num.ttl delete mode 100644 test/data/suites/DAWG/data-r2/distinct/data-opt.ttl delete mode 100644 test/data/suites/DAWG/data-r2/distinct/data-star.ttl delete mode 100644 test/data/suites/DAWG/data-r2/distinct/data-str.ttl delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-1-results.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-all.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-node.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-num.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-opt.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-star-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-star-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/distinct-str.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/distinct/no-distinct-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/distinct/no-distinct-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/distinct/no-distinct-all.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/no-distinct-node.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/no-distinct-num.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/no-distinct-opt.srx delete mode 100644 test/data/suites/DAWG/data-r2/distinct/no-distinct-str.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/data-builtin-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/data-builtin-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/data-langMatches-de.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/data-langMatches.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/lang-case-insensitive-eq.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/lang-case-insensitive-ne.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity-eq.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity-ne.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-blank-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-iri-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-isliteral-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-lang-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-lang-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-lang-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-de-de.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-str-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-str-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-str-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-str-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/q-uri-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-blank-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-3.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-iri-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-isliteral-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-lang-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-lang-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-lang-3.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-de.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm-eq.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm-not-eq.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-str-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-str-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-str-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-str-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/result-uri-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/sameTerm-eq.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/sameTerm-not-eq.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-builtin/sameTerm.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/data-eq.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-5.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-5.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq2-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq2-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/query-eq2-graph-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-5.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-5.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq2-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq2-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-equals/result-eq2-graph-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/data.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/query-ge-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/query-le-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/query-minus-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/query-mul-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/query-plus-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/query-unminus-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/query-unplus-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/result-ge-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/result-le-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/result-minus-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/result-mul-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/result-plus-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/result-unminus-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/expr-ops/result-unplus-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/extended-manifest-evaluation.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/data-g1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/data-g2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/data-g3-dup.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/data-g3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/data-g4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-01.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-02.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-03.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-04.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-05.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-06.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-07.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-08.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-09.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-09.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-10.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/graph/graph-11.ttl delete mode 100644 test/data/suites/DAWG/data-r2/graph/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/.htaccess delete mode 100644 test/data/suites/DAWG/data-r2/i18n/kanji-01-results.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/kanji-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/i18n/kanji-02-results.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/kanji-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/i18n/kanji.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-01-results.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-01.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-02-results.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-02.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-03-results.ttl delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/i18n/normalization-03.ttl delete mode 100644 test/data/suites/DAWG/data-r2/manifest-evaluation.ttl delete mode 100644 test/data/suites/DAWG/data-r2/manifest-syntax.ttl delete mode 100644 test/data/suites/DAWG/data-r2/open-world/data-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/open-world/data-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/open-world/data-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/open-world/data-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/open-world/date-1-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/date-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/date-2-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/date-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/date-3-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/date-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/date-4-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/date-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-cmp-01-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-cmp-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-cmp-02-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-cmp-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-01-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-02-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-03-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-04-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-05-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-06-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-07-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-08-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-09-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-09.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-10-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-11-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-12-result.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/open-eq-12.rq delete mode 100644 test/data/suites/DAWG/data-r2/open-world/sameTerm-StringSimpleLiteralCmp.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/sameTerm-eq-StringSimpleLiteralCmp.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/sameTerm-eq.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/sameTerm-manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/open-world/sameTerm-not-eq-StringSimpleLiteralCmp.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/sameTerm-not-eq.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/sameTerm.srx delete mode 100644 test/data/suites/DAWG/data-r2/open-world/sameTerm.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/data-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-1-result.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-2-result.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-3-result.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-4-result.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-5-result-not-simplified.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-5-result-simplified.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/expr-5.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional-filter/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/complex-data-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/complex-data-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/data.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/q-opt-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional/q-opt-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional/q-opt-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional/q-opt-complex-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional/q-opt-complex-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional/q-opt-complex-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional/q-opt-complex-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/optional/result-opt-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/result-opt-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/result-opt-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/result-opt-complex-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/result-opt-complex-2.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/result-opt-complex-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/optional/result-opt-complex-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/reduced/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/reduced/reduced-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/reduced/reduced-1.srx delete mode 100644 test/data/suites/DAWG/data-r2/reduced/reduced-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/reduced/reduced-2.srx delete mode 100644 test/data/suites/DAWG/data-r2/reduced/reduced-star.ttl delete mode 100644 test/data/suites/DAWG/data-r2/reduced/reduced-str.ttl delete mode 100644 test/data/suites/DAWG/data-r2/regex/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-data-01.ttl delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-query-001.rq delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-query-002.rq delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-query-003.rq delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-query-004.rq delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-result-001.ttl delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-result-002.ttl delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-result-003.ttl delete mode 100644 test/data/suites/DAWG/data-r2/regex/regex-result-004.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/data.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-12.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-13.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-20.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-21.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-22.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-23.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-24.rq delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-01.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-02.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-03.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-04.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-10.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-11.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-12.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-13.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-20.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-21.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-22.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-23.ttl delete mode 100644 test/data/suites/DAWG/data-r2/solution-seq/slice-results-24.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/.manifest.ttl.swp delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-1.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-11.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-3.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-4.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-6.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-7.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-8.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-9.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-builtin.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-function.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/data-sort-numbers.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/extended-manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-1.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-2.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-3.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-4.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-5.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-6.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-9.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-builtin.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-function.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/query-sort-numbers.rq delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-1.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-10.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-11.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-2.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-3.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-4.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-5.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-6.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-7.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-8.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-9.rdf delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-builtin.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-function.ttl delete mode 100644 test/data/suites/DAWG/data-r2/sort/result-sort-numbers.ttl delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-forms-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-forms-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-09.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-12.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-13.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-14.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-15.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-16.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-17.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-18.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-19.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-20.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-09.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-12.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-13.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-14.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-union-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-union-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-ask-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-describe01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-describe02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-select-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-select-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-09.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-12.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-13.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-14.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-06.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-07.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-08.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-09.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-12.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-13.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-14.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-15.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-16.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-17.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-18.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-19.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-20.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-21.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-22.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-23.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-24.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-25.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-26.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-27.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-28.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-29.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-30.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-31.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnode-dot.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnodes-missing-pvalues-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnodes-missing-pvalues-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-empty-optional-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-empty-optional-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-filter-missing-parens.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-lone-list.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-lone-node.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-filter.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-graph-bad.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-optional-bad.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-union-bad.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-09.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-10.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-11.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-34.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-35.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-36.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-37.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-38.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-GRAPH-breaks-BGP.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-OPT-breaks-BGP.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-UNION-breaks-BGP.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql4/syn-leading-digits-in-prefixed-names.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql5/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql5/syntax-reduced-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/syntax-sparql5/syntax-reduced-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/data-01.ttl delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/data-02.ttl delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/data-03.ttl delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/dawg-data-01.ttl delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/dawg-tp-01.rq delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/dawg-tp-02.rq delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/dawg-tp-03.rq delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/dawg-tp-04.rq delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/dawg-tp-05.rq delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/result-tp-01.ttl delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/result-tp-02.ttl delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/result-tp-03.ttl delete mode 100644 test/data/suites/DAWG/data-r2/triple-match/result-tp-04.ttl delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/false.ttl delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/manifest.ttl delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-byte-short-fail.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-byte-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-decimal-decimal.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-double-decimal-fail.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-double-decimal.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-double-double.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-double-float-fail.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-double-float.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-float-decimal-fail.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-float-decimal.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-float-float.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-int-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-integer-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-long-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-negativeInteger-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-nonNegativeInteger-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-nonPositiveInteger-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-positiveInteger-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-short-byte-fail.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-short-decimal.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-short-double.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-short-float.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-short-int-fail.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-short-long-fail.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-short-short-fail.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-short-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedByte-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedInt-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedLong-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedShort-short.rq delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/tP.ttl delete mode 100644 test/data/suites/DAWG/data-r2/type-promotion/true.ttl diff --git a/test/data/suites/DAWG/data-r2/LICENSE b/test/data/suites/DAWG/data-r2/LICENSE deleted file mode 100644 index eaa1cbaa1..000000000 --- a/test/data/suites/DAWG/data-r2/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -All tests materials are licensed under the W3C Software Notice and License, as follows: -____________________________________ -W3C� SOFTWARE NOTICE AND LICENSE -http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 - -This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions. - -Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications: - - 1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. - 2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code. - 3. Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.) - -THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. - -The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders. - -____________________________________ - diff --git a/test/data/suites/DAWG/data-r2/README b/test/data/suites/DAWG/data-r2/README deleted file mode 100644 index 94f9013db..000000000 --- a/test/data/suites/DAWG/data-r2/README +++ /dev/null @@ -1,16 +0,0 @@ -Data Access Working Group SPARQL Query Language test suite reorganization - -This directory contains restructured copies of tests from -the DAWG test suite (available at -http://www.w3.org/2001/sw/DataAccess/tests/data/). The purpose of this -restructuring is to enhance usability, clear away obsolete tests and -provide an up-to-date, consistent and easy to use suite of test cases -that SPARQL query language implementors can use to evaluate their -implementation. - - -The Working Group decided -(http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0096/21-dawg-minutes.html#item05) -on 21 Aug 2007 that the tests as-is constitute a test suite that the group will -use to generate an implementation report for the SPARQL Query Language for -RDF. diff --git a/test/data/suites/DAWG/data-r2/algebra/data-1.ttl b/test/data/suites/DAWG/data-r2/algebra/data-1.ttl deleted file mode 100644 index aa2efdc9f..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/data-1.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p "1"^^xsd:integer . - diff --git a/test/data/suites/DAWG/data-r2/algebra/data-2.ttl b/test/data/suites/DAWG/data-r2/algebra/data-2.ttl deleted file mode 100644 index 1bbf6e4d1..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/data-2.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p "1"^^xsd:integer . -:x :p "2"^^xsd:integer . -:x :p "3"^^xsd:integer . -:x :p "4"^^xsd:integer . - -:x :q "1"^^xsd:integer . -:x :q "2"^^xsd:integer . -:x :q "3"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-nested-1.rq b/test/data/suites/DAWG/data-r2/algebra/filter-nested-1.rq deleted file mode 100644 index 78f28533c..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-nested-1.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : - -SELECT ?v -{ :x :p ?v . FILTER(?v = 1) } diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-nested-1.srx b/test/data/suites/DAWG/data-r2/algebra/filter-nested-1.srx deleted file mode 100644 index 3a0f024ac..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-nested-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-nested-2.rq b/test/data/suites/DAWG/data-r2/algebra/filter-nested-2.rq deleted file mode 100644 index 8430cef61..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-nested-2.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : - -SELECT ?v -{ :x :p ?v . { FILTER(?v = 1) } } diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-nested-2.srx b/test/data/suites/DAWG/data-r2/algebra/filter-nested-2.srx deleted file mode 100644 index 8ac7e1c72..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-nested-2.srx +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-placement-1.rq b/test/data/suites/DAWG/data-r2/algebra/filter-placement-1.rq deleted file mode 100644 index cdabba47b..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-placement-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT ?v -{ - ?s :p ?v . - FILTER (?v = 2) -} diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-placement-1.srx b/test/data/suites/DAWG/data-r2/algebra/filter-placement-1.srx deleted file mode 100644 index 7f4d99002..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-placement-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - 2 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-placement-2.rq b/test/data/suites/DAWG/data-r2/algebra/filter-placement-2.rq deleted file mode 100644 index 0f4e1a3a1..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-placement-2.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT ?v -{ - FILTER (?v = 2) - ?s :p ?v . -} diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-placement-2.srx b/test/data/suites/DAWG/data-r2/algebra/filter-placement-2.srx deleted file mode 100644 index 7f4d99002..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-placement-2.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - 2 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-placement-3.rq b/test/data/suites/DAWG/data-r2/algebra/filter-placement-3.rq deleted file mode 100644 index f3be6d27b..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-placement-3.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : - -SELECT ?v ?w -{ - FILTER (?v = 2) - FILTER (?w = 3) - ?s :p ?v . - ?s :q ?w . -} diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-placement-3.srx b/test/data/suites/DAWG/data-r2/algebra/filter-placement-3.srx deleted file mode 100644 index dc55af4f3..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-placement-3.srx +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - 2 - - - 3 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-scope-1.rq b/test/data/suites/DAWG/data-r2/algebra/filter-scope-1.rq deleted file mode 100644 index 917a67ff9..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-scope-1.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : - -SELECT * -{ - :x :p ?v . - { :x :q ?w - OPTIONAL { :x :p ?v2 FILTER(?v = 1) } - } -} diff --git a/test/data/suites/DAWG/data-r2/algebra/filter-scope-1.srx b/test/data/suites/DAWG/data-r2/algebra/filter-scope-1.srx deleted file mode 100644 index 34c182d10..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/filter-scope-1.srx +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - 4 - - - 3 - - - - - 4 - - - 2 - - - - - 4 - - - 1 - - - - - 3 - - - 3 - - - - - 3 - - - 2 - - - - - 3 - - - 1 - - - - - 2 - - - 3 - - - - - 2 - - - 2 - - - - - 2 - - - 1 - - - - - 1 - - - 3 - - - - - 1 - - - 2 - - - - - 1 - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/join-combo-1.rq b/test/data/suites/DAWG/data-r2/algebra/join-combo-1.rq deleted file mode 100644 index 60b2992e9..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/join-combo-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT ?a ?y ?d ?z -{ - ?a :p ?c OPTIONAL { ?a :r ?d }. - ?a ?p 1 { ?p a ?y } UNION { ?a ?z ?p } -} \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/algebra/join-combo-1.srx b/test/data/suites/DAWG/data-r2/algebra/join-combo-1.srx deleted file mode 100644 index 84e94f2c7..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/join-combo-1.srx +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - http://example/x1 - - - http://www.w3.org/1999/02/22-rdf-syntax-ns#Property - - - 4 - - - - - http://example/x1 - - - http://example/z - - - 4 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/join-combo-2.rq b/test/data/suites/DAWG/data-r2/algebra/join-combo-2.rq deleted file mode 100644 index 36cfd3cd1..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/join-combo-2.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT ?x ?y ?z -{ - GRAPH ?g { ?x ?p 1 } { ?x :p ?y } UNION { ?p a ?z } -} diff --git a/test/data/suites/DAWG/data-r2/algebra/join-combo-2.srx b/test/data/suites/DAWG/data-r2/algebra/join-combo-2.srx deleted file mode 100644 index 817a717be..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/join-combo-2.srx +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - http://example/b - - - http://www.w3.org/1999/02/22-rdf-syntax-ns#Property - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/join-combo-graph-1.ttl b/test/data/suites/DAWG/data-r2/algebra/join-combo-graph-1.ttl deleted file mode 100644 index 15b720a19..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/join-combo-graph-1.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - - :b :p "1"^^xsd:integer . -_:a :p "9"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/algebra/join-combo-graph-2.ttl b/test/data/suites/DAWG/data-r2/algebra/join-combo-graph-2.ttl deleted file mode 100644 index ac7d3b7de..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/join-combo-graph-2.ttl +++ /dev/null @@ -1,15 +0,0 @@ -@prefix : . -@prefix rdf: . -@prefix xsd: . - -:x1 :p "1"^^xsd:integer . -:x1 :r "4"^^xsd:integer . -:x2 :p "2"^^xsd:integer . -:x2 :r "10"^^xsd:integer . -:x2 :x "1"^^xsd:integer . -:x3 :q "3"^^xsd:integer . -:x3 :q "4"^^xsd:integer . -:x3 :s "1"^^xsd:integer . -:x3 :t :s . -:p a rdf:Property . -:x1 :z :p . diff --git a/test/data/suites/DAWG/data-r2/algebra/manifest.ttl b/test/data/suites/DAWG/data-r2/algebra/manifest.ttl deleted file mode 100644 index 73595a25f..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/manifest.ttl +++ /dev/null @@ -1,175 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:label "Algebra" ; - mf:entries - ( :nested-opt-1 - :nested-opt-2 - :opt-filter-1 - :opt-filter-2 - :opt-filter-3 - :filter-place-1 - :filter-place-2 - :filter-place-3 - :filter-nested-1 - :filter-nested-2 - :filter-scope-1 - :join-scope-1 - :join-combo-1 - :join-combo-2 - ) . - -:join-combo-1 a mf:QueryEvaluationTest ; - mf:name "Join operator with OPTs, BGPs, and UNIONs" ; - rdfs:comment """Tests nested combination of Join with a BGP / OPT and a BGP / UNION""" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:join-combo-2 a mf:QueryEvaluationTest ; - mf:name "Join operator with Graph and Union" ; - rdfs:comment """Tests combination of Join operator with Graph on LHS and Union on RHS""" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:graphData ; - qt:data ] ; - mf:result . - -:nested-opt-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Nested Optionals - 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment """Nested-optionals with a shared variable that does not appear in the middle pattern (a not well-formed query pattern as per "Semantics and Complexity" of SPARQL""" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:nested-opt-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Nested Optionals - 2" ; - rdfs:comment "OPTIONALs parse in a left-associative manner" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:opt-filter-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Optional-filter - 1" ; - rdfs:comment "A FILTER inside an OPTIONAL can reference a variable bound in the required part of the OPTIONAL" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:opt-filter-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Optional-filter - 2 filters" ; - rdfs:comment "FILTERs inside an OPTIONAL can refer to variables from both the required and optional parts of the construct." ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:opt-filter-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Optional-filter - scope of variable" ; - rdfs:comment "FILTERs in an OPTIONAL do not extend to variables bound outside of the LeftJoin(...) operation" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:filter-place-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Filter-placement - 1" ; - rdfs:comment "FILTER placed after the triple pattern that contains the variable tested" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:filter-place-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Filter-placement - 2" ; - rdfs:comment "FILTERs are scoped to the nearest enclosing group - placement within that group does not matter" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:filter-place-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Filter-placement - 3" ; - rdfs:comment "FILTERs are scoped to the nearest enclosing group - placement within that group does not matter" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:filter-nested-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Filter-nested - 1" ; - rdfs:comment "A FILTER is in scope for variables bound at the same level of the query tree" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:filter-nested-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Filter-nested - 2" ; - rdfs:comment "A FILTER in a group { ... } cannot see variables bound outside that group" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:filter-scope-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Filter-scope - 1" ; - rdfs:comment "FILTERs in an OPTIONAL do not extend to variables bound outside of the LeftJoin(...) operation" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:join-scope-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Join scope - 1" ; - rdfs:comment "Variables have query scope." ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.rq b/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.rq deleted file mode 100644 index 4622dafe0..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.rq +++ /dev/null @@ -1,11 +0,0 @@ -PREFIX : - -SELECT * -{ - ?x :p ?v . - OPTIONAL - { - ?y :q ?w . - FILTER(?v=2) - } -} diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.srx b/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.srx deleted file mode 100644 index 60f05bca1..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.srx +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - http://example/x2 - - - 2 - - - http://example/x3 - - - 4 - - - - - http://example/x2 - - - 2 - - - http://example/x3 - - - 3 - - - - - http://example/x1 - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.ttl b/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.ttl deleted file mode 100644 index 78e2ec7b7..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-1.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "1"^^xsd:integer . -:x2 :p "2"^^xsd:integer . - -:x3 :q "3"^^xsd:integer . -:x3 :q "4"^^xsd:integer . - diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.rq b/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.rq deleted file mode 100644 index 82b136c81..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.rq +++ /dev/null @@ -1,12 +0,0 @@ -PREFIX : - -SELECT * -{ - ?x :p ?v . - OPTIONAL - { - ?y :q ?w . - FILTER(?v=2) - FILTER(?w=3) - } -} diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.srx b/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.srx deleted file mode 100644 index 42e9b6e4d..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.srx +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - http://example/x2 - - - 2 - - - http://example/x3 - - - 3 - - - - - http://example/x1 - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.ttl b/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.ttl deleted file mode 100644 index 78e2ec7b7..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-2.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "1"^^xsd:integer . -:x2 :p "2"^^xsd:integer . - -:x3 :q "3"^^xsd:integer . -:x3 :q "4"^^xsd:integer . - diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.rq b/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.rq deleted file mode 100644 index 9031586f9..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.rq +++ /dev/null @@ -1,10 +0,0 @@ -PREFIX : - -SELECT * -{ - :x :p ?v . - { :x :q ?w - # ?v is not in scope so ?v2 never set - OPTIONAL { :x :p ?v2 FILTER(?v = 1) } - } -} diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.srx b/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.srx deleted file mode 100644 index e0d780f02..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.srx +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.ttl b/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.ttl deleted file mode 100644 index 78e2ec7b7..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/opt-filter-3.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "1"^^xsd:integer . -:x2 :p "2"^^xsd:integer . - -:x3 :q "3"^^xsd:integer . -:x3 :q "4"^^xsd:integer . - diff --git a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt-alt.rq b/test/data/suites/DAWG/data-r2/algebra/two-nested-opt-alt.rq deleted file mode 100644 index 3c6820deb..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt-alt.rq +++ /dev/null @@ -1,10 +0,0 @@ -PREFIX : - -## The nested optional example, rewritten to a form that is the same -## for the SPARQL algebra and the declarative semantics. -SELECT * -{ - :x1 :p ?v . - OPTIONAL { :x3 :q ?w } - OPTIONAL { :x3 :q ?w . :x2 :p ?v } -} diff --git a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt-alt.srx b/test/data/suites/DAWG/data-r2/algebra/two-nested-opt-alt.srx deleted file mode 100644 index 0644ba5b8..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt-alt.srx +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - 1 - - - 4 - - - - - 1 - - - 3 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.rq b/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.rq deleted file mode 100644 index 71b40469d..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.rq +++ /dev/null @@ -1,11 +0,0 @@ -PREFIX : - -SELECT * -{ - :x1 :p ?v . - OPTIONAL - { - :x3 :q ?w . - OPTIONAL { :x2 :p ?v } - } -} diff --git a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.srx b/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.srx deleted file mode 100644 index 5b948dbfa..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.srx +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.ttl b/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.ttl deleted file mode 100644 index 78ba93c25..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/two-nested-opt.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "1"^^xsd:integer . -:x2 :p "2"^^xsd:integer . -:x3 :q "3"^^xsd:integer . -:x3 :q "4"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.rq b/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.rq deleted file mode 100644 index fa856a4da..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : - -SELECT * -{ - ?X :name "paul" - {?Y :name "george" . OPTIONAL { ?X :email ?Z } } -} - diff --git a/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.srx b/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.srx deleted file mode 100644 index 81d071709..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.srx +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.ttl b/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.ttl deleted file mode 100644 index b6ee6e5d4..000000000 --- a/test/data/suites/DAWG/data-r2/algebra/var-scope-join-1.ttl +++ /dev/null @@ -1,15 +0,0 @@ -@prefix : . - -_:B1 :name "paul" . -_:B1 :phone "777-3426". - -_:B2 :name "john" . -_:B2 :email . - -_:B3 :name "george". -_:B3 :webPage . - -_:B4 :name "ringo". -_:B4 :email . -_:B4 :webPage . -_:B4 :phone "888-4537". diff --git a/test/data/suites/DAWG/data-r2/ask/ask-1.rq b/test/data/suites/DAWG/data-r2/ask/ask-1.rq deleted file mode 100644 index 25f63cbe6..000000000 --- a/test/data/suites/DAWG/data-r2/ask/ask-1.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : - -ASK { :x :p 1 } diff --git a/test/data/suites/DAWG/data-r2/ask/ask-1.srx b/test/data/suites/DAWG/data-r2/ask/ask-1.srx deleted file mode 100644 index 35d0d119a..000000000 --- a/test/data/suites/DAWG/data-r2/ask/ask-1.srx +++ /dev/null @@ -1,6 +0,0 @@ - - - - - true - diff --git a/test/data/suites/DAWG/data-r2/ask/ask-4.rq b/test/data/suites/DAWG/data-r2/ask/ask-4.rq deleted file mode 100644 index 3b56286cc..000000000 --- a/test/data/suites/DAWG/data-r2/ask/ask-4.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : - -ASK { :x :p 99 } diff --git a/test/data/suites/DAWG/data-r2/ask/ask-4.srx b/test/data/suites/DAWG/data-r2/ask/ask-4.srx deleted file mode 100644 index 8eea9e39a..000000000 --- a/test/data/suites/DAWG/data-r2/ask/ask-4.srx +++ /dev/null @@ -1,6 +0,0 @@ - - - - - false - diff --git a/test/data/suites/DAWG/data-r2/ask/ask-7.rq b/test/data/suites/DAWG/data-r2/ask/ask-7.rq deleted file mode 100644 index 4bb6df2e0..000000000 --- a/test/data/suites/DAWG/data-r2/ask/ask-7.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : - -ASK { :x :p ?x } diff --git a/test/data/suites/DAWG/data-r2/ask/ask-7.srx b/test/data/suites/DAWG/data-r2/ask/ask-7.srx deleted file mode 100644 index 35d0d119a..000000000 --- a/test/data/suites/DAWG/data-r2/ask/ask-7.srx +++ /dev/null @@ -1,6 +0,0 @@ - - - - - true - diff --git a/test/data/suites/DAWG/data-r2/ask/ask-8.rq b/test/data/suites/DAWG/data-r2/ask/ask-8.rq deleted file mode 100644 index c8ac10ec4..000000000 --- a/test/data/suites/DAWG/data-r2/ask/ask-8.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : - -ASK { :x :p ?x . FILTER(?x = 99) } diff --git a/test/data/suites/DAWG/data-r2/ask/ask-8.srx b/test/data/suites/DAWG/data-r2/ask/ask-8.srx deleted file mode 100644 index 8eea9e39a..000000000 --- a/test/data/suites/DAWG/data-r2/ask/ask-8.srx +++ /dev/null @@ -1,6 +0,0 @@ - - - - - false - diff --git a/test/data/suites/DAWG/data-r2/ask/data.ttl b/test/data/suites/DAWG/data-r2/ask/data.ttl deleted file mode 100644 index 039b3fd34..000000000 --- a/test/data/suites/DAWG/data-r2/ask/data.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p "1"^^xsd:integer . -:x :p "2"^^xsd:integer . -:x :p "3"^^xsd:integer . - -:y :p :a . -:a :q :r . diff --git a/test/data/suites/DAWG/data-r2/ask/manifest.ttl b/test/data/suites/DAWG/data-r2/ask/manifest.ttl deleted file mode 100644 index 044b04b2e..000000000 --- a/test/data/suites/DAWG/data-r2/ask/manifest.ttl +++ /dev/null @@ -1,61 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:label "ASK" ; - mf:entries - ( - :ask-1 - :ask-4 - :ask-7 - :ask-8 - ) . - - -:ask-1 rdf:type mf:QueryEvaluationTest ; - qt:queryForm qt:QueryAsk ; - mf:name "ASK-1 (SPARQL XML results)" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:ask-4 rdf:type mf:QueryEvaluationTest ; - qt:queryForm qt:QueryAsk ; - mf:name "ASK-4 (SPARQL XML results)" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:ask-7 rdf:type mf:QueryEvaluationTest ; - qt:queryForm qt:QueryAsk ; - mf:name "ASK-7 (SPARQL XML results)" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:ask-8 rdf:type mf:QueryEvaluationTest ; - qt:queryForm qt:QueryAsk ; - mf:name "ASK-8 (SPARQL XML results)" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-1.rq b/test/data/suites/DAWG/data-r2/basic/base-prefix-1.rq deleted file mode 100644 index 4adf184f6..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-1.rq +++ /dev/null @@ -1,4 +0,0 @@ -BASE -PREFIX : <> - -SELECT * WHERE { :x ?p ?v } diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-1.srx b/test/data/suites/DAWG/data-r2/basic/base-prefix-1.srx deleted file mode 100644 index 8083e5992..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-1.srx +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - d:x ns:p - - - http://example.org/ns#p - - - - - x:x x:p - - - http://example.org/x/p - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-2.rq b/test/data/suites/DAWG/data-r2/basic/base-prefix-2.rq deleted file mode 100644 index 824f2cb9f..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-2.rq +++ /dev/null @@ -1,4 +0,0 @@ -BASE -PREFIX : <#> - -SELECT * WHERE { :x ?p ?v } diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-2.srx b/test/data/suites/DAWG/data-r2/basic/base-prefix-2.srx deleted file mode 100644 index 1b900e50e..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-2.srx +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - z:x z:p - - - http://example.org/x/#p - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-3.rq b/test/data/suites/DAWG/data-r2/basic/base-prefix-3.rq deleted file mode 100644 index 73e134d0d..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-3.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX ns: -PREFIX x: - -SELECT * WHERE { x:x ns:p ?v } diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-3.srx b/test/data/suites/DAWG/data-r2/basic/base-prefix-3.srx deleted file mode 100644 index 7901e3dde..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-3.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - d:x ns:p - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-4.rq b/test/data/suites/DAWG/data-r2/basic/base-prefix-4.rq deleted file mode 100644 index 763059947..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-4.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE - -SELECT * WHERE {

?v } diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-4.srx b/test/data/suites/DAWG/data-r2/basic/base-prefix-4.srx deleted file mode 100644 index f5bbac4fc..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-4.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - x:x x:p - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-5.rq b/test/data/suites/DAWG/data-r2/basic/base-prefix-5.rq deleted file mode 100644 index 010e75560..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-5.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE - -SELECT * WHERE { <#x> <#p> ?v } diff --git a/test/data/suites/DAWG/data-r2/basic/base-prefix-5.srx b/test/data/suites/DAWG/data-r2/basic/base-prefix-5.srx deleted file mode 100644 index 058fc97aa..000000000 --- a/test/data/suites/DAWG/data-r2/basic/base-prefix-5.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - z:x z:p - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/bgp-no-match.rq b/test/data/suites/DAWG/data-r2/basic/bgp-no-match.rq deleted file mode 100644 index b72ccca46..000000000 --- a/test/data/suites/DAWG/data-r2/basic/bgp-no-match.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX foaf: -SELECT ?x -WHERE { - ?x foaf:name "John Smith" ; - a foaf:Womble . -} - diff --git a/test/data/suites/DAWG/data-r2/basic/bgp-no-match.srx b/test/data/suites/DAWG/data-r2/basic/bgp-no-match.srx deleted file mode 100644 index 43e69cc9b..000000000 --- a/test/data/suites/DAWG/data-r2/basic/bgp-no-match.srx +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/data-1.ttl b/test/data/suites/DAWG/data-r2/basic/data-1.ttl deleted file mode 100644 index bfe253e15..000000000 --- a/test/data/suites/DAWG/data-r2/basic/data-1.ttl +++ /dev/null @@ -1,8 +0,0 @@ -@prefix ns: . -@prefix x: . -@prefix z: . - -x:x ns:p "d:x ns:p" . -x:x x:p "x:x x:p" . - -z:x z:p "z:x z:p" . diff --git a/test/data/suites/DAWG/data-r2/basic/data-2.ttl b/test/data/suites/DAWG/data-r2/basic/data-2.ttl deleted file mode 100644 index 26721861f..000000000 --- a/test/data/suites/DAWG/data-r2/basic/data-2.ttl +++ /dev/null @@ -1,8 +0,0 @@ -@prefix : . -@prefix xsd: . - - -:x :list0 () . -:x :list1 ("1"^^xsd:integer) . -:x :list2 ("11"^^xsd:integer "22"^^xsd:integer) . -:x :list3 ("111"^^xsd:integer "222"^^xsd:integer "333"^^xsd:integer) . diff --git a/test/data/suites/DAWG/data-r2/basic/data-3.ttl b/test/data/suites/DAWG/data-r2/basic/data-3.ttl deleted file mode 100644 index 598afc949..000000000 --- a/test/data/suites/DAWG/data-r2/basic/data-3.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix : . - -# This file uses UNIX line end conventions. - -:x1 :p1 "x" . -:x2 :p2 """x -y""" . - -:x3 :p3 """x -y"""^^:someType . - - diff --git a/test/data/suites/DAWG/data-r2/basic/data-4.ttl b/test/data/suites/DAWG/data-r2/basic/data-4.ttl deleted file mode 100644 index bfd42b757..000000000 --- a/test/data/suites/DAWG/data-r2/basic/data-4.ttl +++ /dev/null @@ -1,14 +0,0 @@ -@prefix : . -@prefix xsd: . -@prefix rdf: . - -:x :p1 "true"^^xsd:boolean . -:x :p2 "false"^^xsd:boolean . - -:x rdf:type :C . - -:x :n1 "123.0"^^xsd:decimal . -:x :n2 "456.0"^^xsd:decimal . - -:x :n3 "+5"^^xsd:integer . -:x :n4 "-18"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/basic/data-5.ttl b/test/data/suites/DAWG/data-r2/basic/data-5.ttl deleted file mode 100644 index 282eb584d..000000000 --- a/test/data/suites/DAWG/data-r2/basic/data-5.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p1 "1"^^xsd:integer . -:x :p2 "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/basic/data-6.ttl b/test/data/suites/DAWG/data-r2/basic/data-6.ttl deleted file mode 100644 index 8df49a4ca..000000000 --- a/test/data/suites/DAWG/data-r2/basic/data-6.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p1 "1"^^xsd:integer . -:x :p1 "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/basic/data-7.ttl b/test/data/suites/DAWG/data-r2/basic/data-7.ttl deleted file mode 100644 index 441143c6c..000000000 --- a/test/data/suites/DAWG/data-r2/basic/data-7.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix : . -@prefix foaf: . - -:john a foaf:Person ; - foaf:name "John Smith" . - - diff --git a/test/data/suites/DAWG/data-r2/basic/list-1.rq b/test/data/suites/DAWG/data-r2/basic/list-1.rq deleted file mode 100644 index 15d6ecb56..000000000 --- a/test/data/suites/DAWG/data-r2/basic/list-1.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : - -SELECT ?p -{ :x ?p () . } - diff --git a/test/data/suites/DAWG/data-r2/basic/list-1.srx b/test/data/suites/DAWG/data-r2/basic/list-1.srx deleted file mode 100644 index 842088a0c..000000000 --- a/test/data/suites/DAWG/data-r2/basic/list-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#list0 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/list-2.rq b/test/data/suites/DAWG/data-r2/basic/list-2.rq deleted file mode 100644 index d0fef0b14..000000000 --- a/test/data/suites/DAWG/data-r2/basic/list-2.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : - -SELECT ?p -{ :x ?p (1) . } - diff --git a/test/data/suites/DAWG/data-r2/basic/list-2.srx b/test/data/suites/DAWG/data-r2/basic/list-2.srx deleted file mode 100644 index 94ef90012..000000000 --- a/test/data/suites/DAWG/data-r2/basic/list-2.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#list1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/list-3.rq b/test/data/suites/DAWG/data-r2/basic/list-3.rq deleted file mode 100644 index c28d2d795..000000000 --- a/test/data/suites/DAWG/data-r2/basic/list-3.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : - -SELECT ?p ?v -{ :x ?p (?v) . } - diff --git a/test/data/suites/DAWG/data-r2/basic/list-3.srx b/test/data/suites/DAWG/data-r2/basic/list-3.srx deleted file mode 100644 index 849b8323f..000000000 --- a/test/data/suites/DAWG/data-r2/basic/list-3.srx +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - http://example.org/ns#list1 - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/list-4.rq b/test/data/suites/DAWG/data-r2/basic/list-4.rq deleted file mode 100644 index a96249d81..000000000 --- a/test/data/suites/DAWG/data-r2/basic/list-4.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : - -SELECT ?p ?v ?w -{ :x ?p (?v ?w) . } - diff --git a/test/data/suites/DAWG/data-r2/basic/list-4.srx b/test/data/suites/DAWG/data-r2/basic/list-4.srx deleted file mode 100644 index ca2e35448..000000000 --- a/test/data/suites/DAWG/data-r2/basic/list-4.srx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - http://example.org/ns#list2 - - - 11 - - - 22 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/manifest.ttl b/test/data/suites/DAWG/data-r2/basic/manifest.ttl deleted file mode 100644 index b0e0f0658..000000000 --- a/test/data/suites/DAWG/data-r2/basic/manifest.ttl +++ /dev/null @@ -1,314 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:label "Basic test cases" ; - mf:entries - ( - :base-prefix-1 - :base-prefix-2 - :base-prefix-3 - :base-prefix-4 - :base-prefix-5 - - :list-1 - :list-2 - :list-3 - :list-4 - - :quotes-1 - :quotes-2 - :quotes-3 - :quotes-4 - - :term-1 - :term-2 - :term-3 - :term-4 - :term-5 -# :term-6 # Not SPARQL 1.1 -# :term-7 # Not SPARQL 1.1 - :term-8 - :term-9 - - :var-1 - :var-2 - - :bgp-no-match - :spoo-1 - - :prefix-name-1 - ) . - - -:bgp-no-match rdf:type mf:QueryEvaluationTest ; - mf:name "Non-matching triple pattern" ; - rdfs:comment "Patterns not in data don't match" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result ; - . -:prefix-name-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Prefix name 1" ; - rdfs:comment "No local name - foo:" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result ; - . - -:spoo-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic graph pattern - spoo" ; - rdfs:comment "Test the :x :y :o1, :o2 construct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result ; - . - - -:base-prefix-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Prefix/Base 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - . - -:base-prefix-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Prefix/Base 2" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:base-prefix-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Prefix/Base 3" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:base-prefix-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Prefix/Base 4" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:base-prefix-5 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Prefix/Base 5" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:list-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - List 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:list-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - List 2" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:list-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - List 3" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:list-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - List 4" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:quotes-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Quotes 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:quotes-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Quotes 2" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:quotes-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Quotes 3" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:quotes-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Quotes 4" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 2" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 3" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 4" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-5 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 5" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-6 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 6" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-7 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 7" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-8 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 8" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:term-9 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Term 9" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:var-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Var 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:var-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Basic - Var 2" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - diff --git a/test/data/suites/DAWG/data-r2/basic/prefix-name-1.rq b/test/data/suites/DAWG/data-r2/basic/prefix-name-1.rq deleted file mode 100644 index 5b7d77364..000000000 --- a/test/data/suites/DAWG/data-r2/basic/prefix-name-1.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX ex: -SELECT ?p { - ex: ?p 1 . -} diff --git a/test/data/suites/DAWG/data-r2/basic/prefix-name-1.srx b/test/data/suites/DAWG/data-r2/basic/prefix-name-1.srx deleted file mode 100644 index 16a3e5369..000000000 --- a/test/data/suites/DAWG/data-r2/basic/prefix-name-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#p1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/quotes-1.rq b/test/data/suites/DAWG/data-r2/basic/quotes-1.rq deleted file mode 100644 index 2b0eed7c3..000000000 --- a/test/data/suites/DAWG/data-r2/basic/quotes-1.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT ?x -{ ?x ?p '''x''' } - - diff --git a/test/data/suites/DAWG/data-r2/basic/quotes-1.srx b/test/data/suites/DAWG/data-r2/basic/quotes-1.srx deleted file mode 100644 index db75a69df..000000000 --- a/test/data/suites/DAWG/data-r2/basic/quotes-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#x1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/quotes-2.rq b/test/data/suites/DAWG/data-r2/basic/quotes-2.rq deleted file mode 100644 index 4fd46063d..000000000 --- a/test/data/suites/DAWG/data-r2/basic/quotes-2.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT ?x -{ ?x ?p """x""" } - - diff --git a/test/data/suites/DAWG/data-r2/basic/quotes-2.srx b/test/data/suites/DAWG/data-r2/basic/quotes-2.srx deleted file mode 100644 index db75a69df..000000000 --- a/test/data/suites/DAWG/data-r2/basic/quotes-2.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#x1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/quotes-3.rq b/test/data/suites/DAWG/data-r2/basic/quotes-3.rq deleted file mode 100644 index 0ceff5b4a..000000000 --- a/test/data/suites/DAWG/data-r2/basic/quotes-3.rq +++ /dev/null @@ -1,8 +0,0 @@ -# This query uses UNIX line end conventions. -# It is in CVS in binary. -PREFIX : - -SELECT ?x -{ ?x ?p '''x -y''' -} diff --git a/test/data/suites/DAWG/data-r2/basic/quotes-3.srx b/test/data/suites/DAWG/data-r2/basic/quotes-3.srx deleted file mode 100644 index eea11482e..000000000 --- a/test/data/suites/DAWG/data-r2/basic/quotes-3.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#x2 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/quotes-4.rq b/test/data/suites/DAWG/data-r2/basic/quotes-4.rq deleted file mode 100644 index e14c95205..000000000 --- a/test/data/suites/DAWG/data-r2/basic/quotes-4.rq +++ /dev/null @@ -1,9 +0,0 @@ -# This query uses UNIX line end conventions. -# It is in CVS in binary. -PREFIX : -PREFIX xsd: - -SELECT ?x -{ ?x ?p """x -y"""^^:someType -} diff --git a/test/data/suites/DAWG/data-r2/basic/quotes-4.srx b/test/data/suites/DAWG/data-r2/basic/quotes-4.srx deleted file mode 100644 index c7c42697f..000000000 --- a/test/data/suites/DAWG/data-r2/basic/quotes-4.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#x3 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/spoo-1.rq b/test/data/suites/DAWG/data-r2/basic/spoo-1.rq deleted file mode 100644 index 364bd6d97..000000000 --- a/test/data/suites/DAWG/data-r2/basic/spoo-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT ?s WHERE { - ?s :p1 1, 2 . -} - diff --git a/test/data/suites/DAWG/data-r2/basic/spoo-1.srx b/test/data/suites/DAWG/data-r2/basic/spoo-1.srx deleted file mode 100644 index 1dffd09db..000000000 --- a/test/data/suites/DAWG/data-r2/basic/spoo-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#x - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-1.rq b/test/data/suites/DAWG/data-r2/basic/term-1.rq deleted file mode 100644 index 36a4dad96..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-1.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * { :x ?p true . } diff --git a/test/data/suites/DAWG/data-r2/basic/term-1.srx b/test/data/suites/DAWG/data-r2/basic/term-1.srx deleted file mode 100644 index 16a3e5369..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#p1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-2.rq b/test/data/suites/DAWG/data-r2/basic/term-2.rq deleted file mode 100644 index a1a9f87b7..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-2.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * { :x ?p false } diff --git a/test/data/suites/DAWG/data-r2/basic/term-2.srx b/test/data/suites/DAWG/data-r2/basic/term-2.srx deleted file mode 100644 index 0d2e38cc5..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-2.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#p2 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-3.rq b/test/data/suites/DAWG/data-r2/basic/term-3.rq deleted file mode 100644 index 7d2e21936..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-3.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * { :x a ?C . } diff --git a/test/data/suites/DAWG/data-r2/basic/term-3.srx b/test/data/suites/DAWG/data-r2/basic/term-3.srx deleted file mode 100644 index 5e7265b83..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-3.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#C - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-4.rq b/test/data/suites/DAWG/data-r2/basic/term-4.rq deleted file mode 100644 index 7ba3f97ee..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-4.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * { :x ?p 123.0 } diff --git a/test/data/suites/DAWG/data-r2/basic/term-4.srx b/test/data/suites/DAWG/data-r2/basic/term-4.srx deleted file mode 100644 index 026311f7b..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-4.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#n1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-5.rq b/test/data/suites/DAWG/data-r2/basic/term-5.rq deleted file mode 100644 index d931af05f..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-5.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * { :x ?p 123.0. } diff --git a/test/data/suites/DAWG/data-r2/basic/term-5.srx b/test/data/suites/DAWG/data-r2/basic/term-5.srx deleted file mode 100644 index 026311f7b..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-5.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#n1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-6.rq b/test/data/suites/DAWG/data-r2/basic/term-6.rq deleted file mode 100644 index a03be7e75..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-6.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX xsd: - -# DOT is part of the decimal. -#SELECT * { :x ?p 456. } -#SPARQL 1.1 -SELECT * { :x ?p 456.0 } diff --git a/test/data/suites/DAWG/data-r2/basic/term-6.srx b/test/data/suites/DAWG/data-r2/basic/term-6.srx deleted file mode 100644 index a26298cf0..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-6.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#n2 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-7.rq b/test/data/suites/DAWG/data-r2/basic/term-7.rq deleted file mode 100644 index 74d98f784..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-7.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -PREFIX xsd: - -# DOT is part of the decimal. -SELECT * { :x ?p 456.0 . } diff --git a/test/data/suites/DAWG/data-r2/basic/term-7.srx b/test/data/suites/DAWG/data-r2/basic/term-7.srx deleted file mode 100644 index a26298cf0..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-7.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#n2 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-8.rq b/test/data/suites/DAWG/data-r2/basic/term-8.rq deleted file mode 100644 index 4e545bbe2..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-8.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -PREFIX xsd: - -# DOT is part of the decimal. -SELECT * { :x ?p +5 } diff --git a/test/data/suites/DAWG/data-r2/basic/term-8.srx b/test/data/suites/DAWG/data-r2/basic/term-8.srx deleted file mode 100644 index ed965393b..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-8.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#n3 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/term-9.rq b/test/data/suites/DAWG/data-r2/basic/term-9.rq deleted file mode 100644 index b337b2da4..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-9.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -PREFIX xsd: - -# DOT is part of the decimal. -SELECT * { :x ?p -18 } diff --git a/test/data/suites/DAWG/data-r2/basic/term-9.srx b/test/data/suites/DAWG/data-r2/basic/term-9.srx deleted file mode 100644 index 1d09d855f..000000000 --- a/test/data/suites/DAWG/data-r2/basic/term-9.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/ns#n4 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/var-1.rq b/test/data/suites/DAWG/data-r2/basic/var-1.rq deleted file mode 100644 index cf4f6e932..000000000 --- a/test/data/suites/DAWG/data-r2/basic/var-1.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * { :x ?p $v } diff --git a/test/data/suites/DAWG/data-r2/basic/var-1.srx b/test/data/suites/DAWG/data-r2/basic/var-1.srx deleted file mode 100644 index 8579a5302..000000000 --- a/test/data/suites/DAWG/data-r2/basic/var-1.srx +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - http://example.org/ns#p2 - - - 2 - - - - - http://example.org/ns#p1 - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/basic/var-2.rq b/test/data/suites/DAWG/data-r2/basic/var-2.rq deleted file mode 100644 index 24ad05ca3..000000000 --- a/test/data/suites/DAWG/data-r2/basic/var-2.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * { :x ?p $v . :x ?p ?v } diff --git a/test/data/suites/DAWG/data-r2/basic/var-2.srx b/test/data/suites/DAWG/data-r2/basic/var-2.srx deleted file mode 100644 index 8579a5302..000000000 --- a/test/data/suites/DAWG/data-r2/basic/var-2.srx +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - http://example.org/ns#p2 - - - 2 - - - - - http://example.org/ns#p1 - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/bnode-coreference/data.ttl b/test/data/suites/DAWG/data-r2/bnode-coreference/data.ttl deleted file mode 100644 index 7bae62560..000000000 --- a/test/data/suites/DAWG/data-r2/bnode-coreference/data.ttl +++ /dev/null @@ -1,29 +0,0 @@ -@prefix foaf: . -@prefix rdf: . -@prefix rdfs: . - -_:alice - rdf:type foaf:Person ; - foaf:name "Alice" ; - foaf:mbox ; - foaf:knows _:bob ; - . - -_:bob - rdf:type foaf:Person ; - foaf:name "Bob" ; - foaf:knows _:alice ; - foaf:mbox ; - foaf:mbox ; - . - - -_:eve - rdf:type foaf:Person ; - foaf:name "Eve" ; - foaf:knows _:fred ; - . - -_:fred - rdf:type foaf:Person ; - foaf:mbox . diff --git a/test/data/suites/DAWG/data-r2/bnode-coreference/manifest.ttl b/test/data/suites/DAWG/data-r2/bnode-coreference/manifest.ttl deleted file mode 100644 index d5c681c61..000000000 --- a/test/data/suites/DAWG/data-r2/bnode-coreference/manifest.ttl +++ /dev/null @@ -1,22 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix qt: . - -[] rdf:type mf:Manifest ; - rdfs:comment "DAWG test cases on bnode co-reference" ; - mf:entries - ( :dawg-bnode-coref-001). - -:dawg-bnode-coref-001 a mf:QueryEvaluationTest ; - mf:name "dawg-bnode-coreference" ; - rdfs:comment - "Query results must maintain bnode co-references in the dataset" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . diff --git a/test/data/suites/DAWG/data-r2/bnode-coreference/query.rq b/test/data/suites/DAWG/data-r2/bnode-coreference/query.rq deleted file mode 100644 index 271d845b5..000000000 --- a/test/data/suites/DAWG/data-r2/bnode-coreference/query.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX rdf: -PREFIX foaf: - -SELECT ?x ?y -WHERE { - ?x foaf:knows ?y . -} diff --git a/test/data/suites/DAWG/data-r2/bnode-coreference/result.ttl b/test/data/suites/DAWG/data-r2/bnode-coreference/result.ttl deleted file mode 100644 index 9b9a0cca8..000000000 --- a/test/data/suites/DAWG/data-r2/bnode-coreference/result.ttl +++ /dev/null @@ -1,27 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "x" , "y" ; - rs:solution [ rs:binding [ rs:value _:b10 ; - rs:variable "x" - ] ; - rs:binding [ rs:value _:b1f ; - rs:variable "y" - ] - ] ; - rs:solution [ rs:binding [ rs:value _:b1f ; - rs:variable "x" - ] ; - rs:binding [ rs:value _:b10 ; - rs:variable "y" - ] - ] ; - rs:solution [ rs:binding [ rs:value _:b20 ; - rs:variable "x" - ] ; - rs:binding [ rs:value _:b21 ; - rs:variable "y" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/data-1.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/data-1.ttl deleted file mode 100644 index aca66708c..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/data-1.ttl +++ /dev/null @@ -1,14 +0,0 @@ -@prefix : . -@prefix xsd: . - -# These object values are true by the boolean effective value rule. -:x1 :p "1"^^xsd:integer . -:x2 :p "foo" . -:x3 :p "0.01"^^xsd:double . -:x4 :p "true"^^xsd:boolean . - -# These are false -:y1 :p "0"^^xsd:integer . -:y2 :p "0.0"^^xsd:double . -:y3 :p "" . -:y4 :p "false"^^xsd:boolean . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/data-2.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/data-2.ttl deleted file mode 100644 index 0aca15f69..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/data-2.ttl +++ /dev/null @@ -1,19 +0,0 @@ -@prefix : . -@prefix xsd: . - -# These object values are true by the boolean effective value rule. -:x1 :p "1"^^xsd:integer . -:x2 :p "foo" . -:x3 :p "0.01"^^xsd:double . -:x4 :p "true"^^xsd:boolean . - -# These are false -:y1 :p "0"^^xsd:integer . -:y2 :p "0.0"^^xsd:double . -:y3 :p "" . -:y4 :p "false"^^xsd:boolean . - -# Optionals -:x1 :q "true"^^xsd:boolean . -:x2 :q "false"^^xsd:boolean . -:x3 :q "foo"^^:unknown . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/manifest.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/manifest.ttl deleted file mode 100644 index a263db91c..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/manifest.ttl +++ /dev/null @@ -1,81 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Test of boolean expressions" ; - mf:entries - ( :dawg-boolean-literal :dawg-bev-1 :dawg-bev-2 :dawg-bev-3 :dawg-bev-4 :dawg-bev-5 :dawg-bev-6 ) . - -:dawg-boolean-literal a mf:QueryEvaluationTest ; - mf:name "Test literal 'true'" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-bev-1 a mf:QueryEvaluationTest ; - mf:name "Test 'boolean effective value' - true" ; - rdfs:comment "Non-zero numerics, non-empty strings, and the true boolean have an EBV of true" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-bev-2 a mf:QueryEvaluationTest ; - mf:name "Test 'boolean effective value' - false" ; - rdfs:comment "Zero-valued numerics, the empty string, and the false boolean have an EBV of false" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:dawg-bev-3 a mf:QueryEvaluationTest ; - mf:name "Test 'boolean effective value' - &&" ; - rdfs:comment "The && operator takes the EBV of its operands" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-bev-4 a mf:QueryEvaluationTest ; - mf:name "Test 'boolean effective value' - ||" ; - rdfs:comment "The || operator takes the EBV of its operands" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-bev-5 a mf:QueryEvaluationTest ; - mf:name "Test 'boolean effective value' - optional" ; - rdfs:comment "The EBV of an unbound value or a literal with an unknown datatype is a type error, which eliminates the solution in question" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-bev-6 a mf:QueryEvaluationTest ; - mf:name "Test 'boolean effective value' - unknown types" ; - rdfs:comment "Negating a type error is still a type error" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-1.rq b/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-1.rq deleted file mode 100644 index 5d95b4a30..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?a -WHERE - { ?a :p ?v . - FILTER (?v) . - } diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-2.rq b/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-2.rq deleted file mode 100644 index a111b2b23..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-2.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?a -WHERE - { ?a :p ?v . - FILTER ( ! ?v ) . - } diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-3.rq b/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-3.rq deleted file mode 100644 index 28b34ec53..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-3.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?a -WHERE - { ?a :p ?v . - FILTER ("true"^^xsd:boolean && ?v) . - } diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-4.rq b/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-4.rq deleted file mode 100644 index a8cd28f7f..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-4.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?a -WHERE - { ?a :p ?v . - FILTER ("false"^^xsd:boolean || ?v) . - } diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-5.rq b/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-5.rq deleted file mode 100644 index 2597ba50b..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-5.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?a -WHERE - { ?a :p ?v . - OPTIONAL - { ?a :q ?w } . - FILTER (?w) . - } diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-6.rq b/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-6.rq deleted file mode 100644 index 912b62fd6..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-bev-6.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?a ?w -WHERE - { ?a :p ?v . - OPTIONAL - { ?a :q ?w } . - FILTER ( ! ?w ) . - } diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-boolean-literal.rq b/test/data/suites/DAWG/data-r2/boolean-effective-value/query-boolean-literal.rq deleted file mode 100644 index 51abe18b6..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/query-boolean-literal.rq +++ /dev/null @@ -1,5 +0,0 @@ -prefix : -select ?x where { - ?x :p "foo" . - FILTER (true) . -} diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-1.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-1.ttl deleted file mode 100644 index 3d340ceac..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-1.ttl +++ /dev/null @@ -1,27 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "a" ; - rs:solution - [ rs:binding [ rs:value :x4 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x1 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x3 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x2 ; - rs:variable "a" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-2.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-2.ttl deleted file mode 100644 index 2d0857f02..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-2.ttl +++ /dev/null @@ -1,27 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "a" ; - rs:solution - [ rs:binding [ rs:value :y2 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :y4 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :y3 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :y1 ; - rs:variable "a" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-3.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-3.ttl deleted file mode 100644 index 3d340ceac..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-3.ttl +++ /dev/null @@ -1,27 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "a" ; - rs:solution - [ rs:binding [ rs:value :x4 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x1 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x3 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x2 ; - rs:variable "a" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-4.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-4.ttl deleted file mode 100644 index ca06331e7..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-4.ttl +++ /dev/null @@ -1,27 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "a" ; - rs:solution - [ rs:binding [ rs:value :x1 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x2 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x4 ; - rs:variable "a" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :x3 ; - rs:variable "a" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-5.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-5.ttl deleted file mode 100644 index 86420ed36..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-5.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "a" ; - rs:solution - [ rs:binding [ rs:value :x1 ; - rs:variable "a" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-6.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-6.ttl deleted file mode 100644 index b4b58a726..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-bev-6.ttl +++ /dev/null @@ -1,16 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "w" ; - rs:resultVariable "a" ; - rs:solution - [ rs:binding [ rs:value :x2 ; - rs:variable "a" - ] ; - rs:binding [ rs:value "false"^^xsd:boolean ; - rs:variable "w" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-boolean-literal.ttl b/test/data/suites/DAWG/data-r2/boolean-effective-value/result-boolean-literal.ttl deleted file mode 100644 index 594416726..000000000 --- a/test/data/suites/DAWG/data-r2/boolean-effective-value/result-boolean-literal.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution - [ rs:binding [ rs:value :x2 ; - rs:variable "x" - ] - ]. diff --git a/test/data/suites/DAWG/data-r2/bound/bound1-result.ttl b/test/data/suites/DAWG/data-r2/bound/bound1-result.ttl deleted file mode 100644 index 1ffd834cf..000000000 --- a/test/data/suites/DAWG/data-r2/bound/bound1-result.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "a" , "c" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "a" - ] ; - rs:binding [ rs:value ; - rs:variable "c" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "a" - ] ; - rs:binding [ rs:value ; - rs:variable "c" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/bound/bound1.rq b/test/data/suites/DAWG/data-r2/bound/bound1.rq deleted file mode 100644 index b3d7f985b..000000000 --- a/test/data/suites/DAWG/data-r2/bound/bound1.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -SELECT ?a ?c -WHERE - { ?a :b ?c . - OPTIONAL - { ?c :d ?e } . - FILTER (! bound(?e)) - } diff --git a/test/data/suites/DAWG/data-r2/bound/data.ttl b/test/data/suites/DAWG/data-r2/bound/data.ttl deleted file mode 100644 index 50eb82b7f..000000000 --- a/test/data/suites/DAWG/data-r2/bound/data.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -:a1 :b :c1 . -:c1 :d :e . -:a2 :b :c2 . -:c2 :b :f . diff --git a/test/data/suites/DAWG/data-r2/bound/manifest.ttl b/test/data/suites/DAWG/data-r2/bound/manifest.ttl deleted file mode 100644 index 12ab943bb..000000000 --- a/test/data/suites/DAWG/data-r2/bound/manifest.ttl +++ /dev/null @@ -1,22 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "DAWG bound test cases" ; - mf:entries - (:dawg-bound-query-001) . - -:dawg-bound-query-001 a mf:QueryEvaluationTest ; - mf:name "dawg-bound-query-001" ; - rdfs:comment - "BOUND test case." ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . diff --git a/test/data/suites/DAWG/data-r2/cast/cast-bool.rq b/test/data/suites/DAWG/data-r2/cast/cast-bool.rq deleted file mode 100644 index 53084894d..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-bool.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX rdf: -PREFIX xsd: -SELECT ?s WHERE { - ?s :p ?v . - FILTER(datatype(xsd:boolean(?v)) = xsd:boolean) . -} diff --git a/test/data/suites/DAWG/data-r2/cast/cast-bool.srx b/test/data/suites/DAWG/data-r2/cast/cast-bool.srx deleted file mode 100644 index e0e437b90..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-bool.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/bool - - - - diff --git a/test/data/suites/DAWG/data-r2/cast/cast-dT.rq b/test/data/suites/DAWG/data-r2/cast/cast-dT.rq deleted file mode 100644 index 23d7def14..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-dT.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX rdf: -PREFIX xsd: -SELECT ?s WHERE { - ?s :p ?v . - FILTER(datatype(xsd:dateTime(?v)) = xsd:dateTime) . -} diff --git a/test/data/suites/DAWG/data-r2/cast/cast-dT.srx b/test/data/suites/DAWG/data-r2/cast/cast-dT.srx deleted file mode 100644 index 024c6e0d7..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-dT.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/dT - - - - diff --git a/test/data/suites/DAWG/data-r2/cast/cast-dbl.rq b/test/data/suites/DAWG/data-r2/cast/cast-dbl.rq deleted file mode 100644 index 7980272ac..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-dbl.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX rdf: -PREFIX xsd: -SELECT ?s WHERE { - ?s :p ?v . - FILTER(datatype(xsd:double(?v)) = xsd:double) . -} diff --git a/test/data/suites/DAWG/data-r2/cast/cast-dbl.srx b/test/data/suites/DAWG/data-r2/cast/cast-dbl.srx deleted file mode 100644 index 366c18e34..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-dbl.srx +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - http://example.org/fltdbl - - - - - http://example.org/decimal - - - - - http://example.org/int - - - - diff --git a/test/data/suites/DAWG/data-r2/cast/cast-dec.rq b/test/data/suites/DAWG/data-r2/cast/cast-dec.rq deleted file mode 100644 index 9eeeaea08..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-dec.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX rdf: -PREFIX xsd: -SELECT ?s WHERE { - ?s :p ?v . - FILTER(datatype(xsd:decimal(?v)) = xsd:decimal) . -} diff --git a/test/data/suites/DAWG/data-r2/cast/cast-dec.srx b/test/data/suites/DAWG/data-r2/cast/cast-dec.srx deleted file mode 100644 index cae1dad40..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-dec.srx +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - http://example.org/decimal - - - - - http://example.org/int - - - - diff --git a/test/data/suites/DAWG/data-r2/cast/cast-flt.rq b/test/data/suites/DAWG/data-r2/cast/cast-flt.rq deleted file mode 100644 index 8aa0adfc6..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-flt.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX rdf: -PREFIX xsd: -SELECT ?s WHERE { - ?s :p ?v . - FILTER(datatype(xsd:float(?v)) = xsd:float) . -} diff --git a/test/data/suites/DAWG/data-r2/cast/cast-flt.srx b/test/data/suites/DAWG/data-r2/cast/cast-flt.srx deleted file mode 100644 index 366c18e34..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-flt.srx +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - http://example.org/fltdbl - - - - - http://example.org/decimal - - - - - http://example.org/int - - - - diff --git a/test/data/suites/DAWG/data-r2/cast/cast-int.rq b/test/data/suites/DAWG/data-r2/cast/cast-int.rq deleted file mode 100644 index def6ad60e..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-int.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX rdf: -PREFIX xsd: -SELECT ?s WHERE { - ?s :p ?v . - FILTER(datatype(xsd:integer(?v)) = xsd:integer) . -} diff --git a/test/data/suites/DAWG/data-r2/cast/cast-int.srx b/test/data/suites/DAWG/data-r2/cast/cast-int.srx deleted file mode 100644 index 8faa5876d..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-int.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/int - - - - diff --git a/test/data/suites/DAWG/data-r2/cast/cast-str.rq b/test/data/suites/DAWG/data-r2/cast/cast-str.rq deleted file mode 100644 index 8c7315d62..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-str.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX rdf: -PREFIX xsd: -SELECT ?s WHERE { - ?s :p ?v . - FILTER(datatype(xsd:string(?v)) = xsd:string) . -} diff --git a/test/data/suites/DAWG/data-r2/cast/cast-str.srx b/test/data/suites/DAWG/data-r2/cast/cast-str.srx deleted file mode 100644 index abdc4a08d..000000000 --- a/test/data/suites/DAWG/data-r2/cast/cast-str.srx +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - http://example.org/iri - - - - - http://example.org/str - - - - - http://example.org/fltdbl - - - - - http://example.org/decimal - - - - - http://example.org/int - - - - - http://example.org/dT - - - - - http://example.org/bool - - - - diff --git a/test/data/suites/DAWG/data-r2/cast/data.ttl b/test/data/suites/DAWG/data-r2/cast/data.ttl deleted file mode 100644 index 71d39b9ce..000000000 --- a/test/data/suites/DAWG/data-r2/cast/data.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix : . - -:iri :p :z . -:str :p "string" . -:fltdbl :p "-10.2E3" . -:decimal :p "+33.3300" . -:int :p "13" . -:dT :p "2002-10-10T17:00:00Z" . -:bool :p "true" . diff --git a/test/data/suites/DAWG/data-r2/cast/manifest.ttl b/test/data/suites/DAWG/data-r2/cast/manifest.ttl deleted file mode 100644 index 654c761a9..000000000 --- a/test/data/suites/DAWG/data-r2/cast/manifest.ttl +++ /dev/null @@ -1,83 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:label "Casting" ; - mf:entries - ( - :cast-str - :cast-flt - :cast-dbl - :cast-dec - :cast-int - :cast-dT - :cast-bool - ) . - -:cast-str rdf:type mf:QueryEvaluationTest ; - mf:name "Cast to xsd:string" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:cast-flt rdf:type mf:QueryEvaluationTest ; - mf:name "Cast to xsd:float" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:cast-dbl rdf:type mf:QueryEvaluationTest ; - mf:name "Cast to xsd:double" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:cast-dec rdf:type mf:QueryEvaluationTest ; - mf:name "Cast to xsd:decimal" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:cast-int rdf:type mf:QueryEvaluationTest ; - mf:name "Cast to xsd:integer" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:cast-dT rdf:type mf:QueryEvaluationTest ; - mf:name "Cast to xsd:dateTime" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:cast-bool rdf:type mf:QueryEvaluationTest ; - mf:name "Cast to xsd:boolean" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - diff --git a/test/data/suites/DAWG/data-r2/construct/data-ident.ttl b/test/data/suites/DAWG/data-r2/construct/data-ident.ttl deleted file mode 100644 index 4b408e4d2..000000000 --- a/test/data/suites/DAWG/data-r2/construct/data-ident.ttl +++ /dev/null @@ -1,18 +0,0 @@ -@prefix foaf: . -@prefix rdf: . -@prefix rdfs: . - -_:alice - rdf:type foaf:Person ; - foaf:name "Alice" ; - foaf:mbox ; - foaf:knows _:bob ; - . - -_:bob - rdf:type foaf:Person ; - foaf:name "Bob" ; - foaf:knows _:alice ; - foaf:mbox ; - foaf:mbox ; - . diff --git a/test/data/suites/DAWG/data-r2/construct/data-opt.ttl b/test/data/suites/DAWG/data-r2/construct/data-opt.ttl deleted file mode 100644 index f3f86dc37..000000000 --- a/test/data/suites/DAWG/data-r2/construct/data-opt.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p :a . -:x :p :b . -:x :p :c . -:x :p "1"^^xsd:integer . - -:a :q "2"^^xsd:integer . -:a :r "2"^^xsd:integer . - -:b :q "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/construct/data-reif.ttl b/test/data/suites/DAWG/data-r2/construct/data-reif.ttl deleted file mode 100644 index 185c5e7a7..000000000 --- a/test/data/suites/DAWG/data-r2/construct/data-reif.ttl +++ /dev/null @@ -1,17 +0,0 @@ -@prefix foaf: . -@prefix rdf: . -@prefix rdfs: . - -_:alice - rdf:type foaf:Person ; - foaf:name "Alice" ; - foaf:mbox ; - foaf:knows _:bob ; - . - -_:bob - rdf:type foaf:Person ; - foaf:name "Bob" ; - foaf:knows _:alice ; - foaf:mbox ; - . diff --git a/test/data/suites/DAWG/data-r2/construct/manifest.ttl b/test/data/suites/DAWG/data-r2/construct/manifest.ttl deleted file mode 100644 index b19e2fd65..000000000 --- a/test/data/suites/DAWG/data-r2/construct/manifest.ttl +++ /dev/null @@ -1,77 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix qt: . - -[] rdf:type mf:Manifest ; - rdfs:comment "Some DAWG test cases on the CONSTRUCT result form" ; - mf:entries - ( - :construct-1 - :construct-2 - :construct-3 - :construct-4 - :construct-5 - ) . - -:construct-1 rdf:type mf:QueryEvaluationTest ; - mf:name "dawg-construct-identity" ; - qt:queryForm qt:QueryConstruct ; - rdfs:comment "Graph equivalent result graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - . - -:construct-2 rdf:type mf:QueryEvaluationTest ; - mf:name "dawg-construct-subgraph" ; - qt:queryForm qt:QueryConstruct ; - rdfs:comment "Result subgraph of original graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - . - -:construct-3 rdf:type mf:QueryEvaluationTest ; - mf:name "dawg-construct-reification-1" ; - qt:queryForm qt:QueryConstruct ; - rdfs:comment "Reification of the default graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - . - -:construct-4 rdf:type mf:QueryEvaluationTest ; - mf:name "dawg-construct-reification-2" ; - qt:queryForm qt:QueryConstruct ; - rdfs:comment "Reification of the default graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - . - -:construct-5 rdf:type mf:QueryEvaluationTest ; - mf:name "dawg-construct-optional" ; - qt:queryForm qt:QueryConstruct ; - rdfs:comment "Reification of the default graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - . diff --git a/test/data/suites/DAWG/data-r2/construct/query-construct-optional.rq b/test/data/suites/DAWG/data-r2/construct/query-construct-optional.rq deleted file mode 100644 index 038c28c73..000000000 --- a/test/data/suites/DAWG/data-r2/construct/query-construct-optional.rq +++ /dev/null @@ -1,10 +0,0 @@ -PREFIX : - -CONSTRUCT { ?x :p2 ?v } - -WHERE -{ - ?x :p ?o . - OPTIONAL {?o :q ?v } -} - diff --git a/test/data/suites/DAWG/data-r2/construct/query-ident.rq b/test/data/suites/DAWG/data-r2/construct/query-ident.rq deleted file mode 100644 index f44f06379..000000000 --- a/test/data/suites/DAWG/data-r2/construct/query-ident.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX rdf: -PREFIX foaf: - -CONSTRUCT { ?s ?p ?o . } -WHERE { - ?s ?p ?o . -} diff --git a/test/data/suites/DAWG/data-r2/construct/query-reif-1.rq b/test/data/suites/DAWG/data-r2/construct/query-reif-1.rq deleted file mode 100644 index 2d4d9f00b..000000000 --- a/test/data/suites/DAWG/data-r2/construct/query-reif-1.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX rdf: -PREFIX foaf: - -CONSTRUCT { [ rdf:subject ?s ; - rdf:predicate ?p ; - rdf:object ?o ] . } -WHERE { - ?s ?p ?o . -} diff --git a/test/data/suites/DAWG/data-r2/construct/query-reif-2.rq b/test/data/suites/DAWG/data-r2/construct/query-reif-2.rq deleted file mode 100644 index 959e1595b..000000000 --- a/test/data/suites/DAWG/data-r2/construct/query-reif-2.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX rdf: -PREFIX foaf: - -CONSTRUCT { _:a rdf:subject ?s ; - rdf:predicate ?p ; - rdf:object ?o . } -WHERE { - ?s ?p ?o . -} diff --git a/test/data/suites/DAWG/data-r2/construct/query-subgraph.rq b/test/data/suites/DAWG/data-r2/construct/query-subgraph.rq deleted file mode 100644 index f6177f081..000000000 --- a/test/data/suites/DAWG/data-r2/construct/query-subgraph.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX rdf: -PREFIX foaf: - -CONSTRUCT { ?s foaf:name ?o . } -WHERE { - ?s foaf:name ?o . -} diff --git a/test/data/suites/DAWG/data-r2/construct/result-construct-optional.ttl b/test/data/suites/DAWG/data-r2/construct/result-construct-optional.ttl deleted file mode 100644 index 85e3fcbc5..000000000 --- a/test/data/suites/DAWG/data-r2/construct/result-construct-optional.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p2 "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/construct/result-ident.ttl b/test/data/suites/DAWG/data-r2/construct/result-ident.ttl deleted file mode 100644 index 35ece1db6..000000000 --- a/test/data/suites/DAWG/data-r2/construct/result-ident.ttl +++ /dev/null @@ -1,17 +0,0 @@ -@prefix foaf: . -@prefix rdf: . - -_:gff - rdf:type foaf:Person ; - foaf:name "Alice" ; - foaf:mbox ; - foaf:knows _:g2a ; - . - -_:g2a - rdf:type foaf:Person ; - foaf:name "Bob" ; - foaf:knows _:gff ; - foaf:mbox ; - foaf:mbox ; - . diff --git a/test/data/suites/DAWG/data-r2/construct/result-reif.ttl b/test/data/suites/DAWG/data-r2/construct/result-reif.ttl deleted file mode 100644 index 1b7eb7deb..000000000 --- a/test/data/suites/DAWG/data-r2/construct/result-reif.ttl +++ /dev/null @@ -1,34 +0,0 @@ -@prefix foaf: . -@prefix rdf: . - -[] rdf:subject _:gff ; - rdf:predicate rdf:type ; - rdf:object foaf:Person . - -[] rdf:subject _:gff ; - rdf:predicate foaf:name ; - rdf:object "Alice" . - -[] rdf:subject _:gff ; - rdf:predicate foaf:mbox ; - rdf:object . - -[] rdf:subject _:gff ; - rdf:predicate foaf:knows ; - rdf:object _:g2a . - -[] rdf:subject _:g2a ; - rdf:predicate rdf:type ; - rdf:object foaf:Person . - -[] rdf:subject _:g2a ; - rdf:predicate foaf:name ; - rdf:object "Bob" . - -[] rdf:subject _:g2a ; - rdf:predicate foaf:knows ; - rdf:object _:gff . - -[] rdf:subject _:g2a ; - rdf:predicate foaf:mbox ; - rdf:object . diff --git a/test/data/suites/DAWG/data-r2/construct/result-subgraph.ttl b/test/data/suites/DAWG/data-r2/construct/result-subgraph.ttl deleted file mode 100644 index 3e226a853..000000000 --- a/test/data/suites/DAWG/data-r2/construct/result-subgraph.ttl +++ /dev/null @@ -1,6 +0,0 @@ -@prefix foaf: . -@prefix rdf: . - -_:gff foaf:name "Alice" . - -_:g2a foaf:name "Bob" . diff --git a/test/data/suites/DAWG/data-r2/dataset/data-g1-dup.ttl b/test/data/suites/DAWG/data-r2/dataset/data-g1-dup.ttl deleted file mode 100644 index 363d37aaa..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/data-g1-dup.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p "1"^^xsd:integer . -:a :p "9"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/dataset/data-g1.ttl b/test/data/suites/DAWG/data-r2/dataset/data-g1.ttl deleted file mode 100644 index 363d37aaa..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/data-g1.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p "1"^^xsd:integer . -:a :p "9"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/dataset/data-g2-dup.ttl b/test/data/suites/DAWG/data-r2/dataset/data-g2-dup.ttl deleted file mode 100644 index dbe42fe51..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/data-g2-dup.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :q "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/dataset/data-g2.ttl b/test/data/suites/DAWG/data-r2/dataset/data-g2.ttl deleted file mode 100644 index dbe42fe51..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/data-g2.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :q "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/dataset/data-g3-dup.ttl b/test/data/suites/DAWG/data-r2/dataset/data-g3-dup.ttl deleted file mode 100644 index c82fcb980..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/data-g3-dup.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -_:x :p "1"^^xsd:integer . -_:a :p "9"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/dataset/data-g3.ttl b/test/data/suites/DAWG/data-r2/dataset/data-g3.ttl deleted file mode 100644 index c82fcb980..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/data-g3.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -_:x :p "1"^^xsd:integer . -_:a :p "9"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/dataset/data-g4-dup.ttl b/test/data/suites/DAWG/data-r2/dataset/data-g4-dup.ttl deleted file mode 100644 index f3f826a5c..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/data-g4-dup.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . -@prefix xsd: . - -_:x :q "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/dataset/data-g4.ttl b/test/data/suites/DAWG/data-r2/dataset/data-g4.ttl deleted file mode 100644 index f3f826a5c..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/data-g4.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . -@prefix xsd: . - -_:x :q "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-01.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-01.rq deleted file mode 100644 index 99b34961b..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-01.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : - -SELECT * -FROM -{ ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-01.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-01.ttl deleted file mode 100644 index 8e4d2587d..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-01.ttl +++ /dev/null @@ -1,29 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-02.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-02.rq deleted file mode 100644 index 2baaae152..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-02.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : - -SELECT * -FROM NAMED -{ ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-02.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-02.ttl deleted file mode 100644 index 4472d7a0b..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-02.ttl +++ /dev/null @@ -1,8 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "s" ; - rs:resultVariable "o" . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-03.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-03.rq deleted file mode 100644 index a92db8373..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-03.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : - -SELECT * -FROM NAMED -{ - GRAPH ?g { ?s ?p ?o } -} - diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-03.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-03.ttl deleted file mode 100644 index cb59bc8da..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-03.ttl +++ /dev/null @@ -1,36 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-04.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-04.rq deleted file mode 100644 index 5bfb8b487..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-04.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : - -SELECT * -FROM -{ - GRAPH ?g { ?s ?p ?o } -} - diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-04.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-04.ttl deleted file mode 100644 index 0c556901b..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-04.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-05.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-05.rq deleted file mode 100644 index 26199c948..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-05.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED -{ ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-05.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-05.ttl deleted file mode 100644 index d6ca97f0b..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-05.ttl +++ /dev/null @@ -1,29 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-06.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-06.rq deleted file mode 100644 index abc05d57a..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-06.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED -{ - GRAPH ?g { ?s ?p ?o } -} - diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-06.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-06.ttl deleted file mode 100644 index b06d28de2..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-06.ttl +++ /dev/null @@ -1,23 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value :q ; - rs:variable "p" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-07.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-07.rq deleted file mode 100644 index 810641433..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-07.rq +++ /dev/null @@ -1,10 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED -{ - { ?s ?p ?o } - UNION - { GRAPH ?g { ?s ?p ?o } } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-07.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-07.ttl deleted file mode 100644 index dd1f79229..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-07.ttl +++ /dev/null @@ -1,43 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-08.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-08.rq deleted file mode 100644 index 7153bd9b4..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-08.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED -{ - ?s ?p ?o - GRAPH ?g { ?s ?q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-08.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-08.ttl deleted file mode 100644 index 58c376fc1..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-08.ttl +++ /dev/null @@ -1,31 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "v" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:resultVariable "q" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :q ; - rs:variable "q" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-09.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-09.rq deleted file mode 100644 index 1ac303b65..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-09.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED { - ?s ?p ?o - GRAPH ?g { ?s ?q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-09.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-09.ttl deleted file mode 100644 index efea5c6da..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-09.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "v" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:resultVariable "q" . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-09b.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-09b.rq deleted file mode 100644 index 329cb2500..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-09b.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED { - ?s ?p ?o - GRAPH ?g { ?s ?q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-10.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-10.rq deleted file mode 100644 index b6ac7a1d9..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-10.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED -{ - ?s ?p ?o - GRAPH ?g { ?s ?q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-10.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-10.ttl deleted file mode 100644 index efea5c6da..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-10.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "v" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:resultVariable "q" . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-10b.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-10b.rq deleted file mode 100644 index a59a6ad61..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-10b.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED -{ - ?s ?p ?o - GRAPH ?g { ?s ?q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-11.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-11.rq deleted file mode 100644 index d7ec5925d..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-11.rq +++ /dev/null @@ -1,13 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM NAMED -FROM NAMED -FROM NAMED -FROM NAMED -{ - { ?s ?p ?o } - UNION - { GRAPH ?g { ?s ?p ?o } } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-11.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-11.ttl deleted file mode 100644 index 5dac03f83..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-11.ttl +++ /dev/null @@ -1,108 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] - ] ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-12.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-12.rq deleted file mode 100644 index 54c1b8cc1..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-12.rq +++ /dev/null @@ -1,16 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM -FROM -FROM -FROM NAMED -FROM NAMED -FROM NAMED -FROM NAMED -{ - { ?s ?p ?o } - UNION - { GRAPH ?g { ?s ?p ?o } } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-12.ttl b/test/data/suites/DAWG/data-r2/dataset/dataset-12.ttl deleted file mode 100644 index 72c4c762b..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-12.ttl +++ /dev/null @@ -1,148 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] - ] ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] - ] ; - rs:solution [ rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/dataset/dataset-12b.rq b/test/data/suites/DAWG/data-r2/dataset/dataset-12b.rq deleted file mode 100644 index 02318c821..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/dataset-12b.rq +++ /dev/null @@ -1,16 +0,0 @@ -PREFIX : - -SELECT * -FROM -FROM -FROM -FROM -FROM NAMED -FROM NAMED -FROM NAMED -FROM NAMED -{ - { ?s ?p ?o } - UNION - { GRAPH ?g { ?s ?p ?o } } -} diff --git a/test/data/suites/DAWG/data-r2/dataset/manifest.ttl b/test/data/suites/DAWG/data-r2/dataset/manifest.ttl deleted file mode 100644 index cdafd092b..000000000 --- a/test/data/suites/DAWG/data-r2/dataset/manifest.ttl +++ /dev/null @@ -1,177 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Tests for GRAPH" ; - mf:entries - ( - :dawg-dataset-01 - :dawg-dataset-02 - :dawg-dataset-03 - :dawg-dataset-04 - :dawg-dataset-05 - :dawg-dataset-06 - :dawg-dataset-07 - :dawg-dataset-08 - :dawg-dataset-09 - :dawg-dataset-10 - :dawg-dataset-11 - :dawg-dataset-12 - :dawg-dataset-09b - :dawg-dataset-10b - :dawg-dataset-12b - ). - -:dawg-dataset-01 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-01" ; - rdfs:comment "Data: default dataset / Query: default dataset" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-02 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-02" ; - rdfs:comment "Data: named dataset / Query: default dataset" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-03 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-03" ; - rdfs:comment "Data: named dataset / Query: named dataset dataset" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-04 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-04" ; - rdfs:comment "Data: named dataset / Query: default dataset" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-05 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-05" ; - rdfs:comment "Data: default and named / Query: default dataset" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-06 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-06" ; - rdfs:comment "Data: default and named / Query: named dataset" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-07 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-07" ; - rdfs:comment "Data: default and named / Query: all data by UNION" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-08 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-08" ; - rdfs:comment "Data: default and named / Query: common subjects" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-09 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-09" ; - rdfs:comment "Data: default and named (bnodes) / Query: common subjects" ; - dawgt:approval dawgt:Withdrawn ; - #dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-09b rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-09b" ; - rdfs:comment "Data: default and named (bnodes) / Query: common subjects" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-10 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-10" ; - rdfs:comment "Data: default and named (same data, with bnodes) / Query: common subjects" ; - dawgt:approval dawgt:Withdrawn ; - #dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-10b rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-10b" ; - rdfs:comment "Data: default and named (same data, with bnodes) / Query: common subjects" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-11 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-11" ; - rdfs:comment "Data: default and named (several) / Query: get everything" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-12 rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-12" ; - rdfs:comment "Data: default (several) and named (several) / Query: get everything" ; - dawgt:approval dawgt:Withdrawn ; - #dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . - -:dawg-dataset-12b rdf:type mf:QueryEvaluationTest ; - mf:name "dataset-12b" ; - rdfs:comment "Data: default (several) and named (several) / Query: get everything" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ] ; - mf:result ; - . diff --git a/test/data/suites/DAWG/data-r2/distinct/data-all.ttl b/test/data/suites/DAWG/data-r2/distinct/data-all.ttl deleted file mode 100644 index a5a0f22a7..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/data-all.ttl +++ /dev/null @@ -1,74 +0,0 @@ -## data-num.ttl -@prefix : . -@prefix xsd: . - -:x1 :p1 "1"^^xsd:integer . -:x1 :p2 "1"^^xsd:integer . - -:x2 :p1 "1"^^xsd:integer . -:x2 :p2 "1"^^xsd:integer . - -:x3 :p1 "01"^^xsd:integer . -:x3 :p2 "01"^^xsd:integer . - -:x4 :p1 "+1"^^xsd:integer . -:x4 :p2 "+1"^^xsd:integer . - -:y1 :p1 "1.0"^^xsd:decimal . -:y1 :p2 "1.0"^^xsd:decimal . - -:y2 :p1 "+1.0"^^xsd:decimal . -:y2 :p2 "+1.0"^^xsd:decimal . - -:y3 :p1 "01.0"^^xsd:decimal . -:y3 :p2 "01.0"^^xsd:decimal . - -:z1 :p1 "1.0e0"^^xsd:double . -:z1 :p2 "1.0e0"^^xsd:double . - -:z2 :p1 "1.0e0"^^xsd:double . -:z2 :p2 "1.0e0"^^xsd:double . - -:z3 :p1 "1.3e0"^^xsd:double . -:z3 :p2 "1.3e0"^^xsd:double . - -:z4 :p1 "1.3e0"^^xsd:double . -:z5 :p1 "1.3e0"^^xsd:float . - -## data-str.ttl - -:x1 :p "abc" . -:x1 :q "abc" . - -:x2 :p "abc"@en . -:x2 :q "abc"@en . - -:x3 :p "ABC" . -:x3 :q "ABC" . - -:x4 :p "ABC"@en . -:x4 :q "ABC"@en . - - -:x5 :p "abc"^^xsd:string . -:x5 :q "abc"^^xsd:string . -:x6 :p "ABC"^^xsd:string . -:x6 :q "ABC"^^xsd:string . - -:x7 :p "" . -:x7 :q "" . - -:x8 :p ""@en . -:x8 :q ""@en . - -:x9 :p ""^^xsd:string . -:x9 :q ""^^xsd:string . - -## data-node.ttl - -:x1 :p1 :z1 . -:x1 :p1 _:a . - -:x1 :p2 :z1 . -:x1 :p2 _:a . - diff --git a/test/data/suites/DAWG/data-r2/distinct/data-node.ttl b/test/data/suites/DAWG/data-r2/distinct/data-node.ttl deleted file mode 100644 index 0166e4ccb..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/data-node.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p1 :z1 . -:x1 :p1 _:a . - -:x1 :p2 :z1 . -:x1 :p2 _:a . - diff --git a/test/data/suites/DAWG/data-r2/distinct/data-num.ttl b/test/data/suites/DAWG/data-r2/distinct/data-num.ttl deleted file mode 100644 index b5e4e0371..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/data-num.ttl +++ /dev/null @@ -1,35 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p1 "1"^^xsd:integer . -:x1 :p2 "1"^^xsd:integer . - -:x2 :p1 "1"^^xsd:integer . -:x2 :p2 "1"^^xsd:integer . - -:x3 :p1 "01"^^xsd:integer . -:x3 :p2 "01"^^xsd:integer . - -:x4 :p1 "+1"^^xsd:integer . -:x4 :p2 "+1"^^xsd:integer . - -:y1 :p1 "1.0"^^xsd:decimal . -:y1 :p2 "1.0"^^xsd:decimal . - -:y2 :p1 "+1.0"^^xsd:decimal . -:y2 :p2 "+1.0"^^xsd:decimal . - -:y3 :p1 "01.0"^^xsd:decimal . -:y3 :p2 "01.0"^^xsd:decimal . - -:z1 :p1 "1.0e0"^^xsd:double . -:z1 :p2 "1.0e0"^^xsd:double . - -:z2 :p1 "1.0e0"^^xsd:double . -:z2 :p2 "1.0e0"^^xsd:double . - -:z3 :p1 "1.3e0"^^xsd:double . -:z3 :p2 "1.3e0"^^xsd:double . - -:z4 :p1 "1.3e0"^^xsd:double . -:z5 :p1 "1.3e0"^^xsd:float . diff --git a/test/data/suites/DAWG/data-r2/distinct/data-opt.ttl b/test/data/suites/DAWG/data-r2/distinct/data-opt.ttl deleted file mode 100644 index 1326d2120..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/data-opt.ttl +++ /dev/null @@ -1,13 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p1 :z1 . -:x1 :p1 :z2 . -:x1 :p1 _:a . - -:x1 :p2 :z1 . -:x1 :p2 :z2 . -:x1 :p2 _:a . - -:z1 :q :r . -_:a :q :s . diff --git a/test/data/suites/DAWG/data-r2/distinct/data-star.ttl b/test/data/suites/DAWG/data-r2/distinct/data-star.ttl deleted file mode 100644 index e2c16c020..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/data-star.ttl +++ /dev/null @@ -1,8 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "abc" . -:x1 :q "abc" . -:x2 :p "abc" . - - diff --git a/test/data/suites/DAWG/data-r2/distinct/data-str.ttl b/test/data/suites/DAWG/data-r2/distinct/data-str.ttl deleted file mode 100644 index 6c0dbb24c..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/data-str.ttl +++ /dev/null @@ -1,29 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "abc" . -:x1 :q "abc" . - -:x2 :p "abc"@en . -:x2 :q "abc"@en . - -:x3 :p "ABC" . -:x3 :q "ABC" . - -:x4 :p "ABC"@en . -:x4 :q "ABC"@en . - - -:x5 :p "abc"^^xsd:string . -:x5 :q "abc"^^xsd:string . -:x6 :p "ABC"^^xsd:string . -:x6 :q "ABC"^^xsd:string . - -:x7 :p "" . -:x7 :q "" . - -:x8 :p ""@en . -:x8 :q ""@en . - -:x9 :p ""^^xsd:string . -:x9 :q ""^^xsd:string . diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-1-results.srx b/test/data/suites/DAWG/data-r2/distinct/distinct-1-results.srx deleted file mode 100644 index 96cc0ff99..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-1-results.srx +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - 1 - - - - - 1.0 - - - - - 1.3 - - - - - +1 - - - - - +1.0 - - - - - 1.3e0 - - - - - 01 - - - - - 01.0 - - - - - +1.3e0 - - - - - 1.3e0 - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-1.rq b/test/data/suites/DAWG/data-r2/distinct/distinct-1.rq deleted file mode 100644 index 3b182219e..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT DISTINCT ?v -{ - ?x ?p ?v . -} diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-2.rq b/test/data/suites/DAWG/data-r2/distinct/distinct-2.rq deleted file mode 100644 index f423c6024..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-2.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT DISTINCT ?v -{ - :x1 ?p ?o - OPTIONAL { ?o :q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-all.srx b/test/data/suites/DAWG/data-r2/distinct/distinct-all.srx deleted file mode 100644 index 963d208ef..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-all.srx +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - ABC - - - - - 1.3e0 - - - - - abc - - - - - 1.3e0 - - - - - ABC - - - - - +1 - - - - - 01.0 - - - - - ABC - - - - - 01 - - - - - - - - - - 1.0e0 - - - - - +1.0 - - - - - abc - - - - - 1 - - - - - - - - - - 1.0 - - - - - b0 - - - - - http://example/z1 - - - - - abc - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-node.srx b/test/data/suites/DAWG/data-r2/distinct/distinct-node.srx deleted file mode 100644 index 7f88f2b87..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-node.srx +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - b0 - - - - - http://example/z1 - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-num.srx b/test/data/suites/DAWG/data-r2/distinct/distinct-num.srx deleted file mode 100644 index 71b81a629..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-num.srx +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - 1.3e0 - - - - - 1.3e0 - - - - - +1 - - - - - 01.0 - - - - - 01 - - - - - 1.0e0 - - - - - +1.0 - - - - - 1 - - - - - 1.0 - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-opt.srx b/test/data/suites/DAWG/data-r2/distinct/distinct-opt.srx deleted file mode 100644 index daf6272d0..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-opt.srx +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - http://example/s - - - - - - - http://example/r - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-star-1.rq b/test/data/suites/DAWG/data-r2/distinct/distinct-star-1.rq deleted file mode 100644 index ddb2d608d..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-star-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX xsd: -SELECT DISTINCT * -WHERE { - { ?s :p ?o } UNION { ?s :q ?o } -} - diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-star-1.srx b/test/data/suites/DAWG/data-r2/distinct/distinct-star-1.srx deleted file mode 100644 index 7a1172ebe..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-star-1.srx +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - http://example/x1 - abc - - - http://example/x2 - abc - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/distinct-str.srx b/test/data/suites/DAWG/data-r2/distinct/distinct-str.srx deleted file mode 100644 index a83675428..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/distinct-str.srx +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - ABC - - - - - abc - - - - - ABC - - - - - ABC - - - - - - - - - - abc - - - - - - - - - - abc - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/manifest.ttl b/test/data/suites/DAWG/data-r2/distinct/manifest.ttl deleted file mode 100644 index 96bd4bd0c..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/manifest.ttl +++ /dev/null @@ -1,128 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:label "DISTINCT" ; - mf:entries - ( - :no-distinct-1 - :distinct-1 - :no-distinct-2 - :distinct-2 - :no-distinct-3 - :distinct-3 - :no-distinct-4 - :distinct-4 - :no-distinct-9 - :distinct-9 - :distinct-star-1 - ) . - -:distinct-star-1 rdf:type mf:QueryEvaluationTest ; - mf:name "SELECT DISTINCT *" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:no-distinct-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Numbers: No distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:distinct-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Numbers: Distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:no-distinct-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Strings: No distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:distinct-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Strings: Distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:no-distinct-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Nodes: No distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:distinct-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Nodes: Distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:no-distinct-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Opt: No distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:distinct-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Opt: Distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - - -:no-distinct-9 rdf:type mf:QueryEvaluationTest ; - mf:name "All: No distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - ##qt:data , , - qt:data - ] ; - mf:result . - -:distinct-9 rdf:type mf:QueryEvaluationTest ; - mf:name "All: Distinct" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - ##qt:data , , - qt:data - ] ; - mf:result . diff --git a/test/data/suites/DAWG/data-r2/distinct/no-distinct-1.rq b/test/data/suites/DAWG/data-r2/distinct/no-distinct-1.rq deleted file mode 100644 index e5724cef1..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/no-distinct-1.rq +++ /dev/null @@ -1,4 +0,0 @@ -SELECT ?v -{ - ?x ?p ?v . -} diff --git a/test/data/suites/DAWG/data-r2/distinct/no-distinct-2.rq b/test/data/suites/DAWG/data-r2/distinct/no-distinct-2.rq deleted file mode 100644 index 9fb8303ec..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/no-distinct-2.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT ?v -{ - :x1 ?p ?o - OPTIONAL { ?o :q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/distinct/no-distinct-all.srx b/test/data/suites/DAWG/data-r2/distinct/no-distinct-all.srx deleted file mode 100644 index 7b8d1136d..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/no-distinct-all.srx +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - ABC - - - - - ABC - - - - - 1.3e0 - - - - - abc - - - - - abc - - - - - 1.3e0 - - - - - ABC - - - - - ABC - - - - - +1 - - - - - +1 - - - - - 1.3e0 - - - - - 1.3e0 - - - - - 01.0 - - - - - 01.0 - - - - - ABC - - - - - ABC - - - - - 01 - - - - - 01 - - - - - - - - - - - - - - - 1.0e0 - - - - - 1.0e0 - - - - - +1.0 - - - - - +1.0 - - - - - abc - - - - - abc - - - - - 1 - - - - - 1 - - - - - - - - - - - - - - - 1.0e0 - - - - - 1.0e0 - - - - - 1.0 - - - - - 1.0 - - - - - b0 - - - - - http://example/z1 - - - - - b0 - - - - - http://example/z1 - - - - - abc - - - - - abc - - - - - 1 - - - - - 1 - - - - - - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/no-distinct-node.srx b/test/data/suites/DAWG/data-r2/distinct/no-distinct-node.srx deleted file mode 100644 index 367262978..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/no-distinct-node.srx +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - b0 - - - - - b0 - - - - - http://example/z1 - - - - - http://example/z1 - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/no-distinct-num.srx b/test/data/suites/DAWG/data-r2/distinct/no-distinct-num.srx deleted file mode 100644 index 052f74ea9..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/no-distinct-num.srx +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - 1.3e0 - - - - - 1.3e0 - - - - - +1 - - - - - +1 - - - - - 1.3e0 - - - - - 1.3e0 - - - - - 01.0 - - - - - 01.0 - - - - - 01 - - - - - 01 - - - - - 1.0e0 - - - - - 1.0e0 - - - - - +1.0 - - - - - +1.0 - - - - - 1 - - - - - 1 - - - - - 1.0e0 - - - - - 1.0e0 - - - - - 1.0 - - - - - 1.0 - - - - - 1 - - - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/no-distinct-opt.srx b/test/data/suites/DAWG/data-r2/distinct/no-distinct-opt.srx deleted file mode 100644 index 1a88d3363..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/no-distinct-opt.srx +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - http://example/s - - - - - - - http://example/r - - - - - http://example/s - - - - - - - http://example/r - - - - diff --git a/test/data/suites/DAWG/data-r2/distinct/no-distinct-str.srx b/test/data/suites/DAWG/data-r2/distinct/no-distinct-str.srx deleted file mode 100644 index da0974bcc..000000000 --- a/test/data/suites/DAWG/data-r2/distinct/no-distinct-str.srx +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - ABC - - - - - ABC - - - - - abc - - - - - abc - - - - - ABC - - - - - ABC - - - - - ABC - - - - - ABC - - - - - - - - - - - - - - - abc - - - - - abc - - - - - - - - - - - - - - - abc - - - - - abc - - - - - - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/data-builtin-1.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/data-builtin-1.ttl deleted file mode 100644 index b8bc87657..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/data-builtin-1.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix : . -@prefix xsd: . - -:xi1 :p "1"^^xsd:integer . -:xi2 :p "1"^^xsd:integer . -:xi3 :p "01"^^xsd:integer . - -:xd1 :p "1.0e0"^^xsd:double . -:xd2 :p "1.0"^^xsd:double . -:xd3 :p "1"^^xsd:double . - -:xt1 :p "zzz"^^:myType . - -:xp1 :p "zzz" . -:xp2 :p "1" . -:xp2 :p "" . - -:xu :p :z . - -:xb :p _:a . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/data-builtin-2.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/data-builtin-2.ttl deleted file mode 100644 index 0067750eb..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/data-builtin-2.ttl +++ /dev/null @@ -1,14 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "string" . -:x2 :p "string"^^xsd:string . -:x3 :p "string"@en . -:x4 :p "lex"^^:unknownType . -:x5 :p "1234"^^xsd:integer . -:x6 :p . -:x7 :p _:bNode . - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/data-langMatches-de.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/data-langMatches-de.ttl deleted file mode 100644 index a0365dfc3..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/data-langMatches-de.ttl +++ /dev/null @@ -1,8 +0,0 @@ -# data-langMatches-de.ttl -# $Id: data-langMatches-de.ttl,v 1.2 2007/08/11 18:30:56 eric Exp $ - -@prefix : . - -:x :p3 "abc"@de . -:x :p4 "abc"@de-de . -:x :p5 "abc"@de-latn-de . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/data-langMatches.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/data-langMatches.ttl deleted file mode 100644 index 646c866cc..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/data-langMatches.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix : . - -:x :p1 "abc" . -:x :p2 . -:x :p3 "abc"@en . -:x :p4 "abc"@en-gb . -:x :p5 "abc"@fr . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-insensitive-eq.srx b/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-insensitive-eq.srx deleted file mode 100644 index 6669f5f0d..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-insensitive-eq.srx +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - http://example/x2 - - - xyz - - - http://example/x2 - - - xyz - - - - - http://example/x2 - - - xyz - - - http://example/x3 - - - xyz - - - - - http://example/x3 - - - xyz - - - http://example/x2 - - - xyz - - - - - http://example/x3 - - - xyz - - - http://example/x3 - - - xyz - - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-insensitive-ne.srx b/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-insensitive-ne.srx deleted file mode 100644 index cc2ee171d..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-insensitive-ne.srx +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity-eq.rq b/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity-eq.rq deleted file mode 100644 index f611e5c9a..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity-eq.rq +++ /dev/null @@ -1,11 +0,0 @@ -# Test: 'xyz'@en = 'xyz'@EN -# $Id: lang-case-sensitivity-eq.rq,v 1.1 2007/06/24 23:15:38 lfeigenb Exp $ - -PREFIX : - -SELECT * -{ - ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER ( ?v1 = ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity-ne.rq b/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity-ne.rq deleted file mode 100644 index ae5a48447..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity-ne.rq +++ /dev/null @@ -1,12 +0,0 @@ -# Test: 'xyz'@en != 'xyz'@EN -# $Id: lang-case-sensitivity-ne.rq,v 1.1 2007/06/24 23:15:38 lfeigenb Exp $ - -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER ( ?v1 != ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity.ttl deleted file mode 100644 index 062b5d645..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/lang-case-sensitivity.ttl +++ /dev/null @@ -1,7 +0,0 @@ -# Data: minimal test of plain literal language sensitivity -# $Id: lang-case-sensitivity.ttl,v 1.1 2007/06/24 23:15:38 lfeigenb Exp $ - -@prefix : . - -:x2 :p "xyz"@en . -:x3 :p "xyz"@EN . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/manifest.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/manifest.ttl deleted file mode 100644 index ae1431f21..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/manifest.ttl +++ /dev/null @@ -1,276 +0,0 @@ -# $Id: manifest.ttl,v 1.13 2007/09/05 17:32:28 lfeigenb Exp $ - -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "DAWG Expression tests: Built-ins" ; - mf:entries - ( :dawg-str-1 :dawg-str-2 :dawg-str-3 :dawg-str-4 - :dawg-isBlank-1 :dawg-isLiteral-1 :dawg-datatype-1 - ## remove test - chnages for SPARQL 1.1 and RDF 1.1 (rdf:langString) - ##:dawg-datatype-2 - :dawg-datatype-3 - :dawg-lang-1 :dawg-lang-2 :dawg-lang-3 :dawg-isURI-1 - :dawg-isIRI-1 :dawg-langMatches-1 :dawg-langMatches-2 - :dawg-langMatches-3 :dawg-langMatches-4 :dawg-langMatches-basic - :lang-case-insensitive-eq - :lang-case-insensitive-ne - :sameTerm-simple :sameTerm-eq :sameTerm-not-eq - ). - -:dawg-isLiteral-1 a mf:QueryEvaluationTest ; - mf:name "isLiteral" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:dawg-str-1 a mf:QueryEvaluationTest ; - mf:name "str-1" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:dawg-str-2 a mf:QueryEvaluationTest ; - mf:name "str-2" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-str-3 a mf:QueryEvaluationTest ; - mf:name "str-3" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-str-4 a mf:QueryEvaluationTest ; - mf:name "str-4" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-isBlank-1 a mf:QueryEvaluationTest ; - mf:name "isBlank-1" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-datatype-1 a mf:QueryEvaluationTest ; - mf:name "datatype-1" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-datatype-2 a mf:QueryEvaluationTest ; - mf:name "datatype-2 : Literals with a datatype" ; - rdfs:comment "updated from original test case: eliminated ordering from test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-datatype-3 a mf:QueryEvaluationTest ; - mf:name "datatype-3 : Literals with a datatype of xsd:string" ; - rdfs:comment "updated from original test case: eliminated ordering from test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-lang-1 a mf:QueryEvaluationTest ; - mf:name "lang-1 : Literals with a lang tag of some kind" ; - rdfs:comment "updated from original test case: eliminated ordering from test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-lang-2 a mf:QueryEvaluationTest ; - mf:name "lang-2 : Literals with a lang tag of ''" ; - rdfs:comment "updated from original test case: eliminated ordering from test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-lang-3 a mf:QueryEvaluationTest ; - mf:name "lang-3 : Graph matching with lang tag being a different case" ; - rdfs:comment "updated from original test case: eliminated ordering from test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-isURI-1 a mf:QueryEvaluationTest ; - mf:name "isURI-1" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-isIRI-1 a mf:QueryEvaluationTest ; - mf:name "isIRI-1" ; - mf:action - [ qt:query ; - qt:data ] ; - # NB same result as before. - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - - -:dawg-langMatches-1 a mf:QueryEvaluationTest ; - mf:name "LangMatches-1" ; - rdfs:comment "langMatches(lang(?v), 'en-GB') matches 'abc'@en-gb" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-langMatches-2 a mf:QueryEvaluationTest ; - mf:name "LangMatches-2" ; - rdfs:comment "langMatches(lang(?v), 'en') matches 'abc'@en, 'abc'@en-gb" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-langMatches-3 a mf:QueryEvaluationTest ; - mf:name "LangMatches-3" ; - rdfs:comment "langMatches(lang(?v), '*') matches 'abc'@en, 'abc'@en-gb, 'abc'@fr" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-langMatches-4 a mf:QueryEvaluationTest ; - mf:name "LangMatches-4" ; - rdfs:comment "! langMatches(lang(?v), '*') matches 'abc'" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:dawg-langMatches-basic a mf:QueryEvaluationTest ; - mf:name "LangMatches-basic" ; - rdfs:comment "the basic range 'de-de' does not match 'de-Latn-de'" ; - mf:action - [ qt:query ; - qt:data ] ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:result . - -:lang-case-insensitive-eq a mf:QueryEvaluationTest ; - mf:name "lang-case-insensitive-eq" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment "'xyz'@en = 'xyz'@EN" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:lang-case-insensitive-ne a mf:QueryEvaluationTest ; - mf:name "lang-case-insensitive-ne" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment "'xyz'@en != 'xyz'@EN" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - - -:sameTerm-simple a mf:QueryEvaluationTest ; - mf:name "sameTerm-simple" ; - rdfs:comment "sameTerm(?v1, ?v2)" ; - mf:action - [ qt:query ; - qt:data ] ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:result . - - -:sameTerm-eq a mf:QueryEvaluationTest ; - mf:name "sameTerm-eq" ; - rdfs:comment "sameTerm(?v1, ?v2) && ?v1 = ?v2" ; - mf:action - [ qt:query ; - qt:data ] ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:result . - - -:sameTerm-not-eq a mf:QueryEvaluationTest ; - mf:name "sameTerm-not-eq" ; - rdfs:comment "!sameTerm(?v1, ?v2) && ?v1 = ?v2" ; - mf:action - [ qt:query ; - qt:data ] ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:result . - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-blank-1.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-blank-1.rq deleted file mode 100644 index 49f1556c6..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-blank-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x ?v -WHERE - { ?x :p ?v . - FILTER isBlank(?v) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-1.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-1.rq deleted file mode 100644 index 13a59e3eb..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x ?v -WHERE - { ?x :p ?v . - FILTER ( datatype(?v) = xsd:double ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-2.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-2.rq deleted file mode 100644 index a6d9bab39..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-2.rq +++ /dev/null @@ -1,9 +0,0 @@ -# Which literals have a datatype and which are errors. - -PREFIX : -PREFIX xsd: - -SELECT ?x -{ ?x :p ?v . - FILTER( datatype(?v) != ) -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-3.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-3.rq deleted file mode 100644 index 308f7c507..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-datatype-3.rq +++ /dev/null @@ -1,9 +0,0 @@ -# Whichliterals have xsd:string as a datatype - -PREFIX : -PREFIX xsd: - -SELECT ?x -{ ?x :p ?v . - FILTER( datatype(?v) = xsd:string ) -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-iri-1.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-iri-1.rq deleted file mode 100644 index dd33f0284..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-iri-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x ?v -WHERE - { ?x :p ?v . - FILTER isIRI(?v) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-isliteral-1.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-isliteral-1.rq deleted file mode 100644 index 52997343d..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-isliteral-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p ?v . - FILTER isLiteral(?v) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-1.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-1.rq deleted file mode 100644 index a7ee383fc..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-1.rq +++ /dev/null @@ -1,9 +0,0 @@ -# Test which things have a lang tag of some form. - -PREFIX : -PREFIX xsd: - -SELECT ?x -{ ?x :p ?v . - FILTER ( lang(?v) != '@NotALangTag@' ) -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-2.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-2.rq deleted file mode 100644 index ce970647b..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-2.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT ?x -{ ?x :p ?v . - FILTER ( lang(?v) = '' ) -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-3.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-3.rq deleted file mode 100644 index ecb703d8b..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-lang-3.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT ?x -{ ?x :p "string"@EN -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-1.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-1.rq deleted file mode 100644 index 04e9c9818..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-1.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : - -SELECT * -{ :x ?p ?v . FILTER langMatches(lang(?v), "en-GB") . } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-2.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-2.rq deleted file mode 100644 index 8c98dd3e9..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-2.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : - -SELECT * -{ :x ?p ?v . FILTER langMatches(lang(?v), "en") . } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-3.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-3.rq deleted file mode 100644 index 5aa69035a..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-3.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : - -SELECT * -{ :x ?p ?v . FILTER langMatches(lang(?v), "*") . } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-4.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-4.rq deleted file mode 100644 index e62eae4bd..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-4.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : - -SELECT * -{ :x ?p ?v . FILTER (! langMatches(lang(?v), "*")) . } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-de-de.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-de-de.rq deleted file mode 100644 index 0815bee82..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-langMatches-de-de.rq +++ /dev/null @@ -1,7 +0,0 @@ -# q-langMatches-de-de.rq -# $Id: q-langMatches-de-de.rq,v 1.1 2007/08/11 18:32:04 eric Exp $ - -PREFIX : - -SELECT * -{ :x ?p ?v . FILTER langMatches(lang(?v), "de-de") . } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-str-1.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-str-1.rq deleted file mode 100644 index a00b57da0..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-str-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x ?v -WHERE - { ?x :p ?v . - FILTER ( str(?v) = "1" ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-str-2.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-str-2.rq deleted file mode 100644 index e66ae02e2..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-str-2.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x ?v -WHERE - { ?x :p ?v . - FILTER ( str(?v) = "01" ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-str-3.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-str-3.rq deleted file mode 100644 index 8f9a29009..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-str-3.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x ?v -WHERE - { ?x :p ?v . - FILTER ( str(?v) = "zzz" ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-str-4.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-str-4.rq deleted file mode 100644 index bdb2ff327..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-str-4.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x ?v -WHERE - { ?x :p ?v . - FILTER ( str(?v) = "" ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/q-uri-1.rq b/test/data/suites/DAWG/data-r2/expr-builtin/q-uri-1.rq deleted file mode 100644 index d8de720e6..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/q-uri-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x ?v -WHERE - { ?x :p ?v . - FILTER isURI(?v) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-blank-1.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-blank-1.ttl deleted file mode 100644 index b6f81427e..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-blank-1.ttl +++ /dev/null @@ -1,16 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:resultVariable "v" ; - rs:solution - [ rs:binding [ rs:value :xb ; - rs:variable "x" - ] ; - rs:binding [ rs:value [] ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-1.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-1.ttl deleted file mode 100644 index 48bb340b4..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-1.ttl +++ /dev/null @@ -1,32 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:resultVariable "v" ; - rs:solution - [ rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd1 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xd3 ; - rs:variable "x" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xd2 ; - rs:variable "x" - ] ; - rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-2.srx b/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-2.srx deleted file mode 100644 index 33ffbe8d3..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-2.srx +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - http://example/x1 - - - - - http://example/x2 - - - - - http://example/x4 - - - - - http://example/x5 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-3.srx b/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-3.srx deleted file mode 100644 index e0b1d3c2c..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-datatype-3.srx +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - http://example/x1 - - - - - http://example/x2 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-iri-1.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-iri-1.ttl deleted file mode 100644 index 1a224e1d2..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-iri-1.ttl +++ /dev/null @@ -1,16 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:resultVariable "v" ; - rs:solution - [ rs:binding [ rs:value :z ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xu ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-isliteral-1.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-isliteral-1.ttl deleted file mode 100644 index 27ebb9916..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-isliteral-1.ttl +++ /dev/null @@ -1,28 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution - [ rs:binding [ rs:value :x1 ; - rs:variable "x" - ] ; - ], - [ rs:binding [ rs:value :x2 ; - rs:variable "x" - ] ; - ], - [ rs:binding [ rs:value :x3 ; - rs:variable "x" - ] ; - ], - [ rs:binding [ rs:value :x4 ; - rs:variable "x" - ] ; - ], - [ rs:binding [ rs:value :x5 ; - rs:variable "x" - ] ; - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-1.srx b/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-1.srx deleted file mode 100644 index 2155be0fa..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-1.srx +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - http://example/x1 - - - - - http://example/x2 - - - - - http://example/x3 - - - - - http://example/x4 - - - - - http://example/x5 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-2.srx b/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-2.srx deleted file mode 100644 index 33ffbe8d3..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-2.srx +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - http://example/x1 - - - - - http://example/x2 - - - - - http://example/x4 - - - - - http://example/x5 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-3.srx b/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-3.srx deleted file mode 100644 index 7267c63ad..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-lang-3.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example/x3 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-1.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-1.ttl deleted file mode 100644 index e05e6584a..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-1.ttl +++ /dev/null @@ -1,14 +0,0 @@ -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "abc"@en-gb ; - rs:variable "v" - ] ; - rs:binding [ rs:value :p4 ; - rs:variable "p" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-2.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-2.ttl deleted file mode 100644 index 29adb9a18..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-2.ttl +++ /dev/null @@ -1,21 +0,0 @@ -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value :p3 ; - rs:variable "p" - ] ; - rs:binding [ rs:value "abc"@en ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value "abc"@en-gb ; - rs:variable "v" - ] ; - rs:binding [ rs:value :p4 ; - rs:variable "p" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-3.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-3.ttl deleted file mode 100644 index 5c7db0ad2..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-3.ttl +++ /dev/null @@ -1,28 +0,0 @@ -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:resultVariable "p" ; - rs:solution [ rs:binding [ rs:value "abc"@en ; - rs:variable "v" - ] ; - rs:binding [ rs:value :p3 ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p4 ; - rs:variable "p" - ] ; - rs:binding [ rs:value "abc"@en-gb ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p5 ; - rs:variable "p" - ] ; - rs:binding [ rs:value "abc"@fr ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-4.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-4.ttl deleted file mode 100644 index 5931a313a..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-4.ttl +++ /dev/null @@ -1,14 +0,0 @@ -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:resultVariable "p" ; - rs:solution [ rs:binding [ rs:value "abc" ; - rs:variable "v" - ] ; - rs:binding [ rs:value :p1 ; - rs:variable "p" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-de.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-de.ttl deleted file mode 100644 index 59087ec89..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-langMatches-de.ttl +++ /dev/null @@ -1,16 +0,0 @@ -# result-langMatches-de.ttl -# $Id: result-langMatches-de.ttl,v 1.2 2007/08/11 18:29:27 eric Exp $ - -@prefix rdf: . -@prefix rs: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable - "p", "v" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "p" - ] , - [ rs:value "abc"@de-de ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm-eq.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm-eq.ttl deleted file mode 100644 index 0a0d9a375..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm-eq.ttl +++ /dev/null @@ -1,188 +0,0 @@ -@prefix rdf: . -@prefix rs: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable - "x1", "v1", "x2", "v2" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "zzz" ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "zzz" ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1" ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1" ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "" ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "" ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value _:b ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value _:b ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "01"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "01"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "zzz"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "zzz"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm-not-eq.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm-not-eq.ttl deleted file mode 100644 index ff5452554..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm-not-eq.ttl +++ /dev/null @@ -1,370 +0,0 @@ -@prefix rdf: . -@prefix rs: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable - "x1", "v1", "x2", "v2" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "01"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "01"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "01"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "01"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "01"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "01"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "01"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "01"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "01"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "01"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm.ttl deleted file mode 100644 index bf5fa1182..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-sameTerm.ttl +++ /dev/null @@ -1,188 +0,0 @@ -@prefix rdf: . -@prefix rs: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable - "x1", "v1", "x2", "v2" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "zzz" ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "zzz" ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1" ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1" ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "" ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "" ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1.0e0"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "01"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "01"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "zzz"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "zzz"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value "1"^^ ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value "1"^^ ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "x1" - ] , - [ rs:value _:a ; - rs:variable "v1" - ] , - [ rs:value ; - rs:variable "x2" - ] , - [ rs:value _:a ; - rs:variable "v2" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-str-1.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-str-1.ttl deleted file mode 100644 index 3af700d69..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-str-1.ttl +++ /dev/null @@ -1,40 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:resultVariable "v" ; - rs:solution - [ rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd3 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xp2 ; - rs:variable "x" - ] ; - rs:binding [ rs:value "1" ; - rs:variable "v" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xi2 ; - rs:variable "x" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xi1 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-str-2.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-str-2.ttl deleted file mode 100644 index 3cba86534..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-str-2.ttl +++ /dev/null @@ -1,16 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:resultVariable "v" ; - rs:solution - [ rs:binding [ rs:value :xi3 ; - rs:variable "x" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-str-3.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-str-3.ttl deleted file mode 100644 index 9d5af30ab..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-str-3.ttl +++ /dev/null @@ -1,24 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:resultVariable "v" ; - rs:solution - [ rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xt1 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xp1 ; - rs:variable "x" - ] ; - rs:binding [ rs:value "zzz" ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-str-4.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-str-4.ttl deleted file mode 100644 index 809888f6e..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-str-4.ttl +++ /dev/null @@ -1,15 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "" ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xp2 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/result-uri-1.ttl b/test/data/suites/DAWG/data-r2/expr-builtin/result-uri-1.ttl deleted file mode 100644 index 1a224e1d2..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/result-uri-1.ttl +++ /dev/null @@ -1,16 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:resultVariable "v" ; - rs:solution - [ rs:binding [ rs:value :z ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xu ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm-eq.rq b/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm-eq.rq deleted file mode 100644 index 45147b1e0..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm-eq.rq +++ /dev/null @@ -1,11 +0,0 @@ -# Test: sameTerm and eq -# $Id: sameTerm-eq.rq,v 1.1 2007/08/31 14:01:57 eric Exp $ - -PREFIX : - -SELECT * -{ - ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER ( sameTerm(?v1, ?v2) && ?v1 = ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm-not-eq.rq b/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm-not-eq.rq deleted file mode 100644 index 00a98ba91..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm-not-eq.rq +++ /dev/null @@ -1,11 +0,0 @@ -# Test: !sameTerm and eq -# $Id: sameTerm-not-eq.rq,v 1.1 2007/08/31 14:01:57 eric Exp $ - -PREFIX : - -SELECT * -{ - ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER ( !sameTerm(?v1, ?v2) && ?v1 = ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm.rq b/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm.rq deleted file mode 100644 index b75276215..000000000 --- a/test/data/suites/DAWG/data-r2/expr-builtin/sameTerm.rq +++ /dev/null @@ -1,11 +0,0 @@ -# Test: sameTerm -# $Id: sameTerm.rq,v 1.1 2007/08/31 14:01:57 eric Exp $ - -PREFIX : - -SELECT * -{ - ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER sameTerm(?v1, ?v2) -} diff --git a/test/data/suites/DAWG/data-r2/expr-equals/data-eq.ttl b/test/data/suites/DAWG/data-r2/expr-equals/data-eq.ttl deleted file mode 100644 index e0f1933d5..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/data-eq.ttl +++ /dev/null @@ -1,23 +0,0 @@ -@prefix : . -@prefix xsd: . - -:xi1 :p "1"^^xsd:integer . -:xi2 :p "1"^^xsd:integer . -:xi3 :p "01"^^xsd:integer . - -:xd1 :p "1.0e0"^^xsd:double . -:xd2 :p "1.0"^^xsd:double . -:xd3 :p "1"^^xsd:double . - -## :xdec1 :p "1.0"^^xsd:decimal . -## :xdec2 :p "1"^^xsd:decimal . -## :xdec3 :p "01"^^xsd:decimal . - -:xt1 :p "zzz"^^:myType . - -:xp1 :p "zzz" . -:xp2 :p "1" . - -:xu :p :z . - -#:xb :p _:a . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/manifest.ttl b/test/data/suites/DAWG/data-r2/expr-equals/manifest.ttl deleted file mode 100644 index 86d89c96f..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/manifest.ttl +++ /dev/null @@ -1,143 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Some SPARQL test cases - equality of values" ; - mf:entries - ( - :eq-1 :eq-2 :eq-3 :eq-4 :eq-5 :eq-2-1 :eq-2-2 - :eq-graph-1 :eq-graph-2 :eq-graph-3 :eq-graph-4 :eq-graph-5 - ). - -:eq-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality 1-1" ; - rdfs:comment "= in FILTER expressions is value equality" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:eq-2 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality 1-2" ; - rdfs:comment "= in FILTER expressions is value equality" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:eq-3 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment "Numerics are not value-equivalent to plain literals" ; - mf:name "Equality 1-3" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:eq-4 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality 1-4" ; - rdfs:comment "= compares plain literals and unknown types with the same lexical form as false" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:eq-5 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment "= on IRI terms" ; - mf:name "Equality 1-5" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:eq-2-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality - 2 var - test equals" ; - rdfs:comment "= in FILTER is value equality" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:eq-2-2 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment "!= in FILTER is value inequality" ; - mf:name "Equality - 2 var - test not equals " ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - - # Graph versions of the equality tests - - # DAWG tests are graph-equivalence, not value equivalent. -:eq-graph-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality 1-1 -- graph" ; - rdfs:comment "Graph pattern matching matches exact terms, not values" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - # DAWG tests are graph-equivalence, not value equivalent. -:eq-graph-2 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality 1-2 -- graph" ; - rdfs:comment "Graph pattern matching matches exact terms, not values" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:eq-graph-3 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality 1-3 -- graph" ; - rdfs:comment "Graph pattern matching matches exact terms, not values" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:eq-graph-4 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality 1-4 -- graph" ; - rdfs:comment "Graph pattern matching matches exact terms, not values" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:eq-graph-5 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Equality 1-5 -- graph" ; - rdfs:comment "Graph pattern matching matches exact terms, not values" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - - diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-1.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-1.rq deleted file mode 100644 index 50db013a2..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p ?v . - FILTER ( ?v = 1 ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-2.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-2.rq deleted file mode 100644 index 2e41d83f8..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-2.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p ?v . - FILTER ( ?v = 1.0e0 ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-3.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-3.rq deleted file mode 100644 index c0088ffed..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-3.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p ?v . - FILTER ( ?v = "1" ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-4.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-4.rq deleted file mode 100644 index 5f81e5750..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-4.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p ?v . - FILTER ( ?v = "zzz" ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-5.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-5.rq deleted file mode 100644 index 660c67489..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-5.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p ?v . - FILTER ( ?v = :z ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-1.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-1.rq deleted file mode 100644 index 19d7fc802..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-1.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p 1 . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-2.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-2.rq deleted file mode 100644 index 1ac9e4a0e..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-2.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p 1.0e0 . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-3.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-3.rq deleted file mode 100644 index 1ef2ad656..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-3.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p "1" - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-4.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-4.rq deleted file mode 100644 index 7c137883a..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-4.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p "zzz" . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-5.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-5.rq deleted file mode 100644 index 660c67489..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq-graph-5.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x -WHERE - { ?x :p ?v . - FILTER ( ?v = :z ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-1.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-1.rq deleted file mode 100644 index 6c6bd4f8b..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-1.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?v1 ?v2 -WHERE - { ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER ( ?v1 = ?v2 ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-2.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-2.rq deleted file mode 100644 index cfb1663e0..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-2.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?v1 ?v2 -WHERE - { ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER ( ?v1 != ?v2 ) . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-graph-1.rq b/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-graph-1.rq deleted file mode 100644 index c4b6f3dd4..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/query-eq2-graph-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX xsd: -PREFIX : -SELECT ?x1 ?x2 ?v -WHERE - { ?x1 :p ?v . - ?x2 :p ?v . - } diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-1.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-1.ttl deleted file mode 100644 index 36d954de4..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-1.ttl +++ /dev/null @@ -1,37 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution - [ rs:binding [ rs:value :xd2 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xd3 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xi2 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xi3 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xd1 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xi1 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-2.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-2.ttl deleted file mode 100644 index a66f577bb..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-2.ttl +++ /dev/null @@ -1,37 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution - [ rs:binding [ rs:value :xd1 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xi2 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xi1 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xi3 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xd2 ; - rs:variable "x" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :xd3 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-3.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-3.ttl deleted file mode 100644 index 696ddeac7..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-3.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution - [ rs:binding [ rs:value :xp2 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-4.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-4.ttl deleted file mode 100644 index 86450a08b..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-4.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution - [ rs:binding [ rs:value :xp1 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-5.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-5.ttl deleted file mode 100644 index 9be6a8e90..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-5.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution - [ rs:binding [ rs:value :xu ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-1.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-1.ttl deleted file mode 100644 index a7b522ecf..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-1.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; -# "1" not same term as "01" -# rs:solution [ rs:binding [ rs:value :xi3 ; -# rs:variable "x" -# ] -# ] ; - rs:solution [ rs:binding [ rs:value :xi2 ; - rs:variable "x" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi1 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-2.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-2.ttl deleted file mode 100644 index d6b6e835f..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-2.ttl +++ /dev/null @@ -1,22 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; -# "1.0" not same term as "1.0e0" -# rs:solution [ rs:binding [ rs:value :xd2 ; -# rs:variable "x" -# ] -# ] ; - rs:solution [ rs:binding [ rs:value :xd1 ; - rs:variable "x" - ] - ] ; -# "1" not same term as "1.0e0" -# rs:solution [ rs:binding [ rs:value :xd3 ; -# rs:variable "x" -# ] -# ] - . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-3.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-3.ttl deleted file mode 100644 index 24b6aaa19..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-3.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution [ rs:binding [ rs:value :xp2 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-4.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-4.ttl deleted file mode 100644 index f36f4f660..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-4.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution [ rs:binding [ rs:value :xp1 ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-5.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-5.ttl deleted file mode 100644 index 2b1ca8d0f..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq-graph-5.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x" ; - rs:solution [ rs:binding [ rs:value :xu ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-1.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-1.ttl deleted file mode 100644 index f18bc568d..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-1.ttl +++ /dev/null @@ -1,288 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v2" ; - rs:resultVariable "v1" ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "zzz" ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "zzz" ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1" ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1" ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value :z ; - rs:variable "v2" - ] ; - rs:binding [ rs:value :z ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v2" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v2" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-2.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-2.ttl deleted file mode 100644 index adeb7f5be..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-2.ttl +++ /dev/null @@ -1,104 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v1" ; - rs:resultVariable "v2" ; - rs:solution - [ rs:binding [ rs:value :z ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v1" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :z ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "zzz" ; - rs:variable "v2" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :z ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "zzz" ; - rs:variable "v1" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "1" ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v1" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "1" ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "zzz" ; - rs:variable "v1" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "1" ; - rs:variable "v2" - ] ; - rs:binding [ rs:value :z ; - rs:variable "v1" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "zzz" ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v2" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "1" ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v2" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "zzz" ; - rs:variable "v2" - ] ; - rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v1" - ] - ] ; - rs:solution - [ rs:binding [ rs:value :z ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v2" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "1" ; - rs:variable "v1" - ] ; - rs:binding [ rs:value "zzz" ; - rs:variable "v2" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "1" ; - rs:variable "v1" - ] ; - rs:binding [ rs:value :z ; - rs:variable "v2" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-graph-1.ttl b/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-graph-1.ttl deleted file mode 100644 index 06747dc59..000000000 --- a/test/data/suites/DAWG/data-r2/expr-equals/result-eq2-graph-1.ttl +++ /dev/null @@ -1,229 +0,0 @@ -@prefix xsd: . -@prefix rs: . -@prefix rdf: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "x2" ; - rs:resultVariable "v" ; - rs:resultVariable "x1" ; - rs:solution [ rs:binding [ rs:value :xd2 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd1 ; - rs:variable "x1" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi3 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xi3 ; - rs:variable "x1" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi3 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value :xi1 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd3 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value :xd3 ; - rs:variable "x2" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi1 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xi1 ; - rs:variable "x1" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi1 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value :xi2 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xp2 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value :xp2 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "1" ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd3 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value :xd1 ; - rs:variable "x2" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xu ; - rs:variable "x2" - ] ; - rs:binding [ rs:value :z ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xu ; - rs:variable "x1" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi3 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value :xi2 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi2 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value :xi2 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xd2 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd2 ; - rs:variable "x1" - ] - ] ; - rs:solution [ rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd2 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value :xd1 ; - rs:variable "x2" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi1 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value :xi3 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "01"^^xsd:integer ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xt1 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value "zzz"^^:myType ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xt1 ; - rs:variable "x1" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi3 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value :xi2 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xd3 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "1"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd2 ; - rs:variable "x2" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xd1 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value :xd3 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xd1 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "1.0e0"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd1 ; - rs:variable "x2" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xd2 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "1.0"^^xsd:double ; - rs:variable "v" - ] ; - rs:binding [ rs:value :xd3 ; - rs:variable "x2" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xp1 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value :xp1 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value "zzz" ; - rs:variable "v" - ] - ] ; - rs:solution [ rs:binding [ rs:value :xi1 ; - rs:variable "x1" - ] ; - rs:binding [ rs:value :xi2 ; - rs:variable "x2" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/expr-ops/data.ttl b/test/data/suites/DAWG/data-r2/expr-ops/data.ttl deleted file mode 100644 index ff4435274..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/data.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "1"^^xsd:integer . -:x2 :p "2"^^xsd:integer . -:x3 :p "3"^^xsd:integer . -:x4 :p "4"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/expr-ops/manifest.ttl b/test/data/suites/DAWG/data-r2/expr-ops/manifest.ttl deleted file mode 100644 index 10f060e86..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/manifest.ttl +++ /dev/null @@ -1,87 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "SPARQL tests - XPath operators in FILTERs" ; - mf:entries - ( - :ge-1 :le-1 :mul-1 :plus-1 :minus-1 :unplus-1 :unminus-1 - ). - - -:unplus-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Unary Plusn" ; - rdfs:comment "+A in FILTER expressions" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:unminus-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Unary Minus" ; - rdfs:comment "-A in FILTER expressions" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:plus-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Addition" ; - rdfs:comment "A + B in FILTER expressions" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:minus-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Subtraction" ; - rdfs:comment "A - B in FILTER expressions" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . -:mul-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Multiplication" ; - rdfs:comment "A * B in FILTER expressions" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:ge-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Greater-than or equals" ; - rdfs:comment ">= in FILTER expressions" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . - -:le-1 a mf:QueryEvaluationTest ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:name "Less-than or equals" ; - rdfs:comment "<= in FILTER expressions" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - . diff --git a/test/data/suites/DAWG/data-r2/expr-ops/query-ge-1.rq b/test/data/suites/DAWG/data-r2/expr-ops/query-ge-1.rq deleted file mode 100644 index 5eadb36ee..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/query-ge-1.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o . - FILTER(?o >= 3) . -} diff --git a/test/data/suites/DAWG/data-r2/expr-ops/query-le-1.rq b/test/data/suites/DAWG/data-r2/expr-ops/query-le-1.rq deleted file mode 100644 index 230937254..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/query-le-1.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o . - FILTER(?o <= 2) . -} diff --git a/test/data/suites/DAWG/data-r2/expr-ops/query-minus-1.rq b/test/data/suites/DAWG/data-r2/expr-ops/query-minus-1.rq deleted file mode 100644 index a4c276721..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/query-minus-1.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o . - ?s2 :p ?o2 . - FILTER(?o - ?o2 = 3) . -} diff --git a/test/data/suites/DAWG/data-r2/expr-ops/query-mul-1.rq b/test/data/suites/DAWG/data-r2/expr-ops/query-mul-1.rq deleted file mode 100644 index 5ab293ae2..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/query-mul-1.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o . - ?s2 :p ?o2 . - FILTER(?o * ?o2 = 4) . -} diff --git a/test/data/suites/DAWG/data-r2/expr-ops/query-plus-1.rq b/test/data/suites/DAWG/data-r2/expr-ops/query-plus-1.rq deleted file mode 100644 index 18912bfce..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/query-plus-1.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o . - ?s2 :p ?o2 . - FILTER(?o + ?o2 = 3) . -} diff --git a/test/data/suites/DAWG/data-r2/expr-ops/query-unminus-1.rq b/test/data/suites/DAWG/data-r2/expr-ops/query-unminus-1.rq deleted file mode 100644 index f77d55615..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/query-unminus-1.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o . - FILTER(-?o = -2) . -} diff --git a/test/data/suites/DAWG/data-r2/expr-ops/query-unplus-1.rq b/test/data/suites/DAWG/data-r2/expr-ops/query-unplus-1.rq deleted file mode 100644 index 735e99bb9..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/query-unplus-1.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o . - FILTER(?o = +3) . -} diff --git a/test/data/suites/DAWG/data-r2/expr-ops/result-ge-1.srx b/test/data/suites/DAWG/data-r2/expr-ops/result-ge-1.srx deleted file mode 100644 index dd2996826..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/result-ge-1.srx +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - http://example.org/x3 - - - - - http://example.org/x4 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-ops/result-le-1.srx b/test/data/suites/DAWG/data-r2/expr-ops/result-le-1.srx deleted file mode 100644 index cdce35722..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/result-le-1.srx +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - http://example.org/x1 - - - - - http://example.org/x2 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-ops/result-minus-1.srx b/test/data/suites/DAWG/data-r2/expr-ops/result-minus-1.srx deleted file mode 100644 index f7773e8c1..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/result-minus-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/x4 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-ops/result-mul-1.srx b/test/data/suites/DAWG/data-r2/expr-ops/result-mul-1.srx deleted file mode 100644 index c0e7ebc50..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/result-mul-1.srx +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - http://example.org/x1 - - - - - http://example.org/x2 - - - - - http://example.org/x4 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-ops/result-plus-1.srx b/test/data/suites/DAWG/data-r2/expr-ops/result-plus-1.srx deleted file mode 100644 index cdce35722..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/result-plus-1.srx +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - http://example.org/x1 - - - - - http://example.org/x2 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-ops/result-unminus-1.srx b/test/data/suites/DAWG/data-r2/expr-ops/result-unminus-1.srx deleted file mode 100644 index cb6e83a9b..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/result-unminus-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/x2 - - - - diff --git a/test/data/suites/DAWG/data-r2/expr-ops/result-unplus-1.srx b/test/data/suites/DAWG/data-r2/expr-ops/result-unplus-1.srx deleted file mode 100644 index b355d14d2..000000000 --- a/test/data/suites/DAWG/data-r2/expr-ops/result-unplus-1.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example.org/x3 - - - - diff --git a/test/data/suites/DAWG/data-r2/extended-manifest-evaluation.ttl b/test/data/suites/DAWG/data-r2/extended-manifest-evaluation.ttl deleted file mode 100644 index c3da1c073..000000000 --- a/test/data/suites/DAWG/data-r2/extended-manifest-evaluation.ttl +++ /dev/null @@ -1,13 +0,0 @@ -# $Id: extended-manifest-evaluation.ttl,v 1.2 2007/08/12 15:32:34 lfeigenb Exp $ - -@prefix rdf: . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:label "Extended SPARQL Query Evaluation tests" ; - mf:include ( - - ). - diff --git a/test/data/suites/DAWG/data-r2/graph/data-g1.ttl b/test/data/suites/DAWG/data-r2/graph/data-g1.ttl deleted file mode 100644 index 363d37aaa..000000000 --- a/test/data/suites/DAWG/data-r2/graph/data-g1.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :p "1"^^xsd:integer . -:a :p "9"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/graph/data-g2.ttl b/test/data/suites/DAWG/data-r2/graph/data-g2.ttl deleted file mode 100644 index dbe42fe51..000000000 --- a/test/data/suites/DAWG/data-r2/graph/data-g2.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :q "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/graph/data-g3-dup.ttl b/test/data/suites/DAWG/data-r2/graph/data-g3-dup.ttl deleted file mode 100644 index c82fcb980..000000000 --- a/test/data/suites/DAWG/data-r2/graph/data-g3-dup.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -_:x :p "1"^^xsd:integer . -_:a :p "9"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/graph/data-g3.ttl b/test/data/suites/DAWG/data-r2/graph/data-g3.ttl deleted file mode 100644 index c82fcb980..000000000 --- a/test/data/suites/DAWG/data-r2/graph/data-g3.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix : . -@prefix xsd: . - -_:x :p "1"^^xsd:integer . -_:a :p "9"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/graph/data-g4.ttl b/test/data/suites/DAWG/data-r2/graph/data-g4.ttl deleted file mode 100644 index f3f826a5c..000000000 --- a/test/data/suites/DAWG/data-r2/graph/data-g4.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . -@prefix xsd: . - -_:x :q "2"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-01.rq b/test/data/suites/DAWG/data-r2/graph/graph-01.rq deleted file mode 100644 index f201be94c..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-01.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : - -SELECT * { ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/graph/graph-01.ttl b/test/data/suites/DAWG/data-r2/graph/graph-01.ttl deleted file mode 100644 index 8e4d2587d..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-01.ttl +++ /dev/null @@ -1,29 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-02.rq b/test/data/suites/DAWG/data-r2/graph/graph-02.rq deleted file mode 100644 index f201be94c..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-02.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : - -SELECT * { ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/graph/graph-02.ttl b/test/data/suites/DAWG/data-r2/graph/graph-02.ttl deleted file mode 100644 index 4472d7a0b..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-02.ttl +++ /dev/null @@ -1,8 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "s" ; - rs:resultVariable "o" . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-03.rq b/test/data/suites/DAWG/data-r2/graph/graph-03.rq deleted file mode 100644 index 4fa8077d4..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-03.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT * { - GRAPH ?g { ?s ?p ?o } -} - diff --git a/test/data/suites/DAWG/data-r2/graph/graph-03.ttl b/test/data/suites/DAWG/data-r2/graph/graph-03.ttl deleted file mode 100644 index cb59bc8da..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-03.ttl +++ /dev/null @@ -1,36 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-04.rq b/test/data/suites/DAWG/data-r2/graph/graph-04.rq deleted file mode 100644 index 4fa8077d4..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-04.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT * { - GRAPH ?g { ?s ?p ?o } -} - diff --git a/test/data/suites/DAWG/data-r2/graph/graph-04.ttl b/test/data/suites/DAWG/data-r2/graph/graph-04.ttl deleted file mode 100644 index 0c556901b..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-04.ttl +++ /dev/null @@ -1,9 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-05.rq b/test/data/suites/DAWG/data-r2/graph/graph-05.rq deleted file mode 100644 index f201be94c..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-05.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : - -SELECT * { ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/graph/graph-05.ttl b/test/data/suites/DAWG/data-r2/graph/graph-05.ttl deleted file mode 100644 index d6ca97f0b..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-05.ttl +++ /dev/null @@ -1,29 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-06.rq b/test/data/suites/DAWG/data-r2/graph/graph-06.rq deleted file mode 100644 index 4fa8077d4..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-06.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT * { - GRAPH ?g { ?s ?p ?o } -} - diff --git a/test/data/suites/DAWG/data-r2/graph/graph-06.ttl b/test/data/suites/DAWG/data-r2/graph/graph-06.ttl deleted file mode 100644 index b06d28de2..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-06.ttl +++ /dev/null @@ -1,23 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value :q ; - rs:variable "p" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-07.rq b/test/data/suites/DAWG/data-r2/graph/graph-07.rq deleted file mode 100644 index 299eecc78..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-07.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : - -SELECT * -{ - { ?s ?p ?o } - UNION - { GRAPH ?g { ?s ?p ?o } } -} diff --git a/test/data/suites/DAWG/data-r2/graph/graph-07.ttl b/test/data/suites/DAWG/data-r2/graph/graph-07.ttl deleted file mode 100644 index dd1f79229..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-07.ttl +++ /dev/null @@ -1,43 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-08.rq b/test/data/suites/DAWG/data-r2/graph/graph-08.rq deleted file mode 100644 index 6718ed667..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-08.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT * -{ - ?s ?p ?o - GRAPH ?g { ?s ?q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/graph/graph-08.ttl b/test/data/suites/DAWG/data-r2/graph/graph-08.ttl deleted file mode 100644 index 58c376fc1..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-08.ttl +++ /dev/null @@ -1,31 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "v" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:resultVariable "q" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :q ; - rs:variable "q" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-09.rq b/test/data/suites/DAWG/data-r2/graph/graph-09.rq deleted file mode 100644 index 6718ed667..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-09.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT * -{ - ?s ?p ?o - GRAPH ?g { ?s ?q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/graph/graph-09.ttl b/test/data/suites/DAWG/data-r2/graph/graph-09.ttl deleted file mode 100644 index efea5c6da..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-09.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "v" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:resultVariable "q" . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-10.rq b/test/data/suites/DAWG/data-r2/graph/graph-10.rq deleted file mode 100644 index 6718ed667..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-10.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT * -{ - ?s ?p ?o - GRAPH ?g { ?s ?q ?v } -} diff --git a/test/data/suites/DAWG/data-r2/graph/graph-10.ttl b/test/data/suites/DAWG/data-r2/graph/graph-10.ttl deleted file mode 100644 index efea5c6da..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-10.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "v" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:resultVariable "q" . diff --git a/test/data/suites/DAWG/data-r2/graph/graph-11.rq b/test/data/suites/DAWG/data-r2/graph/graph-11.rq deleted file mode 100644 index 299eecc78..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-11.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : - -SELECT * -{ - { ?s ?p ?o } - UNION - { GRAPH ?g { ?s ?p ?o } } -} diff --git a/test/data/suites/DAWG/data-r2/graph/graph-11.ttl b/test/data/suites/DAWG/data-r2/graph/graph-11.ttl deleted file mode 100644 index 5dac03f83..000000000 --- a/test/data/suites/DAWG/data-r2/graph/graph-11.ttl +++ /dev/null @@ -1,108 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "p" ; - rs:resultVariable "g" ; - rs:resultVariable "s" ; - rs:resultVariable "o" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value :x ; - rs:variable "s" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] - ] ; - rs:solution [ rs:binding [ rs:value :x ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "o" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value :q ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value [] ; - rs:variable "s" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] ; - rs:binding [ rs:value ; - rs:variable "g" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value :a ; - rs:variable "s" - ] ; - rs:binding [ rs:value :p ; - rs:variable "p" - ] ; - rs:binding [ rs:value "9"^^xsd:integer ; - rs:variable "o" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/graph/manifest.ttl b/test/data/suites/DAWG/data-r2/graph/manifest.ttl deleted file mode 100644 index 7152dcabd..000000000 --- a/test/data/suites/DAWG/data-r2/graph/manifest.ttl +++ /dev/null @@ -1,180 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Tests for GRAPH" ; - mf:entries - ( - :dawg-graph-01 - :dawg-graph-02 - :dawg-graph-03 - :dawg-graph-04 - :dawg-graph-05 - :dawg-graph-06 - :dawg-graph-07 - :dawg-graph-08 - :dawg-graph-09 - :dawg-graph-10 - :dawg-graph-10b - :dawg-graph-11 - ). - -:dawg-graph-01 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-01" ; - rdfs:comment "Data: default graph / Query: default graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - ] ; - mf:result ; - . - -:dawg-graph-02 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-02" ; - rdfs:comment "Data: named graph / Query: default graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-03 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-03" ; - rdfs:comment "Data: named graph / Query: named graph graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-04 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-04" ; - rdfs:comment "Data: named graph / Query: default graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - ] ; - mf:result ; - . - -:dawg-graph-05 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-05" ; - rdfs:comment "Data: default and named / Query: default graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-06 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-06" ; - rdfs:comment "Data: default and named / Query: named graph" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-07 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-07" ; - rdfs:comment "Data: default and named / Query: all data by UNION" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-08 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-08" ; - rdfs:comment "Data: default and named / Query: common subjects" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-09 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-09" ; - rdfs:comment "Data: default and named (bnodes) / Query: common subjects" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-10 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-10" ; - rdfs:comment "Data: default and named (same data, with bnodes) / Query: common subjects" ; - dawgt:approval dawgt:Withdrawn ; - #dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-10b rdf:type mf:QueryEvaluationTest ; - mf:name "graph-10b" ; - rdfs:comment "Data: default and named (same data, with bnodes) / Query: common subjects" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - qt:graphData ; - ] ; - mf:result ; - . - -:dawg-graph-11 rdf:type mf:QueryEvaluationTest ; - mf:name "graph-11" ; - rdfs:comment "Data: default and named (several) / Query: get everything" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ; - qt:graphData ; - qt:graphData ; - qt:graphData ; - qt:graphData ; - ] ; - mf:result ; - . - diff --git a/test/data/suites/DAWG/data-r2/i18n/.htaccess b/test/data/suites/DAWG/data-r2/i18n/.htaccess deleted file mode 100644 index 045199efe..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/.htaccess +++ /dev/null @@ -1,6 +0,0 @@ - -ForceType "text/plain; charset=utf-8" - - -ForceType "application/sparql-query; charset=utf-8" - diff --git a/test/data/suites/DAWG/data-r2/i18n/kanji-01-results.ttl b/test/data/suites/DAWG/data-r2/i18n/kanji-01-results.ttl deleted file mode 100644 index 90a16553f..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/kanji-01-results.ttl +++ /dev/null @@ -1,22 +0,0 @@ -@prefix 食: . -@prefix rs: . -@prefix rdf: . -@prefix foaf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "food" ; - rs:resultVariable "name" ; - rs:solution [ rs:binding [ rs:value "Bob" ; - rs:variable "name" - ] ; - rs:binding [ rs:value 食:海老 ; - rs:variable "food" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Alice" ; - rs:variable "name" - ] ; - rs:binding [ rs:value 食:納豆 ; - rs:variable "food" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/i18n/kanji-01.rq b/test/data/suites/DAWG/data-r2/i18n/kanji-01.rq deleted file mode 100644 index 4b995e235..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/kanji-01.rq +++ /dev/null @@ -1,7 +0,0 @@ -# $Id: kanji-01.rq,v 1.3 2005/11/06 08:27:50 eric Exp $ -# test kanji QNames -PREFIX foaf: -PREFIX 食: -SELECT ?name ?food WHERE { - [ foaf:name ?name ; - 食:食べる ?food ] . } diff --git a/test/data/suites/DAWG/data-r2/i18n/kanji-02-results.ttl b/test/data/suites/DAWG/data-r2/i18n/kanji-02-results.ttl deleted file mode 100644 index ed6b1114e..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/kanji-02-results.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix 食: . -@prefix rs: . -@prefix rdf: . -@prefix foaf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "name" ; - rs:solution [ rs:binding [ rs:value "Bob" ; - rs:variable "name" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/i18n/kanji-02.rq b/test/data/suites/DAWG/data-r2/i18n/kanji-02.rq deleted file mode 100644 index b57fc0cec..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/kanji-02.rq +++ /dev/null @@ -1,7 +0,0 @@ -# $Id: kanji-02.rq,v 1.4 2005/11/06 08:27:50 eric Exp $ -# test wide spaces -PREFIX foaf: -PREFIX 食: -SELECT ?name WHERE { - [ foaf:name ?name ; - 食:食べる 食:海老 ] . } diff --git a/test/data/suites/DAWG/data-r2/i18n/kanji.ttl b/test/data/suites/DAWG/data-r2/i18n/kanji.ttl deleted file mode 100644 index b95923ccb..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/kanji.ttl +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: kanji.ttl,v 1.5 2005/11/06 08:27:50 eric Exp $ -# See DOCUMENT INFO below. - -# NAMESPACES -@prefix rdfs: . -@prefix owl: . -@prefix foaf: . -@prefix 食: . - -# DOCUMENT INFO -<> rdfs:comment "test kanji IRIs (composed from QNames)" ; - owl:versionInfo "$Id: kanji.ttl,v 1.5 2005/11/06 08:27:50 eric Exp $". - -# DOCUMENT -_:alice foaf:name "Alice" ; - 食:食べる 食:納豆 . - -_:bob foaf:name "Bob" ; - 食:食べる 食:海老 . - diff --git a/test/data/suites/DAWG/data-r2/i18n/manifest.ttl b/test/data/suites/DAWG/data-r2/i18n/manifest.ttl deleted file mode 100644 index 66f7e4d4d..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/manifest.ttl +++ /dev/null @@ -1,78 +0,0 @@ -# $Id: manifest.ttl,v 1.3 2005/10/25 09:38:08 aseaborne Exp $ - -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "I18N" ; - mf:entries - ( - :kanji-1 - :kanji-2 - :normalization-1 - :normalization-2 - :normalization-3 - ) . - - - - -:kanji-1 rdf:type mf:QueryEvaluationTest ; - mf:name "kanji-01" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . - - -:kanji-2 rdf:type mf:QueryEvaluationTest ; - mf:name "kanji-02" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . - - -:normalization-1 rdf:type mf:QueryEvaluationTest ; - mf:name "normalization-01" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . - -:normalization-2 rdf:type mf:QueryEvaluationTest ; - mf:name "normalization-02" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Example 1 from http://lists.w3.org/Archives/Public/public-rdf-dawg/2005JulSep/0096" ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . - -:normalization-3 rdf:type mf:QueryEvaluationTest ; - mf:name "normalization-03" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Example 2 from http://lists.w3.org/Archives/Public/public-rdf-dawg/2005JulSep/0096" ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-01-results.ttl b/test/data/suites/DAWG/data-r2/i18n/normalization-01-results.ttl deleted file mode 100644 index d4bd3065e..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-01-results.ttl +++ /dev/null @@ -1,15 +0,0 @@ -@prefix HR: . -@prefix rs: . -@prefix rdf: . -@prefix foaf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "name" ; - rs:solution [ rs:binding [ rs:value "Eve" ; - rs:variable "name" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Bob" ; - rs:variable "name" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-01.rq b/test/data/suites/DAWG/data-r2/i18n/normalization-01.rq deleted file mode 100644 index b003b0c3d..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-01.rq +++ /dev/null @@ -1,6 +0,0 @@ -# Figure out what happens with normalization form C. -PREFIX foaf: -PREFIX HR: -SELECT ?name - WHERE { [ foaf:name ?name; - HR:resumé ?resume ] . } diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-01.ttl b/test/data/suites/DAWG/data-r2/i18n/normalization-01.ttl deleted file mode 100644 index 1305297f7..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-01.ttl +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: normalization-01.ttl,v 1.1 2005/10/25 09:38:08 aseaborne Exp $ -# See DOCUMENT INFO below. - -# NAMESPACES -@prefix rdfs: . -@prefix owl: . -@prefix foaf: . -@prefix HR: . - -# DOCUMENT INFO -<> rdfs:comment "Normalized and non-normalized IRIs" ; - owl:versionInfo "$Id: normalization-01.ttl,v 1.1 2005/10/25 09:38:08 aseaborne Exp $". - -# DOCUMENT -[] foaf:name "Alice" ; - HR:resumé "Alice's normalized resumé" . - -[] foaf:name "Bob" ; - HR:resumé "Bob's non-normalized resumé" . - -[] foaf:name "Eve" ; - HR:resumé "Eve's normalized resumé" ; - HR:resumé "Eve's non-normalized resumé" . diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-02-results.ttl b/test/data/suites/DAWG/data-r2/i18n/normalization-02-results.ttl deleted file mode 100644 index b9433b5f6..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-02-results.ttl +++ /dev/null @@ -1,14 +0,0 @@ -# Example 1 from -# http://lists.w3.org/Archives/Public/public-rdf-dawg/2005JulSep/0096 -# $Id: normalization-02-results.ttl,v 1.1 2005/08/09 14:35:26 eric Exp $ -@prefix rdf: . -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "S" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "S" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-02.rq b/test/data/suites/DAWG/data-r2/i18n/normalization-02.rq deleted file mode 100644 index 1b6458089..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-02.rq +++ /dev/null @@ -1,8 +0,0 @@ -# Example 1 from -# http://lists.w3.org/Archives/Public/public-rdf-dawg/2005JulSep/0096 -# $Id: normalization-02.rq,v 1.1 2005/08/09 14:35:26 eric Exp $ -PREFIX : -PREFIX p1: - -SELECT ?S WHERE { ?S :p p1:xyz } - diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-02.ttl b/test/data/suites/DAWG/data-r2/i18n/normalization-02.ttl deleted file mode 100644 index 38620dd25..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-02.ttl +++ /dev/null @@ -1,8 +0,0 @@ -# Example 1 from -# http://lists.w3.org/Archives/Public/public-rdf-dawg/2005JulSep/0096 -# $Id: normalization-02.ttl,v 1.1 2005/08/09 14:35:26 eric Exp $ -@prefix : . - -:s1 :p . -:s2 :p . - diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-03-results.ttl b/test/data/suites/DAWG/data-r2/i18n/normalization-03-results.ttl deleted file mode 100644 index c2c33df25..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-03-results.ttl +++ /dev/null @@ -1,14 +0,0 @@ -# Example 1 from -# http://lists.w3.org/Archives/Public/public-rdf-dawg/2005JulSep/0096 -# $Id: normalization-03-results.ttl,v 1.1 2005/08/09 14:35:26 eric Exp $ -@prefix rdf: . -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "S" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "S" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-03.rq b/test/data/suites/DAWG/data-r2/i18n/normalization-03.rq deleted file mode 100644 index 36583e36e..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-03.rq +++ /dev/null @@ -1,8 +0,0 @@ -# Example 2 from -# http://lists.w3.org/Archives/Public/public-rdf-dawg/2005JulSep/0096 -# $Id: normalization-03.rq,v 1.1 2005/08/09 14:35:26 eric Exp $ -PREFIX : -PREFIX p2: - -SELECT ?S WHERE { ?S :p p2:abc } - diff --git a/test/data/suites/DAWG/data-r2/i18n/normalization-03.ttl b/test/data/suites/DAWG/data-r2/i18n/normalization-03.ttl deleted file mode 100644 index 228082bda..000000000 --- a/test/data/suites/DAWG/data-r2/i18n/normalization-03.ttl +++ /dev/null @@ -1,9 +0,0 @@ -# Example 1 from -# http://lists.w3.org/Archives/Public/public-rdf-dawg/2005JulSep/0096 -# $Id: normalization-03.ttl,v 1.1 2005/08/09 14:35:26 eric Exp $ -@prefix : . - -:s3 :p . -:s4 :p . -:s5 :p . - diff --git a/test/data/suites/DAWG/data-r2/manifest-evaluation.ttl b/test/data/suites/DAWG/data-r2/manifest-evaluation.ttl deleted file mode 100644 index 70e3f4d09..000000000 --- a/test/data/suites/DAWG/data-r2/manifest-evaluation.ttl +++ /dev/null @@ -1,40 +0,0 @@ -@prefix rdf: . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:label "SPARQL Query Evaluation tests" ; - mf:include ( - - - - - - - - - - - - - - - - - - - - - # Needs the data parser fixing (less strict) - # - - - - - - - - - ). - diff --git a/test/data/suites/DAWG/data-r2/manifest-syntax.ttl b/test/data/suites/DAWG/data-r2/manifest-syntax.ttl deleted file mode 100644 index f2709467f..000000000 --- a/test/data/suites/DAWG/data-r2/manifest-syntax.ttl +++ /dev/null @@ -1,14 +0,0 @@ -@prefix rdf: . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:label "SPARQL Syntax Tests" ; - mf:include ( - - - - - - ) . diff --git a/test/data/suites/DAWG/data-r2/open-world/data-1.ttl b/test/data/suites/DAWG/data-r2/open-world/data-1.ttl deleted file mode 100644 index 7155898a5..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/data-1.ttl +++ /dev/null @@ -1,17 +0,0 @@ -@prefix t: . -@prefix : . -@prefix xsd: . - -:x1 :p "a"^^t:type1 . -:x2 :p "b"^^t:type1 . - -:y1 :p "a"^^t:type2 . -:y2 :p "b"^^t:type2 . - -:z1 :p "1"^^xsd:integer . -:z2 :p "01"^^xsd:integer . -:z3 :p "2"^^xsd:integer . -:z4 :p "02"^^xsd:integer . - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/data-2.ttl b/test/data/suites/DAWG/data-r2/open-world/data-2.ttl deleted file mode 100644 index f55287dd8..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/data-2.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "xyz" . -:x2 :p "xyz"@en . -:x3 :p "xyz"@EN . -:x4 :p "xyz"^^xsd:string . -:x5 :p "xyz"^^xsd:integer . -:x6 :p "xyz"^^:unknown . -:x7 :p _:xyz . -:x8 :p :xyz . - -:y1 :q "abc" . -:y2 :q "abc"@en . -:y3 :q "abc"@EN . -:y4 :q "abc"^^xsd:string . -:y5 :q "abc"^^xsd:integer . -:y6 :q "abc"^^:unknown . -:y7 :q _:abc . -:y8 :q :abc . diff --git a/test/data/suites/DAWG/data-r2/open-world/data-3.ttl b/test/data/suites/DAWG/data-r2/open-world/data-3.ttl deleted file mode 100644 index 4cd4f3ad6..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/data-3.ttl +++ /dev/null @@ -1,15 +0,0 @@ -@prefix : . -@prefix xsd: . - -:dt1 :r "2006-08-23T09:00:00+01:00"^^xsd:dateTime . - -:d1 :r "2006-08-23"^^xsd:date . -:d2 :r "2006-08-23Z"^^xsd:date . -:d3 :r "2006-08-23+00:00"^^xsd:date . - -:d4 :r "2001-01-01"^^xsd:date . -:d5 :r "2001-01-01Z"^^xsd:date . - -:d6 :s "2006-08-23"^^xsd:date . -:d7 :s "2006-08-24Z"^^xsd:date . -:d8 :s "2000-01-01"^^xsd:date . diff --git a/test/data/suites/DAWG/data-r2/open-world/data-4.ttl b/test/data/suites/DAWG/data-r2/open-world/data-4.ttl deleted file mode 100644 index 4b003b1d0..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/data-4.ttl +++ /dev/null @@ -1,15 +0,0 @@ -@prefix : . -@prefix xsd: . - - - -:x1 :p [ :v1 "v1" ; :v2 "v2" ] . - -:x2 :p [ :v1 "1"^^xsd:integer ; :v2 "v2" ] . - -:x3 :p [ :v1 "x"^^:unknown ; :v2 "x"^^:unknown ] . - -:x4 :p [ :v1 ; :v2 ] . - -:x5 :p [ :v1 "2006-08-23T09:00:00+01:00"^^xsd:dateTime ; - :v2 "2006-08-22"^^xsd:date ]. diff --git a/test/data/suites/DAWG/data-r2/open-world/date-1-result.srx b/test/data/suites/DAWG/data-r2/open-world/date-1-result.srx deleted file mode 100644 index 9c26dc641..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/date-1-result.srx +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - http://example/d1 - - - 2006-08-23 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/date-1.rq b/test/data/suites/DAWG/data-r2/open-world/date-1.rq deleted file mode 100644 index 1b7ac46f3..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/date-1.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x :r ?v . - FILTER ( ?v = "2006-08-23"^^xsd:date ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/date-2-result.srx b/test/data/suites/DAWG/data-r2/open-world/date-2-result.srx deleted file mode 100644 index 9e783c48f..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/date-2-result.srx +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - http://example/d5 - - - 2001-01-01Z - - - - - http://example/d4 - - - 2001-01-01 - - - - - http://example/dt1 - - - 2006-08-23T09:00:00+01:00 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/date-2.rq b/test/data/suites/DAWG/data-r2/open-world/date-2.rq deleted file mode 100644 index 5efde54ad..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/date-2.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x :r ?v . - FILTER ( ?v != "2006-08-23"^^xsd:date ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/date-3-result.srx b/test/data/suites/DAWG/data-r2/open-world/date-3-result.srx deleted file mode 100644 index 27340a726..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/date-3-result.srx +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - http://example/d3 - - - 2006-08-23+00:00 - - - - - http://example/d2 - - - 2006-08-23Z - - - - - http://example/d1 - - - 2006-08-23 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/date-3.rq b/test/data/suites/DAWG/data-r2/open-world/date-3.rq deleted file mode 100644 index bcb3744a9..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/date-3.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x :r ?v . - FILTER ( ?v > "2006-08-22"^^xsd:date ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/date-4-result.srx b/test/data/suites/DAWG/data-r2/open-world/date-4-result.srx deleted file mode 100644 index c3bfc4397..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/date-4-result.srx +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - http://example/d8 - - - 2000-01-01 - - - - - http://example/d6 - - - 2006-08-23 - - - - - http://example/d7 - - - 2006-08-24Z - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/date-4.rq b/test/data/suites/DAWG/data-r2/open-world/date-4.rq deleted file mode 100644 index 408fef5bd..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/date-4.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT ?x ?date -{ - ?x :s ?date . - FILTER ( datatype(?date) = xsd:date ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/manifest.ttl b/test/data/suites/DAWG/data-r2/open-world/manifest.ttl deleted file mode 100644 index 73537c355..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/manifest.ttl +++ /dev/null @@ -1,223 +0,0 @@ -# $Id: manifest.ttl,v 1.10 2007/09/20 14:26:51 aseaborne Exp $ - -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:label "open world value testing tests" ; - mf:entries - ( - :open-eq-01 :open-eq-02 :open-eq-03 :open-eq-04 :open-eq-05 :open-eq-06 - :open-eq-07 :open-eq-08 :open-eq-09 :open-eq-10 :open-eq-11 :open-eq-12 - :date-1 :date-2 :date-3 :date-4 - :open-cmp-01 :open-cmp-02 - ) . - -:open-eq-01 a mf:QueryEvaluationTest ; - mf:name "open-eq-01" ; - rdfs:comment "graph match - no lexical form in data (assumes no value matching)" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-02 a mf:QueryEvaluationTest ; - mf:name "open-eq-02" ; - rdfs:comment "graph match - unknown type" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-03 a mf:QueryEvaluationTest ; - mf:name "open-eq-03" ; - rdfs:comment "Filter(?v=1)" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-04 a mf:QueryEvaluationTest ; - mf:name "open-eq-04" ; - rdfs:comment "Filter(?v!=1)" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-05 a mf:QueryEvaluationTest ; - mf:name "open-eq-05" ; - rdfs:comment "FILTER(?v = unknown type)" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-06 a mf:QueryEvaluationTest ; - mf:name "open-eq-06" ; - rdfs:comment "FILTER(?v != unknown type)" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-07 a mf:QueryEvaluationTest ; - mf:name "open-eq-07" ; - rdfs:comment "Test of '=' " ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:requires mf:LangTagAwareness ; - mf:requires mf:StringSimpleLiteralCmp ; - mf:notable mf:IllFormedLiteral ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-08 a mf:QueryEvaluationTest ; - mf:name "open-eq-08" ; - rdfs:comment "Test of '!='" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:requires mf:StringSimpleLiteralCmp ; - mf:requires mf:LangTagAwareness ; - mf:requires mf:KnownTypesDefault2Neq ; - mf:notable mf:IllFormedLiteral ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-09 a mf:QueryEvaluationTest ; - mf:name "open-eq-09" ; - rdfs:comment "Test of '='" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:notable mf:IllFormedLiteral ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-10 a mf:QueryEvaluationTest ; - mf:name "open-eq-10" ; - rdfs:comment "Test of '!='" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:notable mf:IllFormedLiteral ; - mf:requires mf:KnownTypesDefault2Neq ; - mf:requires mf:LangTagAwareness ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-11 a mf:QueryEvaluationTest ; - mf:name "open-eq-11" ; - rdfs:comment "test of '=' || '!='" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:notable mf:IllFormedLiteral ; - mf:requires mf:KnownTypesDefault2Neq ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-eq-12 a mf:QueryEvaluationTest ; - mf:name "open-eq-12" ; - rdfs:comment "find pairs that don't value-compare" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:notable mf:IllFormedLiteral ; - mf:requires mf:KnownTypesDefault2Neq ; - mf:requires mf:LangTagAwareness ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:date-1 a mf:QueryEvaluationTest ; - mf:name "date-1" ; - rdfs:comment "Added type : xsd:date '='" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:requires mf:XsdDateOperations ; - . - - # Fixed test (was wrong) - needs reapproving - # Decision at http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0118/04-dawg-minutes.html to leave test not approved -## dawgt:approval dawgt:Approved ; -## dawgt:approvedBy . - -:date-2 a mf:QueryEvaluationTest ; - mf:name "date-2" ; - rdfs:comment "Added type : xsd:date '!='" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:requires mf:XsdDateOperations ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:date-3 a mf:QueryEvaluationTest ; - mf:name "date-3" ; - rdfs:comment "Added type : xsd:date '>'" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:requires mf:XsdDateOperations ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:date-4 a mf:QueryEvaluationTest ; - mf:name "date-4" ; - rdfs:comment "xsd:date ORDER BY" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-cmp-01 a mf:QueryEvaluationTest ; - mf:name "open-cmp-01" ; - rdfs:comment "Find things that compare with < or >" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:open-cmp-02 a mf:QueryEvaluationTest ; - mf:name "open-cmp-02" ; - rdfs:comment "Find things that compare with <= and >" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-cmp-01-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-cmp-01-result.srx deleted file mode 100644 index c7e812df0..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-cmp-01-result.srx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - http://example/x1 - - - v1 - - - v2 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-cmp-01.rq b/test/data/suites/DAWG/data-r2/open-world/open-cmp-01.rq deleted file mode 100644 index d3f8318fe..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-cmp-01.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT ?x ?v1 ?v2 -{ - ?x :p [ :v1 ?v1 ; :v2 ?v2 ] . - FILTER ( ?v1 < ?v2 || ?v1 > ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-cmp-02-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-cmp-02-result.srx deleted file mode 100644 index 45de25a8f..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-cmp-02-result.srx +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - http://example/x4 - - - test:abc - - - test:abc - - - - - http://example/x3 - - - x - - - x - - - - - http://example/x1 - - - v1 - - - v2 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-cmp-02.rq b/test/data/suites/DAWG/data-r2/open-world/open-cmp-02.rq deleted file mode 100644 index 42f94ef0c..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-cmp-02.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT ?x ?v1 ?v2 -{ - ?x :p [ :v1 ?v1 ; :v2 ?v2 ] . - FILTER ( ?v1 < ?v2 || ?v1 = ?v2 || ?v1 > ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-01-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-01-result.srx deleted file mode 100644 index d800fd26f..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-01-result.srx +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-01.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-01.rq deleted file mode 100644 index 4d0c448bf..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-01.rq +++ /dev/null @@ -1,13 +0,0 @@ -# SPARQL is defined over simple entailment so -# only syntactic matches show. -# (Some systems may match because they do -# value-based matching in the graph (D-entailment)) - -# Does not strictly match "1"^xsd:integer - -PREFIX : -PREFIX t: -PREFIX xsd: - -SELECT * -{ ?x :p "001"^^xsd:integer } \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-02-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-02-result.srx deleted file mode 100644 index cf0d0eef7..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-02-result.srx +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - http://example/ns#x1 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-02.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-02.rq deleted file mode 100644 index 9760eb277..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-02.rq +++ /dev/null @@ -1,8 +0,0 @@ -# Test matching in a graph pattern -# Unknown type - -PREFIX : -PREFIX t: - -SELECT * -{ ?x :p "a"^^t:type1 } diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-03-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-03-result.srx deleted file mode 100644 index 3850f0581..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-03-result.srx +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - http://example/ns#z2 - - - 01 - - - - - http://example/ns#z1 - - - 1 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-03.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-03.rq deleted file mode 100644 index 119774f90..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-03.rq +++ /dev/null @@ -1,14 +0,0 @@ -# SPARQL FILTER test by value. -# A processor knows about XSD integer -# so 1 and 01 pass the filter - -PREFIX : -PREFIX t: -PREFIX rdf: -PREFIX rdfs: -PREFIX xsd: - -SELECT * -{ ?x :p ?v - FILTER ( ?v = 1 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-04-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-04-result.srx deleted file mode 100644 index 5919d12f9..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-04-result.srx +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - http://example/ns#z4 - - - 02 - - - - - http://example/ns#z3 - - - 2 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-04.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-04.rq deleted file mode 100644 index cc6b58dc5..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-04.rq +++ /dev/null @@ -1,14 +0,0 @@ -# SPARQL FILTER test by value. -# A processor knows about XSD integer -# so 1 and 01 are excluded by the filter - -PREFIX : -PREFIX t: -PREFIX rdf: -PREFIX rdfs: -PREFIX xsd: - -SELECT * -{ ?x :p ?v - FILTER ( ?v != 1 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-05-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-05-result.srx deleted file mode 100644 index 66acd8929..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-05-result.srx +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - http://example/ns#x1 - - - a - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-05.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-05.rq deleted file mode 100644 index 88b34fff3..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-05.rq +++ /dev/null @@ -1,11 +0,0 @@ -# SPARQL FILTER test by value. -# Only one valus is known to be "a"^^t:type1 -# (others maybe but the processor does not positively know this) - -PREFIX : -PREFIX t: - -SELECT * -{ ?x :p ?v - FILTER ( ?v = "a"^^t:type1 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-06-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-06-result.srx deleted file mode 100644 index 41065789e..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-06-result.srx +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-06.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-06.rq deleted file mode 100644 index 5395a1b8d..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-06.rq +++ /dev/null @@ -1,12 +0,0 @@ -# SPARQL FILTER test by value for known types. -# Nothing is known to be not the same value as "a"^^t:type1 -# "b"^^t:type1 might be a different lexical form for the same value -# "a"^^t:type2 might have overlapping value spaces for this lexicial form. - -PREFIX : -PREFIX t: - -SELECT * -{ ?x :p ?v - FILTER ( ?v != "a"^^t:type1 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-07-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-07-result.srx deleted file mode 100644 index 39a9d9825..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-07-result.srx +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x1 - - - xyz - - - http://example/x4 - - - xyz - - - - - http://example/x2 - - - xyz - - - http://example/x2 - - - xyz - - - - - http://example/x2 - - - xyz - - - http://example/x3 - - - xyz - - - - - http://example/x3 - - - xyz - - - http://example/x2 - - - xyz - - - - - http://example/x3 - - - xyz - - - http://example/x3 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x4 - - - xyz - - - - - http://example/x5 - - - xyz - - - http://example/x5 - - - xyz - - - - - http://example/x6 - - - xyz - - - http://example/x6 - - - xyz - - - - - http://example/x7 - - - b0 - - - http://example/x7 - - - b0 - - - - - http://example/x8 - - - http://example/xyz - - - http://example/x8 - - - http://example/xyz - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-07.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-07.rq deleted file mode 100644 index e693349fd..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-07.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER ( ?v1 = ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-08-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-08-result.srx deleted file mode 100644 index ee251dfb8..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-08-result.srx +++ /dev/null @@ -1,602 +0,0 @@ - - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/x2 - - - xyz - - - - - http://example/x1 - - - xyz - - - http://example/x3 - - - xyz - - - - - http://example/x1 - - - xyz - - - http://example/x7 - - - b0 - - - - - http://example/x1 - - - xyz - - - http://example/x8 - - - http://example/xyz - - - - - http://example/x2 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x2 - - - xyz - - - http://example/x4 - - - xyz - - - - - http://example/x2 - - - xyz - - - http://example/x5 - - - xyz - - - - - http://example/x2 - - - xyz - - - http://example/x6 - - - xyz - - - - - http://example/x2 - - - xyz - - - http://example/x7 - - - b0 - - - - - http://example/x2 - - - xyz - - - http://example/x8 - - - http://example/xyz - - - - - http://example/x3 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x3 - - - xyz - - - http://example/x4 - - - xyz - - - - - http://example/x3 - - - xyz - - - http://example/x5 - - - xyz - - - - - http://example/x3 - - - xyz - - - http://example/x6 - - - xyz - - - - - http://example/x3 - - - xyz - - - http://example/x7 - - - b0 - - - - - http://example/x3 - - - xyz - - - http://example/x8 - - - http://example/xyz - - - - - http://example/x4 - - - xyz - - - http://example/x2 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x3 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x7 - - - b0 - - - - - http://example/x4 - - - xyz - - - http://example/x8 - - - http://example/xyz - - - - - http://example/x5 - - - xyz - - - http://example/x2 - - - xyz - - - - - http://example/x5 - - - xyz - - - http://example/x3 - - - xyz - - - - - http://example/x5 - - - xyz - - - http://example/x7 - - - b0 - - - - - http://example/x5 - - - xyz - - - http://example/x8 - - - http://example/xyz - - - - - http://example/x6 - - - xyz - - - http://example/x2 - - - xyz - - - - - http://example/x6 - - - xyz - - - http://example/x3 - - - xyz - - - - - http://example/x6 - - - xyz - - - http://example/x7 - - - b0 - - - - - http://example/x6 - - - xyz - - - http://example/x8 - - - http://example/xyz - - - - - http://example/x7 - - - b0 - - - http://example/x1 - - - xyz - - - - - http://example/x7 - - - b0 - - - http://example/x2 - - - xyz - - - - - http://example/x7 - - - b0 - - - http://example/x3 - - - xyz - - - - - http://example/x7 - - - b0 - - - http://example/x4 - - - xyz - - - - - http://example/x7 - - - b0 - - - http://example/x5 - - - xyz - - - - - http://example/x7 - - - b0 - - - http://example/x6 - - - xyz - - - - - http://example/x7 - - - b0 - - - http://example/x8 - - - http://example/xyz - - - - - http://example/x8 - - - http://example/xyz - - - http://example/x1 - - - xyz - - - - - http://example/x8 - - - http://example/xyz - - - http://example/x2 - - - xyz - - - - - http://example/x8 - - - http://example/xyz - - - http://example/x3 - - - xyz - - - - - http://example/x8 - - - http://example/xyz - - - http://example/x4 - - - xyz - - - - - http://example/x8 - - - http://example/xyz - - - http://example/x5 - - - xyz - - - - - http://example/x8 - - - http://example/xyz - - - http://example/x6 - - - xyz - - - - - http://example/x8 - - - http://example/xyz - - - http://example/x7 - - - b0 - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-08.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-08.rq deleted file mode 100644 index cd00e2cc2..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-08.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x1 :p ?v1 . - ?x2 :p ?v2 . - FILTER ( ?v1 != ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-09-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-09-result.srx deleted file mode 100644 index a0a1cc002..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-09-result.srx +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-09.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-09.rq deleted file mode 100644 index 15e4658a2..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-09.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x :p ?v1 . - ?y :q ?v2 . - FILTER ( ?v1 = ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-10-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-10-result.srx deleted file mode 100644 index 6bda1679f..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-10-result.srx +++ /dev/null @@ -1,742 +0,0 @@ - - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/y1 - - - abc - - - - - http://example/x1 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x1 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x1 - - - xyz - - - http://example/y4 - - - abc - - - - - http://example/x1 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x1 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x2 - - - xyz - - - http://example/y1 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y4 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y5 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y6 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x2 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x3 - - - xyz - - - http://example/y1 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y4 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y5 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y6 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x3 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x4 - - - xyz - - - http://example/y1 - - - abc - - - - - http://example/x4 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x4 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x4 - - - xyz - - - http://example/y4 - - - abc - - - - - http://example/x4 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x4 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x5 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x5 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x5 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x5 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x6 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x6 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x6 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x6 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x7 - - - b1 - - - http://example/y1 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y2 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y3 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y4 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y5 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y6 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y7 - - - b0 - - - - - http://example/x7 - - - b1 - - - http://example/y8 - - - http://example/abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y1 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y2 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y3 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y4 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y5 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y6 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y7 - - - b0 - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y8 - - - http://example/abc - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-10.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-10.rq deleted file mode 100644 index b623706e6..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-10.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x :p ?v1 . - ?y :q ?v2 . - FILTER ( ?v1 != ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-11-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-11-result.srx deleted file mode 100644 index 6bda1679f..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-11-result.srx +++ /dev/null @@ -1,742 +0,0 @@ - - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/y1 - - - abc - - - - - http://example/x1 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x1 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x1 - - - xyz - - - http://example/y4 - - - abc - - - - - http://example/x1 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x1 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x2 - - - xyz - - - http://example/y1 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y4 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y5 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y6 - - - abc - - - - - http://example/x2 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x2 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x3 - - - xyz - - - http://example/y1 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y4 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y5 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y6 - - - abc - - - - - http://example/x3 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x3 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x4 - - - xyz - - - http://example/y1 - - - abc - - - - - http://example/x4 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x4 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x4 - - - xyz - - - http://example/y4 - - - abc - - - - - http://example/x4 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x4 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x5 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x5 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x5 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x5 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x6 - - - xyz - - - http://example/y2 - - - abc - - - - - http://example/x6 - - - xyz - - - http://example/y3 - - - abc - - - - - http://example/x6 - - - xyz - - - http://example/y7 - - - b0 - - - - - http://example/x6 - - - xyz - - - http://example/y8 - - - http://example/abc - - - - - http://example/x7 - - - b1 - - - http://example/y1 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y2 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y3 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y4 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y5 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y6 - - - abc - - - - - http://example/x7 - - - b1 - - - http://example/y7 - - - b0 - - - - - http://example/x7 - - - b1 - - - http://example/y8 - - - http://example/abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y1 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y2 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y3 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y4 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y5 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y6 - - - abc - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y7 - - - b0 - - - - - http://example/x8 - - - http://example/xyz - - - http://example/y8 - - - http://example/abc - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-11.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-11.rq deleted file mode 100644 index 8f160e834..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-11.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT * -{ - ?x :p ?v1 . - ?y :q ?v2 . - FILTER ( ?v1 != ?v2 || ?v1 = ?v2 ) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-12-result.srx b/test/data/suites/DAWG/data-r2/open-world/open-eq-12-result.srx deleted file mode 100644 index a018f5413..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-12-result.srx +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/x5 - - - xyz - - - - - http://example/x1 - - - xyz - - - http://example/x6 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x5 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x6 - - - xyz - - - - - http://example/x5 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x5 - - - xyz - - - http://example/x4 - - - xyz - - - - - http://example/x5 - - - xyz - - - http://example/x6 - - - xyz - - - - - http://example/x6 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x6 - - - xyz - - - http://example/x4 - - - xyz - - - - - http://example/x6 - - - xyz - - - http://example/x5 - - - xyz - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/open-eq-12.rq b/test/data/suites/DAWG/data-r2/open-world/open-eq-12.rq deleted file mode 100644 index aca565354..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/open-eq-12.rq +++ /dev/null @@ -1,10 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT ?x ?v1 ?y ?v2 -{ - ?x :p ?v1 . - ?y :p ?v2 . - OPTIONAL { ?y :p ?v3 . FILTER( ?v1 != ?v3 || ?v1 = ?v3 )} - FILTER (!bound(?v3)) -} diff --git a/test/data/suites/DAWG/data-r2/open-world/sameTerm-StringSimpleLiteralCmp.srx b/test/data/suites/DAWG/data-r2/open-world/sameTerm-StringSimpleLiteralCmp.srx deleted file mode 100644 index 0efe6a055..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/sameTerm-StringSimpleLiteralCmp.srx +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x4 - - - xyz - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/sameTerm-eq-StringSimpleLiteralCmp.srx b/test/data/suites/DAWG/data-r2/open-world/sameTerm-eq-StringSimpleLiteralCmp.srx deleted file mode 100644 index 0efe6a055..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/sameTerm-eq-StringSimpleLiteralCmp.srx +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x4 - - - xyz - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/sameTerm-eq.srx b/test/data/suites/DAWG/data-r2/open-world/sameTerm-eq.srx deleted file mode 100644 index 0efe6a055..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/sameTerm-eq.srx +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x4 - - - xyz - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/sameTerm-manifest.ttl b/test/data/suites/DAWG/data-r2/open-world/sameTerm-manifest.ttl deleted file mode 100644 index ea8827ab4..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/sameTerm-manifest.ttl +++ /dev/null @@ -1,61 +0,0 @@ -# Tests: sameTerm and mfx:StringSimpleLiteralCmp . -# $Id: sameTerm-manifest.ttl,v 1.1 2007/06/18 20:07:56 lfeigenb Exp $ - -@prefix rdf: . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix mfx: . -@prefix qt: . -@prefix xsd: . - -<> rdf:type mf:Manifest ; - rdfs:label "sameTerm and mfx:StringSimpleLiteralCmp" ; - mf:entries - ( - [ mf:name "sameTerm" ; - rdfs:comment "sameTerm('xyz', 'xyz'^^xsd:string)" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - ] - [ mf:name "sameTerm-StringSimpleLiteralCmp" ; - rdfs:comment "sameTerm('xyz', 'xyz'^^xsd:string) with mfx:StringSimpleLiteralCmp" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:requires mfx:StringSimpleLiteralCmp - ] - [ mf:name "sameTerm-eq" ; - rdfs:comment "sameTerm('xyz', 'xyz'^^xsd:string) and 'xyz'='xyz'^^xsd:string" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - ] - [ mf:name "sameTerm-eq-StringSimpleLiteralCmp" ; - rdfs:comment "sameTerm('xyz', 'xyz'^^xsd:string) and 'xyz'='xyz'^^xsd:string with mfx:StringSimpleLiteralCmp" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:requires mfx:StringSimpleLiteralCmp - ] - [ mf:name "sameTerm-not-eq" ; - rdfs:comment "!sameTerm('xyz', 'xyz'^^xsd:string) and 'xyz'='xyz'^^xsd:string" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result - ] - [ mf:name "sameTerm-not-eq-StringSimpleLiteralCmp" ; - rdfs:comment "!sameTerm('xyz', 'xyz'^^xsd:string) and 'xyz'='xyz'^^xsd:string with mfx:StringSimpleLiteralCmp" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - mf:requires mfx:StringSimpleLiteralCmp - ] - ). diff --git a/test/data/suites/DAWG/data-r2/open-world/sameTerm-not-eq-StringSimpleLiteralCmp.srx b/test/data/suites/DAWG/data-r2/open-world/sameTerm-not-eq-StringSimpleLiteralCmp.srx deleted file mode 100644 index eb2a896c5..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/sameTerm-not-eq-StringSimpleLiteralCmp.srx +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/x4 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x1 - - - xyz - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/sameTerm-not-eq.srx b/test/data/suites/DAWG/data-r2/open-world/sameTerm-not-eq.srx deleted file mode 100644 index cc2ee171d..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/sameTerm-not-eq.srx +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/sameTerm.srx b/test/data/suites/DAWG/data-r2/open-world/sameTerm.srx deleted file mode 100644 index 0efe6a055..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/sameTerm.srx +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - http://example/x1 - - - xyz - - - http://example/x1 - - - xyz - - - - - http://example/x4 - - - xyz - - - http://example/x4 - - - xyz - - - - - diff --git a/test/data/suites/DAWG/data-r2/open-world/sameTerm.ttl b/test/data/suites/DAWG/data-r2/open-world/sameTerm.ttl deleted file mode 100644 index 80814ee23..000000000 --- a/test/data/suites/DAWG/data-r2/open-world/sameTerm.ttl +++ /dev/null @@ -1,8 +0,0 @@ -# Data: sameTerm tests -# $Id: sameTerm.ttl,v 1.1 2007/06/18 20:07:56 lfeigenb Exp $ - -@prefix : . -@prefix xsd: . - -:x1 :p "xyz" . -:x4 :p "xyz"^^xsd:string . diff --git a/test/data/suites/DAWG/data-r2/optional-filter/data-1.ttl b/test/data/suites/DAWG/data-r2/optional-filter/data-1.ttl deleted file mode 100644 index b79212edd..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/data-1.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix x: . -@prefix : . -@prefix dc: . -@prefix xsd: . - -:book1 dc:title "TITLE 1" . -:book1 x:price "10"^^xsd:integer . - -:book2 dc:title "TITLE 2" . -:book2 x:price "20"^^xsd:integer . - -:book3 dc:title "TITLE 3" . diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-1-result.ttl b/test/data/suites/DAWG/data-r2/optional-filter/expr-1-result.ttl deleted file mode 100644 index 1bf6da9ba..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-1-result.ttl +++ /dev/null @@ -1,27 +0,0 @@ -@prefix dc: . -@prefix rs: . -@prefix x: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "title" ; - rs:resultVariable "price" ; - rs:solution - [ rs:binding [ rs:value "TITLE 1" ; - rs:variable "title" - ] ; - rs:binding [ rs:value "10"^^xsd:integer ; - rs:variable "price" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 3" ; - rs:variable "title" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 2" ; - rs:variable "title" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-1.rq b/test/data/suites/DAWG/data-r2/optional-filter/expr-1.rq deleted file mode 100644 index 5ea50fdac..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-1.rq +++ /dev/null @@ -1,10 +0,0 @@ -PREFIX dc: -PREFIX x: -SELECT ?title ?price -WHERE - { ?book dc:title ?title . - OPTIONAL - { ?book x:price ?price . - FILTER (?price < 15) . - } . - } diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-2-result.ttl b/test/data/suites/DAWG/data-r2/optional-filter/expr-2-result.ttl deleted file mode 100644 index caa3a4510..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-2-result.ttl +++ /dev/null @@ -1,17 +0,0 @@ -@prefix dc: . -@prefix rs: . -@prefix x: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "title" ; - rs:resultVariable "price" ; - rs:solution - [ rs:binding [ rs:value "TITLE 1" ; - rs:variable "title" - ] ; - rs:binding [ rs:value "10"^^xsd:integer ; - rs:variable "price" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-2.rq b/test/data/suites/DAWG/data-r2/optional-filter/expr-2.rq deleted file mode 100644 index 80fd3fae3..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-2.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX dc: -PREFIX x: -SELECT ?title ?price -WHERE - { ?book dc:title ?title . - OPTIONAL - { ?book x:price ?price } . - FILTER (?price < 15) . - } diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-3-result.ttl b/test/data/suites/DAWG/data-r2/optional-filter/expr-3-result.ttl deleted file mode 100644 index a3cf2a5ec..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-3-result.ttl +++ /dev/null @@ -1,22 +0,0 @@ -@prefix dc: . -@prefix rs: . -@prefix x: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "title" ; - rs:resultVariable "price" ; - rs:solution - [ rs:binding [ rs:value "TITLE 3" ; - rs:variable "title" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 1" ; - rs:variable "title" - ] ; - rs:binding [ rs:value "10"^^xsd:integer ; - rs:variable "price" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-3.rq b/test/data/suites/DAWG/data-r2/optional-filter/expr-3.rq deleted file mode 100644 index 0e33c6cd8..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-3.rq +++ /dev/null @@ -1,9 +0,0 @@ -PREFIX dc: -PREFIX x: -SELECT ?title ?price -WHERE - { ?book dc:title ?title . - OPTIONAL - { ?book x:price ?price } . - FILTER ( ( ! bound(?price) ) || ( ?price < 15 ) ) . - } diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-4-result.ttl b/test/data/suites/DAWG/data-r2/optional-filter/expr-4-result.ttl deleted file mode 100644 index c0c97b20b..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-4-result.ttl +++ /dev/null @@ -1,24 +0,0 @@ -@prefix dc: . -@prefix rs: . -@prefix x: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "title" ; - rs:resultVariable "price" ; - rs:solution - [ rs:binding [ rs:value "TITLE 1" ; - rs:variable "title" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 3" ; - rs:variable "title" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 2" ; - rs:variable "title" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-4.rq b/test/data/suites/DAWG/data-r2/optional-filter/expr-4.rq deleted file mode 100644 index 6e2988726..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-4.rq +++ /dev/null @@ -1,10 +0,0 @@ -PREFIX dc: -PREFIX x: -SELECT ?title ?price -WHERE - { ?book dc:title ?title . - OPTIONAL - { ?book x:price ?price . - FILTER (?price < 15 && ?title = "TITLE 2") . - } . - } diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-5-result-not-simplified.ttl b/test/data/suites/DAWG/data-r2/optional-filter/expr-5-result-not-simplified.ttl deleted file mode 100644 index c0c97b20b..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-5-result-not-simplified.ttl +++ /dev/null @@ -1,24 +0,0 @@ -@prefix dc: . -@prefix rs: . -@prefix x: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "title" ; - rs:resultVariable "price" ; - rs:solution - [ rs:binding [ rs:value "TITLE 1" ; - rs:variable "title" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 3" ; - rs:variable "title" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 2" ; - rs:variable "title" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-5-result-simplified.ttl b/test/data/suites/DAWG/data-r2/optional-filter/expr-5-result-simplified.ttl deleted file mode 100644 index 4797fc843..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-5-result-simplified.ttl +++ /dev/null @@ -1,27 +0,0 @@ -@prefix dc: . -@prefix rs: . -@prefix x: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "title" ; - rs:resultVariable "price" ; - rs:solution - [ rs:binding [ rs:value "TITLE 2" ; - rs:variable "title" - ] ; - rs:binding [ rs:value "20"^^xsd:integer ; - rs:variable "price" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 3" ; - rs:variable "title" - ] - ] ; - rs:solution - [ rs:binding [ rs:value "TITLE 1" ; - rs:variable "title" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional-filter/expr-5.rq b/test/data/suites/DAWG/data-r2/optional-filter/expr-5.rq deleted file mode 100644 index 4faca4f9f..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/expr-5.rq +++ /dev/null @@ -1,13 +0,0 @@ -PREFIX dc: -PREFIX x: -SELECT ?title ?price -WHERE - { ?book dc:title ?title . - OPTIONAL - { - { - ?book x:price ?price . - FILTER (?title = "TITLE 2") . - } - } . - } diff --git a/test/data/suites/DAWG/data-r2/optional-filter/manifest.ttl b/test/data/suites/DAWG/data-r2/optional-filter/manifest.ttl deleted file mode 100644 index f7a5f7b5e..000000000 --- a/test/data/suites/DAWG/data-r2/optional-filter/manifest.ttl +++ /dev/null @@ -1,75 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "OPTIONAL with inner and outer FILTERs" ; - mf:entries - (:dawg-optional-filter-001 - :dawg-optional-filter-002 - :dawg-optional-filter-003 - :dawg-optional-filter-004 - # The extra two are mutually exclusive : same query, same data, diferent reading of spec. - # ARQ implements the intent: simplify after all algebra generation done. - #:dawg-optional-filter-005-simplified - :dawg-optional-filter-005-not-simplified). - -:dawg-optional-filter-001 a mf:QueryEvaluationTest ; - mf:name "OPTIONAL-FILTER" ; - rdfs:comment "FILTER inside an OPTIONAL does not block an entire solution" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:dawg-optional-filter-002 a mf:QueryEvaluationTest ; - mf:name "OPTIONAL - Outer FILTER" ; - rdfs:comment "FILTER outside an OPTIONAL tests bound and unbound variables" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-optional-filter-003 a mf:QueryEvaluationTest ; - mf:name "OPTIONAL - Outer FILTER with BOUND" ; - rdfs:comment "Use !bound to only run outer FILTERs against variables bound in an OPTIONAL" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:dawg-optional-filter-004 a mf:QueryEvaluationTest ; - mf:name "OPTIONAL - Inner FILTER with negative EBV for outer variables" ; - rdfs:comment "FILTER inside an OPTIONAL does not corrupt the entire solution" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy . - -:dawg-optional-filter-005-simplified a mf:QueryEvaluationTest ; - mf:name "dawg-optional-filter-005-simplified"; - rdfs:comment "Double curly braces get simplified to single curly braces early on, before filters are scoped"; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-optional-filter-005-not-simplified a mf:QueryEvaluationTest ; - mf:name "dawg-optional-filter-005-not-simplified"; - rdfs:comment "Double curly braces do NOT get simplified to single curly braces early on, before filters are scoped"; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . diff --git a/test/data/suites/DAWG/data-r2/optional/complex-data-1.ttl b/test/data/suites/DAWG/data-r2/optional/complex-data-1.ttl deleted file mode 100644 index 1fdc04577..000000000 --- a/test/data/suites/DAWG/data-r2/optional/complex-data-1.ttl +++ /dev/null @@ -1,21 +0,0 @@ -@prefix foaf: . - - - foaf:mbox ; - foaf:name "Alice"; - foaf:nick "WhoMe?"; - foaf:depiction . - - - foaf:mbox ; - foaf:nick "BigB" ; - foaf:name "Bert" . - - - foaf:mbox ; - foaf:givenName "Eve" . - - - foaf:mbox ; - foaf:nick "jDoe"; - foaf:isPrimaryTopicOf . diff --git a/test/data/suites/DAWG/data-r2/optional/complex-data-2.ttl b/test/data/suites/DAWG/data-r2/optional/complex-data-2.ttl deleted file mode 100644 index 7521627bb..000000000 --- a/test/data/suites/DAWG/data-r2/optional/complex-data-2.ttl +++ /dev/null @@ -1,32 +0,0 @@ -@prefix rdf: . -@prefix foaf: . -@prefix ex: . -@prefix xsd: . - -_:a rdf:type foaf:Person ; - foaf:name "Eve" ; - ex:empId "9"^^xsd:integer . - -_:b rdf:type foaf:Person ; - foaf:name "Alice" ; - ex:empId "29"^^xsd:integer ; - ex:healthplan ex:HealthPlanD. - -_:c rdf:type foaf:Person ; - foaf:name "Fred" ; - ex:empId "27"^^xsd:integer . - -_:e foaf:name "Bob" ; - ex:empId "23"^^xsd:integer ; - ex:healthplan ex:HealthPlanC. - -_:f foaf:name "Bob" ; - ex:empId "30"^^xsd:integer; - ex:healthplan ex:HealthPlanB. - -_:g rdf:type foaf:Person; - ex:ssn "000000000"; - foaf:name "Bert"; - ex:department "DeptA" ; - ex:healthplan ex:HealthPlanA. - diff --git a/test/data/suites/DAWG/data-r2/optional/data.ttl b/test/data/suites/DAWG/data-r2/optional/data.ttl deleted file mode 100644 index 19c0854fb..000000000 --- a/test/data/suites/DAWG/data-r2/optional/data.ttl +++ /dev/null @@ -1,11 +0,0 @@ -@prefix foaf: . - -_:a foaf:mbox . -_:a foaf:name "Alice" . -_:a foaf:nick "WhoMe?" . - -_:b foaf:mbox . -_:b foaf:name "Bert" . - -_:e foaf:mbox . -_:e foaf:nick "DuckSoup" . diff --git a/test/data/suites/DAWG/data-r2/optional/manifest.ttl b/test/data/suites/DAWG/data-r2/optional/manifest.ttl deleted file mode 100644 index ae76b45a9..000000000 --- a/test/data/suites/DAWG/data-r2/optional/manifest.ttl +++ /dev/null @@ -1,99 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "OPTIONAL test cases" ; - mf:entries - (:dawg-optional-001 - :dawg-optional-002 - :dawg-union-001 - :dawg-optional-complex-1 - :dawg-optional-complex-2 - :dawg-optional-complex-3 - :dawg-optional-complex-4 ). - -:dawg-optional-complex-1 a mf:QueryEvaluationTest ; - mf:name "Complex optional semantics: 1" ; - rdfs:comment - "Complex optional: LeftJoin(LeftJoin(BGP(..),{..}),Join(BGP(..),Union(..,..)))" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-optional-complex-2 a mf:QueryEvaluationTest ; - mf:name "Complex optional semantics: 2" ; - rdfs:comment - "Complex optional: LeftJoin(Join(BGP(..),Graph(var,{..})),Union(..,..))" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:graphData ; - qt:data ] ; - mf:result . - -:dawg-optional-complex-3 a mf:QueryEvaluationTest ; - mf:name "Complex optional semantics: 3" ; - rdfs:comment - "Complex optional: LeftJoin(Join(BGP(..),Graph(var,{..})),LeftJoin(BGP(..),{..}))" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:graphData ; - qt:data ] ; - mf:result . - -:dawg-optional-complex-4 a mf:QueryEvaluationTest ; - mf:name "Complex optional semantics: 4" ; - rdfs:comment - "Complex optional: LeftJoin(Join(BGP(..),Union(..,..)),Join(BGP(..),Graph(varOrIRI,{..})))" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action - [ qt:query ; - qt:graphData ; - qt:data ] ; - mf:result . - -:dawg-optional-001 a mf:QueryEvaluationTest ; - mf:name "One optional clause" ; - rdfs:comment - "One optional clause" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-optional-002 a mf:QueryEvaluationTest ; - mf:name "Two optional clauses" ; - rdfs:comment - "One optional clause" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - -:dawg-union-001 a mf:QueryEvaluationTest ; - mf:name "Union is not optional" ; - rdfs:comment "Union is not optional" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - diff --git a/test/data/suites/DAWG/data-r2/optional/q-opt-1.rq b/test/data/suites/DAWG/data-r2/optional/q-opt-1.rq deleted file mode 100644 index a171bedde..000000000 --- a/test/data/suites/DAWG/data-r2/optional/q-opt-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX foaf: - -SELECT ?mbox ?name - { - ?x foaf:mbox ?mbox . - OPTIONAL { ?x foaf:name ?name } . - } diff --git a/test/data/suites/DAWG/data-r2/optional/q-opt-2.rq b/test/data/suites/DAWG/data-r2/optional/q-opt-2.rq deleted file mode 100644 index a0f9998af..000000000 --- a/test/data/suites/DAWG/data-r2/optional/q-opt-2.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX foaf: - -SELECT ?mbox ?name ?nick - { - ?x foaf:mbox ?mbox . - OPTIONAL { ?x foaf:name ?name } . - OPTIONAL { ?x foaf:nick ?nick } . - } diff --git a/test/data/suites/DAWG/data-r2/optional/q-opt-3.rq b/test/data/suites/DAWG/data-r2/optional/q-opt-3.rq deleted file mode 100644 index a500712f7..000000000 --- a/test/data/suites/DAWG/data-r2/optional/q-opt-3.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX foaf: - -SELECT ?mbox ?name - { - { ?x foaf:mbox ?mbox } - UNION - { ?x foaf:mbox ?mbox . ?x foaf:name ?name } - } diff --git a/test/data/suites/DAWG/data-r2/optional/q-opt-complex-1.rq b/test/data/suites/DAWG/data-r2/optional/q-opt-complex-1.rq deleted file mode 100644 index 9ebd7e8ae..000000000 --- a/test/data/suites/DAWG/data-r2/optional/q-opt-complex-1.rq +++ /dev/null @@ -1,11 +0,0 @@ -PREFIX foaf: -SELECT ?person ?nick ?page ?img ?name ?firstN -{ - ?person foaf:nick ?nick - OPTIONAL { ?person foaf:isPrimaryTopicOf ?page } - OPTIONAL { - ?person foaf:name ?name - { ?person foaf:depiction ?img } UNION - { ?person foaf:givenName ?firstN } - } FILTER ( bound(?page) || bound(?img) || bound(?firstN) ) -} \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/optional/q-opt-complex-2.rq b/test/data/suites/DAWG/data-r2/optional/q-opt-complex-2.rq deleted file mode 100644 index 4a84cd63c..000000000 --- a/test/data/suites/DAWG/data-r2/optional/q-opt-complex-2.rq +++ /dev/null @@ -1,16 +0,0 @@ -PREFIX foaf: -PREFIX ex: -SELECT ?id ?ssn -WHERE -{ - ?person - a foaf:Person; - foaf:name ?name . - GRAPH ?x { - [] foaf:name ?name; - foaf:nick ?nick - } - OPTIONAL { - { ?person ex:empId ?id } UNION { ?person ex:ssn ?ssn } - } -} \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/optional/q-opt-complex-3.rq b/test/data/suites/DAWG/data-r2/optional/q-opt-complex-3.rq deleted file mode 100644 index 3b9d51068..000000000 --- a/test/data/suites/DAWG/data-r2/optional/q-opt-complex-3.rq +++ /dev/null @@ -1,17 +0,0 @@ -PREFIX foaf: -PREFIX ex: -SELECT ?name ?nick ?plan ?dept -WHERE -{ - ?person - a foaf:Person; - foaf:name ?name . - GRAPH ?x { - [] foaf:name ?name; - foaf:nick ?nick - } - OPTIONAL { - ?person ex:healthplan ?plan - OPTIONAL { ?person ex:department ?dept } - } -} \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/optional/q-opt-complex-4.rq b/test/data/suites/DAWG/data-r2/optional/q-opt-complex-4.rq deleted file mode 100644 index c843a079c..000000000 --- a/test/data/suites/DAWG/data-r2/optional/q-opt-complex-4.rq +++ /dev/null @@ -1,15 +0,0 @@ -PREFIX foaf: -PREFIX ex: -SELECT ?name ?plan ?dept ?img -WHERE -{ - ?person foaf:name ?name - { ?person ex:healthplan ?plan } UNION { ?person ex:department ?dept } - OPTIONAL { - ?person a foaf:Person - GRAPH ?g { - [] foaf:name ?name; - foaf:depiction ?img - } - } -} \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/optional/result-opt-1.ttl b/test/data/suites/DAWG/data-r2/optional/result-opt-1.ttl deleted file mode 100644 index 6f3d58229..000000000 --- a/test/data/suites/DAWG/data-r2/optional/result-opt-1.ttl +++ /dev/null @@ -1,25 +0,0 @@ -@prefix rs: . -@prefix foaf: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "mbox" ; - rs:resultVariable "name" ; - rs:solution [ rs:binding [ rs:value "Alice" ; - rs:variable "name" - ] ; - rs:binding [ rs:value ; - rs:variable "mbox" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "mbox" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Bert" ; - rs:variable "name" - ] ; - rs:binding [ rs:value ; - rs:variable "mbox" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional/result-opt-2.ttl b/test/data/suites/DAWG/data-r2/optional/result-opt-2.ttl deleted file mode 100644 index 5f6457382..000000000 --- a/test/data/suites/DAWG/data-r2/optional/result-opt-2.ttl +++ /dev/null @@ -1,32 +0,0 @@ -@prefix rs: . -@prefix foaf: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "mbox" ; - rs:resultVariable "nick" ; - rs:resultVariable "name" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "mbox" - ] ; - rs:binding [ rs:value "DuckSoup" ; - rs:variable "nick" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "mbox" - ] ; - rs:binding [ rs:value "Alice" ; - rs:variable "name" - ] ; - rs:binding [ rs:value "WhoMe?" ; - rs:variable "nick" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "mbox" - ] ; - rs:binding [ rs:value "Bert" ; - rs:variable "name" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional/result-opt-3.ttl b/test/data/suites/DAWG/data-r2/optional/result-opt-3.ttl deleted file mode 100644 index 211bbe069..000000000 --- a/test/data/suites/DAWG/data-r2/optional/result-opt-3.ttl +++ /dev/null @@ -1,33 +0,0 @@ -@prefix rs: . -@prefix rdf: . -@prefix foaf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "mbox" ; - rs:resultVariable "name" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "mbox" - ] ; - rs:binding [ rs:value "Alice" ; - rs:variable "name" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "mbox" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "mbox" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Bert" ; - rs:variable "name" - ] ; - rs:binding [ rs:value ; - rs:variable "mbox" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "mbox" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional/result-opt-complex-1.ttl b/test/data/suites/DAWG/data-r2/optional/result-opt-complex-1.ttl deleted file mode 100644 index 51c80cb55..000000000 --- a/test/data/suites/DAWG/data-r2/optional/result-opt-complex-1.ttl +++ /dev/null @@ -1,34 +0,0 @@ -@prefix rs: . -@prefix foaf: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "person" ; - rs:resultVariable "nick" ; - rs:resultVariable "page" ; - rs:resultVariable "img" ; - rs:resultVariable "name" ; - rs:resultVariable "firstN" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "person" - ] ; - rs:binding [ rs:value "WhoMe?" ; - rs:variable "nick" - ]; - rs:binding [ rs:value ; - rs:variable "img" - ]; - rs:binding [ rs:value "Alice" ; - rs:variable "name" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "person" - ] ; - rs:binding [ rs:value "jDoe" ; - rs:variable "nick" - ]; - rs:binding [ rs:value ; - rs:variable "page" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional/result-opt-complex-2.ttl b/test/data/suites/DAWG/data-r2/optional/result-opt-complex-2.ttl deleted file mode 100644 index 36e3f26bd..000000000 --- a/test/data/suites/DAWG/data-r2/optional/result-opt-complex-2.ttl +++ /dev/null @@ -1,16 +0,0 @@ -@prefix rs: . -@prefix foaf: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "id" ; - rs:resultVariable "ssn" ; - rs:solution [ rs:binding [ rs:value "29"^^xsd:integer ; - rs:variable "id" - ] - ] ; - rs:solution [ rs:binding [ rs:value "000000000" ; - rs:variable "ssn" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/optional/result-opt-complex-3.ttl b/test/data/suites/DAWG/data-r2/optional/result-opt-complex-3.ttl deleted file mode 100644 index 03d2f666f..000000000 --- a/test/data/suites/DAWG/data-r2/optional/result-opt-complex-3.ttl +++ /dev/null @@ -1,33 +0,0 @@ -@prefix ex: . -@prefix rs: . -@prefix foaf: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "name" ; - rs:resultVariable "nick" ; - rs:resultVariable "plan" ; - rs:resultVariable "dept" ; - rs:solution [ rs:binding [ rs:value "Alice" ; - rs:variable "name" - ] ; - rs:binding [ rs:value "WhoMe?" ; - rs:variable "nick" - ]; - rs:binding [ rs:value ex:HealthPlanD ; - rs:variable "plan" - ] - ] ; - rs:solution _:a . _:a rs:binding [ rs:value "Bert" ; - rs:variable "name" - ] ; - rs:binding [ rs:value "BigB" ; - rs:variable "nick" - ]; - rs:binding [ rs:value ex:HealthPlanA ; - rs:variable "plan" - ]; - rs:binding [ rs:value "DeptA" ; - rs:variable "dept" - ] - . diff --git a/test/data/suites/DAWG/data-r2/optional/result-opt-complex-4.ttl b/test/data/suites/DAWG/data-r2/optional/result-opt-complex-4.ttl deleted file mode 100644 index 141d855b7..000000000 --- a/test/data/suites/DAWG/data-r2/optional/result-opt-complex-4.ttl +++ /dev/null @@ -1,48 +0,0 @@ -@prefix ex: . -@prefix rs: . -@prefix foaf: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "img" ; - rs:resultVariable "name" ; - rs:resultVariable "plan" ; - rs:resultVariable "dept" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "img" - ] ; - rs:binding [ rs:value "Alice" ; - rs:variable "name" - ]; - rs:binding [ rs:value ex:HealthPlanD; - rs:variable "plan" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Bob" ; - rs:variable "name" - ]; - rs:binding [ rs:value ex:HealthPlanC; - rs:variable "plan" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Bob" ; - rs:variable "name" - ]; - rs:binding [ rs:value ex:HealthPlanB; - rs:variable "plan" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Bert" ; - rs:variable "name" - ]; - rs:binding [ rs:value "DeptA" ; - rs:variable "dept" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Bert" ; - rs:variable "name" - ]; - rs:binding [ rs:value ex:HealthPlanA ; - rs:variable "plan" - ]; - ] . diff --git a/test/data/suites/DAWG/data-r2/reduced/manifest.ttl b/test/data/suites/DAWG/data-r2/reduced/manifest.ttl deleted file mode 100644 index 253e225e8..000000000 --- a/test/data/suites/DAWG/data-r2/reduced/manifest.ttl +++ /dev/null @@ -1,38 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:label "REDUCED" ; - mf:entries - ( - :reduced-1 - :reduced-2 - ) . - -:reduced-1 rdf:type mf:QueryEvaluationTest ; - mf:resultCardinality mf:LaxCardinality ; - mf:name "SELECT REDUCED *" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - #dawgt:approval dawgt:NotApproved ; - - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:reduced-2 rdf:type mf:QueryEvaluationTest ; - mf:resultCardinality mf:LaxCardinality ; - mf:name "SELECT REDUCED ?x with strings" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - #dawgt:approval dawgt:NotApproved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - diff --git a/test/data/suites/DAWG/data-r2/reduced/reduced-1.rq b/test/data/suites/DAWG/data-r2/reduced/reduced-1.rq deleted file mode 100644 index 19bac38ca..000000000 --- a/test/data/suites/DAWG/data-r2/reduced/reduced-1.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX xsd: -SELECT REDUCED * -WHERE { - { ?s :p ?o } UNION { ?s :q ?o } -} - diff --git a/test/data/suites/DAWG/data-r2/reduced/reduced-1.srx b/test/data/suites/DAWG/data-r2/reduced/reduced-1.srx deleted file mode 100644 index 99ca0fa7f..000000000 --- a/test/data/suites/DAWG/data-r2/reduced/reduced-1.srx +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - http://example/x1 - abc - - - http://example/x1 - abc - - - http://example/x2 - abc - - - diff --git a/test/data/suites/DAWG/data-r2/reduced/reduced-2.rq b/test/data/suites/DAWG/data-r2/reduced/reduced-2.rq deleted file mode 100644 index bb900a9a3..000000000 --- a/test/data/suites/DAWG/data-r2/reduced/reduced-2.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -PREFIX xsd: - -SELECT REDUCED ?v -{ - ?x ?p ?v . -} diff --git a/test/data/suites/DAWG/data-r2/reduced/reduced-2.srx b/test/data/suites/DAWG/data-r2/reduced/reduced-2.srx deleted file mode 100644 index da0974bcc..000000000 --- a/test/data/suites/DAWG/data-r2/reduced/reduced-2.srx +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - ABC - - - - - ABC - - - - - abc - - - - - abc - - - - - ABC - - - - - ABC - - - - - ABC - - - - - ABC - - - - - - - - - - - - - - - abc - - - - - abc - - - - - - - - - - - - - - - abc - - - - - abc - - - - - - - - - - - - - - diff --git a/test/data/suites/DAWG/data-r2/reduced/reduced-star.ttl b/test/data/suites/DAWG/data-r2/reduced/reduced-star.ttl deleted file mode 100644 index e2c16c020..000000000 --- a/test/data/suites/DAWG/data-r2/reduced/reduced-star.ttl +++ /dev/null @@ -1,8 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "abc" . -:x1 :q "abc" . -:x2 :p "abc" . - - diff --git a/test/data/suites/DAWG/data-r2/reduced/reduced-str.ttl b/test/data/suites/DAWG/data-r2/reduced/reduced-str.ttl deleted file mode 100644 index 6c0dbb24c..000000000 --- a/test/data/suites/DAWG/data-r2/reduced/reduced-str.ttl +++ /dev/null @@ -1,29 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x1 :p "abc" . -:x1 :q "abc" . - -:x2 :p "abc"@en . -:x2 :q "abc"@en . - -:x3 :p "ABC" . -:x3 :q "ABC" . - -:x4 :p "ABC"@en . -:x4 :q "ABC"@en . - - -:x5 :p "abc"^^xsd:string . -:x5 :q "abc"^^xsd:string . -:x6 :p "ABC"^^xsd:string . -:x6 :q "ABC"^^xsd:string . - -:x7 :p "" . -:x7 :q "" . - -:x8 :p ""@en . -:x8 :q ""@en . - -:x9 :p ""^^xsd:string . -:x9 :q ""^^xsd:string . diff --git a/test/data/suites/DAWG/data-r2/regex/manifest.ttl b/test/data/suites/DAWG/data-r2/regex/manifest.ttl deleted file mode 100644 index d3519081d..000000000 --- a/test/data/suites/DAWG/data-r2/regex/manifest.ttl +++ /dev/null @@ -1,57 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "SPARQL regex test cases" ; - mf:entries ( - :dawg-regex-001 :dawg-regex-002 :dawg-regex-003 :dawg-regex-004 - ). - -:dawg-regex-001 a mf:QueryEvaluationTest ; - mf:name "regex-query-001" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Simple unanchored match test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-regex-002 a mf:QueryEvaluationTest ; - mf:name "regex-query-002" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Case insensitive unanchored match test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-regex-003 a mf:QueryEvaluationTest ; - mf:name "regex-query-003" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Use/mention test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-regex-004 a mf:QueryEvaluationTest ; - mf:name "regex-query-004" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "str()+URI test" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - diff --git a/test/data/suites/DAWG/data-r2/regex/regex-data-01.ttl b/test/data/suites/DAWG/data-r2/regex/regex-data-01.ttl deleted file mode 100644 index 930f1b7c8..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-data-01.ttl +++ /dev/null @@ -1,5 +0,0 @@ -@prefix rdf: . -@prefix ex: . - -ex:foo rdf:value "abcDEFghiJKL" , "ABCdefGHIjkl", "0123456789", - , "http://example.com/literal" . diff --git a/test/data/suites/DAWG/data-r2/regex/regex-query-001.rq b/test/data/suites/DAWG/data-r2/regex/regex-query-001.rq deleted file mode 100644 index 3c8f66138..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-query-001.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX rdf: -PREFIX ex: - -SELECT ?val -WHERE { - ex:foo rdf:value ?val . - FILTER regex(?val, "GHI") -} diff --git a/test/data/suites/DAWG/data-r2/regex/regex-query-002.rq b/test/data/suites/DAWG/data-r2/regex/regex-query-002.rq deleted file mode 100644 index b0bb7fde0..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-query-002.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX ex: -PREFIX rdf: - -SELECT ?val -WHERE { - ex:foo rdf:value ?val . - FILTER regex(?val, "DeFghI", "i") -} diff --git a/test/data/suites/DAWG/data-r2/regex/regex-query-003.rq b/test/data/suites/DAWG/data-r2/regex/regex-query-003.rq deleted file mode 100644 index 384da9b05..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-query-003.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX rdf: -PREFIX ex: - -SELECT ?val -WHERE { - ex:foo rdf:value ?val . - FILTER regex(?val, "example\\.com") -} diff --git a/test/data/suites/DAWG/data-r2/regex/regex-query-004.rq b/test/data/suites/DAWG/data-r2/regex/regex-query-004.rq deleted file mode 100644 index 1635291fb..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-query-004.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX rdf: -PREFIX ex: -SELECT ?val -WHERE { - ex:foo rdf:value ?val . - FILTER regex(str(?val), "example\\.com") -} diff --git a/test/data/suites/DAWG/data-r2/regex/regex-result-001.ttl b/test/data/suites/DAWG/data-r2/regex/regex-result-001.ttl deleted file mode 100644 index fe8ad33b0..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-result-001.ttl +++ /dev/null @@ -1,10 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "val" ; - rs:solution [ rs:binding [ rs:value "ABCdefGHIjkl" ; - rs:variable "val" - ] ; - ] . diff --git a/test/data/suites/DAWG/data-r2/regex/regex-result-002.ttl b/test/data/suites/DAWG/data-r2/regex/regex-result-002.ttl deleted file mode 100644 index afe3844f6..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-result-002.ttl +++ /dev/null @@ -1,14 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "val" ; - rs:solution [ rs:binding [ rs:value "ABCdefGHIjkl" ; - rs:variable "val" - ] ; - ] ; - rs:solution [ rs:binding [ rs:value "abcDEFghiJKL" ; - rs:variable "val" - ] ; - ] . diff --git a/test/data/suites/DAWG/data-r2/regex/regex-result-003.ttl b/test/data/suites/DAWG/data-r2/regex/regex-result-003.ttl deleted file mode 100644 index 8db395833..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-result-003.ttl +++ /dev/null @@ -1,10 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "val" ; - rs:solution [ rs:binding [ rs:value "http://example.com/literal" ; - rs:variable "val" - ] ; - ] . diff --git a/test/data/suites/DAWG/data-r2/regex/regex-result-004.ttl b/test/data/suites/DAWG/data-r2/regex/regex-result-004.ttl deleted file mode 100644 index 18b66bd5d..000000000 --- a/test/data/suites/DAWG/data-r2/regex/regex-result-004.ttl +++ /dev/null @@ -1,14 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "val" ; - rs:solution [ rs:binding [ rs:value "http://example.com/literal" ; - rs:variable "val" - ] ; - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "val" - ] ; - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/data.ttl b/test/data/suites/DAWG/data-r2/solution-seq/data.ttl deleted file mode 100644 index 5718aa0ec..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/data.ttl +++ /dev/null @@ -1,18 +0,0 @@ -@prefix : . -@prefix xsd: . - -:x :num "1"^^xsd:integer . -:x :num "2"^^xsd:integer . -:x :num "3"^^xsd:integer . -:x :num "4"^^xsd:integer . -:x :num "1.5"^^xsd:decimal . - -:y :num "1"^^xsd:integer . -:y :num "2"^^xsd:integer . -:y :num "3"^^xsd:integer . - -:x :str "aaa" . -:x :str "002" . -:x :str "1" . -:x :str "AAA" . -:x :str "" . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/manifest.ttl b/test/data/suites/DAWG/data-r2/solution-seq/manifest.ttl deleted file mode 100644 index fe4d9d5ce..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/manifest.ttl +++ /dev/null @@ -1,117 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:label "Solution Sequence" ; - mf:entries - ( - :limit-1 - :limit-2 - :limit-3 - :limit-4 - :offset-1 - :offset-2 - :offset-3 - :offset-4 - :slice-1 - :slice-2 - :slice-3 - :slice-4 - :slice-5 - ) . - - -:limit-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Limit 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:limit-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Limit 2" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:limit-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Limit 3" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:limit-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Limit 4" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:offset-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Offset 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:offset-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Offset 2" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:offset-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Offset 3" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:offset-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Offset 4" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:slice-1 rdf:type mf:QueryEvaluationTest ; - mf:name "Slice 1" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:slice-2 rdf:type mf:QueryEvaluationTest ; - mf:name "Slice 2" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:slice-3 rdf:type mf:QueryEvaluationTest ; - mf:name "Slice 3" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:slice-4 rdf:type mf:QueryEvaluationTest ; - mf:name "Slice 4" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . - -:slice-5 rdf:type mf:QueryEvaluationTest ; - mf:name "Slice 5" ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - mf:action [ qt:query ; qt:data ] ; - mf:result . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-01.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-01.rq deleted file mode 100644 index d9ec37a28..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-01.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -LIMIT 1 diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-02.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-02.rq deleted file mode 100644 index a438f4516..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-02.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -LIMIT 100 - diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-03.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-03.rq deleted file mode 100644 index 3ed7eb228..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-03.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -LIMIT 0 diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-04.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-04.rq deleted file mode 100644 index 8ded67d7b..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-04.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT DISTINCT ?v -WHERE { [] :num ?v } -ORDER BY ?v -LIMIT 100 diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-10.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-10.rq deleted file mode 100644 index 212e98f0c..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-10.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -OFFSET 1 diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-11.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-11.rq deleted file mode 100644 index b40c5e7b0..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-11.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -OFFSET 0 diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-12.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-12.rq deleted file mode 100644 index 25a3a38bb..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-12.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -OFFSET 100 diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-13.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-13.rq deleted file mode 100644 index afab880a2..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-13.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : - -SELECT DISTINCT ?v -WHERE { [] :num ?v } -ORDER BY ?v -OFFSET 2 diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-20.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-20.rq deleted file mode 100644 index c01e3fe01..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-20.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -LIMIT 1 -OFFSET 1 - diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-21.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-21.rq deleted file mode 100644 index 2e996f635..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-21.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -OFFSET 1 -LIMIT 2 \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-22.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-22.rq deleted file mode 100644 index d0728f046..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-22.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] ?p ?v } -ORDER BY ?v -OFFSET 100 -LIMIT 1 \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-23.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-23.rq deleted file mode 100644 index c4b9e80b8..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-23.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT ?v -WHERE { [] :num ?v } -ORDER BY ?v -OFFSET 2 -LIMIT 5 \ No newline at end of file diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-24.rq b/test/data/suites/DAWG/data-r2/solution-seq/slice-24.rq deleted file mode 100644 index ccf659abc..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-24.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : - -SELECT DISTINCT ?v -WHERE { [] :num ?v } -ORDER BY ?v -OFFSET 2 -LIMIT 5 diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-01.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-01.ttl deleted file mode 100644 index 7f9f318c9..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-01.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-02.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-02.ttl deleted file mode 100644 index fd6beafc3..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-02.ttl +++ /dev/null @@ -1,47 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "1.5"^^xsd:decimal ; - rs:variable "v" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value "4"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 8 - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 4 - ] ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 6 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 5 - ] ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 7 - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-03.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-03.ttl deleted file mode 100644 index 9809666f9..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-03.ttl +++ /dev/null @@ -1,6 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-04.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-04.ttl deleted file mode 100644 index 1d82eb18b..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-04.ttl +++ /dev/null @@ -1,32 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 4 - ] ; - rs:solution [ rs:binding [ rs:value "4"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 5 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value "1.5"^^xsd:decimal ; - rs:variable "v" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-10.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-10.ttl deleted file mode 100644 index 91bd53867..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-10.ttl +++ /dev/null @@ -1,42 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 6 - ] ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 5 - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] ; - rs:solution [ rs:binding [ rs:value "4"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 7 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 4 - ] ; - rs:solution [ rs:binding [ rs:value "1.5"^^xsd:decimal ; - rs:variable "v" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 3 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-11.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-11.ttl deleted file mode 100644 index 3aa576750..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-11.ttl +++ /dev/null @@ -1,47 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 4 - ] ; - rs:solution [ rs:binding [ rs:value "4"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 8 - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 5 - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 6 - ] ; - rs:solution [ rs:binding [ rs:value "1.5"^^xsd:decimal ; - rs:variable "v" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 7 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-12.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-12.ttl deleted file mode 100644 index 9809666f9..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-12.ttl +++ /dev/null @@ -1,6 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-13.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-13.ttl deleted file mode 100644 index 2b29162a2..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-13.ttl +++ /dev/null @@ -1,22 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "4"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-20.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-20.ttl deleted file mode 100644 index 7f9f318c9..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-20.ttl +++ /dev/null @@ -1,12 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-21.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-21.ttl deleted file mode 100644 index d2ee444d6..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-21.ttl +++ /dev/null @@ -1,18 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "1.5"^^xsd:decimal ; - rs:variable "v" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "1"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-22.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-22.ttl deleted file mode 100644 index 9809666f9..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-22.ttl +++ /dev/null @@ -1,6 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-23.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-23.ttl deleted file mode 100644 index fe33c3c2b..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-23.ttl +++ /dev/null @@ -1,32 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 4 - ] ; - rs:solution [ rs:binding [ rs:value "1.5"^^xsd:decimal ; - rs:variable "v" - ] ; - rs:index 1 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 5 - ] . diff --git a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-24.ttl b/test/data/suites/DAWG/data-r2/solution-seq/slice-results-24.ttl deleted file mode 100644 index 2b29162a2..000000000 --- a/test/data/suites/DAWG/data-r2/solution-seq/slice-results-24.ttl +++ /dev/null @@ -1,22 +0,0 @@ -@prefix : . -@prefix rs: . -@prefix rdf: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable "v" ; - rs:solution [ rs:binding [ rs:value "4"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value "3"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "2"^^xsd:integer ; - rs:variable "v" - ] ; - rs:index 1 - ] . diff --git a/test/data/suites/DAWG/data-r2/sort/.manifest.ttl.swp b/test/data/suites/DAWG/data-r2/sort/.manifest.ttl.swp deleted file mode 100644 index 9a14952b634d54acd29826b7ada003e19e4ac5a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 zcmeI2Yls}h7RM`z$u(+R;{&e`q}=#n7c=jD%^LS+LlO;|cw=1GxAe^P?helMOuBpA zT{T`s1z!ZeC_Yd>C=&073krfC;sY@XB8VD96jW4DeBuLC6urNyo!Rts#_WtEaaXG0 zx3kq#eY*R9x_auII+^%|n>Ne-XhN_ZCB%nMJiGCn8y1NVmIzU>ZMApKEjwX3X9SmsQ(*n9V3)6fg=H1&jhl0i%FX zz$jo8FbWt2i~>f11)_kJ6JqZXLUgU*f=K|V9KiD(LX=?uK08u~hv5R)1_RIm0$$>n zo#4PItOaFf9h?NqU^liOhaGSp908vmF2u9&4BP`ZLLYp0m=LeQZnz6FkcI(R3BN2C z;sy8*TncBy$?(;oLhOMT;X$|+Ho-FZ@E_QON1y`d!Z~mnbilpKgcyMYoC4o2#ST0G z_k#ylzzOgcNs%YvVenuBoD3(y_asQ(hudHybV3JwL}KMBxD)Px9GnM>;W?5m55TP; zYg=(_(8~JxlB0L!tjTeI&?=YR($!W$&NPR0)6U5=_UmKk)=kSb6TV*_jKwA=C!>?8 zXvrN{^%ecGcwa2p7g07M#k^CYz+$LsLZ95tjd_FFQc;y=$j)sPT*#6mJ^O0g<vyc8Ejv}kMr1(k9Mq?rX-iA>*jlmO z=?%)5rEc{CYC6uS*TA*CO2Lvm(tEo)JH7SijOCuFyS+|~`Q`@vQnp+xQ?RR^@Tbf8qpCd~$veJ1ZoATQ za&oLtviyer=nwg$zb$|CHSdo;RkPE)Kd?N%{V_8fs!wTYOpOFjYhUw7w9#$+OJSy8ZIE;a#!b$y z9n#2Qy&;G7w&gJ1GR?lfT6EaFe}5gw35|sB2?^iRmhh?Og-^9MQm{OaM+#4WSGnYQ z`AlJ2R-8*JlVYFiPkj7^8D0%xKN(3GPa-3N;L_QUHe`x z-ReygeqS|mLNerpWLr*1XeY>-DbvB6O#c4NtVL&Y2M2PtK2QD3bw4lc`%!4t35k#s z68bcOdF)ul**8fK?9Wv41wTJCcMt4#D#eWLdP12A>`n(8iMR}Z-y8hCFWBf0HU{)@ zUBO+6U?Ul9q=JneeI#>Tru=T65^l*>ujV!$WPVSjD#w;t%dVqhpj+Lp-)MQ_R}crL}HJ&++R_aj}2QRIU2F z&YBi$dE*<5$0%y2L&VEY*hQ=ExWSfgMaMPaD)>5koJQYPgDXj-)9F||8A~Q3`eLRX z-ZilmA75r4aw^!8tnawC*6fg=H1&jg2`>Gb;UbqD=hSOm&EP{84`}e>WI2=A9-rozm;2PKp|AuZj7E~R; zoiG6-&<#Jc=Klt~4*!L_;a~6z>-}%T9=H##f^{$qC&E&A8qF%O6|{Z}ZBA*f*C^1I z0<%961SO_w<#z%zQ?+8MR)iWUf8DfG&;40|G*v5qT`irdT3L8icY(=&wZ87a@tCPv s`ID+nP1TAn{0*g(fqB1S5h1c_>YGsaGP diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-1.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-1.ttl deleted file mode 100644 index 3ecf17861..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-1.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix rdf: . -@prefix foaf: . - -_:a foaf:name "Eve". -_:b foaf:name "Alice" . -_:c foaf:name "Fred" . -_:e foaf:name "Bob" . diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-11.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-11.ttl deleted file mode 100644 index 76f1900ff..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-11.ttl +++ /dev/null @@ -1,15 +0,0 @@ -# sort-11 -- test relative order of plain literals and xsd:strings -# $Id: data-sort-11.ttl,v 1.1 2007/06/25 11:10:32 jbroekst Exp $ - -@prefix rdf: . -@prefix foaf: . -@prefix xsd: . - -_:a foaf:name "Eve". -_:b foaf:name "Alice" . -_:f foaf:name "Eve"^^xsd:string . -_:g foaf:name "Alice"^^xsd:string . -_:h foaf:name "Fred"^^xsd:string . -_:j foaf:name "Bob"^^xsd:string . -_:c foaf:name "Fred" . -_:e foaf:name "Bob" . diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-3.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-3.ttl deleted file mode 100644 index 8cc6a0929..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-3.ttl +++ /dev/null @@ -1,17 +0,0 @@ -@prefix rdf: . -@prefix foaf: . - -_:a rdf:type foaf:Person ; - foaf:name "Eve" ; - foaf:mbox . - -_:b rdf:type foaf:Person ; - foaf:name "Alice" ; - foaf:mbox . - -_:c rdf:type foaf:Person ; - foaf:mbox ; - foaf:name "Fred" . - -_:e foaf:name "Bob" . - diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-4.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-4.ttl deleted file mode 100644 index b5529b8f4..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-4.ttl +++ /dev/null @@ -1,22 +0,0 @@ -@prefix rdf: . -@prefix foaf: . -@prefix ex: . -@prefix xsd: . - -_:a rdf:type foaf:Person ; - foaf:name "Eve" ; - ex:empId "9"^^xsd:integer . - -_:b rdf:type foaf:Person ; - foaf:name "Alice" ; - ex:empId "29"^^xsd:integer . - -_:c rdf:type foaf:Person ; - foaf:name "Fred" ; - ex:empId "27"^^xsd:integer . - -_:e foaf:name "Bob" ; - ex:empId "23"^^xsd:integer . - -_:f foaf:name "Bob" ; - ex:empId "30"^^xsd:integer . diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-6.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-6.ttl deleted file mode 100644 index 5900c01cb..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-6.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix rdf: . -@prefix foaf: . -@prefix ex: . -@prefix xsd: . - -_:a rdf:type foaf:Person ; - foaf:name "Eve" ; - ex:address . - -_:b rdf:type foaf:Person ; - foaf:name "Alice" ; - ex:address "Fascination Street 11" . - -_:c rdf:type foaf:Person ; - foaf:name "Fred" ; - ex:address "fred@work.example" . - -_:e foaf:name "Bob" ; - ex:address . - diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-7.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-7.ttl deleted file mode 100644 index d36dbc054..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-7.ttl +++ /dev/null @@ -1,19 +0,0 @@ -@prefix rdf: . -@prefix foaf: . -@prefix ex: . -@prefix xsd: . - -_:a rdf:type foaf:Person ; - foaf:name "Eve" ; - ex:empId "9"^^xsd:integer . - -_:b rdf:type foaf:Person ; - foaf:name "Alice" ; - ex:empId "29"^^xsd:integer . - -_:c rdf:type foaf:Person ; - foaf:name "Fred" ; - ex:empId "27"^^xsd:integer . - -_:e foaf:name "Bob" ; - ex:empId "23.0"^^xsd:float . diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-8.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-8.ttl deleted file mode 100644 index f68f0bd0a..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-8.ttl +++ /dev/null @@ -1,13 +0,0 @@ -@prefix rdf: . -@prefix foaf: . -@prefix ex: . -@prefix xsd: . - -_:a foaf:name "Eve" ; - ex:empId "9"^^xsd:integer . - -_:f foaf:name "John" ; - ex:empId [ ex:number "29"^^xsd:integer ] . - -_:g foaf:name "Dirk" ; - ex:empId . diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-9.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-9.ttl deleted file mode 100644 index 044f997b8..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-9.ttl +++ /dev/null @@ -1,10 +0,0 @@ -@prefix rdf: . -@prefix foaf: . -@prefix xsd: . - -_:a foaf:name "Eve"^^xsd:string . -_:b foaf:name "Alice"^^xsd:string . -_:c foaf:name "Fred"^^xsd:string . -_:e foaf:name "Bob"^^xsd:string . - - diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-builtin.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-builtin.ttl deleted file mode 100644 index 23712e959..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-builtin.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix : . -@prefix xsd: . - -:s1 :p "2"^^xsd:integer . -:s2 :p "300"^^xsd:integer . -:s3 :p "10"^^xsd:integer . - diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-function.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-function.ttl deleted file mode 100644 index efeeb5664..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-function.ttl +++ /dev/null @@ -1,6 +0,0 @@ -@prefix : . - -:s1 :p "2" . -:s2 :p "300" . -:s3 :p "10" . - diff --git a/test/data/suites/DAWG/data-r2/sort/data-sort-numbers.ttl b/test/data/suites/DAWG/data-r2/sort/data-sort-numbers.ttl deleted file mode 100644 index 0f0f2a4df..000000000 --- a/test/data/suites/DAWG/data-r2/sort/data-sort-numbers.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix : . -@prefix xsd: . - -:s1 :p "1"^^xsd:integer; :q "2"^^xsd:integer . -:s2 :p "10"^^xsd:integer; :q "20"^^xsd:integer . -:s3 :p "100"^^xsd:integer; :q "200"^^xsd:integer . - diff --git a/test/data/suites/DAWG/data-r2/sort/extended-manifest.ttl b/test/data/suites/DAWG/data-r2/sort/extended-manifest.ttl deleted file mode 100644 index e443cdb27..000000000 --- a/test/data/suites/DAWG/data-r2/sort/extended-manifest.ttl +++ /dev/null @@ -1,19 +0,0 @@ -@prefix rdf: . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Sorting test cases." ; - mf:entries - ( <#dawg-sort-11> - ). - -<#dawg-sort-11> a mf:QueryEvaluationTest; - mf:name "sort-11" ; - rdfs:comment "test relative order of plain literals and xsd:strings" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . diff --git a/test/data/suites/DAWG/data-r2/sort/manifest.ttl b/test/data/suites/DAWG/data-r2/sort/manifest.ttl deleted file mode 100644 index aff08ec77..000000000 --- a/test/data/suites/DAWG/data-r2/sort/manifest.ttl +++ /dev/null @@ -1,148 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Sorting test cases." ; - mf:entries - ( :dawg-sort-1 :dawg-sort-2 :dawg-sort-3 :dawg-sort-4 - :dawg-sort-5 :dawg-sort-6 :dawg-sort-7 :dawg-sort-8 - :dawg-sort-9 :dawg-sort-10 - :dawg-sort-numbers - :dawg-sort-builtin - :dawg-sort-function - ). - -:dawg-sort-1 a mf:QueryEvaluationTest; - mf:name "sort-1" ; - rdfs:comment "Alphabetic sort (ascending) on untyped literals" ; - mf:action - [ qt:query ; - qt:data ] ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:result . - -:dawg-sort-2 a mf:QueryEvaluationTest; - mf:name "sort-2" ; - rdfs:comment "Alphabetic sort (descending) on untyped literals" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-3 a mf:QueryEvaluationTest; - mf:name "sort-3" ; - rdfs:comment "Sort on (possibly unbound) URIs" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-4 a mf:QueryEvaluationTest; - mf:name "sort-4" ; - rdfs:comment "Sort on datatyped (integer) literals" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-5 a mf:QueryEvaluationTest; - mf:name "sort-5" ; - rdfs:comment "Sort first on untyped literals (ascending), then on datatyped (integer) literals (descending" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-6 a mf:QueryEvaluationTest; - mf:name "sort-6" ; - rdfs:comment "Sort on mixed result of uris and literals." ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-7 a mf:QueryEvaluationTest; - mf:name "sort-7" ; - rdfs:comment "Sort on comparable mixed typed literals (integer and float)" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-8 a mf:QueryEvaluationTest; - mf:name "sort-8" ; - rdfs:comment "Sort on several mixed values (bnode, uri, literal)" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-9 a mf:QueryEvaluationTest; - mf:name "sort-9" ; - rdfs:comment "Alphabetic sort (ascending) on datatyped (string) literals" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-10 a mf:QueryEvaluationTest; - mf:name "sort-10" ; - rdfs:comment "Alphabetic sort (descending) on datatyped (string) literals" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result . - -:dawg-sort-numbers a mf:QueryEvaluationTest; - mf:name "Expression sort" ; - rdfs:comment "Sort by a bracketted expression" ; - mf:action - [ qt:query ; - qt:data ] ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:result . - -:dawg-sort-builtin a mf:QueryEvaluationTest; - mf:name "Builtin sort" ; - rdfs:comment "Sort by a builtin operator" ; - mf:action - [ qt:query ; - qt:data ] ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:result . - -:dawg-sort-function a mf:QueryEvaluationTest; - mf:name "Function sort" ; - rdfs:comment "Sort by function invocation" ; - mf:action - [ qt:query ; - qt:data ] ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - mf:result . - diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-1.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-1.rq deleted file mode 100644 index 28a46543b..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-1.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX foaf: -SELECT ?name -WHERE { ?x foaf:name ?name } -ORDER BY ?name diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-10.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-10.rq deleted file mode 100644 index 096f93992..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-10.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX foaf: -SELECT ?name -WHERE { ?x foaf:name ?name } -ORDER BY DESC(?name) diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-2.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-2.rq deleted file mode 100644 index 096f93992..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-2.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX foaf: -SELECT ?name -WHERE { ?x foaf:name ?name } -ORDER BY DESC(?name) diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-3.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-3.rq deleted file mode 100644 index 6c6a45daf..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-3.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX foaf: -SELECT ?name ?mbox -WHERE { ?x foaf:name ?name . - OPTIONAL { ?x foaf:mbox ?mbox } - } -ORDER BY ASC(?mbox) diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-4.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-4.rq deleted file mode 100644 index 3f8b3ee65..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-4.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX foaf: -PREFIX ex: - -SELECT ?name ?emp -WHERE { ?x foaf:name ?name ; - ex:empId ?emp - } -ORDER BY ASC(?emp) diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-5.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-5.rq deleted file mode 100644 index 71bfb00bf..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-5.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX foaf: -PREFIX ex: - -SELECT ?name ?emp -WHERE { ?x foaf:name ?name ; - ex:empId ?emp - } -ORDER BY ?name DESC(?emp) diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-6.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-6.rq deleted file mode 100644 index 085b9d7b9..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-6.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX ex: - -SELECT ?address -WHERE { ?x ex:address ?address } -ORDER BY ASC(?address) diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-9.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-9.rq deleted file mode 100644 index 28a46543b..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-9.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX foaf: -SELECT ?name -WHERE { ?x foaf:name ?name } -ORDER BY ?name diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-builtin.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-builtin.rq deleted file mode 100644 index 2f193579f..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-builtin.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o . -} ORDER BY str(?o) diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-function.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-function.rq deleted file mode 100644 index 46735b6ba..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-function.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -PREFIX xsd: -SELECT ?s WHERE { - ?s :p ?o . -} ORDER BY xsd:integer(?o) diff --git a/test/data/suites/DAWG/data-r2/sort/query-sort-numbers.rq b/test/data/suites/DAWG/data-r2/sort/query-sort-numbers.rq deleted file mode 100644 index 36546f257..000000000 --- a/test/data/suites/DAWG/data-r2/sort/query-sort-numbers.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT ?s WHERE { - ?s :p ?o1 ; :q ?o2 . -} ORDER BY (?o1 + ?o2) diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-1.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-1.rdf deleted file mode 100644 index b127d321d..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-1.rdf +++ /dev/null @@ -1,38 +0,0 @@ - - - - - name - - 1 - - name - Alice - - - - 2 - - name - Bob - - - - 3 - - name - Eve - - - - 4 - - name - Fred - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-10.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-10.rdf deleted file mode 100644 index 4d5eb721b..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-10.rdf +++ /dev/null @@ -1,38 +0,0 @@ - - - - - name - - 1 - - name - Fred - - - - 2 - - name - Eve - - - - 3 - - name - Bob - - - - 4 - - name - Alice - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-11.ttl b/test/data/suites/DAWG/data-r2/sort/result-sort-11.ttl deleted file mode 100644 index ebab77fda..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-11.ttl +++ /dev/null @@ -1,49 +0,0 @@ -# sort-11 -- test relative order of plain literals and xsd:strings -# $Id: result-sort-11.ttl,v 1.1 2007/06/25 11:10:40 jbroekst Exp $ - -@prefix rdf: . -@prefix rs: . - -[] rdf:type rs:ResultSet ; - rs:resultVariable - "name" ; - rs:solution [ rs:binding [ rs:value "Alice" ; - rs:variable "name" - ] ; - rs:index 1 - ] ; - rs:solution [ rs:binding [ rs:value "Bob" ; - rs:variable "name" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value "Eve" ; - rs:variable "name" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value "Fred" ; - rs:variable "name" - ] ; - rs:index 4 - ] ; - rs:solution [ rs:binding [ rs:value "Alice"^^ ; - rs:variable "name" - ] ; - rs:index 5 - ] ; - rs:solution [ rs:binding [ rs:value "Bob"^^ ; - rs:variable "name" - ] ; - rs:index 6 - ] ; - rs:solution [ rs:binding [ rs:value "Eve"^^ ; - rs:variable "name" - ] ; - rs:index 7 - ] ; - rs:solution [ rs:binding [ rs:value "Fred"^^ ; - rs:variable "name" - ] ; - rs:index 8 - ] . diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-2.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-2.rdf deleted file mode 100644 index 6319919fb..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-2.rdf +++ /dev/null @@ -1,38 +0,0 @@ - - - - - name - - 1 - - name - Fred - - - - 2 - - name - Eve - - - - 3 - - name - Bob - - - - 4 - - name - Alice - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-3.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-3.rdf deleted file mode 100644 index 4b8ce3940..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-3.rdf +++ /dev/null @@ -1,56 +0,0 @@ - - - - - name - mbox - - - 1 - - name - Bob - - - - - - 2 - - name - Alice - - - mbox - - - - - - 3 - - name - Eve - - - mbox - - - - - - 4 - - name - Fred - - - mbox - - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-4.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-4.rdf deleted file mode 100644 index 088cdcf3c..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-4.rdf +++ /dev/null @@ -1,71 +0,0 @@ - - - - - name - emp - - - 1 - - name - Eve - - - emp - 9 - - - - - 2 - - name - Bob - - - emp - 23 - - - - - 3 - - name - Fred - - - emp - 27 - - - - - 4 - - name - Alice - - - emp - 29 - - - - - 5 - - name - Bob - - - emp - 30 - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-5.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-5.rdf deleted file mode 100644 index 4206cb568..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-5.rdf +++ /dev/null @@ -1,72 +0,0 @@ - - - - - name - emp - - - 1 - - name - Alice - - - emp - 29 - - - - - 2 - - name - Bob - - - emp - 30 - - - - - 3 - - name - Bob - - - emp - 23 - - - - - 4 - - name - Eve - - - emp - 9 - - - - - 5 - - name - Fred - - - emp - 27 - - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-6.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-6.rdf deleted file mode 100644 index 4acdc81ae..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-6.rdf +++ /dev/null @@ -1,42 +0,0 @@ - - - - - address - - - 1 - - address - - - - - - 2 - - address - - - - - - 3 - - address - Fascination Street 11 - - - - - 4 - - address - fred@work.example - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-7.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-7.rdf deleted file mode 100644 index f5b975aa3..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-7.rdf +++ /dev/null @@ -1,59 +0,0 @@ - - - - - name - emp - - - 1 - - name - Eve - - - emp - 9 - - - - - 2 - - name - Bob - - - emp - 23.0 - - - - - 3 - - name - Fred - - - emp - 27 - - - - - 4 - - name - Alice - - - emp - 29 - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-8.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-8.rdf deleted file mode 100644 index c3da0404b..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-8.rdf +++ /dev/null @@ -1,48 +0,0 @@ - - - - - name - emp - - - 1 - - name - John - - - emp - - - - - - 2 - - name - Dirk - - - emp - - - - - - 3 - - name - Eve - - - emp - 9 - - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-9.rdf b/test/data/suites/DAWG/data-r2/sort/result-sort-9.rdf deleted file mode 100644 index 14affa575..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-9.rdf +++ /dev/null @@ -1,38 +0,0 @@ - - - - - name - - 1 - - name - Alice - - - - 2 - - name - Bob - - - - 3 - - name - Eve - - - - 4 - - name - Fred - - - - diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-builtin.ttl b/test/data/suites/DAWG/data-r2/sort/result-sort-builtin.ttl deleted file mode 100644 index 1c4b73b7f..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-builtin.ttl +++ /dev/null @@ -1,25 +0,0 @@ -# sort-11 -- test relative order of plain literals and xsd:strings -# $Id: result-sort-builtin.ttl,v 1.1 2007/08/17 23:40:16 lfeigenb Exp $ - -@prefix rdf: . -@prefix rs: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable - "s" ; - rs:solution [ rs:binding [ rs:value :s1 ; - rs:variable "s" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value :s2 ; - rs:variable "s" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value :s3 ; - rs:variable "s" - ] ; - rs:index 1 - ] . diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-function.ttl b/test/data/suites/DAWG/data-r2/sort/result-sort-function.ttl deleted file mode 100644 index da60f08d5..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-function.ttl +++ /dev/null @@ -1,25 +0,0 @@ -# sort-11 -- test relative order of plain literals and xsd:strings -# $Id: result-sort-function.ttl,v 1.1 2007/08/17 23:40:16 lfeigenb Exp $ - -@prefix rdf: . -@prefix rs: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable - "s" ; - rs:solution [ rs:binding [ rs:value :s1 ; - rs:variable "s" - ] ; - rs:index 1 - ] ; - rs:solution [ rs:binding [ rs:value :s2 ; - rs:variable "s" - ] ; - rs:index 3 - ] ; - rs:solution [ rs:binding [ rs:value :s3 ; - rs:variable "s" - ] ; - rs:index 2 - ] . diff --git a/test/data/suites/DAWG/data-r2/sort/result-sort-numbers.ttl b/test/data/suites/DAWG/data-r2/sort/result-sort-numbers.ttl deleted file mode 100644 index 3cb298999..000000000 --- a/test/data/suites/DAWG/data-r2/sort/result-sort-numbers.ttl +++ /dev/null @@ -1,25 +0,0 @@ -# sort-11 -- test relative order of plain literals and xsd:strings -# $Id: result-sort-numbers.ttl,v 1.1 2007/08/17 23:40:16 lfeigenb Exp $ - -@prefix rdf: . -@prefix rs: . -@prefix : . - -[] rdf:type rs:ResultSet ; - rs:resultVariable - "s" ; - rs:solution [ rs:binding [ rs:value :s1 ; - rs:variable "s" - ] ; - rs:index 1 - ] ; - rs:solution [ rs:binding [ rs:value :s2 ; - rs:variable "s" - ] ; - rs:index 2 - ] ; - rs:solution [ rs:binding [ rs:value :s3 ; - rs:variable "s" - ] ; - rs:index 3 - ] . diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/manifest.ttl b/test/data/suites/DAWG/data-r2/syntax-sparql1/manifest.ttl deleted file mode 100644 index b06bc5376..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/manifest.ttl +++ /dev/null @@ -1,524 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Syntax tests syntax-sparql1" ; - mf:entries - ( :syntax-basic-01 :syntax-basic-02 :syntax-basic-03 - :syntax-basic-04 :syntax-basic-05 :syntax-basic-06 - :syntax-qname-01 :syntax-qname-02 :syntax-qname-03 - :syntax-qname-04 :syntax-qname-05 :syntax-qname-06 - :syntax-qname-07 :syntax-qname-08 :syntax-lit-01 - :syntax-lit-02 :syntax-lit-03 :syntax-lit-04 :syntax-lit-05 - :syntax-lit-06 :syntax-lit-07 :syntax-lit-08 :syntax-lit-09 - :syntax-lit-10 :syntax-lit-11 :syntax-lit-12 :syntax-lit-13 - :syntax-lit-14 :syntax-lit-15 :syntax-lit-16 :syntax-lit-17 - :syntax-lit-18 :syntax-lit-19 :syntax-lit-20 :syntax-struct-01 - :syntax-struct-02 :syntax-struct-03 :syntax-struct-05 - :syntax-struct-06 :syntax-struct-07 :syntax-struct-08 - :syntax-struct-09 :syntax-struct-10 :syntax-struct-11 - :syntax-struct-12 :syntax-struct-13 :syntax-struct-14 - :syntax-lists-01 :syntax-lists-02 :syntax-lists-03 - :syntax-lists-04 :syntax-lists-05 :syntax-bnodes-01 - :syntax-bnodes-02 :syntax-bnodes-03 :syntax-bnodes-04 - :syntax-bnodes-05 :syntax-forms-01 :syntax-forms-02 - :syntax-union-01 :syntax-union-02 :syntax-expr-01 - :syntax-expr-02 :syntax-expr-03 :syntax-expr-04 - :syntax-expr-05 :syntax-order-01 :syntax-order-02 - :syntax-order-03 :syntax-order-04 :syntax-order-05 - :syntax-order-06 :syntax-order-07 :syntax-limit-offset-01 - :syntax-limit-offset-02 :syntax-limit-offset-03 - :syntax-limit-offset-04 :syntax-pat-01 :syntax-pat-02 - :syntax-pat-03 :syntax-pat-04 - ). - -:syntax-basic-01 mf:name "syntax-basic-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-basic-02 mf:name "syntax-basic-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-basic-03 mf:name "syntax-basic-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-basic-04 mf:name "syntax-basic-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-basic-05 mf:name "syntax-basic-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-basic-06 mf:name "syntax-basic-06.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-qname-01 mf:name "syntax-qname-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-qname-02 mf:name "syntax-qname-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-qname-03 mf:name "syntax-qname-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-qname-04 mf:name "syntax-qname-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-qname-05 mf:name "syntax-qname-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-qname-06 mf:name "syntax-qname-06.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-qname-07 mf:name "syntax-qname-07.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-qname-08 mf:name "syntax-qname-08.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-01 mf:name "syntax-lit-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-02 mf:name "syntax-lit-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-03 mf:name "syntax-lit-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-04 mf:name "syntax-lit-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-05 mf:name "syntax-lit-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-06 mf:name "syntax-lit-06.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-07 mf:name "syntax-lit-07.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-08 mf:name "syntax-lit-08.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-09 mf:name "syntax-lit-09.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-10 mf:name "syntax-lit-10.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-11 mf:name "syntax-lit-11.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-12 mf:name "syntax-lit-12.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-13 mf:name "syntax-lit-13.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-14 mf:name "syntax-lit-14.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-15 mf:name "syntax-lit-15.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-16 mf:name "syntax-lit-16.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-17 mf:name "syntax-lit-17.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-18 mf:name "syntax-lit-18.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-19 mf:name "syntax-lit-19.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lit-20 mf:name "syntax-lit-20.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-01 mf:name "syntax-struct-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-02 mf:name "syntax-struct-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-03 mf:name "syntax-struct-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-05 mf:name "syntax-struct-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-06 mf:name "syntax-struct-06.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-07 mf:name "syntax-struct-07.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-08 mf:name "syntax-struct-08.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-09 mf:name "syntax-struct-09.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-10 mf:name "syntax-struct-10.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-11 mf:name "syntax-struct-11.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-12 mf:name "syntax-struct-12.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-13 mf:name "syntax-struct-13.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-struct-14 mf:name "syntax-struct-14.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-01 mf:name "syntax-lists-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-02 mf:name "syntax-lists-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-03 mf:name "syntax-lists-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-04 mf:name "syntax-lists-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-05 mf:name "syntax-lists-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-bnodes-01 mf:name "syntax-bnodes-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-bnodes-02 mf:name "syntax-bnodes-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-bnodes-03 mf:name "syntax-bnodes-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-bnodes-04 mf:name "syntax-bnodes-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-bnodes-05 mf:name "syntax-bnodes-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-forms-01 mf:name "syntax-forms-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-forms-02 mf:name "syntax-forms-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-union-01 mf:name "syntax-union-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-union-02 mf:name "syntax-union-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-expr-01 mf:name "syntax-expr-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-expr-02 mf:name "syntax-expr-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-expr-03 mf:name "syntax-expr-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-expr-04 mf:name "syntax-expr-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-expr-05 mf:name "syntax-expr-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-order-01 mf:name "syntax-order-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-order-02 mf:name "syntax-order-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-order-03 mf:name "syntax-order-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-order-04 mf:name "syntax-order-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-order-05 mf:name "syntax-order-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-order-06 mf:name "syntax-order-06.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-order-07 mf:name "syntax-order-07.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-limit-offset-01 mf:name "syntax-limit-offset-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-limit-offset-02 mf:name "syntax-limit-offset-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-limit-offset-03 mf:name "syntax-limit-offset-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-limit-offset-04 mf:name "syntax-limit-offset-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-pat-01 mf:name "syntax-pat-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-pat-02 mf:name "syntax-pat-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-pat-03 mf:name "syntax-pat-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-pat-04 mf:name "syntax-pat-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-01.rq deleted file mode 100644 index 9bb639b18..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * -WHERE { } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-02.rq deleted file mode 100644 index 8ab5230bc..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-02.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * {} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-03.rq deleted file mode 100644 index b096d7bbe..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-03.rq +++ /dev/null @@ -1,4 +0,0 @@ -# No trailing dot -PREFIX : -SELECT * -WHERE { ?x ?y ?z } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-04.rq deleted file mode 100644 index f3001bc45..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-04.rq +++ /dev/null @@ -1,3 +0,0 @@ -# With trailing dot -SELECT * -WHERE { ?x ?y ?z . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-05.rq deleted file mode 100644 index 8a8f4dd4d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-05.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Two triples : no trailing dot -SELECT * -WHERE { ?x ?y ?z . ?a ?b ?c } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-06.rq deleted file mode 100644 index d0fb4026e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-basic-06.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Two triples : with trailing dot -SELECT * -WHERE { ?x ?y ?z . ?a ?b ?c . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-01.rq deleted file mode 100644 index 1431943db..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { [:p :q ] } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-02.rq deleted file mode 100644 index 053e5d35e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { [] :p :q } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-03.rq deleted file mode 100644 index bc892ef75..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-03.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { [ ?x ?y ] :p [ ?pa ?b ] } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-04.rq deleted file mode 100644 index d7fe19e8f..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-04.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * -WHERE { [ :p :q ; ] } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-05.rq deleted file mode 100644 index e3b946404..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-bnodes-05.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT * -WHERE { _:a :p1 :q1 . - _:a :p2 :q2 . - } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-01.rq deleted file mode 100644 index 6bccf7f3b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * -WHERE { ?s ?p ?o . FILTER (?o) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-02.rq deleted file mode 100644 index 8b4f160ef..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * -WHERE { ?s ?p ?o . FILTER REGEX(?o, "foo") } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-03.rq deleted file mode 100644 index 74a048394..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-03.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * -WHERE { ?s ?p ?o . FILTER REGEX(?o, "foo", "i") } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-04.rq deleted file mode 100644 index 77602d394..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-04.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX xsd: -SELECT * -WHERE { ?s ?p ?o . FILTER xsd:integer(?o) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-05.rq deleted file mode 100644 index 529b5b61b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-expr-05.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX xsd: -SELECT * -WHERE { ?s ?p ?o . FILTER :myFunc(?s,?o) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-forms-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-forms-01.rq deleted file mode 100644 index 251b0e17a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-forms-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { ( [ ?x ?y ] ) :p ( [ ?pa ?b ] 57 ) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-forms-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-forms-02.rq deleted file mode 100644 index 97b9bbb94..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-forms-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { ( [] [] ) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-01.rq deleted file mode 100644 index 0634eb5fe..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-01.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY ?o -LIMIT 5 diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-02.rq deleted file mode 100644 index 4882aa7c8..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-02.rq +++ /dev/null @@ -1,7 +0,0 @@ -# LIMIT and OFFSET can be in either order -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY ?o -LIMIT 5 -OFFSET 3 diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-03.rq deleted file mode 100644 index 246b8afec..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-03.rq +++ /dev/null @@ -1,7 +0,0 @@ -# LIMIT and OFFSET can be in either order -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY ?o -OFFSET 3 -LIMIT 5 diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-04.rq deleted file mode 100644 index 699edcd1a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-limit-offset-04.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY ?o -OFFSET 3 diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-01.rq deleted file mode 100644 index 6e69d63b8..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { ( ?x ) :p ?z } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-02.rq deleted file mode 100644 index 52016f247..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { ?x :p ( ?z ) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-03.rq deleted file mode 100644 index 30d74b06e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-03.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { ( ?z ) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-04.rq deleted file mode 100644 index 74aae6bb3..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-04.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { ( ( ?z ) ) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-05.rq deleted file mode 100644 index 234ae64c1..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lists-05.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { ( ( ) ) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-01.rq deleted file mode 100644 index 286ce6ee3..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-01.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p "x" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-02.rq deleted file mode 100644 index d77473fd8..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-02.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p 'x' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-03.rq deleted file mode 100644 index e3806ed20..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-03.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p "x\"y'z" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-04.rq deleted file mode 100644 index 689cb0871..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-04.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p 'x"y\'z' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-05.rq deleted file mode 100644 index 77420247d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-05.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p "x\"" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-06.rq deleted file mode 100644 index 3979ecbca..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-06.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p 'x\'' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-07.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-07.rq deleted file mode 100644 index 87b188be9..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-07.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p 123 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-08.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-08.rq deleted file mode 100644 index d780dc39a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-08.rq +++ /dev/null @@ -1,11 +0,0 @@ -BASE -PREFIX : <#> -#SELECT * WHERE { :x :p 123. . } - -# SPARQL 1.1 -SELECT * - { - :x :p1 123.0 . - :x :p2 123. # SPARQL 1.1 -- integer - :x :p3 123. - } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-09.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-09.rq deleted file mode 100644 index af6b37fa5..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-09.rq +++ /dev/null @@ -1,6 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p """Long -"" -Literal -""" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-10.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-10.rq deleted file mode 100644 index 5d47db109..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-10.rq +++ /dev/null @@ -1,5 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p '''Long -'' """ -Literal''' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-11.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-11.rq deleted file mode 100644 index dcef246f4..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-11.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p """Long""\"Literal""" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-12.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-12.rq deleted file mode 100644 index 9ff4663ff..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-12.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p '''Long''\'Literal''' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-13.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-13.rq deleted file mode 100644 index f85122322..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-13.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p """Long\"""Literal""" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-14.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-14.rq deleted file mode 100644 index e48d0ef12..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-14.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p '''Long\'''Literal''' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-15.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-15.rq deleted file mode 100644 index ecb55e1c2..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-15.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p '''Long '' Literal''' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-16.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-16.rq deleted file mode 100644 index 5c00eb9d3..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-16.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p '''Long ' Literal''' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-17.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-17.rq deleted file mode 100644 index 73db5159b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-17.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p '''Long''\\Literal with '\\ single quotes ''' } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-18.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-18.rq deleted file mode 100644 index d62f63bc7..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-18.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p """Long "" Literal""" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-19.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-19.rq deleted file mode 100644 index dd8cdd439..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-19.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p """Long " Literal""" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-20.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-20.rq deleted file mode 100644 index 289bc39f1..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-lit-20.rq +++ /dev/null @@ -1,3 +0,0 @@ -BASE -PREFIX : <#> -SELECT * WHERE { :x :p """Long""\\Literal with "\\ single quotes""" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-01.rq deleted file mode 100644 index 395ee9eba..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-01.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY ?o diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-02.rq deleted file mode 100644 index 683b5d277..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-02.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY (?o+5) diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-03.rq deleted file mode 100644 index 6b40f05fa..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-03.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY ASC(?o) diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-04.rq deleted file mode 100644 index 7ab1e1ea4..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-04.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY DESC(?o) diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-05.rq deleted file mode 100644 index a84dba1fa..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-05.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY DESC(:func(?s, ?o)) diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-06.rq deleted file mode 100644 index 062c66b98..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-06.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY - DESC(?o+57) :func2(?o) ASC(?s) diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-07.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-07.rq deleted file mode 100644 index 48c4aed13..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-order-07.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT * -{ ?s ?p ?o } -ORDER BY str(?o) diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-01.rq deleted file mode 100644 index 77218788f..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-01.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * -{ } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-02.rq deleted file mode 100644 index 05823a221..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-02.rq +++ /dev/null @@ -1,4 +0,0 @@ -# No DOT after optional -PREFIX : -SELECT * -{ ?a :b :c OPTIONAL{:x :y :z} :x ?y ?z } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-03.rq deleted file mode 100644 index b526d7ee7..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-03.rq +++ /dev/null @@ -1,7 +0,0 @@ -# No DOT between non-triples patterns -PREFIX : -SELECT * -{ ?a :b :c - OPTIONAL{:x :y :z} - { :x1 :y1 :z1 } UNION { :x2 :y2 :z2 } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-04.rq deleted file mode 100644 index 30078201d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-pat-04.rq +++ /dev/null @@ -1,8 +0,0 @@ -# No DOT between non-triples patterns -PREFIX : -SELECT * -{ - OPTIONAL{:x :y :z} - ?a :b :c - { :x1 :y1 :z1 } UNION { :x2 :y2 :z2 } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-01.rq deleted file mode 100644 index b4a31e059..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-01.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * -{ ?x :p ?z } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-02.rq deleted file mode 100644 index 8cfedbb4e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-02.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * -WHERE { :x :p :z . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-03.rq deleted file mode 100644 index a49e9e6fc..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-03.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * -WHERE { :_1 :p.rdf :z.z . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-04.rq deleted file mode 100644 index ebc3d0454..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-04.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -PREFIX a: -SELECT * -WHERE { : a: :a . : : : . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-05.rq deleted file mode 100644 index 792cf1c1f..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-05.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : <> -SELECT * -WHERE { : : : . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-06.rq deleted file mode 100644 index 8cbd783aa..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-06.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : <#> -SELECT * -WHERE { : : : . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-07.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-07.rq deleted file mode 100644 index 3f0bb649d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-07.rq +++ /dev/null @@ -1,4 +0,0 @@ -BASE -PREFIX : <#> -SELECT * -WHERE { : : : . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-08.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-08.rq deleted file mode 100644 index 14709ab97..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-qname-08.rq +++ /dev/null @@ -1,5 +0,0 @@ -BASE -PREFIX : <#> -PREFIX x.y: -SELECT * -WHERE { :a.b x.y: : . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-01.rq deleted file mode 100644 index 0c08d8ef5..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-01.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Operator -PREFIX : -SELECT * -{ OPTIONAL { } } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-02.rq deleted file mode 100644 index 094dd25ac..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-02.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Operator -PREFIX : -SELECT * -{ OPTIONAL { :a :b :c } } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-03.rq deleted file mode 100644 index 3f7812e5b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-03.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Triple, no DOT, operator -PREFIX : -SELECT * -{ :p :q :r OPTIONAL { :a :b :c } } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-05.rq deleted file mode 100644 index 7eaf07682..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-05.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Triple, DOT, operator -PREFIX : -SELECT * -{ :p :q :r . OPTIONAL { :a :b :c } } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-06.rq deleted file mode 100644 index 47d27d244..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-06.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Triple, DOT, operator, DOT -PREFIX : -SELECT * -{ :p :q :r . OPTIONAL { :a :b :c } . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-07.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-07.rq deleted file mode 100644 index 6b1ff7a2b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-07.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Operator, no DOT -PREFIX : -SELECT * -{ OPTIONAL { :a :b :c } } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-08.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-08.rq deleted file mode 100644 index 8eef3e55d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-08.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Operator, DOT -PREFIX : -SELECT * -{ OPTIONAL { :a :b :c } . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-09.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-09.rq deleted file mode 100644 index e5b1ee6a0..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-09.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Operator, triple -PREFIX : -SELECT * -{ OPTIONAL { :a :b :c } ?x ?y ?z } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-10.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-10.rq deleted file mode 100644 index 11b401fac..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-10.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Operator, DOT triple -PREFIX : -SELECT * -{ OPTIONAL { :a :b :c } . ?x ?y ?z } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-11.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-11.rq deleted file mode 100644 index 2932d38e3..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-11.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Triple, semi, operator -PREFIX : -SELECT * -{ :p :q :r ; OPTIONAL { :a :b :c } } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-12.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-12.rq deleted file mode 100644 index 7623a111b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-12.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Triple, semi, DOT, operator -PREFIX : -SELECT * -{ :p :q :r ; . OPTIONAL { :a :b :c } } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-13.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-13.rq deleted file mode 100644 index c16e79a68..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-13.rq +++ /dev/null @@ -1,6 +0,0 @@ -# Two elements in the group -PREFIX : -SELECT * -{ :p :q :r . OPTIONAL { :a :b :c } - :p :q :r . OPTIONAL { :a :b :c } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-14.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-14.rq deleted file mode 100644 index 88f7992db..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-struct-14.rq +++ /dev/null @@ -1,6 +0,0 @@ -# Two elements in the group -PREFIX : -SELECT * -{ :p :q :r OPTIONAL { :a :b :c } - :p :q :r OPTIONAL { :a :b :c } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-union-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-union-01.rq deleted file mode 100644 index bd65cc53e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-union-01.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT * -{ - { ?s ?p ?o } UNION { ?a ?b ?c } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-union-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-union-02.rq deleted file mode 100644 index 564d2057e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql1/syntax-union-02.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT * -{ - { ?s ?p ?o } UNION { ?a ?b ?c } UNION { ?r ?s ?t } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/manifest.ttl b/test/data/suites/DAWG/data-r2/syntax-sparql2/manifest.ttl deleted file mode 100644 index 0b09f309a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/manifest.ttl +++ /dev/null @@ -1,348 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Syntax tests syntax-sparql2" ; - mf:entries - ( :syntax-general-01 :syntax-general-02 :syntax-general-03 - :syntax-general-04 :syntax-general-05 :syntax-general-06 - :syntax-general-07 :syntax-general-08 :syntax-general-09 - :syntax-general-10 :syntax-general-11 :syntax-general-12 - :syntax-general-13 :syntax-general-14 :syntax-keywords-01 - :syntax-keywords-02 :syntax-keywords-03 :syntax-lists-01 - :syntax-lists-02 :syntax-lists-03 :syntax-lists-04 - :syntax-lists-05 :syntax-bnode-01 :syntax-bnode-02 - :syntax-bnode-03 :syntax-function-01 :syntax-function-02 - :syntax-function-03 :syntax-function-04 :syntax-form-select-01 - :syntax-form-select-02 :syntax-form-ask-02 - :syntax-form-construct01 :syntax-form-construct02 - :syntax-form-construct03 :syntax-form-construct04 - :syntax-form-construct06 :syntax-form-describe01 - :syntax-form-describe02 :syntax-dataset-01 :syntax-dataset-02 - :syntax-dataset-03 :syntax-dataset-04 :syntax-graph-01 - :syntax-graph-02 :syntax-graph-03 :syntax-graph-04 - :syntax-graph-05 :syntax-esc-01 :syntax-esc-02 :syntax-esc-03 - :syntax-esc-04 :syntax-esc-05 ) . - -:syntax-general-01 mf:name "syntax-general-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-02 mf:name "syntax-general-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-03 mf:name "syntax-general-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-04 mf:name "syntax-general-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-05 mf:name "syntax-general-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-06 mf:name "syntax-general-06.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-07 mf:name "syntax-general-07.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-08 mf:name "syntax-general-08.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-09 mf:name "syntax-general-09.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-10 mf:name "syntax-general-10.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-11 mf:name "syntax-general-11.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-12 mf:name "syntax-general-12.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-13 mf:name "syntax-general-13.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-general-14 mf:name "syntax-general-14.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-keywords-01 mf:name "syntax-keywords-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-keywords-02 mf:name "syntax-keywords-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-keywords-03 mf:name "syntax-keywords-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-01 mf:name "syntax-lists-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-02 mf:name "syntax-lists-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-03 mf:name "syntax-lists-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-04 mf:name "syntax-lists-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-lists-05 mf:name "syntax-lists-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-bnode-01 mf:name "syntax-bnode-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-bnode-02 mf:name "syntax-bnode-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-bnode-03 mf:name "syntax-bnode-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-function-01 mf:name "syntax-function-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-function-02 mf:name "syntax-function-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-function-03 mf:name "syntax-function-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-function-04 mf:name "syntax-function-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-select-01 mf:name "syntax-form-select-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-select-02 mf:name "syntax-form-select-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-ask-02 mf:name "syntax-form-ask-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-construct01 mf:name "syntax-form-construct01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-construct02 mf:name "syntax-form-construct02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-construct03 mf:name "syntax-form-construct03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-construct04 mf:name "syntax-form-construct04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-construct06 mf:name "syntax-form-construct06.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-describe01 mf:name "syntax-form-describe01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-form-describe02 mf:name "syntax-form-describe02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-dataset-01 mf:name "syntax-dataset-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-dataset-02 mf:name "syntax-dataset-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-dataset-03 mf:name "syntax-dataset-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-dataset-04 mf:name "syntax-dataset-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-graph-01 mf:name "syntax-graph-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-graph-02 mf:name "syntax-graph-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-graph-03 mf:name "syntax-graph-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-graph-04 mf:name "syntax-graph-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-graph-05 mf:name "syntax-graph-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-esc-01 mf:name "syntax-esc-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-esc-02 mf:name "syntax-esc-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-esc-03 mf:name "syntax-esc-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-esc-04 mf:name "syntax-esc-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syntax-esc-05 mf:name "syntax-esc-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-01.rq deleted file mode 100644 index f786b0a34..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { [] :p [] } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-02.rq deleted file mode 100644 index 8f97e54ea..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-02.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -# Tab -SELECT * WHERE { [ ] :p [ - ] } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-03.rq deleted file mode 100644 index d58c260f2..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-bnode-03.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * WHERE { [ :p :q - ] } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-01.rq deleted file mode 100644 index 9b9130193..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-01.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT ?x -FROM -WHERE {} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-02.rq deleted file mode 100644 index 93a05db70..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-02.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : -SELECT ?x -FROM NAMED -WHERE {} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-03.rq deleted file mode 100644 index 01f39b404..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-03.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT ?x -FROM NAMED :graph1 -FROM NAMED :graph2 -WHERE {} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-04.rq deleted file mode 100644 index 92e3250b0..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-dataset-04.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -SELECT ?x -FROM :g1 -FROM :g2 -FROM NAMED :graph1 -FROM NAMED :graph2 -WHERE {} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-01.rq deleted file mode 100644 index 301010400..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * -WHERE {

"\t" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-02.rq deleted file mode 100644 index f795ca457..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * -WHERE {

"x\t" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-03.rq deleted file mode 100644 index 67c66c6bc..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-03.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * -WHERE {

"\tx" } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-04.rq deleted file mode 100644 index b08151cb5..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-04.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * -WHERE { <\u0078> :\u0070 ?xx\u0078 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-05.rq deleted file mode 100644 index 9a88ba2a3..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-esc-05.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : -SELECT * -# Comments can contain \ u -# <\u0078> :\u0070 ?xx\u0078 -WHERE { <\u0078> :\u0070 ?xx\u0078 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-ask-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-ask-02.rq deleted file mode 100644 index e875654c0..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-ask-02.rq +++ /dev/null @@ -1 +0,0 @@ -ASK {} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct01.rq deleted file mode 100644 index b18358a3f..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct01.rq +++ /dev/null @@ -1 +0,0 @@ -CONSTRUCT { ?s . ?s ?o } WHERE {?s ?p ?o} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct02.rq deleted file mode 100644 index 69e76335e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct02.rq +++ /dev/null @@ -1 +0,0 @@ -CONSTRUCT { ?s . ?s ?o .} WHERE {?s ?p ?o} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct03.rq deleted file mode 100644 index c566010c4..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct03.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX rdf: -CONSTRUCT { [] rdf:subject ?s ; - rdf:predicate ?p ; - rdf:object ?o } -WHERE {?s ?p ?o} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct04.rq deleted file mode 100644 index 97410945e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct04.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX rdf: -CONSTRUCT { [] rdf:subject ?s ; - rdf:predicate ?p ; - rdf:object ?o . } -WHERE {?s ?p ?o} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct06.rq deleted file mode 100644 index af808a3c3..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-construct06.rq +++ /dev/null @@ -1 +0,0 @@ -CONSTRUCT {} WHERE {} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-describe01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-describe01.rq deleted file mode 100644 index bc5b13d93..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-describe01.rq +++ /dev/null @@ -1 +0,0 @@ -DESCRIBE diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-describe02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-describe02.rq deleted file mode 100644 index 2132ac7e5..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-describe02.rq +++ /dev/null @@ -1 +0,0 @@ -DESCRIBE ?u WHERE { ?u . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-select-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-select-01.rq deleted file mode 100644 index 56d7118e1..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-select-01.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-select-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-select-02.rq deleted file mode 100644 index 870475207..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-form-select-02.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * { } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-01.rq deleted file mode 100644 index 0de4fff4a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX q: -SELECT * WHERE { FILTER (q:name()) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-02.rq deleted file mode 100644 index 6b7aa198c..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX q: -SELECT * WHERE { FILTER (q:name( )) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-03.rq deleted file mode 100644 index faaa08581..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-03.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX q: -SELECT * WHERE { FILTER (q:name( -)) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-04.rq deleted file mode 100644 index bb2422072..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-function-04.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX q: -SELECT * WHERE { FILTER (q:name(1 -)) . FILTER (q:name(1,2)) . FILTER (q:name(1 -,2))} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-01.rq deleted file mode 100644 index 9b51d2cde..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-01.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-02.rq deleted file mode 100644 index f0b82f8ec..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-02.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { _:x } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-03.rq deleted file mode 100644 index eb77be85e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-03.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { 1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-04.rq deleted file mode 100644 index e1d47430e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-04.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { +11 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-05.rq deleted file mode 100644 index a5c2c0d08..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-05.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { -1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-06.rq deleted file mode 100644 index dc5ff8b9b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-06.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { 1.0 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-07.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-07.rq deleted file mode 100644 index 5d316d5bc..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-07.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { +1.0 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-08.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-08.rq deleted file mode 100644 index c0654dbf2..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-08.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { -1.0 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-09.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-09.rq deleted file mode 100644 index 6e6e6f11c..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-09.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { 1.0e0 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-10.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-10.rq deleted file mode 100644 index 788bf114b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-10.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { +1.0e+1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-11.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-11.rq deleted file mode 100644 index 771acb6f0..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-11.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT * WHERE { -1.0e-1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-12.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-12.rq deleted file mode 100644 index 171b4f4da..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-12.rq +++ /dev/null @@ -1,2 +0,0 @@ -# Legal, if unusual, IRIs -SELECT * WHERE { } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-13.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-13.rq deleted file mode 100644 index 02378692c..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-13.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Legal, if unusual, IRIs -BASE -SELECT * WHERE { <#x> } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-14.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-14.rq deleted file mode 100644 index 188507d91..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-general-14.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Legal, if unusual, IRIs -BASE -SELECT * WHERE { <¶m=value> } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-01.rq deleted file mode 100644 index 611e663b4..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-01.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - GRAPH ?g { } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-02.rq deleted file mode 100644 index 515736444..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-02.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - GRAPH :a { } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-03.rq deleted file mode 100644 index 526803f48..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-03.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - GRAPH ?g { :x :b ?a } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-04.rq deleted file mode 100644 index 08fac9cf3..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-04.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - :x :p :z - GRAPH ?g { :x :b ?a } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-05.rq deleted file mode 100644 index 0b27ef064..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-graph-05.rq +++ /dev/null @@ -1,7 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - :x :p :z - GRAPH ?g { :x :b ?a . GRAPH ?g2 { :x :p ?x } } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-01.rq deleted file mode 100644 index afe0b58be..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-01.rq +++ /dev/null @@ -1,4 +0,0 @@ -# use keyword FILTER as a namespace prefix -PREFIX FILTER: -SELECT * -WHERE { ?x FILTER:foo ?z FILTER (?z) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-02.rq deleted file mode 100644 index e5f779029..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-02.rq +++ /dev/null @@ -1,4 +0,0 @@ -# use keyword FILTER as a local name -PREFIX : -SELECT * -WHERE { ?x :FILTER ?z FILTER (?z) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-03.rq deleted file mode 100644 index 982cb8c6f..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-keywords-03.rq +++ /dev/null @@ -1,4 +0,0 @@ -# use keyword UNION as a namespace prefix -PREFIX UNION: -SELECT * -WHERE { ?x UNION:foo ?z } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-01.rq deleted file mode 100644 index 8042d5a0e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { () :p 1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-02.rq deleted file mode 100644 index 549f917b1..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { ( ) :p 1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-03.rq deleted file mode 100644 index 56ea79781..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-03.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * WHERE { ( -) :p 1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-04.rq deleted file mode 100644 index c9e7a916c..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-04.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * WHERE { ( 1 2 -) :p 1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-05.rq deleted file mode 100644 index 1faee4506..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql2/syntax-lists-05.rq +++ /dev/null @@ -1,3 +0,0 @@ -PREFIX : -SELECT * WHERE { ( 1 2 -) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/manifest.ttl b/test/data/suites/DAWG/data-r2/syntax-sparql3/manifest.ttl deleted file mode 100644 index 099afbacc..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/manifest.ttl +++ /dev/null @@ -1,329 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Syntax tests syntax-sparql3" ; - mf:entries - ( :syn-01 :syn-02 :syn-03 :syn-04 :syn-05 :syn-06 - :syn-07 :syn-08 :syn-bad-01 :syn-bad-02 :syn-bad-03 - :syn-bad-04 :syn-bad-05 :syn-bad-06 :syn-bad-07 :syn-bad-08 - :syn-bad-09 :syn-bad-10 :syn-bad-11 :syn-bad-12 :syn-bad-13 - :syn-bad-14 :syn-bad-15 :syn-bad-16 :syn-bad-17 :syn-bad-18 - :syn-bad-19 :syn-bad-20 :syn-bad-21 :syn-bad-22 :syn-bad-23 - :syn-bad-24 :syn-bad-25 :syn-bad-26 :syn-bad-27 :syn-bad-28 - :syn-bad-29 :syn-bad-30 :syn-bad-31 :bnode-dot - :bnodes-missing-pvalues-01 :bnodes-missing-pvalues-02 - :empty-optional-01 :empty-optional-02 :filter-missing-parens - :lone-list :lone-node - :blabel-cross-filter :blabel-cross-graph-bad - :blabel-cross-optional-bad :blabel-cross-union-bad ) . - -:syn-01 mf:name "syn-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-02 mf:name "syn-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-03 mf:name "syn-03.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-04 mf:name "syn-04.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-05 mf:name "syn-05.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-06 mf:name "syn-06.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-07 mf:name "syn-07.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-08 mf:name "syn-08.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-01 mf:name "syn-bad-01.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-02 mf:name "syn-bad-02.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-03 mf:name "syn-bad-03.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-04 mf:name "syn-bad-04.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-05 mf:name "syn-bad-05.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-06 mf:name "syn-bad-06.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-07 mf:name "syn-bad-07.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-08 mf:name "syn-bad-08.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-09 mf:name "syn-bad-09.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-10 mf:name "syn-bad-10.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-11 mf:name "syn-bad-11.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-12 mf:name "syn-bad-12.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-13 mf:name "syn-bad-13.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-14 mf:name "syn-bad-14.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-15 mf:name "syn-bad-15.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-16 mf:name "syn-bad-16.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-17 mf:name "syn-bad-17.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-18 mf:name "syn-bad-18.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-19 mf:name "syn-bad-19.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-20 mf:name "syn-bad-20.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-21 mf:name "syn-bad-21.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-22 mf:name "syn-bad-22.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-23 mf:name "syn-bad-23.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-24 mf:name "syn-bad-24.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-25 mf:name "syn-bad-25.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-26 mf:name "syn-bad-26.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-27 mf:name "syn-bad-27.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-28 mf:name "syn-bad-28.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-29 mf:name "syn-bad-29.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-30 mf:name "syn-bad-30.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-31 mf:name "syn-bad-31.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:bnode-dot mf:name "syn-bad-bnode-dot.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:bnodes-missing-pvalues-01 mf:name "syn-bad-bnodes-missing-pvalues-01.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:bnodes-missing-pvalues-02 mf:name "syn-bad-bnodes-missing-pvalues-02.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:empty-optional-01 mf:name "syn-bad-empty-optional-01.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:empty-optional-02 mf:name "syn-bad-empty-optional-02.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:filter-missing-parens mf:name "syn-bad-filter-missing-parens.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:lone-list mf:name "syn-bad-lone-list.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:lone-node mf:name "syn-bad-lone-node.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:blabel-cross-filter mf:name "syn-blabel-cross-filter" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:blabel-cross-graph-bad mf:name "syn-blabel-cross-graph-bad" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:blabel-cross-optional-bad mf:name "syn-blabel-cross-optional-bad" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:blabel-cross-union-bad mf:name "syn-blabel-cross-union-bad" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-01.rq deleted file mode 100644 index 409b73b05..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-01.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Dot after triple -SELECT * WHERE -{ ?s ?p ?o . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-02.rq deleted file mode 100644 index 325915874..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-02.rq +++ /dev/null @@ -1,3 +0,0 @@ -# No dot after triple -SELECT * WHERE -{ ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-03.rq deleted file mode 100644 index 841ec79cb..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-03.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * WHERE -{ ?s ?p ?o . ?s ?p ?o . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-04.rq deleted file mode 100644 index 90e77f9e7..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-04.rq +++ /dev/null @@ -1,3 +0,0 @@ -# No dot -SELECT * WHERE -{ ?s ?p ?o . ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-05.rq deleted file mode 100644 index 37451f9ea..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-05.rq +++ /dev/null @@ -1,3 +0,0 @@ -# DOT after non-triples -SELECT * WHERE -{ FILTER (?o>5) . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-06.rq deleted file mode 100644 index 20d9ea7fe..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-06.rq +++ /dev/null @@ -1,3 +0,0 @@ -# DOT after non-triples -SELECT * WHERE -{ FILTER (?o>5) . ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-07.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-07.rq deleted file mode 100644 index 35282df8a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-07.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Trailing ; -PREFIX : -SELECT * WHERE -{ :s :p :o ; FILTER(?x) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-08.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-08.rq deleted file mode 100644 index 51e5ac925..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-08.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken ; -PREFIX : -SELECT * WHERE -{ :s :p :o ; . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-01.rq deleted file mode 100644 index d8198a872..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-01.rq +++ /dev/null @@ -1,3 +0,0 @@ -# More a test that bad syntax tests work! -PREFIX ex: -SELECT * diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-02.rq deleted file mode 100644 index 1e97167fb..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-02.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Missing DOT, 2 triples -PREFIX : -SELECT * -{ :s1 :p1 :o1 :s2 :p2 :o2 . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-03.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-03.rq deleted file mode 100644 index 4670f1878..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-03.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Missing DOT between triples -PREFIX : -SELECT * -{ :s1 :p1 :o1 :s2 :p2 :o2 . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-04.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-04.rq deleted file mode 100644 index 137a2fc5c..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-04.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Missing DOT after ; between triples -PREFIX : -SELECT * -{ :s1 :p1 :o1 ; :s2 :p2 :o2 . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-05.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-05.rq deleted file mode 100644 index fe7091c35..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-05.rq +++ /dev/null @@ -1,3 +0,0 @@ -# DOT, no triples -SELECT * WHERE -{ . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-06.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-06.rq deleted file mode 100644 index 6fa446b71..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-06.rq +++ /dev/null @@ -1,3 +0,0 @@ -# DOT, no triples -SELECT * WHERE -{ . . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-07.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-07.rq deleted file mode 100644 index 043be02e2..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-07.rq +++ /dev/null @@ -1,3 +0,0 @@ -# DOT, then triples -SELECT * WHERE -{ . ?s ?p ?o } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-08.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-08.rq deleted file mode 100644 index c58afed26..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-08.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Multiple DOTs -SELECT * WHERE -{ ?s ?p ?o . . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-09.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-09.rq deleted file mode 100644 index a7775a006..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-09.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Multiple DOTs -SELECT * WHERE -{ ?s ?p ?o .. } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-10.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-10.rq deleted file mode 100644 index f7570f0a1..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-10.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Multiple DOTs -SELECT * WHERE -{ ?s ?p ?o . . ?s1 ?p1 ?o1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-11.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-11.rq deleted file mode 100644 index 3a326be0b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-11.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Multiple DOTs -SELECT * WHERE -{ ?s ?p ?o .. ?s1 ?p1 ?o1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-12.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-12.rq deleted file mode 100644 index f7570f0a1..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-12.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Multiple DOTs -SELECT * WHERE -{ ?s ?p ?o . . ?s1 ?p1 ?o1 } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-13.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-13.rq deleted file mode 100644 index f7fb35e7c..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-13.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Multiple DOTs -SELECT * WHERE -{ ?s ?p ?o . ?s1 ?p1 ?o1 .. } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-14.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-14.rq deleted file mode 100644 index efaeec7a0..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-14.rq +++ /dev/null @@ -1,3 +0,0 @@ -# DOT, no triples -SELECT * WHERE -{ . FILTER(?x) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-15.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-15.rq deleted file mode 100644 index 082511fff..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-15.rq +++ /dev/null @@ -1,3 +0,0 @@ -# Broken ; -SELECT * WHERE -{ ; FILTER(?x) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-16.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-16.rq deleted file mode 100644 index 96a275260..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-16.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken ; -PREFIX : -SELECT * WHERE -{ :s ; :p :o } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-17.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-17.rq deleted file mode 100644 index 6374665c0..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-17.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken ; -PREFIX : -SELECT * WHERE -{ :s :p ; } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-18.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-18.rq deleted file mode 100644 index 37648a97a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-18.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken ; -PREFIX : -SELECT * WHERE -{ :s :p ; FILTER(?x) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-19.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-19.rq deleted file mode 100644 index 921c6102e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-19.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken ; -PREFIX : -SELECT * WHERE -{ :s :p :o . ; } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-20.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-20.rq deleted file mode 100644 index e893b483e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-20.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken , -PREFIX : -SELECT * WHERE -{ :s , :p :o } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-21.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-21.rq deleted file mode 100644 index c6c073456..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-21.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken , -PREFIX : -SELECT * WHERE -{ :s :p , :o } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-22.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-22.rq deleted file mode 100644 index 7dba68210..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-22.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken , -PREFIX : -SELECT * WHERE -{ :s :p , } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-23.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-23.rq deleted file mode 100644 index 9384ce948..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-23.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken , can't trail -PREFIX : -SELECT * WHERE -{ :s :p :o , } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-24.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-24.rq deleted file mode 100644 index 869717d6a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-24.rq +++ /dev/null @@ -1,4 +0,0 @@ -# Broken , (should be ;) -PREFIX : -SELECT * WHERE -{ :s :p1 :o1 , :p2 :o2} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-25.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-25.rq deleted file mode 100644 index 0bffa187d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-25.rq +++ /dev/null @@ -1 +0,0 @@ -CONSTRUCT diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-26.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-26.rq deleted file mode 100644 index 7da3acf3f..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-26.rq +++ /dev/null @@ -1,5 +0,0 @@ -# Tokenizing matters. -# "longest token rule" means this isn't a "<" and "&&" -PREFIX : -SELECT * WHERE -{ FILTER (?x?y) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-27.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-27.rq deleted file mode 100644 index ded4f37b6..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-27.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { :x [] :q } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-28.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-28.rq deleted file mode 100644 index d7d656e7a..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-28.rq +++ /dev/null @@ -1,2 +0,0 @@ -PREFIX : -SELECT * WHERE { :x _:a :q } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-29.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-29.rq deleted file mode 100644 index f7d0f871b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-29.rq +++ /dev/null @@ -1,2 +0,0 @@ -# Syntactic blank node in a filter. -SELECT * WHERE { _:x FILTER(_:x) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-30.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-30.rq deleted file mode 100644 index c737cb610..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-30.rq +++ /dev/null @@ -1,2 +0,0 @@ -# Syntactic blank node in a filter. -SELECT * WHERE { _:x FILTER(_:x < 3) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-31.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-31.rq deleted file mode 100644 index 523ea4eb9..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-31.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - GRAPH [] { } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnode-dot.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnode-dot.rq deleted file mode 100644 index 68ea752c4..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnode-dot.rq +++ /dev/null @@ -1,2 +0,0 @@ -# NegativeSyntax/bnode-dot.rq -SELECT * WHERE {[] . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnodes-missing-pvalues-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnodes-missing-pvalues-01.rq deleted file mode 100644 index 01bd5a76d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnodes-missing-pvalues-01.rq +++ /dev/null @@ -1,3 +0,0 @@ -# NegativeSyntax/bnodes-missing-pvalues.rq -PREFIX : -SELECT * WHERE { [,] :p [;] . } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnodes-missing-pvalues-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnodes-missing-pvalues-02.rq deleted file mode 100644 index f83774454..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-bnodes-missing-pvalues-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -# NegativeSyntax/bnodes-missing-pvalues-02.rq -SELECT * WHERE {() . [,] . [,;] } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-empty-optional-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-empty-optional-01.rq deleted file mode 100644 index ace43aa9d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-empty-optional-01.rq +++ /dev/null @@ -1,2 +0,0 @@ -# NegativeSyntax/empty-optional.rq -SELECT * { OPTIONAL FILTER (?x) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-empty-optional-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-empty-optional-02.rq deleted file mode 100644 index f79caafa9..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-empty-optional-02.rq +++ /dev/null @@ -1,2 +0,0 @@ -# NegativeSyntax/empty-optional-02.rq -SELECT * { OPTIONAL GRAPH ?v OPTIONAL FILTER (?x) } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-filter-missing-parens.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-filter-missing-parens.rq deleted file mode 100644 index 0ec1c39f1..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-filter-missing-parens.rq +++ /dev/null @@ -1,2 +0,0 @@ -# NegativeSyntax/filter-missing-parens.rq -SELECT * { ?s ?p ?o FILTER ?x } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-lone-list.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-lone-list.rq deleted file mode 100644 index 03dd3e457..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-lone-list.rq +++ /dev/null @@ -1,2 +0,0 @@ -# NegativeSyntax/lone-list.rq -SELECT * WHERE { () } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-lone-node.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-lone-node.rq deleted file mode 100644 index 38baf1f4e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-bad-lone-node.rq +++ /dev/null @@ -1,2 +0,0 @@ -# NegativeSyntax/lone-node.rq -SELECT * WHERE {} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-filter.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-filter.rq deleted file mode 100644 index d018580c1..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-filter.rq +++ /dev/null @@ -1,7 +0,0 @@ -# $Id: syn-blabel-cross-filter.rq,v 1.2 2007/04/09 21:40:22 eric Exp $ -# BNode label used across a FILTER. -PREFIX : - -ASK { _:who :homepage ?homepage - FILTER REGEX(?homepage, "^http://example.org/") - _:who :schoolHomepage ?schoolPage } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-graph-bad.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-graph-bad.rq deleted file mode 100644 index 5b99c916d..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-graph-bad.rq +++ /dev/null @@ -1,7 +0,0 @@ -# $Id: syn-blabel-cross-graph-bad.rq,v 1.2 2007/04/18 23:11:57 eric Exp $ -# BNode label used across a GRAPH. -PREFIX : - -ASK { _:who :homepage ?homepage - GRAPH ?g { ?someone :made ?homepage } - _:who :schoolHomepage ?schoolPage } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-optional-bad.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-optional-bad.rq deleted file mode 100644 index 778edd3f5..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-optional-bad.rq +++ /dev/null @@ -1,9 +0,0 @@ -# $Id: syn-blabel-cross-optional-bad.rq,v 1.5 2007/09/04 15:04:22 eric Exp $ -# BNode label used across an OPTIONAL. -# This isn't necessarily a *syntax* test, but references to bnode labels -# may not span basic graph patterns. -PREFIX foaf: - -ASK { _:who foaf:homepage ?homepage - OPTIONAL { ?someone foaf:made ?homepage } - _:who foaf:schoolHomepage ?schoolPage } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-union-bad.rq b/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-union-bad.rq deleted file mode 100644 index 2a7e273dc..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql3/syn-blabel-cross-union-bad.rq +++ /dev/null @@ -1,11 +0,0 @@ -# $Id: syn-blabel-cross-union-bad.rq,v 1.4 2007/09/04 15:04:09 eric Exp $ -# BNode label used across a UNION. -# This isn't necessarily a *syntax* test, but references to bnode labels -# may not span basic graph patterns. -PREFIX foaf: - -ASK { _:who foaf:homepage ?homepage - { ?someone foaf:made ?homepage } - UNION - { ?homepage foaf:maker ?someone } - _:who foaf:schoolHomepage ?schoolPage } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/manifest.ttl b/test/data/suites/DAWG/data-r2/syntax-sparql4/manifest.ttl deleted file mode 100644 index ab4e1e35c..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/manifest.ttl +++ /dev/null @@ -1,91 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Syntax tests syntax-sparql4" ; - mf:entries - ( :syn-09 :syn-10 :syn-11 - :syn-bad-34 :syn-bad-35 :syn-bad-36 :syn-bad-37 :syn-bad-38 - :syn-bad-OPT-breaks-BGP :syn-bad-UNION-breaks-BGP :syn-bad-GRAPH-breaks-BGP - :syn-leading-digits-in-prefixed-names) . - -:syn-09 mf:name "syn-09.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-10 mf:name "syn-10.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-11 mf:name "syn-11.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-leading-digits-in-prefixed-names mf:name "syn-leading-digits-in-prefixed-names.rq" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - rdf:type mf:PositiveSyntaxTest ; - mf:action . - - -:syn-bad-34 mf:name "syn-bad-34.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-35 mf:name "syn-bad-35.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-36 mf:name "syn-bad-36.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-37 mf:name "syn-bad-37.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:syn-bad-38 mf:name "syn-bad-38.rq" ; - rdf:type mf:NegativeSyntaxTest ; - mf:action ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - - :syn-bad-OPT-breaks-BGP mf:name "syn-bad-OPT-breaks-BGP" ; - rdfs:comment "bad: re-used BNode label after OPTIONAL" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - rdf:type mf:NegativeSyntaxTest ; - mf:action . - - :syn-bad-UNION-breaks-BGP mf:name "syn-bad-UNION-breaks-BGP" ; - rdfs:comment "bad: re-used BNode label after UNION" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - rdf:type mf:NegativeSyntaxTest ; - mf:action . - - :syn-bad-GRAPH-breaks-BGP mf:name "syn-bad-GRAPH-breaks-BGP" ; - rdfs:comment "bad: re-used BNode label after GRAPH" ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved ; - rdf:type mf:NegativeSyntaxTest ; - mf:action . - diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-09.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-09.rq deleted file mode 100644 index 6768cacc2..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-09.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - _:a ?p ?v . _:a ?q 1 -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-10.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-10.rq deleted file mode 100644 index e3882e8b3..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-10.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - { _:a ?p ?v . _:a ?q _:a } UNION { _:b ?q _:c } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-11.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-11.rq deleted file mode 100644 index a50db9306..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-11.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - _:a ?p ?v . FILTER(true) . [] ?q _:a -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-34.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-34.rq deleted file mode 100644 index f42306489..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-34.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - _:a ?p ?v . { _:a ?q 1 } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-35.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-35.rq deleted file mode 100644 index 4cae4b767..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-35.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - { _:a ?p ?v . } _:a ?q 1 -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-36.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-36.rq deleted file mode 100644 index c282a60bb..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-36.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - { _:a ?p ?v . } UNION { _:a ?q 1 } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-37.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-37.rq deleted file mode 100644 index 4cae4b767..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-37.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - { _:a ?p ?v . } _:a ?q 1 -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-38.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-38.rq deleted file mode 100644 index 5e5769f22..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-38.rq +++ /dev/null @@ -1,6 +0,0 @@ -PREFIX : -SELECT * -WHERE -{ - _:a ?p ?v . OPTIONAL {_:a ?q 1 } -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-GRAPH-breaks-BGP.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-GRAPH-breaks-BGP.rq deleted file mode 100644 index a0591c491..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-GRAPH-breaks-BGP.rq +++ /dev/null @@ -1,9 +0,0 @@ -# bad: re-used BNode label after GRAPH -# $Id: syn-bad-GRAPH-breaks-BGP.rq,v 1.1 2007/02/15 15:14:31 eric Exp $ - -PREFIX : -SELECT * -WHERE -{ - _:a ?p ?v . GRAPH ?g { ?s ?p ?v } _:a ?q 1 -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-OPT-breaks-BGP.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-OPT-breaks-BGP.rq deleted file mode 100644 index 77ad9eed2..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-OPT-breaks-BGP.rq +++ /dev/null @@ -1,9 +0,0 @@ -# bad: re-used BNode label after OPTIONAL -# $Id: syn-bad-OPT-breaks-BGP.rq,v 1.1 2007/02/15 15:14:31 eric Exp $ - -PREFIX : -SELECT * -WHERE -{ - _:a ?p ?v . OPTIONAL { ?s ?p ?v } _:a ?q 1 -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-UNION-breaks-BGP.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-UNION-breaks-BGP.rq deleted file mode 100644 index 756d9bf08..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-bad-UNION-breaks-BGP.rq +++ /dev/null @@ -1,11 +0,0 @@ -# bad: re-used BNode label after UNION -# $Id: syn-bad-UNION-breaks-BGP.rq,v 1.3 2007/09/04 15:03:54 eric Exp $ -# This isn't necessarily a *syntax* test, but references to bnode labels -# may not span basic graph patterns. - -PREFIX : -SELECT * -WHERE -{ - _:a ?p ?v1 { ?s ?o } UNION { ?s ?o } _:a ?p ?v2 -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-leading-digits-in-prefixed-names.rq b/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-leading-digits-in-prefixed-names.rq deleted file mode 100644 index 9c0634030..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql4/syn-leading-digits-in-prefixed-names.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX dob: -PREFIX time: -PREFIX dc: -SELECT ?desc -WHERE { - dob:1D a time:ProperInterval; - dc:description ?desc. -} diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql5/manifest.ttl b/test/data/suites/DAWG/data-r2/syntax-sparql5/manifest.ttl deleted file mode 100644 index 6a9589a5b..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql5/manifest.ttl +++ /dev/null @@ -1,27 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix mf: . -@prefix qt: . -@prefix dawgt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Syntax tests syntax-sparql5" ; - mf:entries - ( :syntax-reduced-01 :syntax-reduced-02 - ). - -:syntax-reduced-01 mf:name "syntax-reduced-01.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; -. - -:syntax-reduced-02 mf:name "syntax-reduced-02.rq" ; - rdf:type mf:PositiveSyntaxTest ; - mf:action ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; -. - diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql5/syntax-reduced-01.rq b/test/data/suites/DAWG/data-r2/syntax-sparql5/syntax-reduced-01.rq deleted file mode 100644 index 06d00b05e..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql5/syntax-reduced-01.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT REDUCED * WHERE { ?x ?y ?z } diff --git a/test/data/suites/DAWG/data-r2/syntax-sparql5/syntax-reduced-02.rq b/test/data/suites/DAWG/data-r2/syntax-sparql5/syntax-reduced-02.rq deleted file mode 100644 index 404a64b08..000000000 --- a/test/data/suites/DAWG/data-r2/syntax-sparql5/syntax-reduced-02.rq +++ /dev/null @@ -1 +0,0 @@ -SELECT REDUCED ?x ?y WHERE { ?x ?y ?z } diff --git a/test/data/suites/DAWG/data-r2/triple-match/data-01.ttl b/test/data/suites/DAWG/data-r2/triple-match/data-01.ttl deleted file mode 100644 index 4c2575a82..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/data-01.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . - -:x :p :v1 . -:x :p :v2 . diff --git a/test/data/suites/DAWG/data-r2/triple-match/data-02.ttl b/test/data/suites/DAWG/data-r2/triple-match/data-02.ttl deleted file mode 100644 index 584d3d8c5..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/data-02.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix : . - - -:y :y :x . -:x :y :y . -:y :x :y . - diff --git a/test/data/suites/DAWG/data-r2/triple-match/data-03.ttl b/test/data/suites/DAWG/data-r2/triple-match/data-03.ttl deleted file mode 100644 index 4d5ce3dfc..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/data-03.ttl +++ /dev/null @@ -1,4 +0,0 @@ -@prefix : . - -:x :p :v1.1 . -:x :p :v2.1 . diff --git a/test/data/suites/DAWG/data-r2/triple-match/dawg-data-01.ttl b/test/data/suites/DAWG/data-r2/triple-match/dawg-data-01.ttl deleted file mode 100644 index d79c242a8..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/dawg-data-01.ttl +++ /dev/null @@ -1,29 +0,0 @@ -@prefix foaf: . -@prefix rdf: . -@prefix rdfs: . - -_:alice - rdf:type foaf:Person ; - foaf:name "Alice" ; - foaf:mbox ; - foaf:knows _:bob ; - . - -_:bob - rdf:type foaf:Person ; - foaf:name "Bob" ; - foaf:knows _:alice ; - foaf:mbox ; - foaf:mbox ; - . - - -_:eve - rdf:type foaf:Person ; - foaf:name "Eve" ; - foaf:knows _:fred ; - . - -_:fred - rdf:type foaf:Person ; - foaf:mbox . diff --git a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-01.rq b/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-01.rq deleted file mode 100644 index d4bc1d8f9..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-01.rq +++ /dev/null @@ -1,4 +0,0 @@ -PREFIX : - -SELECT * -WHERE { :x ?p ?q . } diff --git a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-02.rq b/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-02.rq deleted file mode 100644 index 0b71cf912..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-02.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : - -SELECT * -WHERE { ?x :p ?q . } - diff --git a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-03.rq b/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-03.rq deleted file mode 100644 index 6e31cf273..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-03.rq +++ /dev/null @@ -1,2 +0,0 @@ -SELECT * -WHERE { ?a ?a ?b . } diff --git a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-04.rq b/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-04.rq deleted file mode 100644 index 00a4b3d16..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-04.rq +++ /dev/null @@ -1,8 +0,0 @@ -PREFIX rdf: -PREFIX foaf: - -SELECT ?name -WHERE { - ?x rdf:type foaf:Person . - ?x foaf:name ?name . -} diff --git a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-05.rq b/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-05.rq deleted file mode 100644 index 0b71cf912..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/dawg-tp-05.rq +++ /dev/null @@ -1,5 +0,0 @@ -PREFIX : - -SELECT * -WHERE { ?x :p ?q . } - diff --git a/test/data/suites/DAWG/data-r2/triple-match/manifest.ttl b/test/data/suites/DAWG/data-r2/triple-match/manifest.ttl deleted file mode 100644 index 29997974c..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/manifest.ttl +++ /dev/null @@ -1,60 +0,0 @@ -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Some simple DAWG query evaluation test cases" ; - mf:entries - ( - :dawg-triple-pattern-001 - :dawg-triple-pattern-002 - :dawg-triple-pattern-003 - :dawg-triple-pattern-004 - ). - -:dawg-triple-pattern-001 a mf:QueryEvaluationTest ; - mf:name "dawg-triple-pattern-001" ; - rdfs:comment - "Simple triple match" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:dawg-triple-pattern-002 a mf:QueryEvaluationTest ; - mf:name "dawg-triple-pattern-002" ; - rdfs:comment - "Simple triple match" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:dawg-triple-pattern-003 a mf:QueryEvaluationTest ; - mf:name "dawg-triple-pattern-003" ; - rdfs:comment - "Simple triple match - repeated variable" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . - -:dawg-triple-pattern-004 a mf:QueryEvaluationTest ; - mf:name "dawg-triple-pattern-004" ; - rdfs:comment - "Simple triple match - two triples, common variable" ; - mf:action - [ qt:query ; - qt:data ] ; - mf:result ; - dawgt:approvedBy ; - dawgt:approval dawgt:Approved . diff --git a/test/data/suites/DAWG/data-r2/triple-match/result-tp-01.ttl b/test/data/suites/DAWG/data-r2/triple-match/result-tp-01.ttl deleted file mode 100644 index 5f7c2a25a..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/result-tp-01.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "p" , "q" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "q" - ] ; - rs:binding [ rs:value ; - rs:variable "p" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "q" - ] ; - rs:binding [ rs:value ; - rs:variable "p" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/triple-match/result-tp-02.ttl b/test/data/suites/DAWG/data-r2/triple-match/result-tp-02.ttl deleted file mode 100644 index 4fcb9c403..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/result-tp-02.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "q" , "x" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "q" - ] ; - rs:binding [ rs:value ; - rs:variable "x" - ] - ] ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "q" - ] ; - rs:binding [ rs:value ; - rs:variable "x" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/triple-match/result-tp-03.ttl b/test/data/suites/DAWG/data-r2/triple-match/result-tp-03.ttl deleted file mode 100644 index 99192e7b4..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/result-tp-03.ttl +++ /dev/null @@ -1,13 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "a" , "b" ; - rs:solution [ rs:binding [ rs:value ; - rs:variable "a" - ] ; - rs:binding [ rs:value ; - rs:variable "b" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/triple-match/result-tp-04.ttl b/test/data/suites/DAWG/data-r2/triple-match/result-tp-04.ttl deleted file mode 100644 index 9c188aa1a..000000000 --- a/test/data/suites/DAWG/data-r2/triple-match/result-tp-04.ttl +++ /dev/null @@ -1,18 +0,0 @@ -@prefix rs: . - -[] - rs:ResultSet ; - rs:resultVariable - "name" ; - rs:solution [ rs:binding [ rs:value "Bob" ; - rs:variable "name" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Alice" ; - rs:variable "name" - ] - ] ; - rs:solution [ rs:binding [ rs:value "Eve" ; - rs:variable "name" - ] - ] . diff --git a/test/data/suites/DAWG/data-r2/type-promotion/false.ttl b/test/data/suites/DAWG/data-r2/type-promotion/false.ttl deleted file mode 100644 index 5c58bebfb..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/false.ttl +++ /dev/null @@ -1,9 +0,0 @@ -# Simple false result to an ASK query. -# $Id: false.ttl,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -@prefix rdf: . -@prefix rs: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:boolean "false"^^xsd:boolean . diff --git a/test/data/suites/DAWG/data-r2/type-promotion/manifest.ttl b/test/data/suites/DAWG/data-r2/type-promotion/manifest.ttl deleted file mode 100644 index 829cbc12b..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/manifest.ttl +++ /dev/null @@ -1,406 +0,0 @@ -# $Id: manifest.ttl,v 1.7 2007/09/26 14:28:52 lfeigenb Exp $ - -@prefix rdf: . -@prefix : . -@prefix rdfs: . -@prefix dawgt: . -@prefix mf: . -@prefix qt: . - -<> rdf:type mf:Manifest ; - rdfs:comment "Type Promotion Tests" ; - mf:entries - ( - :type-promotion-01 - :type-promotion-02 - :type-promotion-03 - :type-promotion-04 - :type-promotion-05 - :type-promotion-06 - :type-promotion-07 - :type-promotion-08 - :type-promotion-09 - :type-promotion-10 - :type-promotion-11 - :type-promotion-12 - :type-promotion-13 - :type-promotion-14 - :type-promotion-15 - :type-promotion-16 - :type-promotion-17 - :type-promotion-18 - :type-promotion-19 - :type-promotion-20 - :type-promotion-21 - :type-promotion-22 - :type-promotion-23 - :type-promotion-24 - :type-promotion-25 - :type-promotion-26 - :type-promotion-27 - :type-promotion-28 - :type-promotion-29 - :type-promotion-30 - ) . - - -:type-promotion-01 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-double-double" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-02 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-double-float" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-03 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-double-decimal" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-04 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-float-float" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-05 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-float-decimal" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-06 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-decimal-decimal" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-07 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-integer-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-08 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-nonPositiveInteger-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-09 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-negativeInteger-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-10 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-long-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-11 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-int-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-12 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-short-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-13 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-byte-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-14 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-nonNegativeInteger-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-15 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-unsignedLong-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-16 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-unsignedInt-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-17 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-unsignedShort-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-18 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-unsignedByte-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-19 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-positiveInteger-short" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-20 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-short-double" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-21 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-short-float" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-22 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-short-decimal" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-23 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-short-short-fail" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-24 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-byte-short-fail" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-25 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-short-long-fail" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-26 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-short-int-fail" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-27 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-short-byte-fail" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-28 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-double-float-fail" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-29 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-double-decimal-fail" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . -:type-promotion-30 rdf:type mf:QueryEvaluationTest ; - mf:name "tP-float-decimal-fail" ; - qt:queryForm qt:QueryAsk ; - dawgt:approval dawgt:Approved ; - dawgt:approvedBy ; - rdfs:comment - "Positive test: product of type promotion within the xsd:decimal type tree." ; - mf:action - [ qt:data ; - qt:query ] ; - mf:result - . diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-byte-short-fail.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-byte-short-fail.rq deleted file mode 100644 index 061e86f6b..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-byte-short-fail.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-byte-short-fail.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:byte1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:short ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-byte-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-byte-short.rq deleted file mode 100644 index 14173a7b7..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-byte-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-byte-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:byte1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-decimal-decimal.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-decimal-decimal.rq deleted file mode 100644 index 7e04a9049..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-decimal-decimal.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-decimal-decimal.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:decimal1 rdf:value ?l . - t:decimal1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:decimal ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-decimal-fail.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-double-decimal-fail.rq deleted file mode 100644 index 3aa45f473..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-decimal-fail.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-double-decimal-fail.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:double1 rdf:value ?l . - t:decimal1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:decimal ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-decimal.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-double-decimal.rq deleted file mode 100644 index b6b2a34e4..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-decimal.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-double-decimal.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:double1 rdf:value ?l . - t:decimal1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:double ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-double.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-double-double.rq deleted file mode 100644 index cc2648e8c..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-double.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-double-double.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:double1 rdf:value ?l . - t:double1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:double ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-float-fail.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-double-float-fail.rq deleted file mode 100644 index d38b074c7..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-float-fail.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-double-float-fail.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:double1 rdf:value ?l . - t:float1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:float ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-float.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-double-float.rq deleted file mode 100644 index a8a64875f..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-double-float.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-double-float.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:double1 rdf:value ?l . - t:float1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:double ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-float-decimal-fail.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-float-decimal-fail.rq deleted file mode 100644 index fcabccd1d..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-float-decimal-fail.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-float-decimal-fail.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:float1 rdf:value ?l . - t:decimal1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:decimal ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-float-decimal.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-float-decimal.rq deleted file mode 100644 index 474b5b62d..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-float-decimal.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-float-decimal.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:float1 rdf:value ?l . - t:decimal1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:float ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-float-float.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-float-float.rq deleted file mode 100644 index 9fb3a0604..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-float-float.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-float-float.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:float1 rdf:value ?l . - t:float1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:float ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-int-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-int-short.rq deleted file mode 100644 index 409d02a49..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-int-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-int-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:int1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-integer-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-integer-short.rq deleted file mode 100644 index 89a98bdfd..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-integer-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-integer-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:integer1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-long-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-long-short.rq deleted file mode 100644 index 20b1958cb..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-long-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-long-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:long1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-negativeInteger-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-negativeInteger-short.rq deleted file mode 100644 index 00d9cbced..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-negativeInteger-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-negativeInteger-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:negativeIntegerN1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-nonNegativeInteger-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-nonNegativeInteger-short.rq deleted file mode 100644 index b01aa96bd..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-nonNegativeInteger-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-nonNegativeInteger-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:nonNegativeInteger1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-nonPositiveInteger-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-nonPositiveInteger-short.rq deleted file mode 100644 index cd50d9525..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-nonPositiveInteger-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-nonPositiveInteger-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:nonPositiveIntegerN1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-positiveInteger-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-positiveInteger-short.rq deleted file mode 100644 index fc845fd9e..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-positiveInteger-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-positiveInteger-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:positiveInteger1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-byte-fail.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-short-byte-fail.rq deleted file mode 100644 index 3e50fbeb2..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-byte-fail.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-short-byte-fail.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:short1 rdf:value ?l . - t:byte1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:double ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-decimal.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-short-decimal.rq deleted file mode 100644 index 79bd366e7..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-decimal.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-short-decimal.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:short1 rdf:value ?l . - t:decimal1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:decimal ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-double.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-short-double.rq deleted file mode 100644 index 9a9585a0b..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-double.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-short-double.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:short1 rdf:value ?l . - t:double1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:double ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-float.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-short-float.rq deleted file mode 100644 index ce6776a76..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-float.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-short-float.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:short1 rdf:value ?l . - t:float1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:float ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-int-fail.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-short-int-fail.rq deleted file mode 100644 index 5faf072f5..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-int-fail.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-short-int-fail.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:short1 rdf:value ?l . - t:int1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:float ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-long-fail.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-short-long-fail.rq deleted file mode 100644 index 0428b57e2..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-long-fail.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-short-long-fail.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:short1 rdf:value ?l . - t:long1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:decimal ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-short-fail.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-short-short-fail.rq deleted file mode 100644 index 33dea194f..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-short-fail.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-short-short-fail.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:short1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:short ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-short-short.rq deleted file mode 100644 index 20f87175a..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-short-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-short-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:short1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedByte-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedByte-short.rq deleted file mode 100644 index 18c60312e..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedByte-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-unsignedByte-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:unsignedByte1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedInt-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedInt-short.rq deleted file mode 100644 index 87ac6a8b9..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedInt-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-unsignedInt-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:unsignedInt1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedLong-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedLong-short.rq deleted file mode 100644 index fb16fb832..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedLong-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-unsignedLong-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:unsignedLong1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedShort-short.rq b/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedShort-short.rq deleted file mode 100644 index 4c64c327e..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP-unsignedShort-short.rq +++ /dev/null @@ -1,10 +0,0 @@ -# Positive test: product of type promotion within the xsd:decimal type tree. -# $Id: tP-unsignedShort-short.rq,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -PREFIX t: -PREFIX rdf: -PREFIX xsd: -ASK - WHERE { t:unsignedShort1 rdf:value ?l . - t:short1 rdf:value ?r . - FILTER ( datatype(?l + ?r) = xsd:integer ) } diff --git a/test/data/suites/DAWG/data-r2/type-promotion/tP.ttl b/test/data/suites/DAWG/data-r2/type-promotion/tP.ttl deleted file mode 100644 index 1072f785a..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/tP.ttl +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: tP.ttl,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -@prefix rdf: . -@prefix xsd: . -@prefix t: . - -t:decimal1 rdf:value "1"^^xsd:decimal . -t:float1 rdf:value "1"^^xsd:float . -t:double1 rdf:value "1"^^xsd:double . -t:booleanT rdf:value "true"^^xsd:boolean . -t:dateTime1 rdf:value "2005-01-14T12:34:56"^^xsd:dateTime . - -# types derived from xsd:decimal: - - t:integer1 rdf:value "1"^^xsd:integer . - t:nonPositiveIntegerN1 rdf:value "-1"^^xsd:nonPositiveInteger . - t:negativeIntegerN1 rdf:value "-1"^^xsd:negativeInteger . - t:long1 rdf:value "1"^^xsd:long . - t:int1 rdf:value "1"^^xsd:int . - t:short1 rdf:value "1"^^xsd:short . - t:byte1 rdf:value "1"^^xsd:byte . - t:nonNegativeInteger1 rdf:value "1"^^xsd:nonNegativeInteger . - t:unsignedLong1 rdf:value "1"^^xsd:unsignedLong . - t:unsignedInt1 rdf:value "1"^^xsd:unsignedInt . - t:unsignedShort1 rdf:value "1"^^xsd:unsignedShort . - t:unsignedByte1 rdf:value "1"^^xsd:unsignedByte . - t:positiveInteger1 rdf:value "1"^^xsd:positiveInteger . - diff --git a/test/data/suites/DAWG/data-r2/type-promotion/true.ttl b/test/data/suites/DAWG/data-r2/type-promotion/true.ttl deleted file mode 100644 index 6cfa8fc7d..000000000 --- a/test/data/suites/DAWG/data-r2/type-promotion/true.ttl +++ /dev/null @@ -1,9 +0,0 @@ -# Simple true result to an ASK query. -# $Id: true.ttl,v 1.1 2007/06/29 14:24:48 aseaborne Exp $ - -@prefix rdf: . -@prefix rs: . -@prefix xsd: . - -[] rdf:type rs:ResultSet ; - rs:boolean "true"^^xsd:boolean . From a6f42e9b16c68a2e057013bc8b47656f72e82333 Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Sat, 23 Apr 2022 23:04:09 +0200 Subject: [PATCH 08/19] test: Add more tests for Graph serialize This is to verify that all serialization options work for all graphs. --- test/test_serializers/test_serializer.py | 527 ++++++++++++++++++++++- 1 file changed, 520 insertions(+), 7 deletions(-) diff --git a/test/test_serializers/test_serializer.py b/test/test_serializers/test_serializer.py index 7f6ab1023..d2f03b081 100644 --- a/test/test_serializers/test_serializer.py +++ b/test/test_serializers/test_serializer.py @@ -1,14 +1,39 @@ +import enum +import importlib import itertools import logging import re -from pathlib import Path -from test.utils import GraphHelper -from typing import Tuple, cast +from contextlib import contextmanager +from dataclasses import dataclass, field +from functools import lru_cache +from pathlib import Path, PurePath +from test.utils import GraphHelper, get_unique_plugins +from typing import ( + IO, + Callable, + Dict, + Generator, + List, + Optional, + Set, + Tuple, + Union, + cast, +) import pytest +from _pytest.mark.structures import Mark, MarkDecorator, ParameterSet + +import rdflib +import rdflib.plugin +from rdflib import RDF, XSD, Graph, Literal, Namespace, URIRef +from rdflib.graph import DATASET_DEFAULT_GRAPH_ID, ConjunctiveGraph, Dataset +from rdflib.plugins.sparql.parser import DEBUG +from rdflib.serializer import Serializer -from rdflib import RDF, Graph, Literal, Namespace, URIRef -from rdflib.graph import ConjunctiveGraph +EGSCHEMA = Namespace("example:") +EGURN = Namespace("urn:example:") +EGHTTP = Namespace("http://example.com/") @pytest.mark.parametrize( @@ -49,10 +74,66 @@ def test_rdf_type(format: str, tuple_index: int, is_keyword: bool) -> None: EG = Namespace("example:") -@pytest.fixture +@pytest.fixture(scope="session") def simple_graph() -> Graph: + """ + This is a simple graph with no BNodes that can be used in tests. + Assumptions/assertions should not be made about the triples in it, other + than that it contains no blank nodes. + """ graph = Graph() - graph.add((EG.subject, EG.predicate, Literal("日本語の表記体系", lang="jpx"))) + graph.add((EGSCHEMA.subject, EGSCHEMA.predicate, EGSCHEMA.object)) + graph.add((EGSCHEMA.subject, EGSCHEMA.predicate, Literal(12))) + graph.add( + ( + EGHTTP.subject, + EGHTTP.predicate, + Literal("日本語の表記体系", lang="jpx"), + ) + ) + graph.add((EGURN.subject, EGSCHEMA.predicate, EGSCHEMA.subject)) + graph.add( + (EGSCHEMA.object, EGHTTP.predicate, Literal("XSD string", datatype=XSD.string)) + ) + return graph + + +@pytest.fixture(scope="session") +def simple_dataset() -> Dataset: + """ + This is a simple dataset with no BNodes that can be used in tests. + Assumptions/assertions should not be made about the quads in it, other + than that it contains no blank nodes. + """ + graph = Dataset() + graph.default_context.add((EGSCHEMA.subject, EGSCHEMA.predicate, EGSCHEMA.object)) + graph.default_context.add((EGURN.subject, EGURN.predicate, EGURN.object)) + graph.default_context.add((EGHTTP.subject, EGHTTP.predicate, Literal("typeless"))) + graph.get_context(EGSCHEMA.graph).add( + (EGSCHEMA.subject, EGSCHEMA.predicate, EGSCHEMA.object) + ) + graph.get_context(EGSCHEMA.graph).add( + (EGSCHEMA.subject, EGSCHEMA.predicate, Literal(12)) + ) + graph.get_context(EGSCHEMA.graph).add( + ( + EGHTTP.subject, + EGHTTP.predicate, + Literal("日本語の表記体系", lang="jpx"), + ) + ) + graph.get_context(EGSCHEMA.graph).add( + (EGURN.subject, EGSCHEMA.predicate, EGSCHEMA.subject) + ) + graph.get_context(EGURN.graph).add( + (EGSCHEMA.subject, EGSCHEMA.predicate, EGSCHEMA.object) + ) + graph.get_context(EGURN.graph).add( + (EGSCHEMA.subject, EGHTTP.predicate, EGHTTP.object) + ) + graph.get_context(EGURN.graph).add( + (EGSCHEMA.subject, EGHTTP.predicate, Literal("XSD string", datatype=XSD.string)) + ) return graph @@ -92,3 +173,435 @@ def test_serialize_to_fileurl(tmp_path: Path, simple_graph: Graph): graph_check = Graph() graph_check.parse(source=tfpath, format="nt") GraphHelper.assert_triple_sets_equals(simple_graph, graph_check) + + +def test_serialize_badformat(simple_graph: Graph) -> None: + # NOTE: This is using an fully qualified name because of reloading that + # occurs in `test_plugins.py` which results in the the type identity being + # different. + with pytest.raises(rdflib.plugin.PluginException) as ctx: + simple_graph.serialize(destination="http://example.com/", format="badformat") + assert "badformat" in f"{ctx.value}" + + +@dataclass(frozen=True) +class DestRef: + param: Union[Path, PurePath, str, IO[bytes]] + path: Path + + +class DestinationType(str, enum.Enum): + PATH = enum.auto() + PURE_PATH = enum.auto() + STR_PATH = enum.auto() + BINARY_IO = enum.auto() + RETURN = enum.auto() + + @contextmanager + def make_ref(self, tmp_path: Path) -> Generator[Optional[DestRef], None, None]: + path = tmp_path / f"file-{self.name}" + if self is DestinationType.RETURN: + yield None + elif self is DestinationType.PATH: + yield DestRef(path, path) + elif self is DestinationType.PURE_PATH: + yield DestRef(PurePath(path), path) + elif self is DestinationType.STR_PATH: + yield DestRef(f"{path}", path) + elif self is DestinationType.BINARY_IO: + with path.open("wb") as bfh: + yield DestRef(bfh, path) + else: + raise ValueError(f"unsupported type {type!r}") + + +class GraphType(str, enum.Enum): + QUAD = enum.auto() + TRIPLE = enum.auto() + + +class GraphFormat(str, enum.Enum): + TRIG = "trig" + NQUADS = "nquads" + TRIX = "trix" + JSON_LD = "json-ld" + TURTLE = "turtle" + NT11 = "nt11" + XML = "xml" + N3 = "n3" + NTRIPLES = "ntriples" + HEXT = "hext" + + @classmethod + @lru_cache(maxsize=None) + def info_dict(cls) -> "GraphFormatInfoDict": + return GraphFormatInfoDict.make( + GraphFormatInfo( + GraphFormat.TRIG, + graph_types={GraphType.TRIPLE, GraphType.QUAD}, + encodings={"utf-8"}, + ), + GraphFormatInfo( + GraphFormat.NQUADS, + # TODO FIXME: Currently nquads rejects requests to seralize + # non-context-aware stores, this does not make a lot of sense and + # should be fixed. + # + graph_types={GraphType.QUAD}, + encodings={"utf-8"}, + ), + GraphFormatInfo( + GraphFormat.TRIX, + # TODO FIXME: Currently trix rejects requests to seralize + # non-context-aware stores, this does not make a lot of sense and + # should be fixed. + # + graph_types={GraphType.QUAD}, + encodings={"utf-8"}, + ), + GraphFormatInfo( + GraphFormat.JSON_LD, + graph_types={GraphType.TRIPLE, GraphType.QUAD}, + encodings={"utf-8"}, + ), + GraphFormatInfo( + GraphFormat.TURTLE, + graph_types={GraphType.TRIPLE}, + encodings={"utf-8"}, + serializer_list=["longturtle", "turtle"], + ), + GraphFormatInfo( + GraphFormat.NT11, + graph_types={GraphType.TRIPLE}, + encodings={"utf-8"}, + ), + GraphFormatInfo( + GraphFormat.XML, + graph_types={GraphType.TRIPLE}, + encodings={"utf-8"}, + serializer_list=["xml", "pretty-xml"], + ), + GraphFormatInfo( + GraphFormat.N3, + graph_types={GraphType.TRIPLE}, + encodings={"utf-8"}, + ), + GraphFormatInfo( + GraphFormat.NTRIPLES, + graph_types={GraphType.TRIPLE}, + encodings={"utf-8"}, + ), + GraphFormatInfo( + GraphFormat.HEXT, + graph_types={GraphType.TRIPLE, GraphType.QUAD}, + encodings={"utf-8"}, + ), + ) + + @property + def info(self) -> "GraphFormatInfo": + return self.info_dict()[self] + + @classmethod + @lru_cache(maxsize=None) + def set(cls) -> Set["GraphFormat"]: + return set(*cls) + + +@dataclass +class GraphFormatInfo: + name: "GraphFormat" + graph_types: Set[GraphType] + encodings: Set[str] + serializer_list: Optional[List[str]] = field( + default=None, repr=False, hash=False, compare=False + ) + deserializer_list: Optional[List[str]] = field( + default=None, repr=False, hash=False, compare=False + ) + serializers: List[str] = field(default_factory=list, init=False) + deserializers: List[str] = field(default_factory=list, init=False) + + def __post_init__(self) -> None: + self.serializers = ( + [self.name.value] if self.serializer_list is None else self.serializer_list + ) + self.deserializers = ( + [self.name.value] + if self.deserializer_list is None + else self.deserializer_list + ) + + @property + def serializer(self) -> "str": + if not self.serializers: + raise RuntimeError("no serializers for {self.name}") + return self.serializers[0] + + @property + def deserializer(self) -> "str": + if not self.deserializers: + raise RuntimeError("no deserializer for {self.name}") + return self.deserializer[0] + + +class GraphFormatInfoDict(Dict[str, GraphFormatInfo]): + @classmethod + def make(cls, *graph_format: GraphFormatInfo) -> "GraphFormatInfoDict": + result = cls() + for item in graph_format: + result[item.name] = item + return result + + def serdes_dict(self) -> Tuple[Dict[str, GraphFormat], Dict[str, GraphFormat]]: + serializer_dict: Dict[str, GraphFormat] = {} + deserializer_dict: Dict[str, GraphFormat] = {} + for format in self.values(): + for serializer in format.serializers: + serializer_dict[serializer] = format.name + for deserializer in format.deserializers: + deserializer_dict[deserializer] = format.name + return (serializer_dict, deserializer_dict) + + +serializer_dict, deserializer_dict = GraphFormat.info_dict().serdes_dict() + + +def test_all_serializers_specified() -> None: + plugins = get_unique_plugins(Serializer) + for plugin_refs in plugins.values(): + names = {plugin_ref.name for plugin_ref in plugin_refs} + assert ( + set(serializer_dict.keys()) != set() + ), f"serializers does not include any of {names}" + + +def make_serialize_parse_tests() -> Generator[ParameterSet, None, None]: + """ + This function generates test parameters for test_serialize_parse. + """ + xfails: Dict[ + Tuple[str, GraphType, DestinationType, Optional[str]], + Union[MarkDecorator, Mark], + ] = {} + destination_types = set(DestinationType) + for serializer_name, destination_type in itertools.product( + serializer_dict.keys(), destination_types + ): + format = serializer_dict[serializer_name] + encodings: Set[Optional[str]] = {*format.info.encodings, None} + for encoding, graph_type in itertools.product( + encodings, format.info.graph_types + ): + xfail = xfails.get( + (serializer_name, graph_type, destination_type, encoding) + ) + if not xfail: + if serializer_name in ("trig") and graph_type is GraphType.TRIPLE: + xfail = pytest.mark.xfail( + raises=AssertionError, + reason=""" + TriG serializes non-context aware stores incorrectly, adding a blank + node graph name which breaks round tripping. + """, + ) + if serializer_name in ("json-ld"): + xfail = pytest.mark.xfail( + raises=AssertionError, + reason=""" + JSON-LD is dropping datatype: + - rdflib.term.Literal('XSD string'), + + rdflib.term.Literal('XSD string', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#string')), + """, + ) + elif serializer_name in ("hext") and graph_type is GraphType.QUAD: + xfail = pytest.mark.xfail( + raises=AssertionError, + reason=""" + hext is injecting datatype: + - rdflib.term.Literal('typeless', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#string')), + + rdflib.term.Literal('typeless'), + """, + ) + marks = (xfail,) if xfail is not None else () + yield pytest.param( + (serializer_name, graph_type, destination_type, encoding), + id=f"{serializer_name}-{graph_type.name}-{destination_type.name}-{encoding}", + marks=marks, + ) + + +SerializeResultType = Union[bytes, str, Graph] + + +@pytest.mark.parametrize( + ["args"], + make_serialize_parse_tests(), +) +def test_serialize_parse( + tmp_path: Path, + simple_graph: Graph, + simple_dataset: Dataset, + args: Tuple[str, GraphType, DestinationType, Optional[str]], +) -> None: + """ + Serialization works correctly with the given arguments and generates output + that can be parsed to a graph that is identical to the original graph. + """ + serializer_name, graph_type, destination_type, encoding = args + format = serializer_dict[serializer_name] + graph: Union[Graph, Dataset] + if graph_type == GraphType.QUAD: + graph = simple_dataset + elif graph_type == GraphType.TRIPLE: + graph = simple_graph + else: + raise ValueError(f"graph_type {graph_type!r} is not supported") + with destination_type.make_ref(tmp_path) as dest_ref: + destination = None if dest_ref is None else dest_ref.param + serialize_result = graph.serialize( + destination=destination, + format=serializer_name, + encoding=encoding, + ) + + logging.debug("serialize_result = %r, dest_ref = %s", serialize_result, dest_ref) + + if dest_ref is None: + if encoding is None: + assert isinstance(serialize_result, str) + serialized_data = serialize_result + else: + assert isinstance(serialize_result, bytes) + serialized_data = serialize_result.decode(encoding) + else: + assert isinstance(serialize_result, Graph) + assert dest_ref.path.exists() + serialized_data = dest_ref.path.read_bytes().decode( + "utf-8" if encoding is None else encoding + ) + + logging.debug("serialized_data = %s", serialized_data) + check_serialized(format, graph, serialized_data) + + +def check_serialized(format: GraphFormat, graph: Graph, data: str) -> None: + graph_check = Dataset() if isinstance(graph, Dataset) else Graph() + if not format.info.deserializers: + return + graph_check.parse( + data=data, + format=format.info.deserializers[0], + publicID=DATASET_DEFAULT_GRAPH_ID, + ) + logging.debug("graph = %r, graph_check = %r", graph, graph_check) + GraphHelper.assert_sets_equals(graph, graph_check) + + +@dataclass +class SerializeArgs: + format: str + opt_dest_ref: Optional[DestRef] + + @property + def dest_ref(self) -> DestRef: + if self.opt_dest_ref is None: + raise RuntimeError("dest_ref is None") + return self.opt_dest_ref + + +SerializeFunctionType = Callable[[Graph, SerializeArgs], SerializeResultType] +StrSerializeFunctionType = Callable[[Graph, SerializeArgs], str] +BytesSerializeFunctionType = Callable[[Graph, SerializeArgs], bytes] +FileSerializeFunctionType = Callable[[Graph, SerializeArgs], Graph] + + +str_serialize_functions: List[StrSerializeFunctionType] = [ + lambda graph, args: graph.serialize(), + lambda graph, args: graph.serialize(None), + lambda graph, args: graph.serialize(None, args.format), + lambda graph, args: graph.serialize(None, args.format, encoding=None), + lambda graph, args: graph.serialize(None, args.format, None, None), + lambda graph, args: graph.serialize(None, format=args.format), + lambda graph, args: graph.serialize(None, format=args.format, encoding=None), +] + + +bytes_serialize_functions: List[BytesSerializeFunctionType] = [ + lambda graph, args: graph.serialize(encoding="utf-8"), + lambda graph, args: graph.serialize(None, args.format, encoding="utf-8"), + lambda graph, args: graph.serialize(None, args.format, None, "utf-8"), + lambda graph, args: graph.serialize(None, args.format, None, encoding="utf-8"), + lambda graph, args: graph.serialize(None, args.format, encoding="utf-8"), + lambda graph, args: graph.serialize(None, format=args.format, encoding="utf-8"), +] + + +file_serialize_functions: List[FileSerializeFunctionType] = [ + lambda graph, args: graph.serialize(args.dest_ref.param), + lambda graph, args: graph.serialize(args.dest_ref.param, encoding=None), + lambda graph, args: graph.serialize(args.dest_ref.param, encoding="utf-8"), + lambda graph, args: graph.serialize(args.dest_ref.param, args.format), + lambda graph, args: graph.serialize( + args.dest_ref.param, args.format, encoding=None + ), + lambda graph, args: graph.serialize(args.dest_ref.param, args.format, None, None), + lambda graph, args: graph.serialize( + args.dest_ref.param, args.format, encoding="utf-8" + ), + lambda graph, args: graph.serialize( + args.dest_ref.param, args.format, None, encoding="utf-8" + ), + lambda graph, args: graph.serialize( + args.dest_ref.param, args.format, None, "utf-8" + ), +] + + +@pytest.mark.parametrize( + ["destination_type", "serialize_function"], + [ + *[ + (DestinationType.RETURN, str_serialize_function) + for str_serialize_function in str_serialize_functions + ], + *[ + (DestinationType.RETURN, bytes_serialize_function) + for bytes_serialize_function in bytes_serialize_functions + ], + *itertools.product( + { + DestinationType.BINARY_IO, + DestinationType.PATH, + DestinationType.PURE_PATH, + DestinationType.STR_PATH, + }, + file_serialize_functions, + ), + ], +) +def test_serialize_overloads( + tmp_path: Path, + simple_graph: Graph, + destination_type: DestinationType, + serialize_function: SerializeFunctionType, +) -> None: + format = GraphFormat.TURTLE + serializer = format.info.serializer + + with destination_type.make_ref(tmp_path) as dest_ref: + serialize_result = serialize_function( + simple_graph, SerializeArgs(format, dest_ref) + ) + + if isinstance(serialize_result, str): + serialized_data = serialize_result + elif isinstance(serialize_result, bytes): + serialized_data = serialize_result.decode("utf-8") + else: + assert isinstance(serialize_result, Graph) + assert dest_ref is not None + assert dest_ref.path.exists() + serialized_data = dest_ref.path.read_text(encoding="utf-8") + + check_serialized(format, simple_graph, serialized_data) From aa6cde39b910fd644a92aca38cf25014c63385e2 Mon Sep 17 00:00:00 2001 From: Graham Higgins Date: Sat, 14 May 2022 23:43:29 +0100 Subject: [PATCH 09/19] Fixed base URI for RDFLib's SPARQL test suite (#1891) Co-authored-by: Iwan Aucamp --- test/data/suites/rdflib/sparql/manifest.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/data/suites/rdflib/sparql/manifest.ttl b/test/data/suites/rdflib/sparql/manifest.ttl index 5fe53956e..bb8e2b8a9 100644 --- a/test/data/suites/rdflib/sparql/manifest.ttl +++ b/test/data/suites/rdflib/sparql/manifest.ttl @@ -5,7 +5,7 @@ @prefix dawgt: . -@prefix : . +@prefix : . <> a mf:Manifest ; rdfs:label "RDFLib Extra SPARQL tests" ; From b13655efa170edcb90c55d1e0b7377476efa4dfa Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Sat, 14 May 2022 23:07:31 +0200 Subject: [PATCH 10/19] test: move `EARL` and `RDFT` namespaces to separate files This patch moves the `RDFT` and `EARL` namespaces into their own files. This is to make the test code a bit cleaner to work with. Doing this in preperation for rewrite of the RDF/XML test suite. --- test/test_w3c_spec/test_n3_w3c.py | 3 +- test/test_w3c_spec/test_nquads_w3c.py | 3 +- test/test_w3c_spec/test_nt_w3c.py | 3 +- test/test_w3c_spec/test_trig_w3c.py | 3 +- test/test_w3c_spec/test_turtle_w3c.py | 3 +- test/utils/_EARL.py | 42 +++++++++++++++++++++++++++ test/utils/_RDFT.py | 38 ++++++++++++++++++++++++ test/utils/earl.py | 42 +-------------------------- test/utils/manifest.py | 32 +------------------- test/utils/namespace.py | 7 +++++ 10 files changed, 99 insertions(+), 77 deletions(-) create mode 100644 test/utils/_EARL.py create mode 100644 test/utils/_RDFT.py create mode 100644 test/utils/namespace.py diff --git a/test/test_w3c_spec/test_n3_w3c.py b/test/test_w3c_spec/test_n3_w3c.py index 1f1506103..0048e24ef 100644 --- a/test/test_w3c_spec/test_n3_w3c.py +++ b/test/test_w3c_spec/test_n3_w3c.py @@ -4,7 +4,8 @@ import os from test import TEST_DIR from test.data import TEST_DATA_DIR -from test.utils.manifest import RDFT, RDFTest, read_manifest +from test.utils.manifest import RDFTest, read_manifest +from test.utils.namespace import RDFT from typing import Callable, Dict import pytest diff --git a/test/test_w3c_spec/test_nquads_w3c.py b/test/test_w3c_spec/test_nquads_w3c.py index e3e735e26..30a3ebef1 100644 --- a/test/test_w3c_spec/test_nquads_w3c.py +++ b/test/test_w3c_spec/test_nquads_w3c.py @@ -4,7 +4,8 @@ import os from test.data import TEST_DATA_DIR -from test.utils.manifest import RDFT, RDFTest, read_manifest +from test.utils.manifest import RDFTest, read_manifest +from test.utils.namespace import RDFT from typing import Callable, Dict import pytest diff --git a/test/test_w3c_spec/test_nt_w3c.py b/test/test_w3c_spec/test_nt_w3c.py index a9ebfb8b3..cba8104f7 100644 --- a/test/test_w3c_spec/test_nt_w3c.py +++ b/test/test_w3c_spec/test_nt_w3c.py @@ -3,7 +3,8 @@ import os from test import TEST_DIR from test.data import TEST_DATA_DIR -from test.utils.manifest import RDFT, RDFTest, read_manifest +from test.utils.manifest import RDFTest, read_manifest +from test.utils.namespace import RDFT from typing import Callable, Dict import pytest diff --git a/test/test_w3c_spec/test_trig_w3c.py b/test/test_w3c_spec/test_trig_w3c.py index f07ff9857..e534f9b3a 100644 --- a/test/test_w3c_spec/test_trig_w3c.py +++ b/test/test_w3c_spec/test_trig_w3c.py @@ -4,7 +4,8 @@ import os from test.data import TEST_DATA_DIR -from test.utils.manifest import RDFT, RDFTest, read_manifest +from test.utils.manifest import RDFTest, read_manifest +from test.utils.namespace import RDFT from typing import Callable, Dict import pytest diff --git a/test/test_w3c_spec/test_turtle_w3c.py b/test/test_w3c_spec/test_turtle_w3c.py index adea06409..67e075762 100644 --- a/test/test_w3c_spec/test_turtle_w3c.py +++ b/test/test_w3c_spec/test_turtle_w3c.py @@ -5,7 +5,8 @@ from pathlib import Path from test.data import TEST_DATA_DIR from test.utils import file_uri_to_path -from test.utils.manifest import RDFT, RDFTest, read_manifest +from test.utils.manifest import RDFTest, read_manifest +from test.utils.namespace import RDFT from typing import Callable, Dict, Set import pytest diff --git a/test/utils/_EARL.py b/test/utils/_EARL.py new file mode 100644 index 000000000..9d3dd970c --- /dev/null +++ b/test/utils/_EARL.py @@ -0,0 +1,42 @@ +from rdflib.namespace import DefinedNamespace, Namespace +from rdflib.term import URIRef + + +class EARL(DefinedNamespace): + _fail = True + _NS = Namespace("http://www.w3.org/ns/earl#") + + assertedBy: URIRef # assertor of an assertion + Assertion: URIRef # a statement that embodies the results of a test + Assertor: URIRef # an entity such as a person, a software tool, an organization, or any other grouping that carries out a test collectively + automatic: URIRef # where the test was carried out automatically by the software tool and without any human intervention + CannotTell: URIRef # the class of outcomes to denote an undetermined outcome + cantTell: URIRef # it is unclear if the subject passed or failed the test + failed: URIRef # the subject failed the test + Fail: URIRef # the class of outcomes to denote failing a test + inapplicable: URIRef # the test is not applicable to the subject + info: URIRef # additional warnings or error messages in a human-readable form + mainAssertor: URIRef # assertor that is primarily responsible for performing the test + manual: URIRef # where the test was carried out by human evaluators + mode: URIRef # mode in which the test was performed + NotApplicable: URIRef # the class of outcomes to denote the test is not applicable + NotTested: URIRef # the class of outcomes to denote the test has not been carried out + outcome: URIRef # outcome of performing the test + OutcomeValue: URIRef # a discrete value that describes a resulting condition from carrying out the test + passed: URIRef # the subject passed the test + Pass: URIRef # the class of outcomes to denote passing a test + pointer: URIRef # location within a test subject that are most relevant to a test result + result: URIRef # result of an assertion + semiAuto: URIRef # where the test was partially carried out by software tools, but where human input or judgment was still required to decide or help decide the outcome of the test + Software: URIRef # any piece of software such as an authoring tool, browser, or evaluation tool + subject: URIRef # test subject of an assertion + TestCase: URIRef # an atomic test, usually one that is a partial test for a requirement + TestCriterion: URIRef # a testable statement, usually one that can be passed or failed + TestMode: URIRef # describes how a test was carried out + TestRequirement: URIRef # a higher-level requirement that is tested by executing one or more sub-tests + TestResult: URIRef # the actual result of performing the test + TestSubject: URIRef # the class of things that have been tested against some test criterion + test: URIRef # test criterion of an assertion + undisclosed: URIRef # where the exact testing process is undisclosed + unknownMode: URIRef # where the testing process is unknown or undetermined + untested: URIRef # the test has not been carried out diff --git a/test/utils/_RDFT.py b/test/utils/_RDFT.py new file mode 100644 index 000000000..be7eacfa9 --- /dev/null +++ b/test/utils/_RDFT.py @@ -0,0 +1,38 @@ +from rdflib.namespace import DefinedNamespace, Namespace +from rdflib.term import URIRef + + +class RDFT(DefinedNamespace): + """ + Described at . + Generated from . + """ + + _fail = True + _NS = Namespace("http://www.w3.org/ns/rdftest#") + + approval: URIRef # Approval status of a test. + Approval: URIRef # The superclass of all test approval statuses. + Approved: URIRef # Indicates that a test is approved. + Proposed: URIRef # Indicates that a test is proposed, but not approved. + Rejected: URIRef # Indicates that a test is not approved. + TestEval: URIRef # Superclass of all RDF Evaluation Tests. + TestNQuadsNegativeSyntax: URIRef # A negative N-Quads syntax test. + TestNQuadsPositiveSyntax: URIRef # A positive N-Quads syntax test. + TestNTriplesNegativeSyntax: URIRef # A negative N-Triples syntax test. + TestNTriplesPositiveSyntax: URIRef # A positive N-Triples syntax test. + TestSyntax: URIRef # Superclass of all RDF Syntax Tests. + TestTrigEval: URIRef # A positive TriG evaluation test. + TestTrigNegativeEval: URIRef # A negative TriG evaluation test. + TestTriGNegativeSyntax: URIRef # A negative TriG syntax test. + TestTriGPositiveSyntax: URIRef # A positive TriG syntax test. + TestTurtleEval: URIRef # A positive Turtle evaluation test. + TestTurtleNegativeEval: URIRef # A negative Turtle evaluation test. + TestTurtleNegativeSyntax: URIRef # A negative Turtle syntax test. + TestTurtlePositiveSyntax: URIRef # A positive Turtle syntax test. + Test: URIRef # Superclass of all RDF Tests. + TestXMLNegativeSyntax: URIRef # A negative RDF/XML syntax test. + XMLEval: URIRef # A positive RDF/XML evaluation test. + + TestTrigPositiveSyntax: URIRef + TestTrigNegativeSyntax: URIRef diff --git a/test/utils/earl.py b/test/utils/earl.py index e44480bb2..441a3e860 100644 --- a/test/utils/earl.py +++ b/test/utils/earl.py @@ -5,7 +5,7 @@ import logging from datetime import datetime from pathlib import Path -from test.utils.manifest import RDFT +from test.utils.namespace import EARL, RDFT from typing import TYPE_CHECKING, Generator, Optional, Tuple, cast import pytest @@ -23,46 +23,6 @@ from pluggy._result import _Result -class EARL(DefinedNamespace): - _fail = True - _NS = Namespace("http://www.w3.org/ns/earl#") - - assertedBy: URIRef # assertor of an assertion - Assertion: URIRef # a statement that embodies the results of a test - Assertor: URIRef # an entity such as a person, a software tool, an organization, or any other grouping that carries out a test collectively - automatic: URIRef # where the test was carried out automatically by the software tool and without any human intervention - CannotTell: URIRef # the class of outcomes to denote an undetermined outcome - cantTell: URIRef # it is unclear if the subject passed or failed the test - failed: URIRef # the subject failed the test - Fail: URIRef # the class of outcomes to denote failing a test - inapplicable: URIRef # the test is not applicable to the subject - info: URIRef # additional warnings or error messages in a human-readable form - mainAssertor: URIRef # assertor that is primarily responsible for performing the test - manual: URIRef # where the test was carried out by human evaluators - mode: URIRef # mode in which the test was performed - NotApplicable: URIRef # the class of outcomes to denote the test is not applicable - NotTested: URIRef # the class of outcomes to denote the test has not been carried out - outcome: URIRef # outcome of performing the test - OutcomeValue: URIRef # a discrete value that describes a resulting condition from carrying out the test - passed: URIRef # the subject passed the test - Pass: URIRef # the class of outcomes to denote passing a test - pointer: URIRef # location within a test subject that are most relevant to a test result - result: URIRef # result of an assertion - semiAuto: URIRef # where the test was partially carried out by software tools, but where human input or judgment was still required to decide or help decide the outcome of the test - Software: URIRef # any piece of software such as an authoring tool, browser, or evaluation tool - subject: URIRef # test subject of an assertion - TestCase: URIRef # an atomic test, usually one that is a partial test for a requirement - TestCriterion: URIRef # a testable statement, usually one that can be passed or failed - TestMode: URIRef # describes how a test was carried out - TestRequirement: URIRef # a higher-level requirement that is tested by executing one or more sub-tests - TestResult: URIRef # the actual result of performing the test - TestSubject: URIRef # the class of things that have been tested against some test criterion - test: URIRef # test criterion of an assertion - undisclosed: URIRef # where the exact testing process is undisclosed - unknownMode: URIRef # where the testing process is unknown or undetermined - untested: URIRef # the test has not been carried out - - class EarlReport: """ This is a helper class for building an EARL report graph. diff --git a/test/utils/manifest.py b/test/utils/manifest.py index abaaf551b..abdaea624 100644 --- a/test/utils/manifest.py +++ b/test/utils/manifest.py @@ -1,3 +1,4 @@ +from test.utils.namespace import RDFT from typing import Iterable, List, NamedTuple, Optional, Tuple, Union, cast from rdflib import RDF, RDFS, Graph, Namespace @@ -9,37 +10,6 @@ UP = Namespace("http://www.w3.org/2009/sparql/tests/test-update#") -class RDFT(DefinedNamespace): - _fail = True - _NS = Namespace("http://www.w3.org/ns/rdftest#") - - approval: URIRef # Approval status of a test. - Approval: URIRef # The superclass of all test approval statuses. - Approved: URIRef # Indicates that a test is approved. - Proposed: URIRef # Indicates that a test is proposed, but not approved. - Rejected: URIRef # Indicates that a test is not approved. - TestEval: URIRef # Superclass of all RDF Evaluation Tests. - TestNQuadsNegativeSyntax: URIRef # A negative N-Quads syntax test. - TestNQuadsPositiveSyntax: URIRef # A positive N-Quads syntax test. - TestNTriplesNegativeSyntax: URIRef # A negative N-Triples syntax test. - TestNTriplesPositiveSyntax: URIRef # A positive N-Triples syntax test. - TestSyntax: URIRef # Superclass of all RDF Syntax Tests. - TestTrigEval: URIRef # A positive TriG evaluation test. - TestTrigNegativeEval: URIRef # A negative TriG evaluation test. - TestTriGNegativeSyntax: URIRef # A negative TriG syntax test. - TestTriGPositiveSyntax: URIRef # A positive TriG syntax test. - TestTurtleEval: URIRef # A positive Turtle evaluation test. - TestTurtleNegativeEval: URIRef # A negative Turtle evaluation test. - TestTurtleNegativeSyntax: URIRef # A negative Turtle syntax test. - TestTurtlePositiveSyntax: URIRef # A positive Turtle syntax test. - Test: URIRef # Superclass of all RDF Tests. - TestXMLNegativeSyntax: URIRef # A negative RDF/XML syntax test. - XMLEval: URIRef # A positive RDF/XML evaluation test. - - TestTrigPositiveSyntax: URIRef - TestTrigNegativeSyntax: URIRef - - DAWG = Namespace("http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#") ResultType = Union[Identifier, Tuple[Identifier, List[Tuple[Identifier, Identifier]]]] diff --git a/test/utils/namespace.py b/test/utils/namespace.py new file mode 100644 index 000000000..e52cd70b4 --- /dev/null +++ b/test/utils/namespace.py @@ -0,0 +1,7 @@ +from ._EARL import EARL +from ._RDFT import RDFT + +__all__ = [ + "EARL", + "RDFT", +] From d5eb95727c0158293f2981b574ed8f3a1ddb1ac5 Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Sun, 15 May 2022 10:37:04 +0200 Subject: [PATCH 11/19] style: enable and baseline flakeheaven (#1928) * Enable and baseline flakeheaven This patch adds flakeheaven with a baseline, the baseline ignores all existing errors and only reports on new errors. The benefit with this approach is that we can get full flake8 on new changes without having to first address the flake8 warnings with our existing codebase. Baselined errors can still be seen with: - `flakeheaven lint --baseline /dev/null` - `flake8` This also adds a flakeheaven to GitHub Actions in a way which will result in independent reporting. Other changes: - Simplified caching behaviour in GitHub Actions - Removed flake8-black because it does not work well https://github.com/peterjc/flake8-black/issues/59 - Remove redundant/duplicated config for flake8 Co-authored-by: Christian Clauss --- .flake8 | 8 - .flakeheaven.baseline | 3346 +++++++++++++++++++++++++++++++ .github/workflows/validate.yaml | 40 +- Dockerfile.devcontainer | 2 +- Taskfile.yml | 19 + docs/developers.rst | 13 +- pyproject.toml | 19 + requirements.dev.txt | 3 +- requirements.flake8.txt | 3 + setup.cfg | 18 +- setup.py | 5 +- tox.ini | 9 +- 12 files changed, 3458 insertions(+), 27 deletions(-) delete mode 100644 .flake8 create mode 100644 .flakeheaven.baseline create mode 100644 requirements.flake8.txt diff --git a/.flake8 b/.flake8 deleted file mode 100644 index e44a31d27..000000000 --- a/.flake8 +++ /dev/null @@ -1,8 +0,0 @@ -# https://flake8.pycqa.org/en/latest/user/configuration.html -[flake8] -extend-ignore = - # E501: line too long - # Disabled so that black can control line length. - E501, - # Ignored since this is soon not going to be considered an error, see https://www.flake8rules.com/rules/W503.html - W503, diff --git a/.flakeheaven.baseline b/.flakeheaven.baseline new file mode 100644 index 000000000..a7ff2d9d7 --- /dev/null +++ b/.flakeheaven.baseline @@ -0,0 +1,3346 @@ +02bfa4ebbcf73a180864c0e92f2e087d +e1d6ad6643d9bca28461a543f93bb563 +e1d6ad6643d9bca28461a543f93bb563 +e1d6ad6643d9bca28461a543f93bb563 +e1d6ad6643d9bca28461a543f93bb563 +e1d6ad6643d9bca28461a543f93bb563 +e1d6ad6643d9bca28461a543f93bb563 +e1d6ad6643d9bca28461a543f93bb563 +e1d6ad6643d9bca28461a543f93bb563 +c403d5ea40c87e6995c923352e1bc901 +c403d5ea40c87e6995c923352e1bc901 +7a5c7b92de180e0fb660b997a74fcb89 +87ba1bea569a5a91a7157de5b9f5d601 +aab7186e650f53424b93b56303ce04a9 +69ed0689a188dc779fd57f439d5582c1 +a4ad81d4f4a0b77f7544eab637c7b729 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +78cc668c3e569e9dd131031ee15082f6 +bb48f929af2f533dd5ba854f821d12b5 +43e9422f6cde96f6b16f4bbc361f339e +43e9422f6cde96f6b16f4bbc361f339e +ec1580a7c0a8c3e537230547fa73fb96 +cb224219ba93647438826f0d294e9194 +3ece5b4e8a4023dbee935da331de3896 +3ece5b4e8a4023dbee935da331de3896 +25488aeee566d7de91f717bbefd065c6 +4bf36bc9fca97906a8da7dd79411635b +25358f8a027dbc2c89dcab7bf92f8253 +25358f8a027dbc2c89dcab7bf92f8253 +8ddd82b83b34174bb022454f5fe13fcc +b5edbb42c1380aa8b2c397642015136b +94d60784d56418948e598ca47189d0c2 +095dd7013ba88b16cee3c1bac279bb60 +095dd7013ba88b16cee3c1bac279bb60 +e465827579612b245f3037766ed339cc +e465827579612b245f3037766ed339cc +39f3556b4e17160078c6cb6b95980962 +39f3556b4e17160078c6cb6b95980962 +d397f989d8595dd9f5f66acfcf9e9693 +2110ed0b9310ded230da3ffc4302c4fe +e40b2fcd7d6809d50805027bb8921aae +e40b2fcd7d6809d50805027bb8921aae +989178c8406a99a041c1a46de5785b8a +e83c0ba0000e981b2eb9f18eef1ec4d7 +ccba42eefccc29ff938c2f77a30204ab +58828144dd7dc0a98b102c411e27a220 +3f1182db7d8cf7d92eef0e884a4c748d +470cb5f4e7bdf663976f60bd5294373d +d4b1bbd60d2652a7c3196d697a6d8668 +24d6caa7a8ed30ed6f5cb768a7ca27e6 +152adc4b33f359bd323b204558130b70 +5b906abec1e8a8512c0a66f0cf7768a2 +d451a965d3fffb3d50d148880d5a4e30 +bff83c5f99961de789074753d229b525 +82aabf52eb5e76e0b7a33f7099440d02 +527dbf2b858f2ebccf209b56bd042210 +5103f191965e3639710d6c3fc35aa620 +2f222fe129f0f789aadb3bd7fba660cb +2f222fe129f0f789aadb3bd7fba660cb +2f222fe129f0f789aadb3bd7fba660cb +552161f7a580fd4525530c60a96c576c +695730637845e71f8c0edf2642b3ef9d +6b2bbe99d6c8755569d6f7ff9e77670c +6b2bbe99d6c8755569d6f7ff9e77670c +fa76801e1e8bfa3f1ab7717a9aa69c97 +94c513cfacec7d2caf4da7e26c554c33 +f66a8614d23d8ff9bd906f2450444d15 +f01e0337d7b8cc27a6ef996fc2de39fe +cff358f69962e6dde3a3029adae44a69 +0bbefead1c3d2e1b8284e798d960895b +320fb55a531ce146a6661e4691ab46a2 +0cd5e41a53ad70da4638d270fe07c9d9 +fe55700768f2e69eba89b660b07243f5 +bd420727a8732edb96a09a1267e33398 +9c49c38a2a97083a86432c37f429c53a +817a3d1f0af2f8c6baf4f8ef49469001 +1c0c4b6db586fbaa8e890f5946a22603 +db38e1b8a29824e30940ee65a7b2c691 +fcc4bc66d35cab26c99061d9e86a0a72 +b39115b7eb7992ac338302ce73aeddb4 +1a9877256e12872045c88f6c461e9bf2 +1a9877256e12872045c88f6c461e9bf2 +1a9877256e12872045c88f6c461e9bf2 +6454f65386f0f41e88eada8937385cc3 +eaa569e765bd0a3c90598bb4862f00a3 +f0aa10bec478544510ba0048e956ff2d +48bc99b1292d6e604e6d190fc78f1b4d +32d093484ee2f309428e6ba90594246f +419d8026ce8043d0efaa8cbc7e9d20d1 +f7bad65d1f18a4da6f6c5da3b3b75ba1 +aeb54ad7d30cf2ee7aca979cf27310c2 +e8e4a45a0fc039ec50779fce81979d4b +c802108ee95a6da8cfa039c55d3de1de +31bd081bd8d0441c855ac542656ac0d5 +988e9d2010b1a35be8ebd77d9afa4427 +9b7a1c644cb49bb7933f40cd536ff294 +9b7a1c644cb49bb7933f40cd536ff294 +430b6b44c9b4380adfeb0ae6a5064da3 +67a954ae03e29ec7e963bf77e7b3ad52 +456cbac04d56cf0d96cbe15209557457 +b4c8849aab788d768fc4fc7b763ef778 +b4c8849aab788d768fc4fc7b763ef778 +c6eafb4d358d55f1d68cf8c6956ff4fb +3c4cf9241c33816f74ea2f4ad28f4692 +339aef4f491a0e158b170f6134ecc774 +1c8e06f6eb2320f04d8629da33b51286 +cb6e8a899e634f98dd20e3fe1bf489c4 +1c8e06f6eb2320f04d8629da33b51286 +7505fbbbbaa320e8f536a18012e3fdf7 +339aef4f491a0e158b170f6134ecc774 +363639b1bd7c03a58df42f6569f72a38 +1c8e06f6eb2320f04d8629da33b51286 +ee7645bafc36743fe675cb6fabe6baf0 +95352e9831ca551bf8bdf9cd75bf7e8b +95352e9831ca551bf8bdf9cd75bf7e8b +ee7645bafc36743fe675cb6fabe6baf0 +6278f82840d864acaa2112ac469f64f5 +a8227d982c062f7db87a2447709f7272 +ac57c2b93bcb1360057a4b0bf6bbf88b +e235ced7a2ade75ecd95ece3c089f70a +ac57c2b93bcb1360057a4b0bf6bbf88b +e235ced7a2ade75ecd95ece3c089f70a +8ef104e789d9f59eef10183acc98d147 +9596cf02234a3b81f337da1ea56a99a5 +20cbd14ea6f850b6a162a377213a591a +ba55e3b210f61ac0c6f3d7c4021e2dcb +d15cd703ca8083f015f8da72702f107d +ec80fe6a217a90157b7dc2b06a1a3ccd +ec80fe6a217a90157b7dc2b06a1a3ccd +0ab7ed0b9ed39e2ccfe152779bb65d23 +85be0d73b118c246eadd869c93306321 +ad4db3c9efb4fd4cb1120501181234d5 +fb90319c9aab74f2f367433af5d6977e +8854eb92ec9a8a32df218b67e2e67c06 +f209943c360336a77d1c5ad382ed36ac +8eec1ed15fc9860cc54f3cb8cc3bae14 +4e6caefd7a36256c85b6bd060c487874 +1a7455b39475c2d6d42c7ed5d9b5e442 +018ecde721e80f96ec5a36ff22be1701 +018ecde721e80f96ec5a36ff22be1701 +d4d876d406a25635f689cfac5483e695 +11edce5d28cd3617c13e25fff7c98a7e +31129d60ecf98b9fb8c7fa019743e65e +46847c0e64bfdf77c6fc2da7fdc927d5 +368d2d48d36719059830b23d9977ce47 +5e5108623e37b3c16e470fc1b4b13783 +6871a23d564faa086441c4f809a27afe +bef4c0dc0fa5c5ae53aefa032481d7c4 +535929d165665dd6e52d9e4928a35489 +3d8074548aa126fb5360ff99bd3d98ee +5809d6c113e4f1eb82652afa73c977a1 +0169ccbcc18f4a36eb4d3bc5c6b1f156 +7c303a177091bb216a0c2b54d3d4cb74 +b3b7345a28829e45830ee0d9faab8335 +4e4da7e3ef00baeebcdae70d3c04560e +b1095ae73f66eac30377499be7572788 +bef4c0dc0fa5c5ae53aefa032481d7c4 +21fbf0cc6c302ebaa2ac7a885e572b18 +701ef1bef994ca1fc5967d8777e6fd13 +f56d204e8811afd7c93b7a283d96331d +8e4110b530f252507918708d500c1881 +0856ce31d8034d7b680dd02d2e5451e4 +8e4110b530f252507918708d500c1881 +1708845e00e90b8b97f93a2e30be2e76 +8e4110b530f252507918708d500c1881 +b79935ca718796811eeaa777334a335d +f7fcfc527c270d27d55fb56cb89d01ba +a07981b4632b9e907c214c44f65997b3 +a07981b4632b9e907c214c44f65997b3 +a07981b4632b9e907c214c44f65997b3 +08b07caa07922c6cbfa7d93e03340610 +08b07caa07922c6cbfa7d93e03340610 +08b07caa07922c6cbfa7d93e03340610 +f76001f3b60a3d169c1e88d990982014 +d63f735db11b6dafe22a29df690c5220 +8e4110b530f252507918708d500c1881 +e6fccbe37a91772c3816a11fb32978c2 +c4b6a25bf53aadade73f8cfc5aa319db +1a9876507719709d6e3916e2be5ec5a3 +3b66cd1a864ea5d9a294c2e87c6a4886 +c73b2de5cc8a2a55082a2747797aa81c +0e173679afcb4d2ce9f4ecd2ccd76fe2 +a00ecb51cf884822d410800da7a78c66 +48b540612ac4e3d10514f3ef99e25e5f +5b25f1f551b4ec6ac938049baa5c5735 +7957b70085ec9efe5adbe622b0abd6af +16704602eb2120028ade1465055b1767 +6e474e664f02ba912e03522da0a9a503 +bf0bc4ca0de52a5f23aae14483b1d162 +bf0bc4ca0de52a5f23aae14483b1d162 +1b9f8df5304153bba2282160b16bbf07 +1b9f8df5304153bba2282160b16bbf07 +4af9703f051b2ad1c5ee8c077255ddfb +4af9703f051b2ad1c5ee8c077255ddfb +67fa8bb65c0d44868a547e69c116120f +888bb7807040ae2b7ecf98f05cf6339d +3f27f7150c1bf781f5515320ad1e8316 +b12a610cbcfcb74d1a6038a3c749b72f +18d648fe6a7a72c21efaf7f6b5f31f85 +f9ac4c5cbd9f404808cd12713c73d403 +282aa95a20d526d9581b35313e0fcbd9 +3b08303f347665eb6fc26a2a8e32c0f2 +f454050b15099febf230892203da252a +77777c6f2856bbd15dfac01219cc28a5 +f2ed321f0ac6466c2e6a9a140d2c2b23 +1c968c81321f0794fce67a7e165fa5e5 +f7f2398714ab5e29c66f36cc5bc1e855 +d7262f35ed262a168c5550ced232712b +fb3caa62e8ec0f7118346e346751a415 +93a4ea0f064fc809e74d20c5d9a148c2 +81ca49d972d531242457cd086ca56b5b +3413a97ea9707b24a9eae71294fe6144 +29f2d646e1166c5c258eb4e3083f6568 +d209866c97bb6d5f73e0ded9160e7408 +9b02a92bbbb998a0491c76d3878f9371 +5ea4daa4054f5196092ba13794ffcfc4 +d38e3a16f6f9c9f56ec86f87496f168f +dd15c9d40f598e91638ec257ce539be3 +e8898781c77e400283468a8fcb1da81e +0182274426ec1622a5913d5c72d04671 +50dab38771e1624e6175a08938403c1d +a7739076e6c48a539c56e301e4c62778 +f2d91d93f37e3bc16044f6bdd7096035 +7ca717aa3aa6455ec449d243aa7165b8 +e10796c94b1b3480b4b602d6df8bf47c +6fba4bb8c0ee4502b6cb9e442b2ea74a +9031b2d01b29ffcf95ae1a08b5209297 +72daf6e155e0a3b8936826efad4fe1f8 +a6dfc2dec42906d04617d8992fbfa200 +02ee7a8683cd7fda36c21bf6eebb64f1 +57e9ed34d236f1ae443ad5c11428d7a7 +edff7917a5b3fedcdaa9d8df5590642a +eb54f08191a7e6c6bcfbd3a2fd082cd3 +6cdb3950c13bcc61029e29d0a3020cb4 +c11b80dea83b3ecf87571cd5758b399f +3b0a8b81752ecdaff535decee7351d31 +905fdcea32d3db7b6c5cba67ba5bb9ba +3b0a8b81752ecdaff535decee7351d31 +1443ebfc7f25bffc508474c5e457fe0b +0872e60c56866c8283212754e6832728 +7f06aa32deda3b500b892e676f1d678b +3b0a8b81752ecdaff535decee7351d31 +a940f5345cb75a4f6f45f31d4a268a77 +de1ab3627794b0aa4036fab067d50ac3 +3b0a8b81752ecdaff535decee7351d31 +47093552a9e95bc7cfae8f72ac3726b4 +6724834cffb2cb0fe95eff30dd7de5ea +18c1154aa3c93345ca8374b92071ccc3 +75a92d096505d76d4963f318b575a8a6 +df78e8ba9084a882b1cf763e459ffe80 +2174aa2ffa909b575aaeca93f2e58bf9 +5ecc51b79cd81a94762cc4a4b9a163c1 +2565399c058b0782c2fd331b6649a430 +cc10acdb5de7f373bb27079dce65d08e +966241cd83aaa64d6551145b48cb5b5c +c01c0a25f0e04b6accaab308bc4830ef +0c317aaee05ee9885a677b084d03a673 +6b09a7430655a9ce2db1413594b409a2 +af4701a8fcac4599e1596a6e0d38bce5 +402d706f500d2835c85fc6ac3119a51a +0fe3a73815cbf45694fca1acdb5f06af +52fc1c42562f1ec0139043adf5465419 +343809d3d4cd73a7279fd1e782eceae8 +8a196acb20c1043126cea99b111b57e0 +fe72201b035b7482b2697467dc5b2e7d +e2c02a8044e325f07af8e41348acd4ad +55de13c619e907ae0bfc0a99cc8302a0 +184ee28fd63f663984d90bb870de05d8 +c8c4a53910df4a2158bc6aa1f0f38a07 +1561e2d291802cd38fcf8de24756b715 +9b29df8ff3f1a0a571a85257bc08aa72 +43578be9d7b36b65d69fb5c41b451458 +189bbe389a84f18350373b43a9605859 +4fe482d784f10f92cc322b41848c02f8 +6f6fb44dd40f91118d14cb060c492e48 +efa9c10399db1a96474699e8454affdd +844d33e4fd782e4aa371c31b8c721ae2 +811ce6a0b234aaac925af41f2d48c481 +392cb7311c61d7af3570ea6badde6583 +39684840e958884d24ff76dc26846e1b +1351a1b9a7110d965d50c1bcbd012c92 +6efd2738b1d31aec6bd21882b1b89a5e +916c01a99eddb8d279467309370a1299 +da633cec86214ff5d075990cafc05e89 +3eed8bd52486594dd82a3253ddde0f7d +81f65c10f97c7b97c175cb999719e983 +b3a171098378ad7b52f69e3972b94966 +b814e1f19f2e8d5fa643b44ff4d4764b +6cb7ce994e7f9761162914e6e5b295ee +9402f6516885ff2fac323a4b39b5b52a +f016c7d070102c0ecaaf28ba3c87b957 +cee4045cae3bc6ebf9b2ced73e89b637 +aab3b9ec74a741f2e613f06ed3bbefa2 +830c353b4d4470705cb574d07ca19467 +2efd6f737c2b258f5d94b5cea113db68 +fe20e952b6669a1475c40d7f5d4b4177 +d0e637f40f77f150c7bdb79b0d6b6011 +1ce5024c1dd5c6b06fbe74a6b3bf3274 +f01f6ea194df567984273f27ded1b90b +cdc5c3f3111fe362c9b39745eb44e9e9 +3b5fac2c9f8d8028a43c36ccbd6943c6 +8a42787d91c737b706956fe429d15926 +e328aad6a786f9613579480662cc59c8 +e7423f88c570b471f66e49d595d1d3e1 +063bc5878e421bf96094e06235bd5cab +1d1af4e193a0fa60b92d51c041c5d8bc +d2cda5239834d31e22b0c51c6711c1b9 +0200f01e75fc78f6018b23c07b189e0c +1d5250458f75f6815fcfe72ed82e7fec +5a3f9bbf3d75c30c74ceec8dd982d9f8 +a4efcf5cf9a90baaa3694b5371348c3d +cac6d68473167cc439f4656c2727c21b +5e0fbcc1ccb1825ea187eec7900fa965 +6f8462f89077b4fca68d5209d43d441e +6f8462f89077b4fca68d5209d43d441e +46ada918ce47dae10e5fd3137894d1cc +8c65ff7badc12aa16c01bfb489c55078 +41cb1148d556d13cae96f1fd735a8e6f +36790afde55d23f4eecd542919e4c20b +e3feb3d81b399aa6f245c169a3df545c +725c4bd7e5cf2d880cd6d7b22144b2f1 +6748f78c700712fd20ac3a37705a88f3 +45837b6f3639fe679588164674287434 +45837b6f3639fe679588164674287434 +45837b6f3639fe679588164674287434 +45837b6f3639fe679588164674287434 +9e9989a6bdfe1b1a87d44fc6656a4f9a +675ec6e6347b867d11b2d17f3ea499cf +2e17acc1ddda658635cae5bb253b4830 +73e2f0be5fcae51b3aec9e4a23a9b982 +1f19c17388b5c7f36ea438e42eb47ae4 +8b8126a6e9570d63ee23133cd987d2f9 +6c3f247f4a4628d8296d98d15b427848 +b16d485893a0b20e0a115061b2d3d99f +b16d485893a0b20e0a115061b2d3d99f +04fb9687187e1b1ae1c202a4f1ae02b8 +da29570f0e4050dabab685e951cbf6d8 +d4beb607ce7e8da5380d100ecd32eaad +189f38f2a6bf23a43b830b3302cf03b8 +da29570f0e4050dabab685e951cbf6d8 +103b6b8b39465a8e7f2dfbbd576360f6 +bcf7b82ba6da43272e03e2c73b2aaaf2 +bcf7b82ba6da43272e03e2c73b2aaaf2 +4b6cf6f1e047440cc5b0d054fef37af9 +4b6cf6f1e047440cc5b0d054fef37af9 +afc7e0d8812c6adeab68482dc82b7484 +afc7e0d8812c6adeab68482dc82b7484 +afc7e0d8812c6adeab68482dc82b7484 +0b38362e083f2c0b87904d59da015d3e +6d8e15c1f21f55881cff5d9574e556d4 +d7097752bf764532b2d756b057c97a6b +b75c43c75c1ed9b0ceb3775787278ffd +7d9e5c347b7c77f4baf839ab3c16bd1f +a089337d30ae884accfeb6b0e189a6c2 +b93771011f071c8a07345f7ff2a59c64 +aa0ace620b759e42f8d62f6641685b19 +2f89d838dceed009745c92daa6e1eb0c +3ee21070299236f79967ccb9024fc2c6 +a328e9e4192d6dd2c82340e591d76b8e +7e37537b3276e188a0c30c6650f335f2 +b43dea1220b7d325c3a71f75a8c1f66a +8ca5c6a8fb129806a8cac1fed958ab99 +b08386e6a16b4a428fa2bc4fbd579d77 +41705bcc697f78bb0684e208db5c9a47 +42e69605a4573c53bf05c11e8a7d9fd7 +cb58e942aa0be400aa529e3df164fedc +db2c0be876b8f025871d0d30917105cf +b2fc51b456e1dcab86c41b057769e4b1 +0d3bd1946036016f6703fb5e474e8e12 +1823d0e6fe44210bb5f65d89725c685b +2df0842909c14d807bcc5a1cb070f855 +96c53dd7058428c9927ad8bf5afc87d2 +8a7a86d53b113d36f9c3a02a84443407 +d82cb07c7d31ffaf65d0bfb61c9b05d2 +b646c77403578f61d0011d7830a0f65a +2d965bc1bedde97856687a536437629c +c683371d5f4f8af92ed0da91ec450475 +6235b9aaeb8efa3a4be6ca30e8cf9cf0 +4ecb2b50ca6e15616181a12355a191bb +4853f1f0d51afd7c274728c4cf2402dd +277eb48e9f9743920e9fe54e821a2945 +277eb48e9f9743920e9fe54e821a2945 +277eb48e9f9743920e9fe54e821a2945 +d1b0f17f9b9a1f60dbfd0af9a5727ab7 +84df9599c78e0ff282718dbdd1014798 +c94e4eafd6bca67a1ee2bda86a140310 +abb6e5057780df2e968ef5b390bece5f +f0e4193eab344314effa9e5b30b0c8b5 +6f51642ac60a8521595ea523d9ddfc44 +d3fedc9bd600736a679574ca13910b0a +704405a671c8b1932f0ab3431d81449f +f2fddf65960cf04c1561d2aa0127acb6 +ca2008804d2bd50d27edccf8e1199cae +d266b6695b06a96f156fe8f26b089b09 +3d9c1e31251ddc118ac9375f60dedb88 +8e93e3e5c8b7a311367470a3d9b910e2 +c2c68b4f02c45be9491b51d32d607ca3 +0ce0f210e94f5f8515509729a5b48131 +85d227cb23f810a5037654f11b186061 +db96459b800a1234d01101760b371bd4 +778e0097f09cb0b2510ad87d87f89b80 +cc8fe929adc220158b8ac42fac7862a4 +5f34eea78758c0334e3a1249f89a720f +c0aa9476e62e7509df29500767572fb1 +bb15f406598d2b301907fbb1ec772a57 +380f371e11c2ac1f63e9d5177a8600cf +4ae73150e95ad5653ff5cf57c0d54c22 +39c4429019b3f72be9b29232b73d66ae +abbf7a27784459989045792ccdcd62fa +393960add50c6562cc1fc0a916398a17 +73826fd6177c013c1eefba32b545cd0e +fcb5bbc48d40008b0390ac5b5e790085 +2b67cf8608f232e1a5979584179a2853 +22dd9bd2c9311ea170f8b28ce5c0e85c +de5cdc690de2e81720cdae18d614f208 +4b677af684e0d0500f691b8632b370b8 +86964061962b8af0ec27a1165bed150e +abae14b1af5585c6eea93030fb9a9e0e +1e3b1c7b6c3b45a6f644cc0ebb557d83 +717f9e771c1ffa4bdbdbb032399706c1 +6aa73ce4e279863d1697314ecb1979aa +20c1cb52a258dfbe016934794ce5639c +c690da0bc3d6aa3473dbbed0ba9840da +13f35fbaa368ad2c2f214f044e49169b +df08a9f97c764a619bb028f5873ebd05 +29e80b3be0ca3905cc6210f22b9654e1 +f079dbc96392018e58a0e9084843119b +1f63ef87ef691b34bbb9857393c903f3 +0857b47063309dd3881ed7e60c1b51f6 +216ee6cb982c96d17d0e3d359c225e0f +2b7a5d3bd4f7c2703e20dfd6eeb5bbee +978d8b48bef4c3328386375f846a3320 +b3bf1b3045d2a1d6f09cfb85466312b7 +f296a9f29bfd6ab647d5ded3eeee482f +41a4778b14e291f53609404e8f8ee00b +70b9dc5a11e6a2cf46ece9cf2efbc33e +69078faaa1dd5d4746d5f81372d15773 +a9fa7797d184eede8bf9a48674a68e4c +bd689eec2ca4416ef053996def314964 +082da34f24637dc7051756df640e320b +bbb87fee2f5d0ec190dfeaa1b46c5f98 +216194dabe9175ecc45e46df86e82652 +9fbf70bb7346ba08e333f17759695d16 +c021a824fc69463947e2515e396590ca +480e896b9b9e2e6cf2f0bbb283728c0a +6546a4c758c862a01a25be6b297b89a5 +2a08a325e426ba9532b28369e093e8cc +fdbad34375ce9add515495d8dfad520f +4506d4d424232164c5ea0815c7e3d5c7 +f36ac950acb8c24a4e041babf357d65c +7e45dc5af1fef923dd71f161e5da5512 +93ce6a9cb29489250ff2516cf690d38a +37134ff8527d98323c8f834a276c18b3 +26917320eefcb2a08f2cc8183d470692 +ac1f936c311360856120cfc1be765e34 +76ab9b583c2495ec974308eaf4fe7a7a +f1de536c5adc3525105eea377cd765d1 +317f067c71342732361e7e0f863b139a +9a0e65e17f68eadf2a887f232e9a33a2 +568debe767efb48de1e62185e7daf457 +a404c2d63344a74b126a9924e7f2a99c +7417c9b9b18a34519762ba1bd220e31e +f6f6d0b50ccd1c5c3035ba777bfb2d02 +9083a6ee97e7b50166b7086aca88c6b5 +f6f33f55df3ec8681586eebf8104e53d +1d1648207053c4fcb8c9ebdbcb6ab0f3 +8af48e5fbe46254b247c985ec189eefa +3be08431f04433b26088e52936905774 +266f499b79295d6f86e782c9b0c81639 +7764bff1dae66586240d9610ae6abe91 +5c546e70070e5ae797834ebc806c3597 +c500724e993fa77b1fff2cdeeddaae47 +05bd1b8558a204bbe28a0b024caad20d +3a1f71abf1718b4839e9dfc471e7b591 +385995a71e53a6f1d0789bc576a519e7 +353da241656432947d246a81a8773031 +e54e9f0e13f0bbafd06cb5cf3a982212 +72e4f60c16caaf79c1e25e9f9f675669 +6d629ebb1ebbccb9a07b30a4abfbf3b2 +41e28eaa7d8189ad10b0fca9986e1d1f +6cf9ae80314eb4a89932ad9ff43ec83b +2e52ac37468d67adfc201681f56104b8 +02fe71317edaed25013f5d2dfbcac591 +07b638194fb40b4e06f65193f800c71a +29121d3c73d6e669ad6309bf1f40d2a1 +a1369bc1772ff41a6c63c2c7f56816bb +03ea0ca9c4ab1339585038ef280049ee +3b992983997648446b0ee420d450d3e3 +70f1653ab7aa55049ee584169331c57a +c92715ff43ea1b7bdcc36f041b715a27 +a5470197ad19272f73ef08fbb31bade7 +9823f3f9801393ceac83b0fe683951d9 +7b7705b1a424aef3e8ad5731425b69da +3e615898b5e7e2fe775613496665b4b1 +57f08359ff19bfaa1eaf486c2f09feb9 +d3c7db389ee604e3336d69ac2ea79140 +ffed16c60f237c37f7ca54e857e2b5d9 +fcf02b905648ef26e79f479ce99f8e0d +e5533ba95294e62236cd285a955836c9 +35eb84d02c111cae4ac38e4fe09b2f32 +3710733dcb415f433943b73cf72e1a80 +8dd610dc366b7b35805519378dc70fda +9e238c66285593232bba54c1e65a87b7 +ae4002bd36987f8faca131f57392f0e6 +a8a5db8b71cd8561d49eba1fe5ca8f2d +5a70e2244fcf4de54c9a0aa7eb3aa5ee +b7165f1b5095693eb789ba4a393ffed9 +ccef9331a2078a2ea0b9ebfed427a7bb +449fc16c5b592706ec6af91b863ea0b5 +bdeb3784589724fd0cac74bf8d52c660 +7e6bb915c67eafd3efd1d15cb3a1a2f4 +e12b120bedb29a448f093f4d8993b472 +a6e9fd4c15e40850efca61eb9d43b4c7 +ed20cc9f994d43a008e16682f2c0d18c +f97d533dd392bdbe433f5d51af223c27 +9091dc26402e09a73393db5be67f2e96 +3216cf360436b623217989bf8364b179 +ba08fbd8d5a76c2e23ecccc9105548c9 +a322025503f6b9e7dd907e48e4b84bb8 +329222582d9ccb9f2f108d6448ea4f97 +e3500d073dbfacc49652661a3f3ef2a1 +9f2bb8069291b290fd185db1fb578d3c +591715128735bf55c867a547fced6522 +ba4e3603c1a2fc866c384906767369b3 +41544181884455303e8c6ee4c0fc5a2c +09b1a54267016d50025b9fe465c81968 +8a3fcb17540477252ea0a8e4c56623bf +6343d5e5c135475ef984b2de68f086a2 +d11444794acc36ba2ac3e866fdfb5004 +e5bb8060d0a0acad1a0e9b53c1d04b00 +fd42b198dd69564fa85c1b3c690c1759 +d27124e264ed58c5582792aacfb4489e +9d0dc766a02d4913ce45b25f3545cdd3 +70652c85362797f2f060618fdb18a34f +2e9cb09627b37eaac4aef4e8f23e9c93 +bf343d92a5fdeb15fe1480206cdbb716 +465fb111d0b5412543baaac1cb1d0c8a +b5994cb76669c18a9e0421c40afe2baa +17d9dd2bf018a085e7d19b9510be1c61 +60d5ce2fbacfcb9fd2bcff99ecfdbc39 +5c9cbb436dea4631ffa7e04c660ef72b +7d7eb3d80e2ce323a2a7f00623061342 +dcfadaa643675c8a7ee9b305f1953663 +13bae45a674cf6279c92d39bee44eb4f +9caf609b9f849018ce9a87f384185b07 +1a9ef48f7d3d2bbebe60d8ecbc0c1c5a +66cc32cee3b276106e3bf9b1af6660fe +86ff9d50df8bf9b99fd6effb0ce3e26a +51d463277cd5616df735fa68d8cd3f2d +1272f5804bd5cc611a6ad781c2ec9fcb +c0e708e7e4666be8a69b0c45095df01d +5f39867334db22ec63a3e8a5d929e0f8 +f7a5250c99544ac30a1f81f52a963f27 +27772b3abe781241f9f593a7c7241bcf +bb82e47237be7ae5c9316e59dc649c04 +c4ef8dbd00b759fe700f1cf0cb13e8d0 +d5a433080aea64c8b19e5925d920eea5 +fc6b03d06a3aada98d690f58b55c2412 +5c7ef807ad61215a10863f2b71501e9c +23699e5777d4e864b6e5bc940c361a1e +f32d36adcd7fd1ebd9c9d0548f5cddb8 +485a8e133bf64914adf42c82debd22c6 +5b22f118ac9f243bd7450dde74af7a1b +664e23929a337585984e889d165b1ead +89d532458f93ce4a0dc199098442ea69 +565193b177659837f896ac05f3380108 +6163e06ba179c6c91ee5c9da95a60819 +94e7917261639c94057b01e6a3cd0532 +3447be1efe38270740ab8a3784fc0f42 +6068c6d53ec9e3b039d5c04c5663ca28 +18dc1efe611c58117e858d54e66d7220 +74d0dee294ff65a767b2523f81dfd304 +c2d21ac567b93aab151d3f5746d29f13 +d1d6d5fccd419af62d12d9e17b44cdd4 +4723a88b766b35c6d5b9ef0733fd653a +b6bd3d404448d68ac36d5d989752d6b0 +c0010c7cb2a50b56df0dd99655840df6 +da8673cdf4961996bc9b567494549f53 +e9009c57de69e0b3c7a60e43ebfd2515 +25349f7de7513c9131403050f113f549 +404b5d2b78aeb351beee9b1bfdd3fcc6 +fb948dfb2a627950d2928a94981ab0ac +302a005ef58b03774cfe4998a062a157 +00718736e9ea11ecfbb48135c0a116fd +21a6597e21bcc69243bdb9d894b81f3a +53ca8af575c54126a1338daebc6a7908 +565b6769cba2295e188fdcc83d5c45a8 +a485a4a4f34ebed20c6bd2c1c0a34223 +1134eb4900778fb0fd7e0bb996aa9047 +160d1a88173e3800de35033cccd7e5eb +d082d7f240fb4a41a91410ec83cfe022 +435debd512f444a2da0799136842ebba +4d291128c759d92170ff3c3fc8cd998a +42c640ba7c3bf25bc08808099cd354fe +4d1b11374a451b0e6546521eb6b37c83 +ba8b8cae45672a57f5617e4bb22c9bcd +240a8a818f39eb638875acc154948c6e +62b21e36d9b5afd0ac95d5a1c704e99e +0e5be376e2d78619b6bb36cca9755988 +24a710d9252ae11f9471d61cea06bc41 +0f06fb8bf4e3bd7adeaa64bba4e53961 +8014711365f079fe20cb19d0c14c2002 +775d193cac7935373f8d70bb478e7695 +2a9d51c749222c5e70d92c775a6819b5 +6ec4f439e6e3355f3508612cf9196524 +dc2c6d688a1c673b24eb9683c029d942 +225e5640857b9fa0507a689fb72ddbf3 +0f008306dbaae0688940d08fc86c96b8 +20a763dc383abb5548446fcd4e349f32 +119404468c389cdbad9f4dede0f5d699 +73198c45d273567ff30962182fe432d1 +cf42fcec04e5226724eebaa6e9f91824 +036cdb21435c7c817a63ed112c2ffa7e +e4f42ade9580102df74ea17616ffab29 +5689fe00672ed9d94ce97b0736148ccd +65526102d996e422d46bd81423ec7978 +a2c74d7a676d0128c0d03f3f7beb6214 +702d2bc023d79a0b7ea763ec8537ed57 +78b861f07c1bddbcfb7e91e80747b9b9 +2a565694d16c9a3a2df305b39777205e +7df29046055189e074880777fb86a3dd +cda07858b5b3fc023c9e242001ee329f +3446b928fa5581e7c494764be54ba46e +d2055c3cb98d4bf5a3f519560382f1a3 +51bbd91937799221bcf8c47e425528fe +9360fcd8159133660addd664ecefbee5 +f89d5ee0ab9a52a556264f9355e7c3e7 +d52ed42475f37497aaaee7989994d63e +c1a9b530b057ebb6d19ff3d163b15b46 +127d6e301c24b502b310f3e321bf917f +5978c0c52253f59794d92892e80ac836 +4d57afa11ebe2e8d58c996fb7ae698fa +9efcadc2ffbdc05e9b774f1379530e50 +df68dfe1d8e4408d36ce0a9bb8a6a2c6 +838d7aff1a802186b4686272aa568e41 +814085e590ff72ad2d021fff5304d469 +316d34612938970982b5f80de904371d +ff0a3def2326a1a5c9c0625784047fc2 +66c715fe518b39ad2971f5f8dd466ad0 +9429bdb5e2f615a483117653bb52c8c1 +012a70313f50f5ad54176b53f78275b9 +a97e5d5428ec7f7b6d0a0f83c5b2e624 +9f6b5940f216ea1b1c072e98c4d43193 +b04b6e50b3b84a94e0641f5d40eceb96 +d36811281040e84f920360aefce2d28a +f4da8619534656ae3707077bae58fc9d +287b7f2b6b782b6122b29244aeaac450 +be48f38c0ed91c0555be55534f542ee8 +d7fd8176094465da0d1294f0a3dc5548 +d9fe333caaeba7c1d9c8583c14d4d9da +ab6d34196c7b870f82439c2256f4ae96 +52ea9abd867c5e095e2e35d6bb4a8276 +8b21e1873919f215db953a0e2b2f3ae3 +a98fabd67f085473dd82d52a6e318a47 +50e8a20f198e4c407f11392d0620a3b3 +60bd37e175b846a5f92e2b02fa32b821 +1c730a5929a818a310b0b6647929198d +989ffd7123a20dec5c6c42d014ca5d2f +08234ab189689d1b731c105815dcc6c5 +63504033d40738c1c2a0938291186023 +a5538e5196db05b8ac55c79cb9e4e10c +52ed181042b7e7ddc09ef1cef3e545dc +2a471359612b9e930198171b908546db +da4d18b75e7936dcb1027d086d7ac882 +976e6b5db6d886a2ab93fbfcab47eb53 +12bfc5cbc7519065242e004b923ba95f +cc437b2ef45ed4d7c6d2b2d2c6983305 +ad9fbc5e71c82a9b888c0501c3e19eea +8e0b6014c26377fa015695205a973c12 +72a01ac5a942f3142454721a8d3a90d8 +a1599925df64de99019284ee57645bb3 +9f09a6b2d31b5c795bd606eabb7e17bf +fd900fbcdea88ab373886a9ae629d18f +ed305311205d435d3f13ba912ca8f37f +b8b2ab7fb776a87dce6b3de0da20dada +7df4431dc487ccc3bc02c77e9ed53b1c +d9841b882ee2c696a1c55d21d9687aef +006c6f5d6979e8493fad0c5baf3f2db3 +ec7c1921cece481439f083c798b39533 +924a00c5a7bc0ae61a34350b6fb635bb +90d3163da9f9540b0b73723cd88564f0 +89dfaa38d628eec31eb735b634215a5f +56dcdb1b81ad1e3b751738f71f195db2 +8eda1c4753914f1f424567de4d0e0c79 +e9dd7a0379e2d027abebf08ef1ed98bd +4fbd32e1c347735181b17732d6feeb06 +eeb88be10ad30676fb676dd85edc0e25 +a7c77b614e0cb40f2dd2c99659a6a802 +47ca60d9cc97db06782fa0907a5c2748 +e3e339364d4b4fc5de282b206caa36c7 +e0d78888a77c70665b7c9150fd91f421 +baaa7fa0f48a73193a905690eb06cbdc +dbb05ada9322b6b1b89b3f08207bc36b +e03f3f73db3105dbea40a0950c07d817 +7ebf9ea0967b564b5e81dcf8743407e9 +19bbdd54e5ecd265e461ed78cca7fc0f +ab9a1475ad0b83b1da0718bd5e08eedb +769df21b6c0f89f409c2958ffa0c17a9 +97e295d0388fe644c309d6f6a4a4cb9c +30f9c3937e88d5af6b37dcb079ccbbaf +32f3237df50cda39a6467dace5dbe759 +908280911420c5a4134c4a7d9f925291 +9f0220e25658ad402aec2b4a0265e881 +b947a8ca834db6f4df7d514063aca680 +384ebe49938532fc5125d3d36a75651f +ce210b1028d04de5c784a6eca8f96ebd +f242687cd03096a1430c0c4b52d30f35 +63a55b8bbe367715d332ad778bd42a88 +71601a4bc9063baab98f26960a061268 +b48312a4bb1c92110f7dfd1f637ce372 +9b038795127bf37417cdd19ed5a68d0b +aa3c3ccf87820c0a59142d34221d7e3a +c57b17a3d438405fffab529c939048b7 +4cd208e3e73aed06c0e9749326de1d5c +0649aa52aa2e26c866a980c962f11783 +647f3a7b78516d823c9ff91c3d4b0886 +fe9509c93649691a2098ca456f8b7fb3 +eab45d3b92723cdda9841ccd9fc1fb5b +b289334884e51b9ad637be82b99253f9 +6c4adccd6d95ef6435cac832d1a01488 +7325f55518af8c37211abf7e50ce28f0 +47d40901f4f395bfa720dd47005076b3 +d875f8ea850e4e184d17e4c3e59a3980 +c577b721af2e3c34de19dcfb0ac7cbb2 +890ab00c6a0f3de6898f2168ce4d09e4 +c71a88b4289a7f96d17f62c2de6c3984 +3d987377ccc9695907dbe85d449e7eb2 +fa0d6b2b28a0ba2c9d0d5353be0e9104 +49c5a7bd67c5ce9be364dc22b62db0e3 +ff215f4203c9c0fcb955e10b4e6aacab +a3412c4f1698e7da3426f6ad69f2e083 +cf72d13b4fed5b1b18ddac734bda47dc +97ac66a910cb53b2a6081ed58b1f147d +c08af689b375044d8f35b99203f16cb8 +590499d8586689ad80842ccad380d205 +37c4e04ac814bb759962e066a8f39a32 +f7285b436a6e783cd7c1835fa0d7ec8a +7813c19e91efabf35ddeddd7d4874bac +75e0e2ab92298c23da09c288b6920333 +fd5f3ea39c593323313efa58430d0afc +493837463839be87927470f4e5687611 +e22839d03d22f5346083966ee68f5d0c +5cfc391632930cdb18b5c3e5793e38ee +c4ac1c479d6bf5d547a682fdac62f117 +a89b44eb19cb7a41688b40a469c17743 +1531a6a77623aadb9b2b74095d980d16 +3f7b215b36c2c0742cb7955e738a7ed3 +37224e4d6b6205d986a27ab65632a55d +6a096de9a530dd2087aabd392d519ba4 +dd9a64a4e451f38489fe436afa447853 +fcfe7667028e79945a0075ff5b7bb7ef +25c593810782f7c6cc2456c200a8fcdd +9c2b6b2196f31494bdb9e40266c2d392 +f73a320903d01ee50b689fc776ab6be3 +9132c5f89c50a031b650749107a35fe5 +00bd2927f67a99af2a70eae5f24c61a4 +a1dbecf045ce18a82e3ca318d84d53d6 +24fd1e0def74f5ec32ae3eec02ab5538 +db5f07c621b293fc3cb111381b31157f +8ebd230f3d0b5d465f19c1cfeab79c05 +7e19542140778f8c2ed99be1a2884add +dd3ccb05e6c9b3625123e97e2b67aa45 +c68c4ed016db7695aae6ad3ddb2a2a15 +1dfce3c71b9b74209b660e8caf65e62f +ddc373adc5b81e643ec06cc79cf51069 +24b620ba809ef4ec1bf69b578c004fba +8aabe5a700b9f788e58cbe2e674aaf3b +95cde79d6049b0baa702a202ea46c21e +8342a3341db0bf966804f65e8d60e027 +9281be8dec4373f07416fb61cae5b4d5 +2d844fc589831431d243bb2a92b801ff +770812b718b5bde5560f1ea384410936 +0a479839dbbd406523ef744cba2e2029 +3bdf67fd4ddeed76c50ffa0a72c75964 +f27f0ba5554e6520d3ba3988ba5275ff +2b82a61e7d280287937b5098f8211c5c +416b2f47d7e02b060c00b0d14f65ca6f +77ad2ac2ca9b210abbabc913fbe6c819 +a4fad9ed017a6ec9f117b7dbf3345670 +fafe036842cad31249f873871cb3b48f +28b590419f9c99eabe7d2f2b3b5cf1bc +035a0c74e2969c355bbd05b212dd5e27 +1af83a2e6776b58290149fde965a7623 +0e46dff95dcd20cdf092d37bd63ad7ed +de5f56e542b4bc1722756406ca7fb789 +b79364ba8b9110d730631d5a9f2b0cf4 +182d34bcd31039d8363ee06828410538 +3762f08632b0041db7620e2539fce2a6 +f55b75f8fff6340f15c412b495a6af57 +ef9bb0cf1cff35fcff0ba2b5da02f4f9 +9f38064f313aafde44b8b39aa80dbb2c +31613b4132403ce80879b49481b19315 +b9ddafa6ff917df8cca333857fee5231 +99824d2ce671a36c350e9990bd84ce10 +ec8afc0ba1e0981fa6c7481a0a403eee +dae211ed31494c4dfd1d2432bd55da1f +3896611c6023ffd409bbf6e1ebe68d3a +128dcbfe5829b2d554bc538a99624b17 +811f7ae52fe387f8c60e0ba650d6f394 +d84ad888dce6b00295c5c003afdb9ec2 +1afeaae623c40a6a41b94936617b5c86 +a1d98478f09a846bfaa1f8e82f8b5219 +2f55f66e71dc7b1926173b1037376517 +c066b18a63e6947a181ca50aaf41667d +4fb3edf23b7a14fc09bf651ea4602d31 +fda2b48b228d61417075f4d6e53210b1 +0faca68c37d2df90cb6436147c9ac6ed +cd83a873a2bc442d8daa1687d0b0b7c2 +71d69c5ff8ca2b291990c7b7ebd77e20 +e191fef054cfb6b6c51cb9b31445d81e +875ff0f391bc67fe5446be8932c25e8f +0aee38cf4898bca12fe5a3cad72f52a7 +2c66a29ff75959297d28802a8ae37d85 +858616bd34f55deb63debe6b7ed05c0f +3957594eb6447596b350adb841853ad4 +ba372ca7ea9b3ff080614b6e2693d7da +44d0cb109dfb4bd10855d0bd121e9b3b +ecb01c7787057019d153705165d5101c +201fd15ed8c048314b394b562beca6dd +f865276aed86c49c7b8647073d585e7f +a5f4741769ad01be3600c502a57dd240 +91ebf8fc25624da6d4573e13fc79922d +b3c502c6cdd4554be14d262cce101a91 +92ab47253d4ebefdb5d24ea3adbd81ea +718c577c3ca423f6de9ea0e73f402fe7 +12e0477020d73d9d27c4a0e967e5f331 +082aff7922c1762a46b0f1adf0665fc1 +75657ceed900241f597f3931e53ae691 +36375493897588d41e589c94f175fdef +f4eb0141c8f60af6450b403353459392 +578983f8068f5770d6fa15bdd23be66a +412059d28251272aa47d9ea708a72624 +4327e366d8b81200da409fd03fe4f0ac +0b6c658304de986daee2cd87aedd1317 +1116aaec13f21ae1b83e9ae29accd8e0 +6b3091dbb94ff3c8d0787387703ae83e +0f99dac04fd625ac62c9794533e9c796 +5058af6aa1c03d04783d332325c242a5 +4cc572d93844fa1338f97441c6478cd0 +d16950c543344128a433e2a35684c6e8 +f853b197f2f478a2a0d58210a44a57f3 +2d7088c5b352905bdb5f63949af8cb8b +0206a26a419d8324d2d13b9d30cb9c98 +2f54ad0882bef5d66a7d1f0e924c0715 +b4eafa0e8a66bf1e3a777fddc337520f +a65aeefeeb2c9d5250f9b6de1ceae2c6 +122fe9dd450ed27070806e8879b8de8c +b40d509899de354e740c6f5c0d965f97 +4cf7210b1dff6378186158027b7fe5f2 +287f96b8f49651095e30ce857a8f554b +3116734fc645e6ab2ab7335f5f886881 +36a676db4bd13d0af6760df5420aad1f +1a1f1878c814e2c06a6a60194de99e93 +3b2a5a5d245fa09564a69ff062776fe0 +44adaab6517b268633bfe3b73bc077ef +045d2bda2ea4077dfdaf70da44d89a73 +0bf2b8091a99184651c835c64d443dcb +f4d26ab0fec6335b4db91a1cc7787c7c +dbc9d5d8848927b2d57806b1935bf787 +9ae440d902ee0d75b0a922a7e1f77d2a +72cb8a11c57b4d03bb96ad0fdb9cf5a4 +63794f1b0c9154c5cbe39686370aea23 +7990d509d0d667c1d27c0a35fa8b4ac3 +6cc809fce55b900ef2ae5294360174df +d084e57f9b6f2bf26a8b407f8a06c3e4 +f54de080f44d93ddc7573682e97130fa +cee0b6ad85080509fdfaac64d364132e +9db5d4d766f047520cdac3a0c432eab4 +45fcd47a52f38b9b748786a76af52d8a +2332006187011ee009856ab10888aede +eb46d25eccca44bd3b2473f07f274e6f +88fb4c374e1441f9e7476007cd4b2d8e +388031af90ba0275bd0a14772a6a3710 +f8a17b16a7e0b445dfbf086a080d139f +bb65f46fc3d27f2b60e68ed2c807dae4 +38fefd2a83e4af63e0681025efc91188 +bb7fe4511ab06ec032f413d0b7fc03dd +e84cc50c5cf0ddc372f10e5f3b3ad4e6 +52641d68ea4225a85365cad2e8b9f00e +a71e603226b90ce7991ca17590ce918e +d5bffa4bc2040fb22be4874c872c9127 +3ab8f580cbe71b76654fb92712f816e3 +3cdf4c05b2b7745820b381e14a08b04b +a0e2179ae36824b4a3fcf155f054ae88 +29390f95ee8aab59d270b6bca3459c0d +ccbb1d9c2fa74ab9cb6e5d26681723ee +50a66919e8e024735de810f8e756c4f4 +0ac93ec8b52a1fdeeb35da7be387fb33 +f35a4d362cc19d20c77c22eadcf1ae28 +89153007bd82614d823cc2f16cfc020f +3f72590499a60e016349a9fcb10a28ca +a2d5b02192d4e4b474474b08990cc7e1 +34cf571e9681cc11740d5a012c62a9a7 +cad9017e4bdcc1655139764ff578a808 +0f41cabe04ec9fc973acbbe65ef6921f +dc31f97a26336e45252235ecc77c67c8 +9c24cb9a97a543082c29ab2a6f3f0953 +895753386f7113ed98c8b2c537ead1d9 +5346f6f91ec26f9e25f99c2c13bfad6e +8c5c9088cac7dee7ab949bc51bcbe140 +0a91ef997f6f0c18118234940a884bf1 +66c2031f5d8f1b43b9ccd6a7f934b9cf +0268992117b7cc96f77110fa58e3b2ce +263f1a143f5c227390cb5690a50b37b2 +e9ebba96d21bcd51293843411a02ff94 +077320ea16e32c5922d31f276d7cbdf9 +e054c96ff2a5e93d73d52b2fca032e9a +b4af2191ceec5aeb427f8acb66b37f66 +d661fa3085db53f667435fb32fae895f +e24e5a28bfa566bd90c8b7a8328ccee7 +61be061264a4f1b2c9b4b7229136f436 +eb1f601a779bf014bf81481ab38c0161 +30941409f34a77eef99a0aebeb19bc94 +8e7ec1f57d3a66431ecdd2389f9620ca +1c2bc2717bef6ce17c8bbed59c913c4b +4d5388d8d4768cfa4dc539b014b9ad47 +d098d4fdfa5e0d36e2066586a4fd74b5 +1410da8001bf22ac7a93a58bb7d45e77 +f80b332f61fad3121bf9f172995c8904 +4d380fedb168765b35ac46a5e40b1273 +02927cb6c7d389cac9557ec1d5ae3d04 +15dc1be76f0bf63f8bad1a553e80f0e3 +ad3038a1e0c7e71e42ce6a218469def4 +94e43ce38f1dc7d875be1cd0de4550a2 +4c6f79ebca7e8436fd2ed0306f51e6f0 +bdd2d9a73171c05dc349aa233f32d8bc +541c404d549c8174864eb11305fe2e36 +c1acc2074341e9c0287e9c7e64c9498b +c54a23898b1917530688762af1e671b9 +e8bebffba2b149b251d3e0d1d04a9f40 +5f1ecceefacb1014399582ae5cf97d87 +481e7a819ee5b5c42b469adca81104a5 +0f9335699ead73bd0d3d77a39e1e48ce +171a0006cf48a1773920b1e5c73c4d56 +1f8d04bdb499744d620e149bf143435e +6de1ea035335307ffed095b6cb6ef031 +5694b08e9b7bf517264fc0aa44c4f22f +0c33bcaf31605a96bd52388dbb99156f +92d57470a4a81fab5bc855a5642c6ccb +45f250fa3cb7eb64254ad0987e81409c +4fc869fd3a8e4c30a231503f3a3b20d4 +3668eef202251c4f95b0eb177235bb03 +845e9804ccf2e699b4eb8532829e0c6d +4c08b2bf81c1b72d961a575dc415c595 +c0e5b2a4104860555edd343da69ec4bb +0f5683cfffba4cf783090a60023d7657 +bd9d0d7b6dc4783f464f51d3ffceb2d0 +2a28c085fe1e1a5eb5f0e82586da55f6 +41f85290ec1738184e4a4877bd24e918 +d3867ddab5abd3b4cd9732b965ee4420 +9094db5758e7ed7cc555c44567b00b5c +0a6176f3184caad2995f0e352ac83430 +4f97753f016a0d0072a8affb3a3068e1 +4b0454d85a638755d8d3e0afd829da11 +9eb127ff23e31011afd25c4e34d57a3a +4071d6c7a18317373cfc64623f4151cf +ad8a41927ecb2134ac729de61ee682cb +8b70dbf0efcd2cb7ef338d597f96ac85 +eb6048a0025a72a334d672a8c3e3223e +29983120e02cbd005cf8dbc027e50276 +265d6ea73031124edfdfe209478b16c9 +2e971e1096f90ba264335a995474338a +f34c09a240145c1b4c0ab1eb2a9c3578 +9c069787fd2a49e836fade4c7ddfec52 +ed7dcfca13e129c34819b2060eaa0522 +3f4be1dd13befaf4529fda9d694096b8 +4a456e431fd896bcd885e6656dcb2902 +14a5f32d6dafbf0cc840bc02f0915a6e +0757f9887129fd1af65b14209d2b2b1c +ae7247ab73bcf45d40f799bc8f4ed1ed +ce0dc429bca2675a954c2946f19b54a0 +bd77d598872e9fe163bbbc7d5a77ab69 +4001072532101684a1b2f5355414af2b +86f43d2a75dd6b7babec9a41221bbe3a +18784b10a7fce47338f8da8e7939092c +4802332bb23734135bfa8f773612e42c +873d69ba44f8b0f0686952bbf2ca1dcf +e1d80205da641c4b4c8d1004abc54438 +5775b12f0a6035c7216cd71f54481f84 +ff09612f743986e8654ce1cb7847c6c9 +0693d49d540f035817fd3b5bf59b67ae +823b260b859148e28e28f89f3e8b1bab +108dfb03e10677801a97036fab47d78a +e16fb13102eeb830955f08f2ad021342 +258b8004dee864f36b3c2a592caed625 +9a4d083f0be3aa61b25fb5447e94d469 +bf33e73264e77aca70dcd352460662ba +6506e18af818297e59700eddb0e201d3 +2d1acd65c416bcadea0e59c10af4016a +b9e2b93b35b22b11392f4eaf70e9fed7 +f0f72e817848ff7dd7806c5d1b2bfdb9 +e017c17f1510c28eabe3c5f14d471459 +84f4743a7f35c7cc1f1427801c05dca0 +fcf0a85108b10fbfdae6b47c924e43cc +191dc0c518fdf6aaf00e0167d3fa6eb0 +6d9a13530387e964607176ae927112a0 +9c4526a28015464a3a96a48f5c0409d8 +08c0203ee83191f5f8acb8ffa1d8bdd9 +b0824c849090498144200d7f499a5e37 +6963ccd15e67e766acca940794de6904 +e6fd6b4fb78422ce25b20eb22bc70d6c +45ae2a21448f08409c30751093295159 +cc4ad22951452566a5888a52eb424f8a +ded3ebfeb352d284af5a719b39a3d757 +700820c90a638b442556e4547b950cfd +634f3059a7dc8d19343c3bea1f38fe1c +669fbe1c46bc03317e64363233f8d497 +3c013f53111e6fb12943ff5b7532cfa8 +5086fc2891a848030ffaabf8df0eb753 +2705c650503b2003e6e9dfc8fc9a2b3d +d2bf28a09f0b9596816a9efc7bba91c8 +957390d6e79434864f5493c89b754707 +d15ca4199c8ea5b929995990fd63203e +6c906da908be6f741f2b089ee62ae5a8 +f5f8fa9450dc7decb6c7250b29874bfd +addd2d5f6954a71c29e8bbfdebd72495 +df77eda1623846a7e1688a202add3079 +e339c224de45e3c35ec76ae8499d4446 +0868d98453cf29165bb1402c4f75c6d6 +f624c62f823c87148e3d98f8383a3a96 +9e254126c5593f7c89d8ae1a86389936 +d6857f6c40ef91dbe30cd3e1dcf387c3 +049b6cdd156ee05094e2a1e8952c3745 +da25638328dffd35804c0288e245552a +91ea3e2f0ccca7b9ad5d04f52bb542c7 +d1da628ef7c9b543e862b898a04aafb6 +9069db6fc1e23bd9c33542e543706245 +baadac4786369678f09bff15fa0f5074 +ee43ffe5f57473ca3688fd1c56ad7766 +d6a5b1406807dcf52fb310b0ccf1c89f +76592fbad5f1afb86685b0a980869cb7 +8e67683fe9bce52297720f49614ffb5e +f19b6030376338e366d6d4b40d78614d +5acc3731f31cc06b3871df4efea21b51 +fc691cf493f4ba53ce8ac6ca3d648f87 +90f0ee8506912e89ccc0b4d08220a5fc +92eb835b243faf9cb5e5276331e20a58 +e7e8e7048ab094b45543a382c7344fce +90313a39bc7e5bedf83edfca10397835 +72028a95871bcaf192c13fc3dbce8972 +463898b7ba549b32ab52507ffc70fdb7 +1bf3d5e38751c2426699b726834ce371 +be15e2c8c55c113e4bfe35195b7288c7 +fa5e42e5f659bdc7a0e4b42f2fe8e60d +6604f54347024d87301b8bf790571d8f +9d693ed39653bf140f044cb6b6da0988 +fdd4bbc8d12bc4a0b690461defddd1e3 +b9c4cf8d6ea549c2ede531d579eab1e2 +ece0c9826a92597f4984fd716c56c1e0 +b32c5989e2a6474f43ccd14053a31ff8 +904fc3621a3cbc8b7eb7c42cd73f14a8 +8def9dfa67073267f9c3fab9bb4d8cba +b48aa7d9ec577e080dda366bcc0f8ed3 +0bea6ecc701ae9cbed0e1567c3da4b5f +7b29c262bc95be6ff46aa514adc4d8e9 +08443a78d553d06fa1f4917e8d6877f9 +84d06335bbb1a946a10c21636b512965 +6e5570e1acf3a8dddb6281021ccd1c46 +f1542f49a177e1391925952ceb95e04d +fa04c3039078ff169518c73dd80a72af +2449c0030726b7ac1c70c20e23184275 +0b1659a0517906d78795e14115680685 +2f4af2581b5a10dd753260dbd4ae5b64 +701c23b6307fad63e52bf862141a8eec +74b746e74bf1b324731a47f851402559 +2136e15510dd6e197e4d3448f04755d0 +a25f949f64b6889a517b438db7461671 +349fc337e07a9f7fe03d86ddd6d1fbc0 +5060ae67e836c5102dae0889769a7463 +a294587cfe5bda82571baaf24e1a4fbb +a557523693c60f06043749aa84b59645 +d28059f4cccc1085bc49451be40342ef +0c4a4ab8c5e7916e619beafa8ecf69dc +bac578c694fbe521f5aa32705467ebc9 +15f18248521eff3ff636099c6100f455 +6fd860d41d3e1c1fd021b0f98e39f1b5 +feb1ed3134a5a25b377d69de4a3ac516 +7f8d25520cad5df8ce03792451d3e618 +7597eff532a1b91997ac461c8c03fb3e +ea9b57225d6e64d346af9beb90e78b80 +024d853cf64b4a34075600ca0412ee72 +d7e387f83a400fb39f3e9f4cb4048c4d +1f2d8ac58deec98ec32562b1d64da66f +440d37eb168280093d479c0ea1ca131d +91d2e5d6f9767a65ce520b17a3ac323c +08381e37ac9b04329177f6e57eb7ec6e +cdbabdd823f8a2085bbfdbc9c600fde2 +60a4ca7bf8d279892731c751eb85fa0f +18615e6a97a9ca8ed6b1068e21e06c50 +39f85492b5817c682f2fc0e6b037875b +b6dc520246ebb892d60df211a6187c88 +5590469929677755c5f66eec894debf9 +dd47f772a0441ca21ae142ccf23f8b41 +5e244d0ea290399088563964d429c3c9 +2136a399b51f446c6e6a06db54b49d8e +027ff0a8ca0d93698865664051b15ac6 +2a075a2ae2957be7f5227f168f7e4d28 +3e9ae158574279f017e0430f4a294e61 +6528b9b7888ad329ee1948002ada9291 +caf4fb0eddc60b908c45d0c6c5298618 +581e584b0999ae9e32126309c2c58886 +470eed6f9352f1ab0c519e885422795d +e3509b1de07871ed718abd86c84dea97 +e32d45a07299e1d12f35c3dbabbeb4af +239d079939cfea3916644c84f1552dfa +a975c6fd07194ae943bfa5c9b8030ed3 +a62846a6ae5e2006a3fc29ee69b16d0b +dbf1f2a25ec847d30ed896d7e0300237 +4741868214db42d01be59d948eed79c6 +d556d11ac23b2e638bfcd184dea7101e +4553168488fbfecb79a1b79263160016 +e54075bdf1865743041fb1da9c483ad0 +3390de249fd46c5dbeede1aa92ae80cc +48525e99bfc7541f2bdab1e5e013526c +4822ca765cb768bf9a929289814eb430 +f1b90bf3d3e96c37686224c83721aec0 +5573a55bc89bfce32fddb0134a5ee123 +9b3f59a6e2af6ad34425077289240e72 +5e48069324232f63b1b15e7c58e9e2b7 +d4f667e3c6a823a3ce67ca7ded309545 +e4b94ea5b6ba2cf13893eecb18598d40 +9fbd46d11b38453e2d6377cccf1faa5f +90088524fe96c554eebeb2f8d9145a0c +3c3cd41154e1d2955b5acc683ec6c8d0 +214dcfe0e62783518ab78ad5f04f6913 +e1cae3055475bd966c861eabba07fede +4de39fa3ada06801144fb068e4f7cf0f +e10b401de968e2cc25dc5509ad484d60 +94ccfd47968687f69b2694dc61f96cac +2dec66cc27daa04eb7fe267279160656 +dbe3713e4ddae4a099c1605318ff6d34 +64fe94371cfff752fa04df4c6e1397fe +a6460cb34624335e7788cdc4b8d6f77a +4d4906758ec983bd50bc0d7021850ef0 +e71febe9056d7b6180e69167c9c8df99 +ccfe9aed43a9029a0825e0bf56b7a81b +c15704827ced826eeb6f968083e6d98e +414631c344e1675079f9123573f492ef +3c91c648a62048bba3fdb55b3dd713a0 +183d9ea7f3c3a2fc9a33ef3885d3c282 +df92c4a29b9f9ae1b74fbea9eb396922 +abe8323a41c7f3dd830010137254591a +e0ed12e7bbcdb2c529fcab4039a494fa +05fa84f55e79021d1b54463d04e1a32a +18e02efaba96acd03474a0322933ca1c +43e5eb7a00aa9d78f26eaf62bd658585 +b1ef869397df762636822d478688bf3c +88c3fd8f5cded32d0d2bd03d43f9f4bc +ec02d697be4dad9a95caacb0e32ffb1c +1f23b96009e21e800bbbc3ad7a889bc4 +4072ca99316be65c82a41149132d1a53 +6072e96df19cf6d84bfe17db205ed553 +110cae122030bda352570f54c60fd7be +013047e3124551c6a08d0477d7c2c875 +6b55e22e358dfece5996aadacd9e27fc +49f827a3ca7784070287657162e9b617 +751c9ae1ebeb7b9de4a3d76fede17fd0 +7acf0ddfcfb461ee060bf610e5106e02 +197118f9421c1d143b8380035054799e +17b54e486f04627dcb2ad0b89917d14b +b4621a4d259db0c84d2bfac00b493681 +d704086f0f783c37e435d6f3c8648113 +d9503babab4724013c4a037d386d5096 +86482feac21fd6a0020238dd28d59ce8 +c7853bb74cb3c39428c725ccb53e1e55 +0e2c836a6e360b471f4c292ae1d0aa48 +516837ad61fb56fb1a8ac9c7b8f12a89 +75f0bb1a17c1a7a54f285401ec52117b +2d0c2fc8604228fcba70a4f9f3dfde50 +2734e8d3c526f989ed3e5e151394d227 +7d0148cc875ece18cbbe53320cc0c5e4 +e15c846d8287b6c1025dcd8b459ba1be +63cde5d9ee7f729599b1114c3ead2888 +5de5cb10358dd46196e675a54d67ace3 +2670757eef13f7445d624f16964bc836 +07f88c16f67528e19fe04f81cd1fd0cd +57f4ad3dc7aeabb83f4f4746da974cbb +08a6123efed219d7864890939392765b +974271a835f303b1b2d1ebd2b176bb4b +a8318404fd7d8b4c85babf91e50f2eba +32369af79890c96cb9c9e7a8f141c969 +f207cecc8aaed537c7bc3209a291bfc3 +7e6ab7b3c07df391e0eb19e3bc8ac744 +37dc8c9288bbd83c99dcaaf01da77af3 +44683edd78970e0b62dc292908052024 +312600a78e9dae61603219effad35330 +e740ce55f23fc4682dc0394a662cc12a +b48f936e6fa8e0205a82121befac9030 +88cb74815e7e221dbd83e97b80e6d5ff +efb5ac474e99810eb68fd159d6525837 +8495d40b73b3912d6a46617972a591dd +ffc24958c3805caa89836f5951d2cf28 +003d6da5081c6824f30b503670e1e5d0 +f2814a3cc47180a8a75b2c4e52a32fb0 +9010b41bafd4b62a309dbbebf4e1f68d +6073b4e2adba01810ca58f3c208d3ed7 +76c794200bf27b4842462919d6d03c5d +777a49e9557096ba55dca543b7da9a58 +48696b7b935ffb6c9ec32143d9284549 +92c00ca64f195ef4d7853aa13afa4e3f +e8a5b218c80f8f7abe6d0d68d1194308 +d5f59751222d112aad10f49b35dcd603 +1bcf97606a2473718821bd8f44243018 +295fcc6cc2cdf48202505b336b86808d +4eaa995c58307d1d7bf04c752c6b9d72 +94c5f873e267e10bef70bc797763d5ac +636e370e3fb357141c3688d18ffb23d6 +d5e3b3d7890f7d52e8677f7fb2f73be0 +49e5c90a5023e3d28d58ae2de0664c29 +dc3fd234d5610b9a8cf395c1afd1d892 +af1f9a6644044f44dc23e8748693670b +adfcdc9a0bc9145c4e9775ad9ad9bbb6 +8580e6a9c5cb6e614dae87c276a8b68a +8b82f782f68a5cb0ff152747a3a4a078 +31fc2447f2b0c9e62dba4005e34be51e +7690ff1c2f22fcaf8c305115c5a73b1e +9ff053b55914d132b3b888d006c5f923 +84ea1f1c1f7b6d5c715eff2363d03227 +3785780088a85ac08ee2b3d9308b3615 +d3f1dda7b6b86b3c8462524b809683ab +8311a6c5321d845b8a15c36df34c4ff8 +449559317cce672b25cedf28ac6ab32b +8a167345aae7a48d01051c33b5926e35 +6d19ddbd44179d984dcb301c990ea0d3 +995e3250d12697cd79cb958cfb931a24 +1eb73fa22af0d4d19fe69463c8386ca5 +07a0a71323fd8f8a128fac091157386b +68259521fb0d85ddb9232f89a1a6f072 +4557a8583af8d595d11bb8525484abb9 +3178c73ed64fb9d76595bb6ecd4fce2b +b52937f3996f6d88eec508b14c04d929 +c3a65b3e87e5df1a338b30385360e41d +0a3f85728782fb87782cc4ce0351e19b +f6124a844743cec252273e28b164239b +ac867ef6321d59ebf03b2c4820bd97d1 +8ff37d8039173b46b334fa2cf3c61696 +5dbe7ce3c94e687db86836d4b70a6799 +4bf96a6e9cf4672fd46435a6452b1c1d +443d75855b28a6cb2a054bf4a88faafb +b40af5331e319e8ca69880b72fa0023e +f77a81606ec26373eb4e973cb288c548 +0c722decb700e040f301ac41fec779b1 +2076633413f9360fd3d6c788e1b4bfbf +202a39bd4c2c82e53a9ac457b64a4141 +0c1efe8dec15178ca3354b5eccc96189 +6a4cb5a6509e649b07ab87e7f11ec97c +f42c76235ec39b0168f5dd5c01904d4c +3195a9198751c5bb9e9bf153a77bcd78 +a048cd6bb5980eadf008ca996879c99a +fafeb0c394684f2584c6c333d686fce8 +b61216a285911e31963784c4b425eec1 +877c0acc68dc23d619714da89aef387d +dd0bf131f32a707ec70ed7b7347cfb79 +d9ae265d998422550dbaa6fa7f86e85a +400539aa062d79e73293d28e81e20ecc +8a0d37b68770a87aa30e5d1b581aca28 +3655df5b497de48f4a3dff9197e10055 +f461f82a30ac3bcb72a938d207aec632 +bd39971758c884f4f475bf81aa16d6e5 +42b8ca813c002eb32a94a7b5a267d367 +36ea4ec630e79dccbda6ed2bb100d4af +6614ad9d5a1d91faf5cbc5499a3c8027 +5de43aca73fe7f876938870379b955b5 +6737b1b45265491d957d089ec2ef917c +a686c6abda74bfb0ec68e3e7ecdd54f7 +2288d3ae38cc4372b215f26340e4d381 +05661fa6c7eeab56d45552fee1a87af4 +3eb9bc81f39fea61165d2c2004b4896c +3ebb73ccd260430456daefdbf8df742f +a06baa6da58160c7a92abfc72388321e +163f27e0cb24f46d153493fa4c2602db +7abeacb499c2e02e086e1c38b9c04c1c +ab9f5c505b8fbaa2b31fa25ce507c014 +2fcf80b297eb6ae7ea038791ca378db3 +679042a25601f56fc6d255565fd9b863 +8ee12922673ff311a0268632bf84eb6d +83f466c4c3060cd97564878b01503000 +8123d69783a1dde07e0ad03f300ada8d +ab761643dd6df6b99275fdb2150d2690 +d41bca889ccee0bb1adacbae8419eb36 +6c45a24b98c1496b645a6adb530ce05f +4b6c89605f8a09982a9b1cc4206dff3c +11c7cfba0a4b6c96bb79c47d589e9686 +8f7b3a60ac7015ef357d9b3af826f2b2 +d5e75e04c334c9543e66df4967f558d1 +60494dbcba199530fb0ebbf1dd9caf2d +655286e2f441c758a8f91f6ce9701406 +17bfabe1526bff315b4b80fc982d3745 +308075a9badc0ca2f64750c5228f2e7c +ada51ef80ecb5cdf8cd54f0353727074 +207cf679d83747c464294cd40f2fe509 +3afdd791d031bd39d7aff0a6fc616821 +baf21da4d1f941efe4974ca6a6a50577 +18a9194e6d9e1021e75e31d22323c816 +991c7567cb9af094e0c2ede6a00fc8e9 +ea9e944867fca3b0b3955ca7e6533f18 +49c8b28e2084eb39e58a75213d1420ea +6ad374662814cd2017eaa2e9161c1e0d +83072121a5c41ddea36d07d0af40e828 +3ad745c70a1c548088d93946a918abfa +2fd2d4c8cefa171133c48a0e9654290f +74ad43dc5f823b3b60504e721f399a25 +6f04cd765ab7ca7b117c9ff075e93fb5 +7d1e6a46082de244bcb4a14d94f1599d +16d558e0ed6d398dd88df227c336ccac +442783394dad3c53f42e3254598ce1b0 +f22cabfd1872fd7675824fe78d8b01ef +84435d7189fc98e882099b15ae4b8d38 +7b3159f89d8cdae918cfd16e451ca677 +00580c32a0deee6597cd62ceb8850435 +3a31cc8cb89908a7349b5e975db628d1 +f39362c1037accae98f7abf70a4da95a +962b32833f9a5849039e746b11b38324 +07ebb177d1dac81f9a5a9db4aac66508 +3520c21f170aa9de4af09e62538a1030 +0daba984e8adca5c27808b73b5ea1342 +5644125fe66d2ca32657f03bdadb4183 +77d185f70d04725300a9f6d39be4ffb0 +efaa79d33fe8817f2d960d86c339e669 +7c6a1e873d7a02c576c7ff2a3e3d5e4b +55d1264dca001ae84171a9c8c28524ff +03b7d965ed82303a903104251f06fc5e +c43a0b6db81e89eb8df1b9479e9f689f +1b2e1f85bd58c429a8729f04fd1d8f5a +31ebe99f6479dae792e0ecbbd8002c3e +4de9d7657e31fe7ed8e2ce15b6d9ccc9 +88c84ade75a5b0be95b540d545f41024 +3ae2d3020b71af84992d3610328415af +2b9cb84b86fdfe6c7a276a54de74da50 +ddf9d4e16e2b440caa8ab2a45c1eca3c +db9e75e7ed9d4d12f1fcd918608f0f5c +4375c6a2bfc2537855007342a5ab44a7 +9e7418ad984a4dc7a98b65e1164ac76b +a95c4473cdfd928817c9518e026d65b4 +980396eedf67bc72dea881311d1cba04 +6e1fa869e12c3f02245ad7131329fb51 +1fdc092e6a7bb3a8d12cd24a188a9570 +10f94802461dc186c1b026ed632143bd +b8c1b9c41973f6114c8513bac4ac5893 +96380f8439197f1ad78694490253a9d1 +628497e8a6e1d7dc031788d6fea7de9a +0c44b530eb02f1c754842d9e00a511ff +6f045e8b8338efb47b23a9f3cedba154 +d3da3f6c7f8554b7b0fe7bc74d23e4e0 +8c5b53c1a5501d2e461eb6423c718251 +2a9879a8728609b89186d812d916727d +2261341270fc9607d1df09227d382141 +81f1f98059cbe221fe70fcbecfedb440 +215aae163a962232883924262b0111a6 +97668a2ea015430d2915598fd6a9b5b3 +46b48d67c85f7192855b41d49d731aed +785fffcec3342604e1ec230c3fd69034 +296a4764c711023b7650c8b29f412e8e +56fc501c1830d8f260278d72ce48e9e9 +978ff18f1a64116efe4d9c2036572b05 +67c4e02a17d9a8963541d50a32e87170 +d08c7f5ec8aa8580a2d9347f974f865c +4d90f8a3f225a1d50648da927e6d6cb8 +2c98363cf146969b7c61fe81b26873c0 +cedad2bf33be9f7bca8800f8dfea9468 +76bfffb59c11624803b5badeae8d474b +b57104e5e784797824e7aea08e2e43aa +706e5cf859e37e59754605fe63344849 +f54e4dc6857c1414c7cbfe48408057ae +0c13675bb911638dff263ea002091c17 +014977008d5a55f506128aec5c750e86 +500c4941e846c4e9fa94079c5d3efaf9 +7e6b91c943d4b38ed21f2bbb571f434e +e1b24741343a23b70b51bb28b0dd2b50 +1bbf1b85c018a78666641c22f380efe4 +993178a2affb5b893a2c3c1fa1299fd5 +206d7a2b6ec0a4feed627f38a02c4d72 +27073ef05f86e315ad094195e62c9c35 +fc23a276682fcaea70b28985d0b40b32 +3471c235fc83c3d1177ed31c4c463172 +95561b739fa153300830e5074d5e8995 +acf67c49595cfb480b2909b402f06af6 +1c833234c0e86f765467773845199599 +5e4302a2e37c809a58452ac31f12fc62 +eb97a7cc00b9b57ccd9ef224269865a0 +c5bedf8087e3b4638df1f0e0fbcdd64c +505b69aba1b8f6f92e0c87bb2156359d +68a670433a927806ccbe67fd60bbe741 +88cc8c56694d05360864c3b626ba5fee +a39b634ee0e6cd2649e0a4e4b32bdd34 +be30ac785e827b181eacfc9471d4ecfe +124cde04f57f28bb4f48a91125d94285 +e8e792104eb9e5cd04de291b513b29fe +362e6beba5e662d057bdcd70434c2e98 +8b78d548d095812a2b161894a928bf79 +e4c3adf3d2caadf52285e5e4596e215b +fe4033f15a94bd9f4f3eaec7f3d6e7c4 +e8679eb742d6e8f1675f201f03a9004e +7c273ef319c9e19d5986eddcff10cd0e +5dd7e5758a8e8701495cbc622ff113a2 +b01ce83338f89a76e876ec397e79fa54 +9aba290db2d39a5086676321dcc78e1b +26357be2adf06316adff82aaa99eb78d +438421ca34072f257066ef45dfc5cf57 +a271d29c2c9aedb31f4d1482d28e2516 +79a9e612eeff79f4259fc5d857e5468b +3661caab922f8168e4866866a3fdddc5 +a0520894519d0aeac7f0f1d6b71d1a65 +bbfae3fa555d47d8a7816a3997a19010 +21b01b2ef04037b2fa98ed50e8ab2685 +a1091e50f6a33fb9b9c6ab20b164ac48 +88c4ffb4d70b20b6785a348152235c9d +d0b99c3ab0dbe527b824b3bc8d9624dc +4d60d4c3c4924e3857b603971d54bfdd +fe02a09ea51c552645156dc3a43c5a45 +1c325cb4c22f04dd3f6ec12c5b1e7e58 +6fb52c94ddb17017ded914d4428fbf1c +a096baca72b226b6ddc54fc63c56f560 +df8c5ad3d9fc37da87915db15c29600f +58c3de8048c08839f8d52290d0f1a014 +cb8138d497ac65afacf61e9530007dff +842b2b2856c0bf0f2962f1adbcfee443 +01a64d3ddd1ff2505c6ccb2f5de3c757 +b97ea275288fd3a3f36bb984ae170b15 +c4e3784029caed973f9471e60c3340f5 +c784cec550404b352a94477fee5e9c7e +e3f22bd2aaca681aba5905e32bb1d3f8 +4cb013e99ca7673bd8aab688414f5ae6 +0f675eba6b73356a01ec4af99d8cff73 +31a7708d6188f2c28240d4ae3b1f9b21 +5c597d600f19ccdb782e14590eaf6169 +50008eb2ef0156073480178275976564 +68735f85c1994790331e3fc43ce59b01 +f7c79dcceb64b37a33edbe3fee7b958b +d09dd99f5974f7a98799821505c962ab +ee07551f07b4a89d0a3ba45f36b0445b +3bb6ac44e20fe45580d64b7c0e64e735 +5274fa7155ded2c9a2261472a0a64721 +06c80dd4b937f1e702ebba62604e485d +7a6bec21e4d8759d3feb8b11c9e79463 +9b096cc87a0b72844c63322f29014f6e +9c9fd8819854074c2df00d6b8b2eda87 +285827d44524822b05d657ea93b1633d +289df4d10906b7ecf56df68a1451c292 +241d5f6b44b27547297a5c5d30eb6356 +d53d21443eb2cb5ab00cc1109ed8187e +fda379009a5c62850b3f96658faf5204 +2e8d1730a566feb2b0b69c2cbea33f45 +92ab9e607ccb40696f24fcea5000ecaf +64666ad3a5d2c2d0978791ae40e19613 +9b908c30fece87a0314ad4bce60926a9 +3273889790beb0bb98088857d566ab53 +f9944c5a712d0695b03ed36eab786e06 +028f3ac62a5f2e577e49fe69ddf5aed5 +cb3d0a949bdb727c492775cc659f2109 +2bc5c0ddbfd37454a111e81cff16da56 +c6a352301cb1de583befdf6934f6345c +17e74b5e4dadbfd83fca98137745b1ba +636272e4d4ecf69e32fcbabaa93f4116 +1d68759028e8161cd0a97fd877c6461d +662b9c285a9796a6e411c1fcb2de243b +67fd5a3bd94833059c9ae2286903b061 +b743d93e91cc404e6148bc716236da0d +8c2729369f40a09be781cb4ddbc33e88 +1308595614c24977c6120e5ea44d9e02 +a661e2458691f8158ba1d2edbc56275a +808ee7d40d16d38733bf7978a77b4aca +c5b3de74ee0f51270e40eabfa759c70a +1ef7879ad44d4a69057fd3e15fab0e0e +f9ef68481fd68a449489a5c1c678b186 +97114d7e5865779a39856a3ebf3e9889 +6c405042557354948409db1a0587056a +e03a07f191a1e2f89c1712e6dc7cb866 +d4211395823b3b88eb5b1d261e564e76 +d466c5b1a12a89ec86b3520e352ab0e2 +2cea38aeee67ad5cb18e2f16fac1e971 +9e9d3272bb4f50f360a62ac084b62e38 +021209a397ae21125d2f1522f83693dd +efae6b14e4d8a50f402d91bc8c5860fd +9646c5974387204ca47da476413093d3 +b407bb17b59b7b9c80eca1eca2c43ee3 +eeca017c9faa25ac919bd262bd1c3879 +e5e6a9c2bc3e189c96b4228fa9cbceab +81fd06562e327a5b29820eedfbcea089 +c0f92cdfb2389db655b4a171e3506b7f +a56f055d1d1a725b1cc4fbf759a637d4 +bd38090a28ce35cf16773d350be0851a +d08b353d78bf9378bd76a4b82e043132 +fb921f63866162af0184f39ae6475153 +2d3bb674c370ee5e0bad16cd56a8754c +4d9ce302e4ab6d0fb99aaed297433a6d +0300bce20ec28e85831594e6f0f1afce +76fb998fa19d75695bd761e6a8e3dc47 +8e423f7b9543c0882f55588969f827e9 +c20012841827f0fdaaf93bb45c2a7d72 +d8228bc95684eeb618fa8a75faffe1f5 +524dc3fe89430bb79a157aa0800c2271 +cf7753bc7c9197030bc451d15a5a8fc6 +4dd056e3782051f4db2d9f6b7fa5d9c2 +69a4b55513ac05f301abb645e65717aa +ff388baee7e786830a76b89c79fbac98 +f0e1ac8cb8cbfd305469ed0ebfb95f06 +23c906acf42387a6a322dd8ad39eb986 +2492fef0f94ed53dd1a6e7a7af4a06c4 +30111cb424cfe0fd8788309526e468bb +8a6a147c0c31e8d1ec8bf5e8d8dfc3d7 +f155d54630ac9d997dbb69e42d73a8ee +61bd781296c75c0eef3df6c76b50d222 +6de1d54edcc02ec8ea3ef336403b5ce3 +6af43d9f3c297a2420544c1b20209feb +c0bfded11a31914e4f8bfe64a55cdb79 +95ed88881a9e5076786c964267720e79 +5fe621ce6dcdca0c028c7e42e0fac503 +04161d67b341f86db3fcae2b01c4d8be +c2594f52f373a2e54f60a256aec780c2 +8d8a7b080cdf66b0b6cf19e0042a024a +d0923c304e9b69b3fd3c650075385923 +e4f269d703c47667cb55d6448252bdad +8b0cee426b2aa8bfe7fe05eb6028fa8e +f0aa05826aa7ec93412f714c03f58c4d +720c40e91f91987d78a564cb2f229248 +ff419baeeb0c9e8e4f33d7a77ebecd9d +9e53f3fcc034fc2ff1df5132cc46609b +8a06c3365e1ca715c88328854b178636 +87bb91ea2d189007bb0542410957621a +db208ce9e24087938b515a19399ce602 +98143601b72e60ce1deb35b8fe7ef2e6 +588a397435948ec5cc5ac1fee280a883 +f490c1487a399f315ff18ecb011283c6 +cc638a843e20f4de5533d639a6f36758 +a98bc613e11d87f0ba8770071d4c76b0 +0dc5550cb7bba563772f1a09518d2688 +891430570b3e4a40d6de6fb86c5a1902 +4a64ca8c2a6f1bc71394f8c28dac80a1 +370a61eca8ea48fec4cddcc3db90b722 +2a550657e9bb235e49618a7ffd4e62f6 +0d385f69e651460973dc2bc25d8b7676 +e3ecf3101e2a83ac5c838bfd80fac9e5 +ed8b16a45ca803d0894789a728a4282d +5583cafd79521747ae9b8e98770a9be8 +98a1495d87154ed117b6b58a30526c60 +a81832b6d1412f2939599a74f945b54f +0706af34f7f53aae9bdbe4f8427aa59f +c1ed0342f6699e48afb31439e5c00767 +b2c467288dc8d895262b62fe6e2bc613 +d960b5a39d5e21497c4d0894b242a582 +eb8ff1c90ba607e0ecb7ee5bc82fac39 +82fc97233071ec9cc839ccd5399ea433 +e49a7d5b728d2ef002d261c53b4c8315 +6adf383bd97af29680b2b2f6db2f5f3f +98c8aa53a033d5b25294b35c83a51325 +0325c6080a0734299fb0a32a9552bc4b +87663e9ed96e8d9ad5cb939c8280d438 +76b43278da113cb4eaf8e47d5df65b13 +8a2936e065cb12e766fc5fdb1518ad04 +4a5d3de497752fae803c3fa4d088feb7 +7aba0ee4e82b268942f1f0955870eb35 +34cbeb44c0e05b23de39138a7f26ebd2 +9a95e24c9497278f4d766a00476bf66d +7b1a701928585606035c669aa62bd466 +0938b6e6099a82f7b10e44eac57a1567 +7aac21f8713a1cf39844d33eb4c54893 +3f7f3a888cd588632e11d30302df8f83 +f82416efd00c88e17ec48ac77748e490 +c51ddcca2348f9412160ea3416fb0140 +76aa1a579fe64cfedf76b26ba7180ee1 +144886af02feb1866b83963626eff0ff +844fc86b72e7465eb24382d6e4f39f41 +3bda897f1e9ffe78735d2e8eb276ea91 +b0b583515b99ecd636b78681a779cce3 +7076c9da86b0c34430ee3ac0e034d73f +44ceae9d5cd0202393ffe1ed7398da9a +19e87105c73010922313462a06e5cfc5 +5c92dd097535b3cc55fd362c5db0f4fe +ba740b55d0ba4757ffa27df409769b08 +06fd02946e301fcbfab4bac27feaf601 +a1c014e0aebd00e0c686199435293f86 +cab2e7d0690636d174c2693bc04b11ee +c59516b849ebb22ad9f0130e1b012e2b +dd4b7085a2af43348ec94c6820bbbf39 +4a320c809a9d13f2a6622146e0218f83 +9acd1388ac341a9f4fb873d8fd9c7310 +1d2a79a89242c95c1666e0dd87d83973 +d19706f127a83fbfd05d03623f55a7d3 +d77bfea1e56e238697164652552cf8b9 +118847020261406e183e413a6b3c7c7a +58e4d194da17b526e6b9e2438e904b0f +f1429fc3018f3b90070bd750a79c91a4 +025d9252c5034d371c7a1f9d4a5ca8df +9e9fd1b904c7eae68c2e15de644ba498 +46e8c2392c78835502d756f52b6a3921 +824ef1306c7e6b9e40b798668b1730d5 +b58cd97806f9c2bca912c058e1b180a4 +4d74e6e278301b5410b19912e0fc9f56 +5db23e7b124c9a75a5cd76a8e1d67d78 +6f568461466ac41bd029aa9400c17cb2 +e97662b1d8db841aeb7e18125cb94a38 +b60fbf48ec234cdddb158819e137abfd +1eda46bc5e46dec0c8176e647bb9a5b2 +42ac429ec11c997859a88c67c3a7a463 +0e19e5a6bb44dbfc48a503747f69c633 +b8c92ec40e263238be07f736c6cf461e +144c18b607ff83bb13acdfe440f3f24b +f9a9cc83227c631099889a6b6d53df3c +c1f43334a99231377a46d4e0b56697ee +a7921852e14d98afa118a29039acecce +c22c67686076fb88349da152c27a9530 +271c894b47ba5a254340239c0f25d88c +766148e457bbb4170e0d2c6483aecbe6 +2fe71084d1c766ca2a2418a53a761907 +c052735fb0f986a6004f540da9c81566 +f0bbfd1286b2e153dcfe0ffdb1a3c278 +8bc4014356886799b82b23ab7bffbb5b +4d45b3987b59453a40be1e268a7c06ea +c25f252168468c48dcb10a173d987a86 +7c5a49eb7c7515ae1d051ffed2f88a48 +cea4edeeb8dd00c05e5ffa562089b307 +da6276baa9a55af9a824864bfcaa600a +60636e13352e1f0d373cc95c62b86922 +4fa317450ee801e05ba822754b073b41 +ec1c4a1e7c71ad8817dd07f66b3acd2d +3a1017bdd580996b1324396582f4f0f2 +03963841a3df6dcee6403d2896de5471 +f2b73df3a3791ea17f996c5993569d94 +ab3d670fa0fbf5f88a1e63e2e5172ab9 +f3725adab364d33088d53ccbb2fa9e63 +702b4f43484567845e5f0ce07411a031 +aceb8ebdae2ada04e0bcfe237b69f9a9 +2a84054e93e52c9c6076aa1993826f5a +df19daacfbf69a86e291b5a9e550f167 +3c097d671a99174f432449cb14ad615c +e7bb6deedc5524fd820b82b12f97af19 +6ae56c2227bec0f4b563d881a5566bfe +8d228724e1ea476132993a6e50dac2e4 +e708ca2c0229ef3effb3c35d290aa6f4 +9197a5fefe5d636cfd82ddddb8cd0a2d +29e60b40d7b4cf8c69bb4be0fe121c9e +0bfbe4f5cd5b61901c30e82268ef73d0 +7b058f0cc7d0e8ce34ff04db1d70ed3f +ff78ae16cfbcd1946b72fc92e8b18d43 +c7ad0e23b8c193e933a22aaddb944f17 +42e9db26898d3af5624ee1f7e72d09e2 +9e50a7c6057d10d14fba288e6e53357a +97343d8b5375ec3bbd429d72ffbf6dda +92ee1e312d3134492c1f9a6146022f3b +4bae89e8347168dad2674aed4b01d65f +3ce36cd26f107f02eeefe7b7ec303709 +3d14319fecdc5900dec3ae534c41da98 +8dc4011ac3dcb49d2e725a6b15f7f900 +fda8380799e04d7c236d23532ce2f50d +f5e72c062ea2fbe27914e68a89ccf932 +1bdb376598e9d4c350b3d7723d0ab883 +a7358eb93f95a3823ff7c3a92b33c828 +69c3b468d44effd2f0a350865daaf1fe +25037ebe245f0cc4ae3df8802f8fdb28 +a9c2956cedd18cfd65fa6f5e17809cb3 +d97b4364a19013c53ec88f43d41d67f2 +07f6d96cb2b9c70b332e867d17ba87a1 +4d8d1d80d3cc51762db6a2258c392b75 +49b77d0c9ed39ec55fff0f2352c7913a +88f2e016010cdd6166dec01468500c44 +1eff0199ce1432b3de7836c8fd0e9eb3 +45870ff6af69514a0570843e250a3668 +30172163a0a56aa438abd82d09da9215 +d98adeaf681d2a8a8d5b8c5f40868d7f +5ecae1aac4af19347884064789ce24c7 +cdeed26ca76d8bf147cff6341b605cc2 +423cf2dc180e364079fe118aa3fd3b79 +2fb8f1a9b9c47c26e49dc113fcc780c1 +91ddb583844357937cc66af184a99f14 +a21b41d387da1d960675d2bcf010a834 +f012519255d833479ed3dda872496e95 +57a6ba8a05cc69815229f7b3b8eda974 +585e8155961e29265b27648980ce1942 +46f68efe43c946ecc28b012cef4d8bc7 +9e22bced3f55633ae96f37de0e5cc876 +40ade34090de9aea5b3f904f151c0a24 +9ab13a689ce0c70a1cdb476742622c7c +14e41eead02bdf95e9244adda3e4ac17 +c8887062b86fba191cc5eb71ee74a7c4 +a10eb29fee7b710e9ae95daf3f77752a +20a6dc72dd1a21eccac435b6ddf56de6 +1e28b7f24ac36e7fd17deadf73177f8a +e1348aa8d4446497876e4d7aaa0c1e82 +5da02590bafb64c9c8d395e061a30955 +13bcd4e0b92d7245a65a3799f1762f59 +c7f1372208c3ab8a6fd73140e3e83117 +b4998870dba177709ba62471f579a0fa +a140509f33480bc3398c95cadad3f076 +f523d5dc4972c40f12dbb5e77c7d18a5 +3f09521ed6d8e6dcd303eaf473f2f488 +ea138667d50204faa4f3d5f8e5fd9f33 +488c60667ae37ff93d21229e1d2db99f +b7aedc10700556c2e0e6eb57fc2917ad +7789fa309add0ea82c660c102cebe486 +bbc842ca20412fed529bdbf265111294 +af5effae425ac4429c5e4b44aac1a5f3 +2f2eb7e2bb465fc18640380597f99acd +cf99f6fa720c80bf8abe42bb1eb817bd +4cc18abbf9ee4d7a10854debde80a014 +0ddca504f8a07785025950c80ea15807 +2117d047e7e57a4c9e962747122397a2 +289fba2897e25113b7a8667d6c02f4e7 +78205b14e3689011244b974557ac2db3 +b98995c64fa72b111a322aa22742f86f +80f0f569167ebe8f4c927b139cf4af0a +8563d3953d2bbd45a7fc03893f29152f +3e7d7f935466c2e9d74726ff2d24bd69 +59f2160f3a5b04d389759f896a12a4cc +40c7bd0aeafd69d5d46f9601aa279fc1 +eec732a1ac48946734d5dcca545f6095 +32f26d5db6c42c0ed242b4fbff78e493 +f50717a667b45cfff8e4d18c91acdd3e +74f2cb74b108106be97a7d1ece83ea8f +e936a6359385a4e9bc8cf9d9c1279f34 +d318e4c89254438533b85813c9732b3a +05a2802de287f7b58f03eb43be0ce0e9 +ac3b3cca307e889ec2c0c5fc6ba1419c +59d810157b7dd8b7faea5216858e600b +f34e5c0d7d3cc4a83235de09cfe292ce +7e59c28036784c7a6c9a70e3d39ed417 +312915d6ef990c3945833fd0cb54c397 +c8d260cf3e95e9c5849d793696d53104 +fb8c06d94248e1ee3e950e5114b7a1cb +ac5759d302a086b26fdcae08eac93751 +46c99c20567b9270cc9a0513c5b4afa8 +d615cf9ec2069c745e7aadd12f551e61 +aa37968897a4bc6f5a9cc9b54bbeb607 +9a41f06a3173fec0e79712af9bcacce1 +041d420aa73ee144af6913b564442a79 +a0fbbc6428dafeed594aac802c7c561b +60cde240c490b4bcd072fcfd41837e0a +736ec39890e3198392d7b0c16558156e +5ec2974755c4b55ae21f43ef824b5471 +ab1c7e204e63fc1f888bcff2bae31df8 +783dd3b2c95b5d1696e9e0a0d53ae5a0 +704db8d5251d7150e670002f44bafb95 +c334204bec86b88b84e7ffb2c052ea9a +72686dd4f5734f35dc04b5bd309e2a7a +38a4cbf7f4db062d9012e743e9e460c2 +b5ae6c3e2673f4b721932ffc8523d5a0 +867c6d33f9e87c6bd372b86ae8ccb4b5 +3b472454f40c0a9092e72f97577f9e75 +bc10202d40441b639c22da716f86cd69 +aa8da2dd0af32ca3ae2fddfdda350992 +66cf5f5e5d7916150b3993b9cf158ce5 +20a69b68a5bef700134c56e473313a6a +79da6887a4a48dc4a10ac81e5df82862 +bba72302aae752e76b76e62aaf0c1698 +e8c6009dd893b5590c10b675ec83896e +1a096a3eb9653e7d5582e7962782dc1a +fc4de94aa0a74aced4bfb5649fb41b93 +d6dc00909815fccbc29d38648f648212 +9e132ea239400634aa9e17888afe88c3 +eb705116c07b3a1c2383d9a16c22b371 +9f0f2672fe9e289853e460098f0f526e +cc7241927b967ad64c63d86fdefbff12 +78f060574328882a10bf60731644513b +a9c213e2b9e9807ce4aaf3597ed7eeb8 +ada32e991a1c14cac170eeb774dad3cf +6829915139fc745a388b3ebe7019c52b +96401fe4bff61a69c8d12307750f6ceb +c8811fd651eca41f0ec0be49ac09c7ef +74efaa8d0661cea38e91e2ab1993b4a8 +fe0e30092932c79df1eba1721ae47f99 +ea28b409722f8b49102bae089ab089df +1dd43020abc7b004fd32659ad09b3950 +69e46d885d02587ea789d0c33901d8f1 +e983edde15524a5c45c436d29a947308 +ad81ab80abc9d74f46664cfe1bc0ad51 +a774b776213cd1b08fff1e078cc75863 +1292c47781ba6f5f9d4964e5f4aa7db3 +29067aea6d92ad6fe0619f01efebfcf5 +1a740892dc1244e5ee0612d5a2b359fa +fd087aae9f8d632f3ede8bdf71174719 +cb42ac3054e48b8ec7bb599cd6c2c567 +5f6f8cdebfa3119258c7a2d91b4b7eeb +a4cb2c46f32a64d4748b5b5c0b28986a +bb7fc69fc0a1f053b2498aa1d7daae28 +39e0cf8f40e24185dfff926e721a0081 +1688f53487e0edfe4f56a635d5b9c69b +a5b67c4be287e31d66e5846adad09871 +8275e330f51d1d8e03371f13405ab993 +e64f87bddd9b82276f60f8409dbbcb6f +85c7a60d29c60a5ea024bbcab7d3a1ea +30d514b1334e01bae45ec1797abe0b44 +c8e24fba9d54f7604847fd691a8e9417 +d782bf30995cb904bacbfc0675cee9a1 +05c40d29fcc418d13fd25d053d39a185 +9497d88e67a9a9a51d308a633d388233 +15eb3bf61b11dbdbd2fbeabc186105e2 +a2265e0b6553ed570877e2ee4fbae183 +50000e98f36e43c9ee0d85894a4fe691 +a0f44fc812e799d0d5a076195f3a3fee +9d8eefd509057d9a7ad6fab110ad7a5d +c19b696ab3b9ab71e8e6094e4272e738 +f3b941e52d21d734432949650b74c1a9 +3f0977eba0e772856f8e8d648e054f86 +d3714a1589d08b9efa24e125e53ce963 +e0135b2900ad1a77b087c680f820628e +d8248067c44b12df16de93e4ef0893c0 +4a857c461332ceec41a5a978728b4df2 +de775898a43b412d52914e1d7f9661e3 +b88faa6a21634fb364ece8e92740a5e7 +626a9a4ab74a8dc382d16a36840cd58d +a7518d60d99329290f7de6f384d03197 +2aabad8dd5ed7378e65d18220bc45dd9 +0098dd049286b05a7cc5095a4364fad3 +f1cff0881af1359832e347fd648dbd42 +8ff67160a3105fbd9e3a23f2e3c04d45 +e55a6e42848266b84ccfe00da3712c8a +dbdd6763264d4ba4b385fa8146a33104 +bd51fa378b3a4c0599bc1426b18c711a +76fc625c65d27845da63fc9734259173 +ffd2367f87b3ccc85d67cb753894e456 +005422de9118654f92dd385b2ca1297c +e1b50f2e2e3daeb816891df2aa6de437 +6fd903c0edd145c38a9165e090e0f45e +cd485991665b2d26fab6d83173f08d6f +7c3f157f55a48c9d7eb6611d78e3cca6 +f9a2efc75b0f539ac8a5b0073ad4fb90 +ff6682e92d86e4191d3e974a2094f98b +949f2257232bb0bc7a1cfe25225a5079 +9de2eb71bd23040cb48594a0d672aaa6 +f3766cd5ba87d9b6e26198ed536808a0 +c72eb7f93a454b56a9baaabce3a3c0d8 +c8c0d3751b7a4af73709b0bfdf694add +99a05a6278f125f3e2f60a9577ecbd94 +2c33bdee2942840de77e4bafe11802e4 +7737979b48dc9113c74681838b8076f3 +a40bec1bce4728d2f0ae775821c4b91e +2102c0928c5ca756c9d3de49d47dc774 +575ab8a6e092a26b07fc903ac7d8a5e3 +418c8bc2b627d6fd1b2882bfe4cc27db +ae1d2ad68cda2f8702dc231f4e3fbeec +cbbef281acd011e35c7228bcde8e77b0 +9bef168bb41dcc2ab1bf160c14f46402 +a2641723969f8ef19d565e13d370375a +5fcfbceb0207d9c6f1318b9a7e607b28 +be71f237a96e5df077916d5016f97faf +9fbf7d34793b2f7560791f8d3508fbbf +8c0688f9936897bec0cd4e75a16f902c +f32ba6813200dd60781a732df4ca8c51 +c280ee7755b4f6ceb0ac59cf77ea3273 +f3a8b34ad2bdc0019a4ee670681442c4 +5d675eda5f36a96e3257634b08af6397 +1d4e9589f9852c8ee14b0d1cd59f0902 +2a8ec8af5aacfb0faaa88fa00b5792f9 +45ad2a49f5856e3795a8077c52c57052 +277342b586de42f2885d28460b3be509 +fc138567213de756ac83591b94f55f09 +63cf0791b83860d68c61ee6199fd6769 +1fcf3dca7f8ab38654ac7cced961d836 +7744209a3bdc98a0470106ed5f205d33 +ffca4b857f0fee9c99ab2549509c13ef +e0c32a4f4225c74dfc177c0446adc7ac +d74591609db45dc24e89d75d4c14937d +6a5a742790e04bbf6824701b9447ed3c +9a095ec54fba4beaad5d086aa5db5cc6 +4d707e83df0bc5eb8f63afbfdc8fda16 +0c00c82f75092b8614263ff0c60f4268 +4c171b83d17f934423660837cf742ae3 +283dee2f64e7250ee397d7e9c2e31349 +7a435aaef73548093fd1c525bff69863 +ba4a2e5ed06aed7bfef5d04b24484854 +7e7958024a1ef5809c3bf0be87e4a82c +d98319bcd8c46be916e8cfb7323270ab +fd5fe6d70ac1bd511d3e127e1d08d3d3 +8dbeb9a59b1042ef59bcce91aa311872 +b87ed3760ed9a5f8f9d91f92d2bbc47c +323e705406cf5e0916ee76bbd5518ed8 +2e5c94faa801fd09a5e24c330f12b719 +5fa7659dc94f176b17ea7fe634cfbc13 +060236d6b369b85e94283452f37a0fc1 +e2148a391d879c3219e15c6ef01ec3a6 +63eddaac520c7238ecf5c0a9fdbe233a +799c65c14943a600fd7158378f110f16 +be5922278eb99be8c6c6ec9c9349b008 +8674ba7ebb52b1dfd88fb25e6f86003d +3b105ae6a37afc2f33a7e6ecc560a947 +9ecbd01fec5b0c55c377792ef4b0b596 +5d3336f6eefa3591148a14760ebd7f4b +37da01606c4515150d98e5037879f398 +8310340a8d464791ddcf20014954b915 +03fcedd3cc06aab5789fe22ae05f0009 +b9b80a45b5725e4ad7818cec4bdcb79a +9a298be13210bd488fd4f15c187d3d44 +86024b33686895c11ef169b53672b308 +1275c93751ea6d3c2fc68239a3576510 +cccbb8a6b350bc326dd5d3fc30938e3c +221c23b54946e7f48e9f4b379cc5b71f +525e32228e2bb7a6bc2768d4110876f6 +bc67a9c7ca8b93437ae2cb8df08d83e7 +cc2930307639c93441c9928944ac3ee1 +6549693790875b9e356c5a38ccb82a01 +6a499d27e389d135dd5d272c79f7539c +6ab41b489a1b47451a8d3765ab44af30 +a709e64f2400cb3466ff14b89ae2259c +bbd737a054ea83440809ef6a47678cbc +d3fa2cf3793e02d2dbd71e3a87296462 +3e3f1e2b5e856abac7984e49c1d26882 +048818899b224bd791f3eef3db78ae11 +9c157512fa4d3fba71b96ee8ce6ee2d0 +851ab72b6394aa2b4255be6c957a51e5 +84951d8053ccccb5860e8b6a9bc6677c +c4953249572583b1cc4956d8b5b25edb +f25715a3a3d8fd0205c0cc8270a73367 +59027f9809069020e2d9d3c16b130d41 +73d87d7368e38e6806984eecd5824d49 +ed8c7d3bc90dde0237f0e2e339aed8cf +bb36e18aa0a1bccea8bfa8cc4860d2ab +7d5ed8bda7e496a359a8798df4ba3d57 +b8e97749be6ad20957c43aa13ab1d67b +a100e7cb39584d0501a8c01d773bfbff +c79f9cb04e04b72d585c626899ad0c58 +4994da7ca635ba6204a30734195fb7b6 +cef6bb02a1499077ed98695641d9f33b +2c00c7b403051257a88d972e70b427b8 +d6809dab84ecb35c08f7bed999001e90 +7e7c874d266bd7e1e526c7e975522fd8 +4c97da63d2ea9bd765551a548e080ad0 +a440a864fa16b64444937f1c1f45d3e5 +b0cfa55ae914f743fb29f05903546929 +41c2556f12064ed4df3e04cebe029859 +34311f2280ae65e2734b9db6ac065da4 +a1dd0b672a0c74faa2ab24a1a8dffc88 +bed4c4f4d9d6457fefdfeafe94dfb94e +209f867d1ffc3cb5f849b7f71625cc46 +e388103e53821dd6c35aa387b461aee4 +fee4cdd0d627fc0caa7fd92a48b15c88 +bcb197f9f204f12d6b0133c85a594877 +bebb327e3c81be225b3fdda5bce0cd1d +4e48ccecd0e6e2f69c56ddaa7e6d8d89 +4a1474ee374f52a2b0dd4ea45bfb2af0 +d434d0a821bd5c0b3f630f112ce2bc8c +616055cdda33b1c9fff1a3125a8ea6d3 +bdde349f8d868a9836de95539b4e0347 +0ce0150c442504f52424859065948eb3 +ca3860f1ba114276a854d0384b1a8436 +5f30b26eb01da983c62995e66964a328 +a29ea667da35ae5a0a61a85e7ddf6733 +640ea578763c3c7efb00b237bcf8b302 +6a8267f79baed0e8c6b999c7002ef7aa +e73d249c49269d5abad0a123dc77b189 +4481fa30c7da43a3d78ab80c1fd50875 +e78719e418100098766de89f0db13d36 +6e508ef9fd36c20f1106de7fba5b1ca8 +c0e7e5903b8f23b62265cedd355c10c4 +d352507b68196bb5e3abc65b807b01d4 +c0fa851cce19148a2a5ec5cf0caf6795 +ba55ccb5023eebe2df0a0c24d694f1cf +8615a8289f16c0dc054770b3372e1528 +6c4ed3099359b06b5ee114060cb8129a +2f3dde3eb00e3917a0bde17821e3bbc7 +8f068ecd78a8a4673ae0d71cde5fd008 +92f38dc26155c9254606c9edc0da3617 +4ab6cc466760a593af5859bfd4742ebb +723a56a108a2348147f922740f60af3f +c2e1d125a4a5d8638c0ebef88058e0da +5ddb844f6fc42a69d47f43e1b77b416e +311b6dfec47c0b6ecf5f28e0af1c1dd0 +72bded5c4f738a231f4b81e8b25be228 +3350f9ff96167ad52d2e10b482f55a50 +6632194986393eaa1d93fe97680dc016 +7243dca81ecf03678d8192eb0fd57b1f +c8cee474331cc8a28c56644daa7b8d9c +47a929e06c1bd4572db40d94ce9098b7 +1ae3366f3ed1f00dcf09dbad8a26a65a +3fcd77045151cb7e25b37bbca19289d5 +b13bc854973dd3116abc1ac5770faff0 +c4faca8f710180583ae4a0f76295e1cf +ed9c9d63db6d6bc1349fea6922e6f5f1 +a8ee5a7da85495647c3cfdbdcb4dd81b +4a29f228e6646c2414516528ceddfe43 +f9be40d611436ff7ba1f609d8d4494ed +6a329cd22f09d9ee01b51c09f259ec3d +06db500c432097049a22b67616c1b897 +4225c6eff2766d557bdfc646bf464e8a +32f100f5d95eb3499b74b1b9d0dfbb26 +0485bca60a660bea1db51696e1acfe9d +138eef7d3455500e779916d536ecd152 +35f3e7bb1e290891a2f632db419db812 +8f95085f44667d3894f33af4695c2b36 +bc4b0033ff97d2246943a5bbd6aec32a +16c69859e328648f8e8e5e75482db196 +969739f8a29aef301a8da49d9c60479a +17a0c897f9634daba439189efb0c79e3 +de6dea610ad8a0f5ee99e92fcfeb74c8 +63e71e67015493f8ecbd9327c1aefb50 +f66569c33264e70a1b6f2fe8bb699fba +e5779d5b3185847ab2fae79a67bb9e58 +d4c50c83b6537361681985b25b7ab693 +2f2a0d3629ccfb134981952e8ad8ee97 +b7d5188b5839431104b7d279ad365e20 +f8f14fbb2910f26b18751560aaf50724 +13314114d9a21e8610254cb818d3123d +e6510aea691ae15d3dacfbe0c7b530ec +458b0c4737e75be4ad1deb7f37258039 +2b9a96cd9cef3fe0e39c8b861325bfcd +f8b40542d0088942ae1fa669e4c29d83 +14b862cea7d5ef883296e11f75bfbfb4 +618a8efd90dfdead4da995cac2d8d266 +1c5df91fdc346a96383eb7af02dfce41 +a36459eab2e24363a3e5cecd4a8a37f2 +785cbeaa7d9a1516fb10cc56ed6e0318 +9dec340b1ef8622a1ee5b2d99bca0fd7 +32b5c279054a46e6f0221de02e8c9992 +41e5586b654dac41dc605a815e339ce8 +ca762683e12eb570f4f31042aec69346 +5d2b0c52dfedd0f3cf2b428e91b0454d +c948c8634f008dcc91a2d6df06bceb9d +4955e45686a1ecba9dca2ea15894ee8b +3ea92ca286ec9fb7cc4bc6ece4f20926 +27b704808e9d00346fab488ab0805ed9 +d42ad3de3db884da2ba89a2a28ae2568 +9619598039391d30070784bce3647b61 +0fe871d49b352dde1564cc69f60c7e04 +d73055e518bd6c8c03123cf923b7bd43 +49724325c73921470cfeca44e4dab82b +9ed754287433d15d950e86333f75f721 +2caf1907423819b87ca68e90f5db1c1d +3251542188a001642879c3c740d4bbf7 +e353f5af686eba4a59134d6eb2934567 +41dbb488f339116654ff207ef5042763 +463d8f7858ffaea9bf7b01b8e9bd2800 +b6aebd17dc8b9da112d33e20f2dcc735 +4a261930870bb10428bf79497ccf3532 +80c2efd695cb6fb8c4993a9d7d6047e2 +d628f6454b041b1ebe4a49a2b2d3c12d +deda4059fea055069a247eca9b75fc4a +6d5e25a7a87f55fb03011b7d03b1a3c8 +35c605af6c6dd9d56f560892e2406cb9 +e7c57641ea6f777f8748e7ab916994d1 +872db753431a63e2e2da50d6f2be8216 +301c4e6fcf92c113407e122385edceba +dc87f50d13b7b53aa33a20c0175202c1 +42c06c2d47ddc931efea88a95e77bb99 +3d52a9988bdc50e994caf4bbea56b973 +36307ac8aa1b7db94e12ad0db761b326 +18adb7cf12244a28cccd69974288fe31 +3d7fbc9b6f56b5a8cdc4c0706d3ddca5 +05067ab3bcbc2d749ae8492383ac3fe9 +7a34b670c8626bef637477452a1df416 +707c4f0523c5476666d053a397556f2c +650cb4b26c0928737f030c88eea0116e +435bf82e318d8086d43290312e39212d +a75a53240eb4f161c8acca14a57281ed +e9c7dca005bdf54968d12cb698e1914b +e2a3ac54a4c2763b7c669a4e86bb6d36 +020af662735bd562302038580c192ef2 +07b141f1318c2e2fb6d41f45c0661901 +04b2836d31e70d1908857e824fe42485 +ec7e31b75383342d87ed15dc170119b6 +c343cc2054eb86a1bcb8b13b5269eee6 +ad1cc895e5bfaa60e8275b6030f6d5a0 +53d53d82c47192403a8d2075b2e62ce9 +acc67908ab1e804e49d6c0c4587d0cb6 +b1ea78f104db739fe1ffc3d4360c32e3 +791ab5ff8a133d719e096bd463202a5d +b9b763ac35e45d094f818a3576b688d4 +96864058ce292747f50821845fb6c8a6 +f25d60ac6a4bfcc34fc3d1a677140e3e +fa57d761afd5a8ecbeaedc32f21f0a94 +8323700f59e4b6f54469c89606ae229f +1593eca641d2ac3924fbd3b719902f76 +65e99291a83528dbb045511e33e8a969 +6c086a67fa3a4c3f6441c9dfd6e537f2 +da4c320652c97c4652eabbf1037a731e +d5b04937b0c1530d18300cec8f096138 +8c616450bf7883ca1ce032e318e073ce +ec0b7d089687647e45c9096be0b59b96 +b0704acf09d49d0d937422423c4a6c75 +4a4e76d21f91a277fa8aa6bfb311e795 +8e1897019641bf39dfd8ccbd3015a458 +e7810fb8d1e69f04966af28582508622 +f71827138f9be02da3d496cab0b56fc6 +742b0106dea5ae5c8a57573d6d364db4 +29502c77a6ac54f0690fcd0f06357e77 +37a6eabf2bd835ec7200219100cfde9f +2012d4486cb4a9d09c117f7f2be0d517 +0e2a64adb8ce6f65fdb26075d083c4af +fe9084540da455409e6f763caa69dde3 +8b17e7785359dcde8a4322d7d565082d +74623eae52358ed2650dcc5ed7e75050 +de47d9035b30435fc3c77aa4d5197aab +5e34ab3252d49303fcc7b869d4d8bd1e +86968c7fdcdc9fe186cbea0efb83a0ed +2dff8824647f0f7f230c8b3748868fd6 +88127e8a143797102f23c3ad129b743f +c7ebc3ec90ef2ea2b75d4475f16dc232 +5189c42b01c52710e91244bf4f46a29d +8cb8a29a83e8a1960d90c51406c84131 +ff12226a40bfae4b7a2cf6b6fab86dd5 +968ffe35732fb2180c8e7a061629aa48 +87c963da7e6faea42e538ace5f082e7e +8e2f9b48632d4eaa3a9d568e964d58b2 +d1fb0d01fac3bcefa4f4d78994937eca +4d23bad91290f8b012996108d4ed56f7 +f281afaf11f90a0c19fd788e8ac910cc +6a7625e9ac0d3f20135b49c2c3840a27 +d241d21514b84ca684758d77ece9fee7 +c6aa49ccad874af8cf2ffc999605a7ca +36156b5b7c193a50e07d35c3d3885b01 +88cdf8d7702ce8fb3cdc5a2a909aa5c7 +d84683f70f9011ff9dcd3c4ec40d35a7 +8f85d1d2d1a71437b4d5ab1c9dea8df8 +d40118f8ea7de579cfa9b0646f67ccb6 +5005975c5daf8c56ed841526ae87f4ba +d8b51076854b8c792f79860f1ffd95bb +53fbe83cfb97223dc405a58a85df7fae +40cdf5684038dee6acec3413c8945d2a +2c62f19c081550751bcc677e7dba3eff +adcbe2395b95494f98796b2786ba1d56 +81e1a9e9fa3b6725e67b71b7b8bf0273 +c0ebb52c84e8a1dd5f4f1011cb879eee +e539548575a5f132b5152206f1e06455 +b00e12fba49177ed0b00e6167d7cfb64 +4462cc8703cd6646f816ae93d96d41eb +3c1ad147576b96438618232b1749aa3a +b8bf352101a10bfdcc5d5538c79625dc +88f1664d06fe6876d0cf6efc9543ec1b +27800e8316c693553cf2d8ece9b03963 +dff0a32e73971fa20f821dcd61e3e548 +dad1cfcd2587568c7a0a59b2a6713dc2 +9ecaab6c1b87fce310f84e07f0803556 +1f542a5647f4a54a364367317021ce1a +86a527d9ac33d76f9c98a47246126bb9 +2ab54f74550cbc82d5f3dde51ec74356 +8f7fb6a2e2243ee6a5f462f3f06478f5 +c43d50ea9c04c7be493642ac27cc189a +9b1090fd819907311a7c56b81f5b9285 +7d4eb311f9d72eca9eeb9173fe7a889b +be1237acfca56e0ee3f3dd3a4490b046 +edfda01d3e946e5e814a761db93f25b8 +054d37cd67fccbb0c7fe85ca5a073e9a +34a0a544a73c8e2593f7e3d2ef035fc6 +187df0b818179ab5cd0995c9fca81540 +2e8c794797652244247bdeb5e19742ab +8d1eabf17aafb9ec44ed02690eb6ad33 +f732074caa197fc8a0410e1d9d1eff62 +eff41077e2a633de08e7a8559538c45c +074666d185879072fec32004f93653e4 +14cea8e4695f450161651563decdda25 +f3cefc4f814ec4dde352bb9a2651b185 +22df10ed6b7cfe91ef8a6358e49ed21c +8e5d413e306311edea9d6d181eddd090 +9a19d88569f37f3983188659e29846ed +7694d46074c317326d610446cb39e69a +5f6b401b89c4467777ac03aac82594c2 +a79233b14cf794c20c5ecee236b36ed5 +ef6afe66ebdc862030e84c4295102d75 +2fa4c044e56d6b887bb701441008b886 +d462440967f5e9f3a90743e38d2f5f6d +dc6c51fb5c256c4ad657b3e2ec389741 +a7e173116e0c233a77482c54c95a2ed5 +a0b016dd851ea6c18c28f4572be498d5 +1573919efe84ae315369fb90d2c319fb +3e0bd23078432146a1b183d09bcfc890 +0a2ed991901b799e11bfe8e099de51b8 +86a6667c053c38fdbb38b8b76ed741df +6ef0a90abec633b310149a7c58012ec9 +bdc7167cc7e6f31682457e5fcd2a7753 +9105d414fc3c58e3be60b7dd6f9acc7b +191e6668ad1a0e4ab2b66ac0de10b767 +dab0df1e1ca512509a325a9e2e11f80e +4970503387ef67041489904b579b8f51 +a384ba6b616cb3e038bdbd0c33d3853c +f873297aade22a5816d26ab284079768 +3f8d41f7b7e05e29eb1bb9c3fa448613 +a95d6bf75717cc21215e118ff0f29d13 +5523dbab924c7b13af26b2d9356a0a93 +6e2374cbc8b5a5bcd9ede9946df16264 +64d69bad568ded9d644c2c73a4e315f1 +96f04c3834d7c89ab531427ba3ed7d01 +deca09b16f8f4a18b4d7cabc436228db +c8ecc878a9169aa0ba70568312589d3b +e786f547c37a16258d6713c34c6086e0 +f964b917266974790c44496376e60c00 +b6beda3d86f70ecece9f3b76b0d12321 +3886441b2a124e9b08865c2161628aa7 +072b8df5b1e11439efe403970e25f039 +55047e2deec552392d6bf34ba83530c7 +47299a4b0351325fe86c5c5218b5db0e +455922571ab92960e8aca8cbf8076e02 +3560f456da1ab150321a04cdd6fe379e +bb3ad92effa9ec805224f8fe8d89cb38 +384f4f21d7eb5b5f1aeb51646d473f2b +c84b586d4cbf588bb53e4dd953393e7a +b71ead42cef9ed860b9707ee999321b3 +deb0b193faaf0d10cb00fe4d500bfb63 +f05f51f8608536f28a120fdf494b7789 +30b62999cc6d8d108ab3276c0b766624 +8af0e1b6de2cc7e79309911ccb476617 +80c482bab6d86e0d08378168116dbdc9 +73b3f078389197d4f9eaed644e207c55 +ba302c0661a1e8023a2267d862535ef9 +196b2a007b1145aff2d8a72e7e8ec916 +5669c64e6a0307f49be2a1f08f42ae52 +25ad2ef8869ba7356c130fa0370ec642 +96382794536f4412db5bfa41428b3238 +68823372365a183f5ed09176d2d07ddb +be0f684a3a68d3ec91a42fbf8899fd6d +a5a5321aabba342bd620f12a6f5079fb +ff676627178c703cc6b24a77dd01698d +08e154544ad30aa104a5511d79d2ee52 +48cb50e819d1f4dca4458f585ffdaf41 +717318aeafc556f3e3486159a090cacb +378d3978f6f035808f451b79fc02ba61 +0b6c5689b63b79bcfd3192ee52f1f367 +912dbea984447119d8169282807257b8 +1aa41e08e0f78ee35c0e934adb257d4d +2f78f2ce38e92233661b4c4d8067b6a8 +9233bbddca7c8aeaf009d0b1e493f0ae +96ee7076fd0479d5c00e031228953d16 +a9c1b7ccc98dfde321cbf8bb49b540ca +0e2ac09229ade4dd05411cd436fd0c65 +4c3fa253d7996818a8a950ad07c21d90 +8a5df5aab3e04698d05a59b106d5c75f +0688a20ba8a7635ac922b067c6178bd2 +c8241e4985d05438a1ef965518741ccf +9fb1d547c8577fdd72f386f040c01c4a +b3c3ba52eda97a84d3ec310195a418f4 +d73ffc00718fff0438c447b83c182c2c +9130b51f67665166b6826924abeff6c5 +f281a9e275071dea74c57ae08fc7f36b +fdbe1f4b7c2b6efc4fdab4dc2e354bce +fb57c52316a24cfb67150a15719b9c60 +7aaaa59152ce1275ee2926b8b3659705 +3d8b2fad60c1aa3fe959971181363b73 +a6e1e31874a7e985c0fa68fba5b01442 +b3712a5e2e3a0e7ed60cc746b8b33ef2 +68dcec92d4da8f652b8c1ac7deccf4a2 +6e3c0991579ae41cece596c70fb23c81 +3d4c4949d0b9fc0bddfa6f6cd2def0cc +c52ec58b22d7f85209c250cc67b1418b +9daa55c99db717e8b7c2f5c6bef61aa4 +45590f2f05a9fcd68b5ca378c2176615 +e921fb334da0d9c2cc46e39e1fad059d +d7ae2f6b5df3a23a3605dc9a6dd268da +b8fb659cf403ea7288327cd1ae9a9358 +ccfacc7b1f9d5d3b8a523a1272cc18ec +d3a75c3978477b41f22a2ae66dd88133 +f457467551ca7e451b17bcc629623757 +345f04f8b517f8afa1a71198f975d2c7 +ec608f690d61ec97d44ea8395d83193f +68d71e108552316c3dcbd7aed3d579d2 +22c3ce0fc5a9a932b91fb2739e5056d1 +6c96bb6fd320096b61e6532c8179ffbe +055dba46ba199649b4e66238a2a256dd +77e9a746704db2bfce21cc3e4e28c519 +1b129ef26b6a0b193d9188d665fd0904 +bdd2675e9412e30d1a14fb4e7e89c467 +d6ce358ccc1ccc2b2494e06cf37662e7 +ffe8b3beb7e3ce19405631bf008ccb24 +74c2b25548b84c6bb6314e8be03ac794 +9b3a2fd41c935b60e14933844d503357 +8be799be5da76c3fbc2e838b499e674a +4f7ce423702f6e6e30bf7d2811c11fb9 +c83abadfe48b5d3f21ded7076a80ba2d +420208f74fb6e6577f4c19e422085318 +058a09311b50e8c30a9d5084d9a8f5ba +1bf1e3995bc715c7e5470824b8e5c584 +b17e5c658abac5d043714148be7d6847 +5949ee79f2c68d75decb2fe3213474f7 +d4e380f87e0d3c099dbac18d19ce7a3e +83e91e64e631987c3e07691c2614541c +28e9e0239f0f87955b4a987c70858ee2 +3a6877045316b1b09280eb43b650db35 +d4e380f87e0d3c099dbac18d19ce7a3e +f3c207e809951fee275b05e609fc3eff +f3c207e809951fee275b05e609fc3eff +dd200104426a26eb1e625d225b1470c5 +a90fa85635f9b23eea3b93f882bb8221 +a03fe9152991e14d350bc5920083f79c +511516136b14e2595a65bcb0ae21cbb5 +27479185ed68fa204196a5aadc62d63c +df4c9682c97a32970dc3836189038306 +61af9cd0bf6b476db37463e0c5c36ced +64d182ff178cfb6ce7301b131b5a1bea +4074d1fb7265403efb164ffe90590209 +d0e320816bfdfd594a570a50daf38e8c +aec5f3c91f62becf027b2d72c06fac08 +eabd52798a1e1a661e0c90851215b128 +bc399ac815b1e15a8e40d5dca5b97634 +4694f60bfb5ee31a49dfeb6263e97a36 +bede66eb7eadee08839ced6f63393020 +bd31d822a8ee49825caf2cddba4077d2 +755fef33c219192b4785cc08621c047e +755fef33c219192b4785cc08621c047e +bb7bdf72feaf25b60819d22194039559 +6e0fb521192b98aa308efe61f9701f5a +6ae15fc9ef48c56d5f3c95bb02b694d4 +d65675abc2f44ae254bebb26a735271a +b2d55f585ebbc9d112366a3e036e2f90 +1211faf785866641e0a3aae40c289e83 +40534bf9268174d7236a1c5f20365f03 +443be9d67db3adaeac7435652827eab6 +647e08768841fcc2b9dda573cb2d64c0 +8c6d3430704268841502326974e5b603 +68cbdb1f2bffbe1596ee89329ac2d4bf +68cbdb1f2bffbe1596ee89329ac2d4bf +9850d34b85291deee274c968e492ec9f +c9a7f6e7aa8ea9d0e3e7b850be118dca +2ffb42c7fa7ad14811bb7cd3742bc31a +9f96e7b4cd16bb8e866b07a03abaa72b +19a687e0407f38dfabf240d3837aa80f +d0dec75358b23194d71bcc7d0724c12e +0d979cfac799056ce984fb3181b9f957 +3209f80ce9f98f024b4b37999ed7c002 +544f6c0bb806e370a5d2d3baf962ac99 +e9e64663f9f5f9fe68424b6a7f7bb417 +c7953b4214f66402bb55c48ac17bf3cd +d3dccab4a3d9f4ac3fa47b35a03ca67c +7320444b24282afdffb83562a9d2c909 +984babace2d0d936cf64a494a6dca13a +0198f6bc935b70610b28680123024fa0 +b997f5096a8e877b9ed3a8a57dfbc39f +5f0ca2440d4404852f9ce2959e0621f8 +a81355708907203e40330bc7b73c18f4 +a81355708907203e40330bc7b73c18f4 +f5954f6e3261c0b0ef4881dd721d123f +dae281167e7281f7f0160ec9f133b328 +08a75c4e682542d58cf4fe8ffdd0fa49 +bb28cf566ebe9e0f8616a97b5d6991a0 +1e043c75a7764e20d190721469af2b82 +247818b20e302ed2c3a0feb8f727b960 +9b42e8afe47028ad040916d62cb1c3fd +66a4a2c2cc57e6b20037c808451d6d14 +cef837c743585e660a948095eb64108d +52a274eb25cbe8131c0212755c1e91df +1dce7c6a79eb395991f08d6d63cfc314 +e8740c2fadd9c65151eb09170d42234c +7e0d5c5a837c37c08998d76c2dfb24a5 +05e3e53bb4669938c3cf316d14fd3744 +93fb2cc9b5ccd978113afbed3f59676e +93fb2cc9b5ccd978113afbed3f59676e +ba58171f91e5c2e492c9ea1e6ccf9224 +d653422a23b9059eb71d6cdf33f61f3c +88b9a2634c8b7cbaa573e5143ec84e6d +13bca70748947cb29ddf84a7b972ddbb +9a165c3ce1665c21da4bcab0f021d835 +9e05fd0f0e7f6d640b4c3a5cdd36a93c +3db4f9356e1048b2482e97cb300d7a9a +6dde2bc8d99828bfd06a83ecd63fa43a +903eb17fb4802eac5aae074197b68b68 +7e3ae1597363af122b0bdab87424153a +8fdf0e40c69b914bdb299a3a49aea15a +63a39aacc83bc50d9147cc7676d313b4 +40435fc51f146eca2af7386881ed10de +a7e6abedb63f41978e77420e7553e412 +aa9193e6332b867bbbf75a2621aa7082 +f144bee51f131d80ebfb77154c40bd2d +461ce63a42cb121c4e1b536beff7a360 +39491efcf885701c0d269d002fbf4fc4 +a8f7e98045a940c66875cac6a6a6c589 +ff82c3a660186218fc31134531dac1f4 +c1d379e20939d73f796b11754098e07b +861b84ead6cd580357980f93abd0aa9e +a8c4fca447d4c7fa02a07246bdfb7cd6 +fc376d4e4c8a4b8305ef1fe2c226c6a9 +76f64ceb9c84db1e143d0bea4976997c +d735b9e659e62ac8c174dac4eae003ab +e5a377321b7cefc0498587c030170e44 +56e9e50fcb8eb69a6b6acd5af3549504 +4d1d61a69d7adbe387061f3e8651017e +f97f8f26bcc695071e7d512b6a894000 +a7d61d7c42fd802c61799ac3c4987f3c +64558404b7c3feec28ac3b850a21e906 +028e7fdbcedec648a6eae2845dd36959 +6c64384915b3f026b16bd4ab169481e7 +471dd4058dcf191c8ba81011e16b7346 +c44d293adf075ab6655595447ebe24b4 +b367c53628f86d625fa0ff3fea04ab92 +ad3712e3c2775fd6d07c32ba48e8852e +9e6b0468e6425da47d765eef30a661f0 +29b4edb534e59e3d02426a96f322cb67 +451c1feda0dfe9ebe0dafeae37a0fc07 +cccbccb47eb5966c0dc0e4a2855f0dfa +a66e6ce755930f76d14318d39b064bf6 +a66e6ce755930f76d14318d39b064bf6 +6fa23da1f6a4183b45131238924d1493 +3639b1cd35e1d40ed93d706c89dfc61f +161c3001ed09a1af76962319411fe35a +409f6e59bd4062d1b0322a2326e29cf5 +c761b422cddac5831125bd158815d30b +2f0c6e4302d927bed384fca7826b7c3f +2f0c6e4302d927bed384fca7826b7c3f +2f0c6e4302d927bed384fca7826b7c3f +90a46c605d27689433c73773ce6d7190 +705d0a9d183edc4288d37386322688b3 +37dc7b4db4db970d7d4db6bb4238f76e +db657ee14fe088eb07e5d685b6f08701 +124eec24586c1599972ac401e5fb0bdc +096d706ae1287aafbeb159d84f65a540 +a1630e38b6f00e279440d348bec3f8a5 +23d6520c4bfbaaa8d096ed3c0c1500c9 +9128bdd31a2174a061388426c474b343 +712e44c131f81ac5a01ee9f41733a049 +99be1fbc155cdaf5b7951d8c249b32f9 +3668c9401afc4df9825f351b048c5d0a +b227341f54e80a4d4981e0c744d2821d +930f2d5e18f4366d8c1133019a458135 +6923b413fe2536c272f95e2b4464c602 +eb4bdd3eeabbdb278cd2fd009ef46154 +d1797cf0b18083c3f5eec72048b64e24 +19dff617b8848582a6d1cdd50041d59c +d0894be7bdafdb3c3be66b98b3026405 +ed290f996c26958808b1cff264073ef4 +c48341e57ca6265059a49e6ec54ecf8c +ee257a76d622bb488d5dfb99614c3f13 +81579da6d6b7fbb41788eb481c38b637 +54a7f812bcfbe431d95f90d42cb5a8fd +6e4de39bc33bec7564d77d05ebe4e423 +481815ad31f6223f533488207f97730c +27f7b8309ecb5636923e22dbd50a92b0 +eed584a3be06a47d489c7880b792f5ef +df205cd0dba3a61c18425552541f2f32 +6fa9403fe86b93302aa5cceccb92128e +d61ce3e66559e16d6848f38400cc219b +590729a5f5b5d0eb05994a825b91f130 +fbeb988052b928df83efd8959efcf1ab +2e72e9f500818c1149a755e17522b9c3 +4cfcbb7e75bb2eeee6aa411ac5bc082e +2b0cc1fee5fb2c8d3128d33e55390a35 +287faaaca2315e671bf442e8dc09918a +b093adfbee63c2c7b56505af2a261c9e +e8af7a1baf52ce11746903a956f735ef +206bca2db9800e1ad9d0ed1e9677444e +ec18653bce53848bc0f2bee67f9f5030 +5c70b2672ebad25001bd88b489768c59 +d7347b1e7a5029312cfba490c28ece50 +d75bfeaf7092a43a5f18d4ffbef5ab3e +05258587a874e21cc2ad8e2f798881d0 +49e69141c30969a1c885627b672752c6 +48f86132a7e0dd9684e5b0d52ac7346a +eecd3b6bb21a95b82ed0f2ab277aaa73 +1c6103338d6c0ae625ca5b0c6e5a3625 +9607fcd3b93109ee78d7c01102ebbc8d +633dab28ff262929d6ecd8bc81b13a37 +6b1866a15d71ebb8dbe56efce8acafb0 +6c845a9a8a2cc016d081a9c0bd285f7c +e0287aead1edb2bef9434dfdfc1934bf +a6a1b3be3aafb5b8896b192e1435d087 +72c4b2cce70f9fd5ddade6afa0fb0e02 +85d1b27dc15b6521ac24b4b56fc6a56b +813358725edb9f43fac9da196e5c89ad +be192fa2449ed5575584dd9fde3d817d +d1806541307821299da40ffeb9dac4e3 +d02dab5c9a587e805be5e2dff1cba846 +d02dab5c9a587e805be5e2dff1cba846 +6b51081ebc259e60224daf9f3e910377 +d3bcb0938b2a00acf1ae3a0d44206f06 +6d28d27dc0a7fcc041e59ef5cd4af687 +df95f6f6ba6c6f5e5202d4e3b19ab7ff +847b3b715176dc9c84a994bcb54c91b0 +c68fa44305b8217617a7617e5b643947 +a3540350858fab9575b7ef3188d05a17 +f1ed96095291347dd6701f140487c02c +916a4c69b5d580ea691948b46b5de8c5 +7f6b191c5350c77c749f07c0c20bba75 +7f6b191c5350c77c749f07c0c20bba75 +6d28d27dc0a7fcc041e59ef5cd4af687 +a566bb90c7e8d96ba2aec2e5898a4e9b +d5741927130f6bffdf057e20a49829b2 +e6b3db7a76da825a733de114dec0c38b +19d81406d9f1d498721693eba11817d8 +4847c386997a9066911a0d47f8d0f175 +037ef315924daa158006bd510bb5d69e +50a29b24548411c75c583299cc5dabe1 +8cd18645a722bbdeec884bc338da6205 +7d62051c7b45f190bb0294bf94cb18f8 +5134da1f09686a22ca509b49658c41d8 +3ecc9546799fdd76dd68b5b2330e3b5f +9da4a1e4aa047e4f6c6ee29b5b14d964 +9da4a1e4aa047e4f6c6ee29b5b14d964 +307ccae0fb02611a679d306de448172d +08a1392659f38eb025e357e28b9cfa83 +830a9ec245c6360a67b48caad8e0850c +298439ac5ff3c6d523325fc9dae5be3a +9932907c5f159e97c4b0ff1abaf6c8d6 +8ebb45da714c80f1fda9f839d959af41 +79fea9c8f9f064c19a2b34d8581bbf87 +f76887a8237d51be3a39d28f302a9c79 +ca8f6eb8ffda15fd660c4ddcf88b383b +30e229b28cc4513a15ae434cfb454c3f +5d2062d4e96281501696da1c3d9241e5 +83c560e6425ebe443b785af22615113c +db860c611aed8021041923e6f6050be7 +011523d91608791f36f0e13a3296ea03 +bac96d830325ea250b6335ad4b7dcd43 +9d65c4cc21f341d9152835578a25417c +99924b99ea69590e1b21c17d94335333 +f2a2b24c5a0306c89fe20c1d0d671301 +1122e7bfd1c550c409f7349031f60c7c +a5c77afe7e3bee604d8a71f4908c3a95 +85fff261fa2d8211bcbfa912c90f0ead +48c2575613d919414599a77b22ba3bfb +e40c74586731cc9886564e1f5c6134ed +e8c027accdb5856c50ac1611828ecc4d +a3c6e07b674114d1d7ddcf1f5dbea126 +c1d1a712596bfd1aab289e255b03ef06 +c546da402eb6f42d3595219b2bc2f0e6 +bef101b46cbb442d6bcd2a95330db6fa +37fae99d82ae6a2f903e20467e7dcf1f +e7b9b0bccdb221ac40ef0faa32d56cfb +14ce615388a4dc83e5ce3c60f67bfdda +1b5ed7c4346b70d26cf3eade83846e8b +633a4102c38267c962d440e254a104a4 +4ac3e640a9e1839c58173e526feff3b3 +d15c43f169a9d74943bc087a6b62f185 +36a0496055cc039f8066e0df44cdaed0 +11d0a2c10e6c38c38220596ab3685b1f +f674b42d1fe86a6428182f572c5564ca +2285d61d30202b4ad5f09c5dcd30d2e2 +6f7330c9a60d10e3ef4b8f44862a1f8d +0343a6a33dc1b28469dbf1ce521159cb +a208da325c94d2856a4ce43e0178dca4 +a208da325c94d2856a4ce43e0178dca4 +5b4dc5180c25ec5c22cc270c11234d24 +2be515e2d709344823ae258675db108c +b677dfa915913145c4cec679e39dbe26 +baeb59b36288bb2f7c288e864a2991ef +f28a65a0184d293c82b2d3b6a17f20ce +3f5eb01aadd58502984fe7b7b23e30af +784d80e69ff940ad0e4f75e46c6099b3 +74f3806e4d5e1ec2d827ddb6259fc330 +9b158da4ce02b0b8522062a43edae034 +7640236f7a52348da18e5363701b41f6 +8dc7d2aa264938ccb301fa162254b4f0 +526c0d6d4d7742738930f16792ce5ead +5c9ab0c9570a763011d26f094be14ad0 +90dca90e3e66a25a7d1fbf6ef5d1577b +4cf8366a1ef9156d57f93bcc3115ca03 +eccceb9a86827e1f29a5ae9fa88eace8 +68f7993cd1104324b3cbcd441a2f4022 +521ec44dd25f611ab3e37ce95dfab2e6 +16c57d2bb175c1d6e3754286872a533a +74630f4ce36893e453325556312bb718 +f6a8975eacb2d12b89c22a65fd4f450a +6730228bec0b9fd8ce4406af5cd03016 +1d48f1940efa787850956457b23541da +f9ec7c207ce40910f3a2aa7146a8aa81 +9fe5eae4d151326da5941573d48e5f73 +70aec9161c49db50f6b06112d1594dfe +cd74140cf262339bb688a579d8383c13 +f9ff6f3533ecb1490ee180867fd9f9dd +5c9e1e5fae0c0207236249d002fedf30 +1ca6ccf656f14c73ebf80e5f7fe353f3 +d4bc39d6b5c3f910dec3632274ae405d +90a87cae6376533400caff4c75b10f9a +812defe7d39489f45fde11865d411b7b +71ad3c13c7a25efaa4ce6c2c9dabda96 +fa35d4a1c1f1b0d314df39dab9b74f2a +472ee51d0dc86f3ef5aec1ea9e4b99bd +8436e9ad7aa7382d82c9e067c13731b1 +a657cf1867ac702f26290eeab5dd23a3 +46b64939a28533fd61ccbd9a68ef6588 +a75089878fa75d7563b723b62771803f +7b50abc03830eba33b664eae0a2c6a7a +ab033e8c68a3fc1ec7359ecfac59b890 +83367997ee831fe7413a736f9c29e9e5 +190ba28a3d9497e439c2d854150ce8e8 +0398c261fdf8c5f79a77981a37dd6b68 +47f776aa984421c165753bda4fadb473 +f36aa2ee5a8c3d15ab282a434cefa52a +eeb24eb86011e6960bf4b1bb634a2546 +20e1721fe69856debca45ab1203b35b3 +e9882406251ebc46a342bd712266df55 +b0c6af7ca5b728e61987a15640ea5924 +ab5a705e7d721920b1bdd03e53ed4204 +02d2ce640b0f098d5a6ae4caefbad42e +48b1c5d81e03b9f31f1c8d43442c1d21 +2efe5a4870feb00f800bd82244eb7039 +f05298a17463d876afd8ee949dab803f +dabf723f35ea9666aa3e1fa7cfd45792 +b0c994e60000d1121ecf420c6cb28bea +5720a6e50c09d84e9151a72495c61dfe +9c3760c98381d8a78263d96e92d863ad +0e5c4fa294582672b76e2f2c260567da +5b92496ab7dee424f66d45be555a2d5e +fc14795b10b1ef105b86239ccbfa7f9d +e79b2250e1ff2793cb67e5f9a758b459 +93a377a5831ae4c11527d40c7938dc26 +5862d74e173d0e5a9d672cf0313d5bf6 +c5201caaa174144e1f1ae7f6c53d3a2b +de4884d3566c53d45abbdea337e94b85 +b29d7ee5638f30eb64c3660b230d81ef +6ac699c8e1fcc9b909dac76b2b5df5a2 +96a6105b6b89ddacac6ba19f010ddc22 +3df5f299f4d9f07ec36ce4279650f619 +81547ef21c776c99d4b497e3ba4dd890 +1d14734247c8c7915449ced82b6b74f7 +3df5f299f4d9f07ec36ce4279650f619 +81547ef21c776c99d4b497e3ba4dd890 +1d14734247c8c7915449ced82b6b74f7 +2cfcbc0e65298dccb2b742b4003e003c +7e5e2f2431265f55f3f7c3e9c3f4b536 +986d657e168519e2731b67b0311176e6 +6f0bdc9d76c41c5dba41a53f92d86137 +cc0a0dd3cbbdaadee4dd1084b7eaa4fd +4f8fe31ba34f97f3ab805e0ad4552565 +78dec3964b00566ca71fa226db080038 +78dec3964b00566ca71fa226db080038 +78dec3964b00566ca71fa226db080038 +78dec3964b00566ca71fa226db080038 +78dec3964b00566ca71fa226db080038 +a705cab8e5c00b55ccf8f25d8d4ab6b4 +180e643d8c9d270d902732a6af949d0b +497a39ee92255a0fe2b1da90f74c0098 +2ae3ff9c414473a7137942b49beb2f8b +c5447219c5cc8166fff5907402824a9a +7023db51c8b3f908ae03960d1b469954 +b450a61f65f48fb14f754b8ad2e865db +a74ce65be925d1999a02f15cede17e21 +7efd03a02b56f28cc8f7f1595966f006 +d734e5d50770a2c07750327482c64b19 +cb13fc73793263cd53c6e238e54b857b +478ccd240cf45e79caee7c88114a1493 +478ccd240cf45e79caee7c88114a1493 +cc526d8486766fc96d8cd739c8ab9631 +0ed5d6a0ac1ececde9455f583104e4f7 +072ad2438cbb03101d5d43d18e08a214 +534a0bb57715ec67b86f308749845d2b +a848083eab81b3ed9763db6f47d3534a +eaf9e2ce791d44195c3b6d12e033cbaa +edd0e27ddd6a354483bc2217228c1e02 +6299450216db9321d7b6aead1dafb568 +b45c2f1e60f53d9588a9db0246437d0e +79deee214d0c7f858a78b366ff0b352f +71400fddfde8944298ee767426f5f529 +b547dae3e28795e5e03e636bcb2a9006 +558b30a82fe89962ce9accdc5b68dfd6 +cefe307394325bca8aabe694eb218f93 +c454083d73a52ddadcbef6fd03f05e27 +713117784406c8528c8c3d51c0e0b3db +12d040b46698fc1031f2d186cee1dd42 +3d006821b0edc7e0e3425062ecbc57ed +ed929d2eb560b2e4125c6176efa50cc7 +8f5a9182e8b6f867913a423a9e8c07a3 +deffcf5145db9262415520b0d0e15014 +a82578fac7784bf2de365755cd5572ed +cbd4c85ed4cb1ec34b53901fc656cf97 +d1ed69ab7f09d9b6e91bb30731211919 +289612ab083deb5b8eed37a6f2fc4c0b +6c975597f9fb54831eafbf887b4f8dac +1dc118b0c0bf2c095fc5728290347aa9 +8b39d0746395f579226f79521dcb2c79 +75f099b2150d4bb6dd63d1394758bd33 +f48a5e0b383c4a3e5488e846a7ccba05 +24de635dc4c8ae130226121fdcb8acd9 +b4aa5b55b968e19e551f5e7dd8c6f2a3 +8422af62ac9f18f4f7270ee351722fc9 +c6fc1a24ef5bbcf0ae4566babefe9338 +98aa37f1c320462ab0b68c6b8448fe6c +9a4348268682cf154d3f44736e90085a +1645c1bdf7608c24ff954e173831a955 +ffa5cdce14f04f794d8b0841c0b75b08 +6935237d22a6ec5c3df24f1434fd6860 +f292176275b7c5f1da1a22806a84da7b +909131cbc7dc09b26dcf7afc754553c5 +9a940e0add3aea3a21b63751b91fb655 +78ffe3f2810d203d0dc5f385f03a340a +2a928c30e9a912ff0702096dabf14d7f +91095ce6bb828b1fbf59500160f861b7 +a4c7837a28622a74f2202b8b0063e416 +c5cb59b186483ab7134abff94f1a5fbb +eff70be6e3458495786255268abb0088 +10bafc802e7475c562a450956a590257 +942c8bbf8bc14d13f628394eb4658810 +0474ee5842866899668f8c1f89a46fa6 +8e746dd06caee01950f78f8fa3124215 +bbade15c9cd703663a19ba35ab896691 +bbade15c9cd703663a19ba35ab896691 +bbade15c9cd703663a19ba35ab896691 +41b18bb1c86b628b0bc71d3ecaa87cbc +5129ab9a632d1f679c1c19f0d2daf14d +b1fffcc4a54e24e1aa8883e1d97c1185 +6e9b5a2a04f9cd5197a83d6a1ba81568 +08d7328e633644510fd52368e9574bdb +2251a7d35f6379efbea5daf529cff01b +6d161615d224576a09d0183d4d4853d3 +6d161615d224576a09d0183d4d4853d3 +961c45fee8dc70473208517af84b21ac +e5ecbd3888a0989b57d963257590fa46 +501c7102bd0394b9bed19bc414004011 +44feedb18cf3e051a71c421aea1c0c76 +d23169c99ffeab5194ce3e7a95643abb +89a5f7e158417c65bf063f46e0594bf0 +b0b9af82e496c9341c020f565465cf01 +d23169c99ffeab5194ce3e7a95643abb +89a5f7e158417c65bf063f46e0594bf0 +75a3fff2ec70c94a9c82693ed12ef897 +3fe63656ccdadcc4450e65ef0223cb79 +6b270918e9fa0daa483f246014078ca3 +45132d031f670f4c3f7d54bf97dcef9e +75a3fff2ec70c94a9c82693ed12ef897 +3fe63656ccdadcc4450e65ef0223cb79 +e43b43b48993f236a4fd6c5f182fd711 +45132d031f670f4c3f7d54bf97dcef9e +0dc6fb793eee26cf7c05199eae56eb36 +0dc6fb793eee26cf7c05199eae56eb36 +0dc6fb793eee26cf7c05199eae56eb36 +0dc6fb793eee26cf7c05199eae56eb36 +0dc6fb793eee26cf7c05199eae56eb36 +0dc6fb793eee26cf7c05199eae56eb36 +1681a2add0e4568b0c7d68a36ffc512f +c307aa98d7417adcea33631bd028e921 +83c6f8e69fa3eed265b57682fc9a0caa +a5ed7b3dba6eda970d18d78201075780 +6a15270b7ae92d6e4b88d215a445988b +435d2f882fbfd322bca4daee4d3389a2 +1d72f2fa2ca6ed9fc9427cce20eef4b7 +8ea6d4237266804f883d8273ca21d84a +a7c0955f29957170fa018ad611fc5164 +b77f6032d0bef6c71db1379697554b18 +b77f6032d0bef6c71db1379697554b18 +ef297aa09423db3099b3ecd74c90c990 +2a064b4df37571820a6c4f9e4cf43f0e +3cdcfe6b66c96b67cee0c5dd39abbe8f +7a1968dfcde0660583abe436bbba2958 +cca54d4af9dc407ce14555d9e76ea684 +3cdcfe6b66c96b67cee0c5dd39abbe8f +00ef87d961eebb5c172e6c9c60de1124 +59cf334b0dd8958b23c6a025d6c8a805 +7b05f7805f4bda4823dd8120139c84c7 +e0eb95ec6c63ef543c7c702143346e44 +6f510cfe0371a74351798f8fb80698b5 +cedc6e9735c1cca95b6a2bdd3c8cc4d7 +e972e25a26bfb36ab9cbb80af7f31983 +d1455755c33fac892ee713ac79e4a966 +51b6399b335e3e8856e41c1887c241a3 +cef80860328f3ea1486f3c02849c4c7c +a2e6f8b73f2580caaad05d7be2963205 +487fac2e0557923c798995aa59fca160 +487fac2e0557923c798995aa59fca160 +40136d88ec73a3d511239994b3cc2dc5 +8dc215404d9f625114506d14af40a23c +58412e45aa1d6771e1cccd2c63014505 +910ece49eb818c5deb7f6725e3c4fd01 +73adba2dac2dfe0a745c9ec9bc9a0c4d +ddeead2931b77ba75be5f1d4712a8cfe +3402b53e726539547caeeffe7ac6ab35 +0a38ae7b09bd5beb6782b69a986bc434 +fba0af1574b458943ee176fcd1824618 +e09e4f39bf7b4fa7b01826a0624ec014 +4a7096bd2a494280a72b27d2f20434d4 +ea9e5af80ae62273728430cd83778f76 +cdaa7db62df4f13493fe3f67ca0697f3 +78341824d4eab934c31567bbcbf60ca2 +63f3be44f7f64593cc1dc0e11c726222 +659ef9f3643387acecd4009dadc01531 +887c65dd24a017d9ab6c79254684098c +4f0bab91c7bc21c56f697f805cc32783 +4f0bab91c7bc21c56f697f805cc32783 +4f0bab91c7bc21c56f697f805cc32783 +fcdb74bd532586087ad06c460e0539d3 +fcdb74bd532586087ad06c460e0539d3 +fcdb74bd532586087ad06c460e0539d3 +887344bcdf6c994364e413a31b657872 +8f7ea15d384c1f7905a02ff448d5f897 +f13b7f26ebc77faedc504b6cd499668e +1b49c308b25623a8867c0bcc112c7604 +6dcbb1ffeac2ee299b346d6eb075c930 +c184375918e207348d7e7227c9fc2459 +ce81eac23923ae598e500a4b66f80d62 +9725f0be61dfd55e86d0261c1c27d62e +b93cb4f987f96743867d75569902ad13 +9ed9c582d4e1ff03f53051d3781ab314 +fb461f1b7314fb810f4739e94ef09052 +b0d8c38afcbefd7aa8e6b6cf677904c1 +efe4ca957c09bb25175a03e5317355f4 +a4a5abe80c60caccdec5bef4c60f4b02 +05b919a841468a3f89866800aa8c7e85 +180c36481d75cf4b5bc1077ff4169a9a +cdbefc832933f39a05b3218a169bb3bb +4332c0ea98d2bf2ca0c05d7149fc8e59 +2ca819ea3736e6009ba3202a8cb7a214 +97762c0c32a11f12b8796ad7b510ad53 +9c9612e6965d95d8542004653d92fe68 +bd064f712d66cdac35c8222c18bbaac0 +92b3601dd66d91842454a213fd3c2e05 +5cec4706fbcab7add9b6495c3df6e3ed +ded51d71d5fe36b240b2fe6a51eee3a8 +45dee3f070fba9707daa2f24706c979a +48844a7c31dd8b5f54340ea8d7c5ff06 +acbea947a3ffdfe13ffb99e9efd7917a +2c868aee081553ca11c17e0d1b53e915 +e231c3f90355cf457c35fd7ec9b868ef +d821c7b7f0d306ed1942330ae5afe632 +d821c7b7f0d306ed1942330ae5afe632 +2fd6e04e992ad94d89e8e70e04488d7e +04c7440e18a04908dd8e062c6e7ef7cf +ba668e12f22476b0592db4da121ba05a +54a5d1a2181ea740a8a8a07c9b500151 +da8fe922f843660558db67d58d24980b +14c3558e147a879337c1e59bac8ba45e +9ec2e262845fd21fe195e0ad8ef173c6 +c89716b8be6c84791b8922e1d5c9eef1 +02c465b0d144c0ccb22c61bc55a179f9 +1541d729003856a45a7a5b78d1806324 +87dd929111c6bb1d3ca25e1a0be8418f +34b103f5dea81798803d4de2aa4d46d8 +4e2b88e7d75661f91e1df5802cf05747 +4e0463c06aefe0121eb9a4106037d193 +b660b1a454ddfcc2b1f885ae4e3d5428 +05d0282d5688055316f9a5e10d3862fd +a443f686e140eff4d9f3753e2da7df24 +2fcbb97ac149c410626f850d88fc79fa +ff3fa2f0a709546a4e6f17b2f9b719db +c83078d3d633b8269f3a84e30fa8d821 +fc42b86f617473cca56cc9cd0553d919 +1bc0f965220b3302117c37d567d3c55a +9305f6b43432e8c4c046da55e110c90f +702918bc4a1ced100af03632bbd9cc22 +702918bc4a1ced100af03632bbd9cc22 +702918bc4a1ced100af03632bbd9cc22 +6e48182c69e12706f85cd971b5608014 +b3831a1787344b2b548a94ba1abee690 +277990cd24264d2fcdeb84e8bc406c0d +15d79cacbd55b87b7a895b609813a5b7 +31102deadb74097b21cd9a0d9a05ecbe +94a81d227f6556926787ec4deddcb72a +32eb3279bc92a8dc5c8d8da2e1e59676 +15d79cacbd55b87b7a895b609813a5b7 +31102deadb74097b21cd9a0d9a05ecbe +b280386591c0bad9f1db2864283c8b49 +881bed5e35f9d319f74aa12d3aa256cc +1ce00c5b34d536c0bebc74d42dc56792 +fd3552e251932660f0d013d0891d1744 +0e9235f50e2b07c1c71431b1ed756f8c +4a4a173a601e3302e13bc9b46d8536b7 +64b08806be91f6da5e1ca8e37bdfa827 +436515fd2f6308fbd1e9266965a6fe70 +f329468ba06e180417d04819840c18a2 +1fce8fad6ce4d28fab5f8c9a7a3dbab4 +2521ecc2ea4e3d1ac49c07e00e5bdf2e +f9b2528fa4db7d08fb29133b6abe7c40 +1a446d64fa35b5cedac50b9fa40bb6f5 +96f3dd530587e20b1127f9a2642899aa +cfdc52262e30f5f17d7bc10e2fde366c +fddf3d2ba81e55ffbbc3a8086c6a0b44 +4a805c2ffb894ff78a54db84f9a07ee1 +607ad8efd6c7c04d5a26315aea8328b3 +63ea10efcc25cb3979489c4cf524a408 +0dfef2ba0cd911247b408bd8240b1abd +13effbb08d818f9c39cb419910ce3a80 +b4e1c87c5a807f4a9b3cf7b6bf3de8fb +4160d54165955ba030fb93b0f6319b69 +ec4cf36930c22ac8d08638c87d8812c5 +e3d7492914a65d5d5b7cc2336f549dea +4426783fda306de1dae91d15ff87d942 +5fdeaacee3091698b35115ee74d4150d +8b5d23aa94800a610c25d2ea1d7d1f59 +b8a47df1e05098dd5a7fea9501e2b00f +ad80a1bdacb0fb5d7b5eede3a0925df0 +7efd669da0cf83b32cb935238b8ed49d +7efd669da0cf83b32cb935238b8ed49d +2a6236404eec221cfc5b6c6a1647f7c2 +a19f6d6b08a44710d18f26fc0081af02 +9096098733241f05f65f098eb9960be3 +65d5d6e3d6f8969a7b727aaaf92ea4ab +c709efa2d909dc4dcc456c855815cb82 +a3fb51e202c6b5ce50c3c44d173767da +a3fb51e202c6b5ce50c3c44d173767da +d0395506e4053f4738c17fd3ce04e8f7 +bd9b6c514590c7b563e9118807dd852a +bf815ba34d9875b6122b6af5ac40d648 +f993b50af8300c963cd6151520fe4336 +da74e781282d987a7e8d8691f9f26a9e +586ed9fdb8a5970924d44e4285d1e003 +9af2ea27f71aa10fbca9696389837ca8 +4dfab241c9563b0b6c2c7533154a3c49 +537ae1a403f7f03cf127d2f8bbe3583f +f63e9485b618859a5c35ce48061fa4fe +6acf1a598d9c2914b6e8bf667940d43e +f8db8610f49dd93cffbf38e9cc239a1b +d06d003e44fc4d547265173589bbc070 +1c660169dea36f461ca75fa26662d8ef +212aa361076152d4149216777df53e9d +3beb80320a5d1c6c37243acf92b3434e +653e922092749c987e7ba33e3a63682c +278235ffc409c8496d504adc7acbe2c5 +278235ffc409c8496d504adc7acbe2c5 +6b7432180bd507e13b8b0c2f6d992427 +83d35f2e3c0d2c2c568565c572da3029 +83d35f2e3c0d2c2c568565c572da3029 +df69ecadc4f53d87648bf657f14ce9ea +34f516657589fad84c41bc9020f88dbf +80ce0d1760f91c104cb3e9d8d807cc3f +579dd2a5e32a74bbbe60b0deef7a8c30 +6ba934953c2fe8a91cf72c33833ba100 +1f112b607a20ee86e135ba8a90010e3e +c0d660f49a350497cc2968a9a160eaa4 +7b28b0661ce8837d6bf8b617d469b9ef +155271a832497142dc8262e92a987f1d +e0937139729e3eca462d3426a2585d93 +e0937139729e3eca462d3426a2585d93 +e0937139729e3eca462d3426a2585d93 +3f84892efb119ef1b596e0805c8e23e2 +57dd9221254b008584266673bee908c6 +064f16203d1484c922002c9490b32ac9 +1e8386c286f2a5d6a3d2b4a1bd90e1e4 +76071791d23914843ff3e0ad765a3458 +ed185bdf15d449fe12a7b833fb312fb6 +3d26cc73514d8c969c05dbb4ff71c68c +1b9bfe6af6458be2e8bc5ca60853ee75 +cab243b41a6a5693310c4f82bc77c78f +c3a387ce17d5e95f577b7a5b814a131f +4a0cc877fa002af394993b974d12e105 +c077e83fe8597aad1f56c8716778daec +dcac0e07759e574441af2ebffb380555 +63a824a836acc307509481a1146da438 +6e626f4b0c74007dd84be83fc16bd442 +23662427a18c57e3abc69e9955b00c48 +c9f310987b75133cdb6bed0e2987df12 +29d1dd19865f5264963962fae9f92a2c +2e95f59b99e471644c107eece7180739 +6913603e91629db7f3c03b5d2e0348cd +df5965fc2526cf6b0fb31ae63e713d84 +64824f04a2c49d563c8f46cb1a00dd02 +1b01894827e78ea0a091d1895af9d829 +f02b80fe96f36f66e9892007f85e2792 +8c865e11724cd9ebbbd865fc76fd14e5 +d4ac51e8c4ae7a66f8bdba8255f1cc76 +5b1a56da6b48992c8600c436c373fbd6 +ba591a89447486425f8340a98a918cb0 +606cca093add7afb92f6897b907e78aa +8902e01ff69775a518e5dd30d1ebb3e2 +efcfeceade46eb69dae026f4a1f2196e +4f139d03b6b16239e0dee3015a8a7b86 +af881dfee10a6d16d527b09bf3d3c1d9 +7c1ac612df81c7321ccf3430ab944fe1 +5658f2cbfe6b5f15fc5c4563df80e421 +7789307a708904bb819ed720c5e47e97 +4ca90dc21afc383e117baf8625b27c24 +12bccf95d188f1e0887509daca2075c8 +daf3e3decd9f109a8de4a823c19e5aa2 +67dd0e79853602cf32d27768d6c19f7f +90451a8c33d076dfe3f646c964a5fe7a +27219b3932fb0092b48a457b6c836c99 +27219b3932fb0092b48a457b6c836c99 +27219b3932fb0092b48a457b6c836c99 +b428fc6cb72f38511a76ecff3f40f1e4 +97577978bc308dc7dd674f885b6a3541 +f306cbb064de0297530db0ef298f0e51 +1f72e875a4b34cb302cd08fcea2bf6f6 +d81d2672f16e0ea0d330522b0dda7496 +f25d913504f5752629eadd18cd3d7486 +f25d913504f5752629eadd18cd3d7486 +f25d913504f5752629eadd18cd3d7486 +1cc56b13e09df9f53653321687d44f61 +6e1b3a41e70e7972539dbc4577167a5e +f15897fc994b2de6d431f1e69cde1e4a +8fcdbaf4912afb3e20c798426a39417c +aada61eb7ba9a1e7802c5bb457610f32 +aada61eb7ba9a1e7802c5bb457610f32 +aada61eb7ba9a1e7802c5bb457610f32 +aada61eb7ba9a1e7802c5bb457610f32 +aada61eb7ba9a1e7802c5bb457610f32 +aada61eb7ba9a1e7802c5bb457610f32 +7babb7b402cd2046fde8ac647d2beaa0 +7babb7b402cd2046fde8ac647d2beaa0 +7babb7b402cd2046fde8ac647d2beaa0 +7babb7b402cd2046fde8ac647d2beaa0 +7babb7b402cd2046fde8ac647d2beaa0 +7babb7b402cd2046fde8ac647d2beaa0 +7babb7b402cd2046fde8ac647d2beaa0 +7babb7b402cd2046fde8ac647d2beaa0 +7669b12bffac2ac7e10eaedf46b16cf8 +7669b12bffac2ac7e10eaedf46b16cf8 +7669b12bffac2ac7e10eaedf46b16cf8 +7669b12bffac2ac7e10eaedf46b16cf8 +7669b12bffac2ac7e10eaedf46b16cf8 +7669b12bffac2ac7e10eaedf46b16cf8 +7669b12bffac2ac7e10eaedf46b16cf8 +7669b12bffac2ac7e10eaedf46b16cf8 +bcc27ccfbd2eff23bbfde60aa04a36dc +bcc27ccfbd2eff23bbfde60aa04a36dc +bcc27ccfbd2eff23bbfde60aa04a36dc +bcc27ccfbd2eff23bbfde60aa04a36dc +bcc27ccfbd2eff23bbfde60aa04a36dc +bcc27ccfbd2eff23bbfde60aa04a36dc +bcc27ccfbd2eff23bbfde60aa04a36dc +8be183418dc0c0f663bf49e9e33db9d9 +8be183418dc0c0f663bf49e9e33db9d9 +8be183418dc0c0f663bf49e9e33db9d9 +8be183418dc0c0f663bf49e9e33db9d9 +8be183418dc0c0f663bf49e9e33db9d9 +8be183418dc0c0f663bf49e9e33db9d9 +5d5cb72034974822a3907324adac7b51 +5d5cb72034974822a3907324adac7b51 +5d5cb72034974822a3907324adac7b51 +5d5cb72034974822a3907324adac7b51 +5d5cb72034974822a3907324adac7b51 +5d5cb72034974822a3907324adac7b51 +5d5cb72034974822a3907324adac7b51 +5d5cb72034974822a3907324adac7b51 +09429fca7b9d258b0dcfc59705daac4e +09429fca7b9d258b0dcfc59705daac4e +09429fca7b9d258b0dcfc59705daac4e +09429fca7b9d258b0dcfc59705daac4e +09429fca7b9d258b0dcfc59705daac4e +09429fca7b9d258b0dcfc59705daac4e +09429fca7b9d258b0dcfc59705daac4e +09429fca7b9d258b0dcfc59705daac4e +7af2242284a4efbfbfd8d61097f9720a +7af2242284a4efbfbfd8d61097f9720a +7af2242284a4efbfbfd8d61097f9720a +7af2242284a4efbfbfd8d61097f9720a +7af2242284a4efbfbfd8d61097f9720a +7af2242284a4efbfbfd8d61097f9720a +7af2242284a4efbfbfd8d61097f9720a +3d74c76ea592240dc7f86a61c81ee390 +3d74c76ea592240dc7f86a61c81ee390 +caf2d7c2f1f13b95c51227eeb23d1367 +caf2d7c2f1f13b95c51227eeb23d1367 +8e7aaf5a15da26ebbf0df9c0881410c2 +5320fb2b2e5be60382eda047ae48b851 +29894e8a8437d2565154d74db1425db4 +58d88545246bcb5c703663d0ecf8ef26 +58d88545246bcb5c703663d0ecf8ef26 +58d88545246bcb5c703663d0ecf8ef26 +58d88545246bcb5c703663d0ecf8ef26 +58d88545246bcb5c703663d0ecf8ef26 +89ceb9c2c202fb5f260452ed8ce448d9 +0b8cbb034d390a465a25b726091e1a8a +d99252bee244bb7732fdce84fbdda7a7 +55aa26927a141169d16478d130607fec +0175faf03d504d8c71bbd1977a76f6bc +0d375ec5642b3409b56204808eaa0808 +cc0b80a60e568c14f1d25928e6399674 +da762d24c3b3caa1726f61a763407627 +d115676bea409dcb72080e34b81d6281 +55a90925f8aa3bd935c9e58645c6c43d +b100e6d0d1c1088b7dae3fa405b268d9 +99b6fe5fa6603b6fe87cd6c03308fc5f +d26052ffc35abde23a06b594d14923e4 +60efd066d62746fb99b84d4ef4c6a372 +1a7807129fd2ba3db17fa5b0a95cb399 +f880e19dd9cb9bb50968588035930bf7 +3952f0bd64aa980cd06509722c9efc41 +49d1f305c222698ae30df3865550d90f +e0e1ec165159ad87bc9cb492e3a61934 +30b780ada4eb2eea405c9931208a1641 +f49c44c24e9060f8deed04b974d2ea8e +8f432a3018c827316e092ad4cb3c813d +5a2913b31cd46d78e72e20325e72849a +13f9fbb7f0af9509de10623f8b84abc8 +65831d14db1a86b35060fd61691836eb +aca3674e73bc097ef2eaeac9c714d627 +dabe8bcf86579efe9dcda98530dcda74 +2324f98f56f699f9dbac3b9a6a28c042 +f2eb3809126c5e44ef9c197245389103 +a1ff303d0282418b33163a711cb9a6f1 +838f9bd591580b66a9c1d3151eec86ba +541f9e42f6b21ada7c00eec3fdb133e8 +c7ce93516d5e62615047589df30b79fa +779936a99a40c590806c26c3ee5d1875 +565e90c5c4fedb44ca7ec1d3164935b3 +7a77beffcec10af2414ad46014874ee5 +e716658c3c57f842a0918d39f23d5212 +8c29e28940da914d4be2bd9e95e9fa52 +2718b18cc1c85a7c31d8b5978fa9b86e +f230030e4c1679cd320c1df2b08b4578 +a670767edda00f65f0ff3fd5e8ae33c0 +1cfe9bceee64986fb9b7ecdd88817c55 +6e63627f1569ab3f45777511d60c849f +993a8d8a34a79bfc00f1c2836aa95771 +a5eb7a17f26412f933d969f934bafeb8 +601b6d90345f78740ac93acb60ba4a04 +6dbd9f9683176868c239e875ed05240d +a80f541d0e887ec7c87895bf5155a64b +4aaaf970d89bcf0e8086e764a6721aec +bca1d744d5d5d66479975ed22743f7e8 +6f738092d055c3f04a83473b388fbadb +15fcbb918dac6af3c19d00bc95e6f8c1 +26eb704c99353a2f865a84af08d6486d +fb4d0bc985502c07e5d20a9cf4ada1ab +9fa1b61943b737b92da4f09051215ebf +82f3878fb9f8c604756155fc8f382833 +524c45cb84f4eaed7b0f2f3c3ffd3792 +9c3e8a69212a81af2eebdc3adbba12e7 +0dc7323c9b9e3bc4bf202b68d264651e +06452af2ad3188a9eef706741934bca7 +fa893f1a6a26481c90957e31321f4283 +3cdbaf9b9695e92794c4bf1b06213798 +7b9e7056d30e0a2456174fce31c10e5f +7b9e7056d30e0a2456174fce31c10e5f +7b9e7056d30e0a2456174fce31c10e5f +bfd0686b679318be77824bf238edf0d8 +062f6b46877fee62406e9c4eaf430b67 +0bf0de038477dcb60ea3cb3cb102f91d +34b389079bdfc376d50d9cf1ea373a81 +8cc4090b2d1d5cdc38ed1977faff3681 +778ba1412f0f47692a4b4d89af482efa +79e5b1841b49189e1b953978f260f0ac +9cebac7f046fcfd1553c1de2d2072485 +b5a93c9c13fd8d380728c1022c957701 +19a21d9c88861594f89943e894b6f517 +a31a398476ea2d0d96018f207a53378c +f90474dcf93c7319148888569e7b6ed1 +598274d8f099623d265319cc9117c967 +19a21d9c88861594f89943e894b6f517 +f5abc93e761b27672a82dcbd474c9d82 +0f9b73ac0b50fb67440b249e8f3caf5e +bc6bf5d33c770da78f6bb2ac7bbd0d41 +8847503ebaf681600bd90547c395c346 +61c2a39e0e4b1c1d9299ffb9685f5deb +cdc4c9619b1f779e0f3d290ca38a9b0a +a3056b41a641372acca0db7074f0ca15 +a46d53bd61ec2e0938cf907663af9215 +c7cfe750e00b219bb69712ac5fadd9e4 +acb2b7dec15dbecb823ba4789aa7865c +2741f418a2367f72e9a908d0b4c8d330 +0ea64f578cfa66d4daea90c664a374f5 +bea105416d9ead16b0bcc231d9c96aea +83dcf8462895f0f82783abb44c40cb6a +94062c3aa1962687a0f0db38306f3277 +f5ad361cb1f0cbfe78025c3e5d8a4817 +53f3b2d078f8c41abaf68155a90441c9 +83dcf8462895f0f82783abb44c40cb6a +635e71ee943805d7586d3acf999cdec1 +e8ffcd074c9db58745bda56dc982bcb4 +eb3f3bed1f08a99503883f1c68fcb7b4 +730722bcef09f212b5b216f03e19da06 +b8761c79db3af75d60abae2e7e6b4d1c +25781e6e2a1aa7f4adbca662e78e0ab7 +a6f99a208bb061b35c4d180e2470d591 +756a858e003ed7991facc4b0ec5b1f58 +e24579ae1cff57510a6ca6e8d4e766d1 +b9c1c0614f62016c5acb300cf3a29a12 +2b4fbad244eb926a9a8ba56ba95f5a04 +2a8e2153026e5ad4f4a9ca11fb45cc76 +56a8511b1a4e79ef3a1a67761a0e5cbe +e39aa74716f5417976498e65eec48d67 +9abf15c73b2b8ce9d0cbb1457ef48710 +e85576f37656797f2c82359c7e474700 +4a7d566702f76961e07371752ba2fef7 +a54254002457fda1b0712a84e7586ebe +433fcf61841eb411036035056bbd627d +332d470bf14822493411e8897ca7e249 +a622f4798b28f0eb10f764159ff08e64 +f2bef2736f9b459ee6865600efcbc9fb +11ffbed6380ecea0a1bd4f7f8d6045b2 +11ffbed6380ecea0a1bd4f7f8d6045b2 +11ffbed6380ecea0a1bd4f7f8d6045b2 +11ffbed6380ecea0a1bd4f7f8d6045b2 +3142801e5a564e4342496a4edbcd1747 +b52064f3b967f63d708aa7c217d30fe0 +ca71b63d83b52cc7997898ee0fc5d34b +f87b4c85ed7ff51c4d80cc862f189f8d +15efc1db72b2f3286725c0dc14821050 +7a9a0d77c4d4e11fedee577f9137e038 +b66796b625282fe452c4fd263a78c1a1 +49a0f22ab0a75cfeb9eb32243ee0804b +1098f52459e389bcc4f276a453be3bcf +72a7e62a56b43b97675861156ef30a1c +590a5a438c79911cef20ce4ed0223f6e +5dfc261fc4ffe677c0c69180457c932a +95aff72690a0a9acea1d9e692bfc2d42 +371a5a2a366aa841fda399fae1d288a6 +25c77369014bf8bb5a87d8b97e4dc7ba +dfb6dded5ae057a4a791a75df503e6ca +326dca490d5f883c2aee98b3c7eb7a35 +daa7782e19d24a7ed0990f0f23381caa +f0aaea941d597aa4961c0a70fc475963 +89976b55874e6b25404b3e68f0020ef0 +44b732fee2b205d169a263a8d4b4a4ee +0989040d40a1ba597d6d42fd2d8805b5 +148a1d102461befea8192e2e3e2490ab +27ad6c1c07616eec0234cc1ce01ab105 +84f843e6176cf18d8c2139b2cd21f3ef +cf707dbfe633a8ddabfca09724c0af3a +7db7aa0825ce98369600a5818406a854 +f0cc8e9e1519cce022d1476471f77a0c +1a27e47f9a7da6bb3872d815c75dd30c +e01e14459d59cdd7e1c9fed31ac7e30a +e01e14459d59cdd7e1c9fed31ac7e30a +e01e14459d59cdd7e1c9fed31ac7e30a +09491d37337215b5fe848db14d086919 +2861a231db3fd7eeac9d1d094c601406 +db7810c857aca451796b53e2dd2f6d29 +82dec601e930b42434fd1ef35cc61a93 +01b3c6ac3436e32874b6e4c59033f821 +94af3e23f34dfab689864bdc09c98f85 +25588ebe294463477591f5b9f4082b7e +132e9b1fd48b5c44e3d631ccc4fac69d +14f0efcd9f02dc2db67e78658f958418 +7443f8c253fe4425025efdc678914702 +132e9b1fd48b5c44e3d631ccc4fac69d +2ea67fe64ba29e53e2454eda7de7c3bd +903cc1b8f72ed866745f0a82f4c40a0e +e44e33463a58946325a38de6d2f5f8bb +c079d0fdfe37578fa1598f6c44adbb48 +8c5e4ab8086a8d3bbb0479b57c8ed652 +3f26ef5d64cafa3db1b37d7a585b6b88 +ef8489248e832b14fcd8e5ac38640609 +e73f514e27f90df63cb1349965d83d22 +1bd53a1242e5b4fc114a349bf613b895 +20f4cb441b6e83fbadd99fc786325008 +20f4cb441b6e83fbadd99fc786325008 +c4d2eec97ee47137454321263a570a8d +46d03c56f9cbf2f241af8928d1039bc6 +e1c5cdf9b0ed191e801d77a611262fd5 +cfd6e5849d34ebd9f5339292f4ffd280 +47ab16e679b07c8bdf868b48992d2cc3 +2e9a9b7a56846bffe2f82df1edcff5a9 +12ca6687c5a8eea726dbb1890f652a1e +a71726eb74df01b2eca3416773c2ded1 +0e595b959927548645d35f29ca720454 +8e20344a30d8f64d4e4a687069436b9c +f262de20893311d30928a68a391ac8c0 +8cfefad9da9c757779e82517e17ab03e +cc236a90229e61f71899675fc44208bc +99432d58534736ef86fbbdd64760fe62 +9b63079240bff6d9945447b5288485a4 +471bc91c0331c68e4e1683e3a88a3740 +e1c5cdf9b0ed191e801d77a611262fd5 +fa273fbab92e12d13c448d33f057a015 +337925db8879fc20cc86b1907990484d +e1c5cdf9b0ed191e801d77a611262fd5 +e1c5cdf9b0ed191e801d77a611262fd5 +cfed85f06a173bc7481ce57e631a395f +b89943ef2300de767ab76e83c4bfa44f +a71726eb74df01b2eca3416773c2ded1 +545f0951f5e2e2503401e7d002b659e0 +fcc3886eed23b63b5774f89426881f32 +b89943ef2300de767ab76e83c4bfa44f +a71726eb74df01b2eca3416773c2ded1 +545f0951f5e2e2503401e7d002b659e0 +a71726eb74df01b2eca3416773c2ded1 +a71726eb74df01b2eca3416773c2ded1 +a71726eb74df01b2eca3416773c2ded1 +0e595b959927548645d35f29ca720454 +8e20344a30d8f64d4e4a687069436b9c +f262de20893311d30928a68a391ac8c0 +8cfefad9da9c757779e82517e17ab03e +cc236a90229e61f71899675fc44208bc +99432d58534736ef86fbbdd64760fe62 +9b63079240bff6d9945447b5288485a4 +a71726eb74df01b2eca3416773c2ded1 +0e595b959927548645d35f29ca720454 +8e20344a30d8f64d4e4a687069436b9c +f262de20893311d30928a68a391ac8c0 +8cfefad9da9c757779e82517e17ab03e +cc236a90229e61f71899675fc44208bc +8fc267bdc29f65c2ee5de103db177723 +9b63079240bff6d9945447b5288485a4 +02a4bff9579365064895e9c1b8e7849b +d1dc8f7204e8107257c1459a0afbdab0 +1935f3218e44ccba65c3c00b1c9990d6 +1f0aec03d2b7e667e9cd9be0afe9aa8f +d92a56bad7867dd55dd3023b34c442b6 +f44a0045efa2e19d2cb8623682d21c46 +d92a56bad7867dd55dd3023b34c442b6 +869189c733cd0535e66c97f9f3ca131d +408d30d0423b841a372c316ac19a8f19 +68f1508a4e1c8189fce9ad1defb615c9 +c2fcc68c762410593ca16cf9e883e8f2 +b243f952dcbb4cde6d712c1feea199cc +8ecfa94c49657d420dfd2ef82e7a6d4c +bd1ee3bc5ae92d3ec1b3b621d35cf196 +712e9dd80cb22b9b8719a6a645f5b0ac +e7900f9f6e35c97c09b1fbc00692e2ab +ce9377744dcd5f543eddd876c6fba9c8 +84aa495df484876afb61277c713afcf4 +75a9249760e4b5e302fbac6129ffe179 +2923cee6cfceab6546fe1aad58e6e11f +49a55b966a0ebf5c0d5c8ea1bf380c44 +d2db2cb417607525705bab5951ca9336 +c4c73a649ae80b826aff1a2693d29374 +c35e3b543b97274a1385403274384e6a +2c9ac891fb3a2c174c95d8b382b199a4 +6a4f971b73008f104c73758faacaabec +f7883b126fc32509d45577b5cac7170c +18c15ae4aa8264fa6ab1856e64cdd22f +9878650d44af48d3f3765fe79ea03ee5 +e3462c7cd965bb50239f8b9eaed73393 +657914c1b31c633ce51cd7b5490a0882 +32532dbfd9478479aff43864a83f913c +5857b9b414ab8dfa1ab84326c5694a91 +9bcf6b17f195a1d609049a2d2a5d1608 +92d3fbc7d0a57bf073bd8c7e28d69a53 +5c4faf19dac0ed11172a13c978afbbe3 +df5571f77a2a65596048565154d2f3e4 +25bf88700bef29cecbf15e4e1eaa5cd1 +aaf6e43e21f4a67634ca0917c83d5e4d +30d9166e2f884b793cc1add4603462bf +5bf1a5481ccf7b9d758cba4009bd4ac2 +5bf1a5481ccf7b9d758cba4009bd4ac2 +5bf1a5481ccf7b9d758cba4009bd4ac2 +5bf1a5481ccf7b9d758cba4009bd4ac2 +bb8c4b3ccfb6a50ad2f5f08a10b565a3 +9bfb99fafd5ef401368fd341717f28e7 +cec5d12e18190e3b6cdd6202c4a255d4 +29c10a7bdf51ff4eee0848ee48bf63ce +155944c4b3c86e9f9353410f5e09b7b9 +e2f882eb592cb80d1a3f331bda096e6a +cb68b7c74d24a31f5f8455634fa1cf2e +63baf267b7c1c3e0cd00875b3679d4b5 +598df03daef1783e8542fd3e99c8068a +a07e2644b704b058de1428222bb65dd3 +c8f22be983f32eb0c92757fd61e8b976 +4a736b7d2c8cb7dae9629c91dc9fe307 +04623f4956ff7f28d1b2a1a367b6a82c +14b09fb90e9ef05ad3abfab93b886607 +43691faee1dbe46e4f2e818a121750ae +1fa68787df902f7a22b55386840701e6 +628b0f91f2107f749c26f2bff0fcf46e +628b0f91f2107f749c26f2bff0fcf46e +cf361951674cb5130b67c8af59815d65 +cf361951674cb5130b67c8af59815d65 +cf361951674cb5130b67c8af59815d65 +ebbfeb573ce0332a905c5962735a20e2 +3fcf2ccdfce324754a9a5defdb1cbcfc +fa2852f4e11b363c55dfbef3ab961579 +eb063952fdb13984202b5aac5f45122c +eb063952fdb13984202b5aac5f45122c +eb063952fdb13984202b5aac5f45122c +eb063952fdb13984202b5aac5f45122c +8d022c643571756358153de2b759503c +8d022c643571756358153de2b759503c +a9e7a1bc3d560310d5155b768b4f473d +5ba6da71189662806bafc3c7dac1f2c6 +5ba6da71189662806bafc3c7dac1f2c6 +2b128bc46fecb137e30f04fdbe47bdf8 +4aeb20a805f0c6999eaa1bf260ebd487 +5c88ac81279b6fdc0a8355b22e4108f4 +5da48fcb090e863ce2ea127caefdb387 +0d038ec5f3d7f0237b65bd7dc7e7497c +1b009a27b28ee1ad6009ce9ce04dabf4 +e06a538da7da42929f158fc9728a18a6 +89093aadd2007052b4c5a1f0d76e04f6 +9f8a9f84cf3243c6c5076d90b50478b0 +3d5d341bdf6f091cf931c7bcddb15388 diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 6563c0da4..63bd0cfb9 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -9,7 +9,7 @@ on: env: FORCE_COLOR: 1 XDG_CACHE_HOME: ${{ github.workspace }}/cache - DEFAULT_PYTHON: "3.7" + PIP_CACHE_DIR: ${{ github.workspace }}/pip-cache jobs: validate: @@ -45,16 +45,10 @@ jobs: with: distribution: "temurin" java-version: "17" - - name: Get pip cache dir - id: pip-cache - shell: bash - run: | - python -m ensurepip - echo "::set-output name=dir::$(pip cache dir)" - name: Cache pip uses: actions/cache@v2 with: - path: ${{ steps.pip-cache.outputs.dir }} + path: ${{ env.PIP_CACHE_DIR }} key: ${{ matrix.os }}-pip-${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py', '**/*requirements*.txt') }} restore-keys: | @@ -81,6 +75,36 @@ jobs: gha:validate env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + extra-tasks: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - task: "gha:flake8" + python-version: 3.8 + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{env.DEFAULT_PYTHON}} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Cache pip + uses: actions/cache@v3 + with: + path: ${{ env.PIP_CACHE_DIR }} + key: tox-${{ matrix.task }}-pip-v1-${{ + hashFiles('**/setup.py', '**/requirements*.txt') }} + restore-keys: | + tox-${{ matrix.task }}-pip-v1- + - name: Install Task + uses: arduino/setup-task@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Run task + shell: bash + run: | + task ${{ matrix.task }} finish: permissions: contents: read diff --git a/Dockerfile.devcontainer b/Dockerfile.devcontainer index f10881c9d..ed071e441 100644 --- a/Dockerfile.devcontainer +++ b/Dockerfile.devcontainer @@ -57,7 +57,7 @@ RUN \ RUN sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin -COPY requirements.txt requirements.dev.txt requirements.dev-extra.txt /var/tmp/ +COPY requirements*.txt /var/tmp/ COPY docs/sphinx-requirements.txt /var/tmp/docs/sphinx-requirements.txt RUN \ diff --git a/Taskfile.yml b/Taskfile.yml index af2b912b1..c9e0d7f5a 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -57,6 +57,11 @@ tasks: cmds: - "{{._PYTHON}} -m pip install --upgrade -r requirements.txt -r requirements.dev.txt -r docs/sphinx-requirements.txt {{if .INSTALL_PIP_EXTRAS}}-r requirements.dev-extras.txt{{end}}" + install:flake8: + desc: Install flake8 dependencies + cmds: + - "{{._PYTHON}} -m pip install --upgrade -r requirements.flake8.txt" + install:deps: desc: Install all dependencies cmds: @@ -96,6 +101,11 @@ tasks: cmds: - "{{.TEST_HARNESS}}{{._PYTHON}} -m pytest {{if .WITH_COVERAGE}}--cov --cov-report={{end}} {{.CLI_ARGS}}" + flake8: + desc: Run flake8 + cmds: + - "{{._PYTHON}} -m flakeheaven lint {{.CLI_ARGS}}" + lint:fix: desc: Fix auto-fixable linting errors cmds: @@ -107,6 +117,8 @@ tasks: cmds: - "{{._PYTHON}} -m isort --check --diff ." - "{{._PYTHON}} -m black --check --diff ." + - task: flake8 + validate:static: desc: Perform static validation @@ -212,6 +224,13 @@ tasks: COVERAGE_FILE: ".coverage" - cmd: coveralls + + gha:flake8: + desc: GitHub Actions flake8 workflow + cmds: + - task: install:flake8 + - task: flake8 + _rimraf: # This task is a utility task for recursively removing directories, it is # similar to rm -rf but not identical and it should work wherever there is diff --git a/docs/developers.rst b/docs/developers.rst index 600cdddce..8fb181f5b 100644 --- a/docs/developers.rst +++ b/docs/developers.rst @@ -11,7 +11,7 @@ developing RDFLib code. * Please be as Pythonic as possible (:pep:`8`). * Code should be formatted using `black `_ and we use Black v22.3.0, with the black config in ``pyproject.toml``. -* Code should also pass `flake8 `_ linting +* Code should also pass `flake8 `_ linting and `mypy `_ type checking. * You must supply tests for new code. @@ -145,12 +145,21 @@ our black.toml config file: python -m black --config black.toml --check ./rdflib -Check style and conventions with `flake8 `_: +Check style and conventions with `flake8 `_: .. code-block:: bash python -m flake8 rdflib +We also provide a `flakeheaven `_ +baseline that ignores existing flake8 errors and only reports on newly +introduced flake8 errors: + +.. code-block:: bash + + python -m flakeheaven + + Check types with `mypy `_: .. code-block:: bash diff --git a/pyproject.toml b/pyproject.toml index efe383b08..5ee2a25b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,22 @@ +[tool.flakeheaven] +format = "grouped" +baseline = ".flakeheaven.baseline" + +[tool.flakeheaven.plugins] +pycodestyle = [ + "+*", + # mirrored from setup.cfg + "-E501", + "-E203", + "-W503" +] +pyflakes = [ + "+*", +] +pep8-naming = ["+*"] +"flake8-*" = ["+*"] + + [tool.black] required-version = "22.3.0" line-length = "88" diff --git a/requirements.dev.txt b/requirements.dev.txt index 586be01e8..5cba6e8ef 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -1,8 +1,6 @@ black==22.3.0 coverage doctest-ignore-unicode==0.1.2 -flake8 -flake8-black html5lib isort mypy @@ -11,3 +9,4 @@ pytest-cov pytest-subtests types-setuptools -r docs/sphinx-requirements.txt +-r requirements.flake8.txt diff --git a/requirements.flake8.txt b/requirements.flake8.txt new file mode 100644 index 000000000..a948a79ae --- /dev/null +++ b/requirements.flake8.txt @@ -0,0 +1,3 @@ +flake8 +flakeheaven; python_version >= '3.8.0' +pep8-naming diff --git a/setup.cfg b/setup.cfg index 131a24db0..fd8556722 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,10 +1,22 @@ [options.package_data] rdflib = py.typed +# https://flake8.pycqa.org/en/latest/user/configuration.html [flake8] -ignore = W806 -max-line-length = 88 -exclude = host,extras,transform,rdfs,pyRdfa,sparql,results,pyMicrodata +exclude = + .git, + __pycache__, + .venv, + .tox, + var, + docs/rdf_terms.rst, # This file is causing an error on GitHub actions +extend-ignore = + # Disabled so that black can control line length. + E501, # line too long + # Disabled based on black recommendations + # https://black.readthedocs.io/en/stable/faq.html#why-are-flake8-s-e203-and-w503-violated + E203, # Whitespace before ':' + W503, # Line break occurred before a binary operator [coverage:run] branch = True diff --git a/setup.py b/setup.py index f0d674893..c15d397a4 100644 --- a/setup.py +++ b/setup.py @@ -33,10 +33,11 @@ "networkx": ["networkx"], "dev": [ "black==22.3.0", - "mypy", "flake8", - "flake8-black", + "flakeheaven; python_version >= '3.8.0'", "isort", + "mypy", + "pep8-naming", "types-setuptools", ], } diff --git a/tox.ini b/tox.ini index 70792f32a..7cf5476b2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py3{7,8,9,10},covreport,docs,precommit + flake8,py3{7,8,9,10},covreport,docs,precommit [testenv] setenv = @@ -28,6 +28,13 @@ commands = {envpython} -m coverage combine {envpython} -m coverage report +[testenv:flake8] +deps = + -rrequirements.flake8.txt +skip_install = true +commands = + {envpython} -m flakeheaven lint + [testenv:docs] extras = docs passenv = TERM From e5c84634d5fd03d14694aa00de69cfe6aeb4545f Mon Sep 17 00:00:00 2001 From: Mark Watts Date: Sun, 15 May 2022 04:13:29 -0500 Subject: [PATCH 12/19] Passing "generate" option through in compute_qname_strict --- rdflib/namespace/__init__.py | 4 ++-- test/test_namespacemanager.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rdflib/namespace/__init__.py b/rdflib/namespace/__init__.py index 6dcf538b3..f194a7f0f 100644 --- a/rdflib/namespace/__init__.py +++ b/rdflib/namespace/__init__.py @@ -538,14 +538,14 @@ def compute_qname_strict( # only the strict output should bear the overhead namespace: str prefix: Optional[str] - prefix, namespace, name = self.compute_qname(uri) + prefix, namespace, name = self.compute_qname(uri, generate) if is_ncname(str(name)): return prefix, namespace, name else: if uri not in self.__cache_strict: try: namespace, name = split_uri(uri, NAME_START_CATEGORIES) - except ValueError as e: + except ValueError: message = ( "This graph cannot be serialized to a strict format " "because there is no valid way to shorten {}".format(uri) diff --git a/test/test_namespacemanager.py b/test/test_namespacemanager.py index 1206f931f..9ee6143aa 100644 --- a/test/test_namespacemanager.py +++ b/test/test_namespacemanager.py @@ -162,3 +162,11 @@ def test_nman_bind_namespaces( graph.namespace_manager = NamespaceManager(graph, selector) if isinstance(expected_result, dict): check_graph_ns(graph, expected_result) + + +def test_compute_qname_no_generate() -> None: + g = Graph() # 'core' bind_namespaces (default) + with pytest.raises(KeyError): + g.namespace_manager.compute_qname_strict( + 'https://example.org/unbound/test', generate=False + ) From 8319c369c4dd2f9310218b5a6a47bc8d73030701 Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Sun, 15 May 2022 09:07:00 +0200 Subject: [PATCH 13/19] build: add GitHub Actions to dependabot This is so we get automatic updates for actions we use. --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 62f2d35d1..d276664ba 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,3 +10,7 @@ updates: versions: - 3.4.3 - 3.5.2 +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly From 3fee93c243a0a9646c961a0bfef958b3db0dc687 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 May 2022 10:56:01 +0000 Subject: [PATCH 14/19] Bump actions/setup-java from 2 to 3 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 3. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 63bd0cfb9..248ce337f 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -40,7 +40,7 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 if: ${{ matrix.extensive-tests }} with: distribution: "temurin" From cc6eb7b725da4f173d20000bdd5c3b25f85ecce2 Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Sun, 15 May 2022 12:50:55 +0200 Subject: [PATCH 15/19] Add CODEOWNERS This is so people in the @RDFLib/core team can see pull requests in . I'm not entirely sure if this will work because @RDFLib/core is private, but worth a try I think. --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 000000000..7b9a2f1d4 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @RDFLib/core From 533f9ca8cdaa5a7a45d891bae04badfad9fba20b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 May 2022 10:56:04 +0000 Subject: [PATCH 16/19] Bump actions/cache from 2 to 3 Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/validate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 248ce337f..06b400007 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -46,7 +46,7 @@ jobs: distribution: "temurin" java-version: "17" - name: Cache pip - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.PIP_CACHE_DIR }} key: ${{ matrix.os }}-pip-${{ matrix.python-version }}-v1-${{ @@ -54,7 +54,7 @@ jobs: restore-keys: | ${{ matrix.os }}-pip-${{ matrix.python-version }}-v1- - name: Cache xdg - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.XDG_CACHE_HOME }} key: ${{ matrix.os }}-xdg-v1-${{ hashFiles('**/with-fuseki.sh') }} From 70abb7d56a06e42828f6c235490415e349169f30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 May 2022 10:56:06 +0000 Subject: [PATCH 17/19] Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 06b400007..caed6f174 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -35,7 +35,7 @@ jobs: os: ubuntu-latest TOX_EXTRA_COMMAND: "flake8 --exit-zero rdflib" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: From d5d354f765151589cadeb723b4a946cc405fdc9f Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Sun, 15 May 2022 15:03:38 +0200 Subject: [PATCH 18/19] feat: add typing for `rdflib/plugins/sparql` (#1926) This patch adds typing to two files and changes imports so that they are more specific to the module in which classes are defined. This patch contains no runtime changes. I'm adding this to make it easier to spot bugs in new PRs to SPARQL code. Also: * Disable some pep8-naming errors for `rdflib/plugins/sparql/*` --- pyproject.toml | 11 ++- rdflib/plugins/sparql/evaluate.py | 92 +++++++++++++------ rdflib/plugins/sparql/sparql.py | 147 +++++++++++++++++------------- 3 files changed, 158 insertions(+), 92 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5ee2a25b8..3d400e56b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,16 @@ pyflakes = [ "+*", ] pep8-naming = ["+*"] -"flake8-*" = ["+*"] + +[tool.flakeheaven.exceptions."rdflib/plugins/sparql/*"] +pep8-naming = [ + "-N802", + "-N803", + "-N806", + "-N812", + "-N816", + "-N801", +] [tool.black] diff --git a/rdflib/plugins/sparql/evaluate.py b/rdflib/plugins/sparql/evaluate.py index 6cdbe7540..edd322e56 100644 --- a/rdflib/plugins/sparql/evaluate.py +++ b/rdflib/plugins/sparql/evaluate.py @@ -18,13 +18,13 @@ import itertools import json as j import re -from typing import Any, Deque, Dict, List, Union +from typing import Any, Deque, Dict, Generator, Iterable, List, Tuple, Union from urllib.parse import urlencode from urllib.request import Request, urlopen from pyparsing import ParseException -from rdflib import BNode, Graph, Literal, URIRef, Variable +from rdflib.graph import Graph from rdflib.plugins.sparql import CUSTOM_EVALS, parser from rdflib.plugins.sparql.aggregates import Aggregator from rdflib.plugins.sparql.evalutils import ( @@ -42,13 +42,19 @@ AlreadyBound, Bindings, FrozenBindings, + FrozenDict, + Query, QueryContext, SPARQLError, ) -from rdflib.term import Identifier +from rdflib.term import BNode, Identifier, Literal, URIRef, Variable +_Triple = Tuple[Identifier, Identifier, Identifier] -def evalBGP(ctx: QueryContext, bgp: List[Any]): + +def evalBGP( + ctx: QueryContext, bgp: List[_Triple] +) -> Generator[FrozenBindings, None, None]: """ A basic graph pattern """ @@ -63,7 +69,8 @@ def evalBGP(ctx: QueryContext, bgp: List[Any]): _p = ctx[p] _o = ctx[o] - for ss, sp, so in ctx.graph.triples((_s, _p, _o)): + # type error: Item "None" of "Optional[Graph]" has no attribute "triples" + for ss, sp, so in ctx.graph.triples((_s, _p, _o)): # type: ignore[union-attr] if None in (_s, _p, _o): c = ctx.push() else: @@ -88,7 +95,9 @@ def evalBGP(ctx: QueryContext, bgp: List[Any]): yield x -def evalExtend(ctx: QueryContext, extend: CompValue): +def evalExtend( + ctx: QueryContext, extend: CompValue +) -> Generator[FrozenBindings, None, None]: # TODO: Deal with dict returned from evalPart from GROUP BY for c in evalPart(ctx, extend.p): @@ -103,7 +112,9 @@ def evalExtend(ctx: QueryContext, extend: CompValue): yield c -def evalLazyJoin(ctx: QueryContext, join: CompValue): +def evalLazyJoin( + ctx: QueryContext, join: CompValue +) -> Generator[FrozenBindings, None, None]: """ A lazy join will push the variables bound in the first part to the second part, @@ -116,7 +127,7 @@ def evalLazyJoin(ctx: QueryContext, join: CompValue): yield b.merge(a) # merge, as some bindings may have been forgotten -def evalJoin(ctx: QueryContext, join: CompValue): +def evalJoin(ctx: QueryContext, join: CompValue) -> Generator[FrozenDict, None, None]: # TODO: Deal with dict returned from evalPart from GROUP BY # only ever for join.p1 @@ -129,7 +140,7 @@ def evalJoin(ctx: QueryContext, join: CompValue): return _join(a, b) -def evalUnion(ctx: QueryContext, union: CompValue): +def evalUnion(ctx: QueryContext, union: CompValue) -> Iterable[FrozenBindings]: branch1_branch2 = [] for x in evalPart(ctx, union.p1): branch1_branch2.append(x) @@ -138,13 +149,15 @@ def evalUnion(ctx: QueryContext, union: CompValue): return branch1_branch2 -def evalMinus(ctx: QueryContext, minus: CompValue): +def evalMinus(ctx: QueryContext, minus: CompValue) -> Generator[FrozenDict, None, None]: a = evalPart(ctx, minus.p1) b = set(evalPart(ctx, minus.p2)) return _minus(a, b) -def evalLeftJoin(ctx: QueryContext, join: CompValue): +def evalLeftJoin( + ctx: QueryContext, join: CompValue +) -> Generator[FrozenBindings, None, None]: # import pdb; pdb.set_trace() for a in evalPart(ctx, join.p1): ok = False @@ -168,7 +181,9 @@ def evalLeftJoin(ctx: QueryContext, join: CompValue): yield a -def evalFilter(ctx: QueryContext, part: CompValue): +def evalFilter( + ctx: QueryContext, part: CompValue +) -> Generator[FrozenBindings, None, None]: # TODO: Deal with dict returned from evalPart! for c in evalPart(ctx, part.p): if _ebv( @@ -178,7 +193,9 @@ def evalFilter(ctx: QueryContext, part: CompValue): yield c -def evalGraph(ctx: QueryContext, part: CompValue): +def evalGraph( + ctx: QueryContext, part: CompValue +) -> Generator[FrozenBindings, None, None]: if ctx.dataset is None: raise Exception( @@ -211,7 +228,9 @@ def evalGraph(ctx: QueryContext, part: CompValue): yield x -def evalValues(ctx: QueryContext, part): +def evalValues( + ctx: QueryContext, part: CompValue +) -> Generator[FrozenBindings, None, None]: for r in part.p.res: c = ctx.push() try: @@ -337,7 +356,8 @@ def evalServiceQuery(ctx: QueryContext, part): res = json["results"]["bindings"] if len(res) > 0: for r in res: - for bound in _yieldBindingsFromServiceCallResult(ctx, r, variables): + # type error: Argument 2 to "_yieldBindingsFromServiceCallResult" has incompatible type "str"; expected "Dict[str, Dict[str, str]]" + for bound in _yieldBindingsFromServiceCallResult(ctx, r, variables): # type: ignore[arg-type] yield bound else: raise Exception( @@ -353,7 +373,7 @@ def evalServiceQuery(ctx: QueryContext, part): """ -def _buildQueryStringForServiceCall(ctx: QueryContext, match): +def _buildQueryStringForServiceCall(ctx: QueryContext, match: re.Match) -> str: service_query = match.group(2) try: @@ -361,10 +381,12 @@ def _buildQueryStringForServiceCall(ctx: QueryContext, match): except ParseException: # This could be because we don't have a select around the service call. service_query = "SELECT REDUCED * WHERE {" + service_query + "}" - for p in ctx.prologue.namespace_manager.store.namespaces(): + # type error: Item "None" of "Optional[Prologue]" has no attribute "namespace_manager" + for p in ctx.prologue.namespace_manager.store.namespaces(): # type: ignore[union-attr] service_query = "PREFIX " + p[0] + ":" + p[1].n3() + " " + service_query # re add the base if one was defined - base = ctx.prologue.base + # type error: Item "None" of "Optional[Prologue]" has no attribute "base" [union-attr] + base = ctx.prologue.base # type: ignore[union-attr] if base is not None and len(base) > 0: service_query = "BASE <" + base + "> " + service_query sol = ctx.solution() @@ -377,7 +399,9 @@ def _buildQueryStringForServiceCall(ctx: QueryContext, match): return service_query -def _yieldBindingsFromServiceCallResult(ctx: QueryContext, r, variables): +def _yieldBindingsFromServiceCallResult( + ctx: QueryContext, r: Dict[str, Dict[str, str]], variables: List[str] +) -> Generator[FrozenBindings, None, None]: res_dict: Dict[Variable, Identifier] = {} for var in variables: if var in r and r[var]: @@ -396,7 +420,7 @@ def _yieldBindingsFromServiceCallResult(ctx: QueryContext, r, variables): yield FrozenBindings(ctx, res_dict) -def evalGroup(ctx: QueryContext, group): +def evalGroup(ctx: QueryContext, group: CompValue): """ http://www.w3.org/TR/sparql11-query/#defn_algGroup """ @@ -404,7 +428,9 @@ def evalGroup(ctx: QueryContext, group): return evalPart(ctx, group.p) -def evalAggregateJoin(ctx: QueryContext, agg): +def evalAggregateJoin( + ctx: QueryContext, agg: CompValue +) -> Generator[FrozenBindings, None, None]: # import pdb ; pdb.set_trace() p = evalPart(ctx, agg.p) # p is always a Group, we always get a dict back @@ -435,7 +461,9 @@ def evalAggregateJoin(ctx: QueryContext, agg): yield FrozenBindings(ctx) -def evalOrderBy(ctx: QueryContext, part): +def evalOrderBy( + ctx: QueryContext, part: CompValue +) -> Generator[FrozenBindings, None, None]: res = evalPart(ctx, part.p) @@ -449,7 +477,7 @@ def evalOrderBy(ctx: QueryContext, part): return res -def evalSlice(ctx: QueryContext, slice): +def evalSlice(ctx: QueryContext, slice: CompValue): res = evalPart(ctx, slice.p) return itertools.islice( @@ -459,7 +487,9 @@ def evalSlice(ctx: QueryContext, slice): ) -def evalReduced(ctx: QueryContext, part): +def evalReduced( + ctx: QueryContext, part: CompValue +) -> Generator[FrozenBindings, None, None]: """apply REDUCED to result REDUCED is not as strict as DISTINCT, but if the incoming rows were sorted @@ -497,7 +527,9 @@ def evalReduced(ctx: QueryContext, part): mru_queue.appendleft(row) -def evalDistinct(ctx: QueryContext, part): +def evalDistinct( + ctx: QueryContext, part: CompValue +) -> Generator[FrozenBindings, None, None]: res = evalPart(ctx, part.p) done = set() @@ -507,13 +539,13 @@ def evalDistinct(ctx: QueryContext, part): done.add(x) -def evalProject(ctx: QueryContext, project): +def evalProject(ctx: QueryContext, project: CompValue): res = evalPart(ctx, project.p) return (row.project(project.PV) for row in res) -def evalSelectQuery(ctx: QueryContext, query): +def evalSelectQuery(ctx: QueryContext, query: CompValue): res = {} res["type_"] = "SELECT" @@ -522,7 +554,7 @@ def evalSelectQuery(ctx: QueryContext, query): return res -def evalAskQuery(ctx: QueryContext, query): +def evalAskQuery(ctx: QueryContext, query: CompValue): res: Dict[str, Union[bool, str]] = {} res["type_"] = "ASK" res["askAnswer"] = False @@ -533,7 +565,7 @@ def evalAskQuery(ctx: QueryContext, query): return res -def evalConstructQuery(ctx: QueryContext, query): +def evalConstructQuery(ctx: QueryContext, query) -> Dict[str, Union[str, Graph]]: template = query.template if not template: @@ -552,7 +584,7 @@ def evalConstructQuery(ctx: QueryContext, query): return res -def evalQuery(graph, query, initBindings, base=None): +def evalQuery(graph: Graph, query: Query, initBindings, base=None): initBindings = dict((Variable(k), v) for k, v in initBindings.items()) diff --git a/rdflib/plugins/sparql/sparql.py b/rdflib/plugins/sparql/sparql.py index 552530083..4846ec740 100644 --- a/rdflib/plugins/sparql/sparql.py +++ b/rdflib/plugins/sparql/sparql.py @@ -1,24 +1,26 @@ import collections import datetime import itertools +import typing as t +from typing import Any, Container, Dict, Iterable, List, Optional, Tuple, Union import isodate import rdflib.plugins.sparql -from rdflib import BNode, ConjunctiveGraph, Graph, Literal, URIRef, Variable from rdflib.compat import Mapping, MutableMapping +from rdflib.graph import ConjunctiveGraph, Graph from rdflib.namespace import NamespaceManager from rdflib.plugins.sparql.parserutils import CompValue -from rdflib.term import Node +from rdflib.term import BNode, Identifier, Literal, Node, URIRef, Variable class SPARQLError(Exception): - def __init__(self, msg=None): + def __init__(self, msg: Optional[str] = None): Exception.__init__(self, msg) class NotBoundError(SPARQLError): - def __init__(self, msg=None): + def __init__(self, msg: Optional[str] = None): SPARQLError.__init__(self, msg) @@ -30,7 +32,7 @@ def __init__(self): class SPARQLTypeError(SPARQLError): - def __init__(self, msg): + def __init__(self, msg: Optional[str]): SPARQLError.__init__(self, msg) @@ -45,11 +47,11 @@ class Bindings(MutableMapping): In python 3.3 this could be a collections.ChainMap """ - def __init__(self, outer=None, d=[]): - self._d = dict(d) + def __init__(self, outer: Optional["Bindings"] = None, d=[]): + self._d: Dict[str, str] = dict(d) self.outer = outer - def __getitem__(self, key): + def __getitem__(self, key: str) -> str: if key in self._d: return self._d[key] @@ -57,26 +59,26 @@ def __getitem__(self, key): raise KeyError() return self.outer[key] - def __contains__(self, key): + def __contains__(self, key: Any) -> bool: try: self[key] return True except KeyError: return False - def __setitem__(self, key, value): + def __setitem__(self, key: str, value: Any) -> None: self._d[key] = value - def __delitem__(self, key): + def __delitem__(self, key: str) -> None: raise Exception("DelItem is not implemented!") def __len__(self) -> int: i = 0 - d = self + d: Optional[Bindings] = self while d is not None: i += len(d._d) d = d.outer - return i # type: ignore[unreachable] + return i def __iter__(self): d = self @@ -84,10 +86,11 @@ def __iter__(self): yield from d._d d = d.outer - def __str__(self): - return "Bindings({" + ", ".join((k, self[k]) for k in self) + "})" + def __str__(self) -> str: + # type error: Generator has incompatible item type "Tuple[Any, str]"; expected "str" + return "Bindings({" + ", ".join((k, self[k]) for k in self) + "})" # type: ignore[misc] - def __repr__(self): + def __repr__(self) -> str: return str(self) @@ -99,20 +102,20 @@ class FrozenDict(Mapping): """ - def __init__(self, *args, **kwargs): - self._d = dict(*args, **kwargs) - self._hash = None + def __init__(self, *args: Any, **kwargs: Any): + self._d: Dict[Identifier, Identifier] = dict(*args, **kwargs) + self._hash: Optional[int] = None def __iter__(self): return iter(self._d) - def __len__(self): + def __len__(self) -> int: return len(self._d) - def __getitem__(self, key): + def __getitem__(self, key: Identifier) -> Identifier: return self._d[key] - def __hash__(self): + def __hash__(self) -> int: # It would have been simpler and maybe more obvious to # use hash(tuple(sorted(self._d.items()))) from this discussion # so far, but this solution is O(n). I don't know what kind of @@ -125,13 +128,13 @@ def __hash__(self): self._hash ^= hash(value) return self._hash - def project(self, vars): + def project(self, vars: Container[Variable]) -> "FrozenDict": return FrozenDict((x for x in self.items() if x[0] in vars)) - def disjointDomain(self, other): + def disjointDomain(self, other: t.Mapping[Identifier, Identifier]) -> bool: return not bool(set(self).intersection(other)) - def compatible(self, other): + def compatible(self, other: t.Mapping[Identifier, Identifier]) -> bool: for k in self: try: if self[k] != other[k]: @@ -141,24 +144,24 @@ def compatible(self, other): return True - def merge(self, other): + def merge(self, other: t.Mapping[Identifier, Identifier]) -> "FrozenDict": res = FrozenDict(itertools.chain(self.items(), other.items())) return res - def __str__(self): + def __str__(self) -> str: return str(self._d) - def __repr__(self): + def __repr__(self) -> str: return repr(self._d) class FrozenBindings(FrozenDict): - def __init__(self, ctx, *args, **kwargs): + def __init__(self, ctx: "QueryContext", *args, **kwargs): FrozenDict.__init__(self, *args, **kwargs) self.ctx = ctx - def __getitem__(self, key): + def __getitem__(self, key: Union[Identifier, str]) -> Identifier: if not isinstance(key, Node): key = Variable(key) @@ -167,30 +170,34 @@ def __getitem__(self, key): return key if key not in self._d: - return self.ctx.initBindings[key] + # type error: Value of type "Optional[Dict[Variable, Identifier]]" is not indexable + # type error: Invalid index type "Union[BNode, Variable]" for "Optional[Dict[Variable, Identifier]]"; expected type "Variable" + return self.ctx.initBindings[key] # type: ignore[index] else: return self._d[key] - def project(self, vars): + def project(self, vars: Container[Variable]) -> "FrozenBindings": return FrozenBindings(self.ctx, (x for x in self.items() if x[0] in vars)) - def merge(self, other): + def merge(self, other: t.Mapping[Identifier, Identifier]) -> "FrozenBindings": res = FrozenBindings(self.ctx, itertools.chain(self.items(), other.items())) return res @property - def now(self): + def now(self) -> datetime.datetime: return self.ctx.now @property - def bnodes(self): + def bnodes(self) -> t.Mapping[Identifier, BNode]: return self.ctx.bnodes @property - def prologue(self): + def prologue(self) -> Optional["Prologue"]: return self.ctx.prologue - def forget(self, before, _except=None): + def forget( + self, before: "QueryContext", _except: Optional[Container[Variable]] = None + ): """ return a frozen dict only of bindings made in self since before @@ -206,7 +213,8 @@ def forget(self, before, _except=None): for x in self.items() if ( x[0] in _except - or x[0] in self.ctx.initBindings + # type error: Unsupported right operand type for in ("Optional[Dict[Variable, Identifier]]") + or x[0] in self.ctx.initBindings # type: ignore[operator] or before[x[0]] is None ) ), @@ -224,12 +232,19 @@ class QueryContext(object): Query context - passed along when evaluating the query """ - def __init__(self, graph=None, bindings=None, initBindings=None): + def __init__( + self, + graph: Optional[Graph] = None, + bindings: Optional[Union[Bindings, FrozenBindings, List[Any]]] = None, + initBindings: Optional[Dict[Variable, Identifier]] = None, + ): self.initBindings = initBindings self.bindings = Bindings(d=bindings or []) if initBindings: self.bindings.update(initBindings) + self.graph: Optional[Graph] + self._dataset: Optional[ConjunctiveGraph] if isinstance(graph, ConjunctiveGraph): self._dataset = graph if rdflib.plugins.sparql.SPARQL_DEFAULT_GRAPH_UNION: @@ -240,10 +255,12 @@ def __init__(self, graph=None, bindings=None, initBindings=None): self._dataset = None self.graph = graph - self.prologue = None - self._now = None + self.prologue: Optional[Prologue] = None + self._now: Optional[datetime.datetime] = None - self.bnodes = collections.defaultdict(BNode) + self.bnodes: t.MutableMapping[Identifier, BNode] = collections.defaultdict( + BNode + ) @property def now(self) -> datetime.datetime: @@ -251,7 +268,9 @@ def now(self) -> datetime.datetime: self._now = datetime.datetime.now(isodate.tzinfo.UTC) return self._now - def clone(self, bindings=None): + def clone( + self, bindings: Optional[Union[FrozenBindings, Bindings, List[Any]]] = None + ) -> "QueryContext": r = QueryContext( self._dataset if self._dataset is not None else self.graph, bindings or self.bindings, @@ -263,7 +282,7 @@ def clone(self, bindings=None): return r @property - def dataset(self): + def dataset(self) -> ConjunctiveGraph: """ "current dataset""" if self._dataset is None: raise Exception( @@ -273,7 +292,7 @@ def dataset(self): ) return self._dataset - def load(self, source, default=False, **kwargs): + def load(self, source: URIRef, default: bool = False, **kwargs): def _load(graph, source): try: return graph.parse(source, format="turtle", **kwargs) @@ -298,7 +317,8 @@ def _load(graph, source): # we are not loading - if we already know the graph # being "loaded", just add it to the default-graph if default: - self.graph += self.dataset.get_context(source) + # Unsupported left operand type for + ("None") + self.graph += self.dataset.get_context(source) # type: ignore[operator] else: if default: @@ -306,7 +326,7 @@ def _load(graph, source): else: _load(self.dataset, source) - def __getitem__(self, key): + def __getitem__(self, key) -> Any: # in SPARQL BNodes are just labels if not isinstance(key, (BNode, Variable)): return key @@ -315,13 +335,13 @@ def __getitem__(self, key): except KeyError: return None - def get(self, key, default=None): + def get(self, key: Variable, default: Optional[Any] = None): try: return self[key] except KeyError: return default - def solution(self, vars=None): + def solution(self, vars: Optional[Iterable[Variable]] = None) -> FrozenBindings: """ Return a static copy of the current variable bindings as dict """ @@ -332,25 +352,25 @@ def solution(self, vars=None): else: return FrozenBindings(self, self.bindings.items()) - def __setitem__(self, key, value): + def __setitem__(self, key: Identifier, value: Identifier) -> None: if key in self.bindings and self.bindings[key] != value: raise AlreadyBound() self.bindings[key] = value - def pushGraph(self, graph): + def pushGraph(self, graph: Optional[Graph]) -> "QueryContext": r = self.clone() r.graph = graph return r - def push(self): + def push(self) -> "QueryContext": r = self.clone(Bindings(self.bindings)) return r - def clean(self): + def clean(self) -> "QueryContext": return self.clone([]) - def thaw(self, frozenbindings): + def thaw(self, frozenbindings: FrozenBindings) -> "QueryContext": """ Create a new read/write query context from the given solution """ @@ -365,19 +385,21 @@ class Prologue: """ def __init__(self): - self.base = None + self.base: Optional[str] = None self.namespace_manager = NamespaceManager(Graph()) # ns man needs a store - def resolvePName(self, prefix, localname): + def resolvePName(self, prefix: Optional[str], localname: Optional[str]) -> URIRef: ns = self.namespace_manager.store.namespace(prefix or "") if ns is None: raise Exception("Unknown namespace prefix : %s" % prefix) return URIRef(ns + (localname or "")) - def bind(self, prefix, uri): + def bind(self, prefix: Optional[str], uri: Any) -> None: self.namespace_manager.bind(prefix, uri, replace=True) - def absolutize(self, iri): + def absolutize( + self, iri: Optional[Union[CompValue, str]] + ) -> Optional[Union[CompValue, str]]: """ Apply BASE / PREFIXes to URIs (and to datatypes in Literals) @@ -389,8 +411,9 @@ def absolutize(self, iri): if iri.name == "pname": return self.resolvePName(iri.prefix, iri.localname) if iri.name == "literal": + # type error: Argument "datatype" to "Literal" has incompatible type "Union[CompValue, Identifier, None]"; expected "Optional[str]" return Literal( - iri.string, lang=iri.lang, datatype=self.absolutize(iri.datatype) + iri.string, lang=iri.lang, datatype=self.absolutize(iri.datatype) # type: ignore[arg-type] ) elif isinstance(iri, URIRef) and not ":" in iri: return URIRef(iri, base=self.base) @@ -403,9 +426,10 @@ class Query: A parsed and translated query """ - def __init__(self, prologue, algebra): + def __init__(self, prologue: Prologue, algebra: CompValue): self.prologue = prologue self.algebra = algebra + self._original_args: Tuple[str, Mapping[str, str], Optional[str]] class Update: @@ -413,6 +437,7 @@ class Update: A parsed and translated update """ - def __init__(self, prologue, algebra): + def __init__(self, prologue: Prologue, algebra: List[CompValue]): self.prologue = prologue self.algebra = algebra + self._original_args: Tuple[str, Mapping[str, str], Optional[str]] From 246c887531d392ba475fb48ba6d21917f510abfe Mon Sep 17 00:00:00 2001 From: Iwan Aucamp Date: Sun, 15 May 2022 15:04:08 +0200 Subject: [PATCH 19/19] test: move rdfs.ttl into `test/data/defined_namespaces` (#1936) Just to make things a bit more organized. --- test/conftest.py | 2 +- test/data/{ => defined_namespaces}/rdfs.ttl | 0 test/data/fetcher.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename test/data/{ => defined_namespaces}/rdfs.ttl (100%) diff --git a/test/conftest.py b/test/conftest.py index 3e6645746..682985fb5 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -15,4 +15,4 @@ @pytest.fixture(scope="session") def rdfs_graph() -> Graph: - return Graph().parse(TEST_DATA_DIR / "rdfs.ttl", format="turtle") + return Graph().parse(TEST_DATA_DIR / "defined_namespaces/rdfs.ttl", format="turtle") diff --git a/test/data/rdfs.ttl b/test/data/defined_namespaces/rdfs.ttl similarity index 100% rename from test/data/rdfs.ttl rename to test/data/defined_namespaces/rdfs.ttl diff --git a/test/data/fetcher.py b/test/data/fetcher.py index 20f26ad1d..2294954d2 100755 --- a/test/data/fetcher.py +++ b/test/data/fetcher.py @@ -218,7 +218,7 @@ def _member_io( remote=Request( "http://www.w3.org/2000/01/rdf-schema#", headers={"Accept": "text/turtle"} ), - local_path=(DATA_PATH / "rdfs.ttl"), + local_path=(DATA_PATH / "defined_namespaces/rdfs.ttl"), ), ]