Some cleanup

- Rename the test data directory for `translate_algebra` to match other test data directories. (i.e. `test_translate_algebra` -> `translate_algebra`) - Remove `types-tabulate` form requirements.dev.txt as this was only used in the custom test framework. - Fix translate algebra docstring. - Add a TODO comment expressing the intent to evaluate algebra tests against a well defined graph and verify the result from the reconstituted query matches the result from the raw query.
RDFLib · Dec 31, 2021 · 052e88b · 052e88b
1 parent 203bcc2
commit 052e88b
Show file tree

Hide file tree

Showing 43 changed files with 8 additions and 5 deletions.
diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -11,4 +11,3 @@ pytest-subtests
 sphinx
 sphinxcontrib-apidoc
 types-setuptools
-types-tabulate
diff --git a/test/test_translate_algebra.py b/test/test_translate_algebra.py
@@ -15,7 +15,7 @@
 
 @pytest.fixture
 def data_path() -> Path:
-    return Path(__file__).parent / "test_translate_algebra"
+    return Path(__file__).parent / "translate_algebra"
 
 
 @dataclass
@@ -33,7 +33,7 @@ def filename(self) -> str:
     def pytest_param(self) -> ParameterSet:
         return pytest.param(self, id=self.id, marks=self.marks)
 
-
+memory
 def _format_query(query: str) -> str:
     buffer = StringIO()
     p = "{"
@@ -232,7 +232,7 @@ def _format_query(query: str) -> str:
 
 
 if os.name != "nt":
-    # On Windows this test causes a stackoverflow or memroy error, so don't run
+    # On Windows this test causes a stackoverflow or memory error, so don't run
     # it on Windows. The test fails anyway on linux and should be fixed. Once
     # the cause of this failure is fixed the condition to not run it on windows
     # should be removed and it should be added to the normal tests.
@@ -266,7 +266,7 @@ def test_all_files_used(data_path: Path) -> None:
 @pytest.mark.parametrize("test_spec", [test.pytest_param() for test in algebra_tests])
 def test_roundtrip(test_spec: AlgebraTest, data_path: Path) -> None:
     """
-    The query must also be executable and shall not violate any SPARQL query syntax.
+    Query remains the same over two successuive parse and translate cycles.
     """
     query_text = (data_path / test_spec.filename).read_text()
 
@@ -285,3 +285,7 @@ def test_roundtrip(test_spec: AlgebraTest, data_path: Path) -> None:
     assert (
         query_from_algebra == query_from_query_from_algebra
     ), f"failed expectation: {test_spec.description}"
+
+    # TODO: Execute the raw query (query_text) and the reconstitued query
+    # (query_from_query_from_algebra) against a well defined graph and ensure
+    # they yield the same result.
diff --git a/...ebra/test_functions__functional_forms.txt → ...ebra/test_functions__functional_forms.txt b/...ebra/test_functions__functional_forms.txt → ...ebra/test_functions__functional_forms.txt
diff --git a/...unctions__functional_forms_not_exists.txt → ...unctions__functional_forms_not_exists.txt b/...unctions__functional_forms_not_exists.txt → ...unctions__functional_forms_not_exists.txt
diff --git a/...unctions__functions_on_dates_and_time.txt → ...unctions__functions_on_dates_and_time.txt b/...unctions__functions_on_dates_and_time.txt → ...unctions__functions_on_dates_and_time.txt
diff --git a/...test_functions__functions_on_numerics.txt → ...test_functions__functions_on_numerics.txt b/...test_functions__functions_on_numerics.txt → ...test_functions__functions_on_numerics.txt
diff --git a/...est_functions__functions_on_rdf_terms.txt → ...est_functions__functions_on_rdf_terms.txt b/...est_functions__functions_on_rdf_terms.txt → ...est_functions__functions_on_rdf_terms.txt
diff --git a/.../test_functions__functions_on_strings.txt → .../test_functions__functions_on_strings.txt b/.../test_functions__functions_on_strings.txt → .../test_functions__functions_on_strings.txt
diff --git a/...lgebra/test_functions__hash_functions.txt → ...lgebra/test_functions__hash_functions.txt b/...lgebra/test_functions__hash_functions.txt → ...lgebra/test_functions__hash_functions.txt
diff --git a/...a/test_graph_patterns__aggregate_join.txt → ...a/test_graph_patterns__aggregate_join.txt b/...a/test_graph_patterns__aggregate_join.txt → ...a/test_graph_patterns__aggregate_join.txt
diff --git a/...late_algebra/test_graph_patterns__bgp.txt → ...late_algebra/test_graph_patterns__bgp.txt b/...late_algebra/test_graph_patterns__bgp.txt → ...late_algebra/test_graph_patterns__bgp.txt
diff --git a/...e_algebra/test_graph_patterns__extend.txt → ...e_algebra/test_graph_patterns__extend.txt b/...e_algebra/test_graph_patterns__extend.txt → ...e_algebra/test_graph_patterns__extend.txt
diff --git a/...e_algebra/test_graph_patterns__filter.txt → ...e_algebra/test_graph_patterns__filter.txt b/...e_algebra/test_graph_patterns__filter.txt → ...e_algebra/test_graph_patterns__filter.txt
diff --git a/...te_algebra/test_graph_patterns__graph.txt → ...te_algebra/test_graph_patterns__graph.txt b/...te_algebra/test_graph_patterns__graph.txt → ...te_algebra/test_graph_patterns__graph.txt
diff --git a/...te_algebra/test_graph_patterns__group.txt → ...te_algebra/test_graph_patterns__group.txt b/...te_algebra/test_graph_patterns__group.txt → ...te_algebra/test_graph_patterns__group.txt
diff --git a/...e_algebra/test_graph_patterns__having.txt → ...e_algebra/test_graph_patterns__having.txt b/...e_algebra/test_graph_patterns__having.txt → ...e_algebra/test_graph_patterns__having.txt
diff --git a/...ate_algebra/test_graph_patterns__join.txt → ...ate_algebra/test_graph_patterns__join.txt b/...ate_algebra/test_graph_patterns__join.txt → ...ate_algebra/test_graph_patterns__join.txt
diff --git a/...lgebra/test_graph_patterns__left_join.txt → ...lgebra/test_graph_patterns__left_join.txt b/...lgebra/test_graph_patterns__left_join.txt → ...lgebra/test_graph_patterns__left_join.txt
diff --git a/...te_algebra/test_graph_patterns__minus.txt → ...te_algebra/test_graph_patterns__minus.txt b/...te_algebra/test_graph_patterns__minus.txt → ...te_algebra/test_graph_patterns__minus.txt
diff --git a/...te_algebra/test_graph_patterns__union.txt → ...te_algebra/test_graph_patterns__union.txt b/...te_algebra/test_graph_patterns__union.txt → ...te_algebra/test_graph_patterns__union.txt
diff --git a/...ebra/test_integration__complex_query1.txt → ...ebra/test_integration__complex_query1.txt b/...ebra/test_integration__complex_query1.txt → ...ebra/test_integration__complex_query1.txt
diff --git a/...e_algebra/test_operators__arithmetics.txt → ...e_algebra/test_operators__arithmetics.txt b/...e_algebra/test_operators__arithmetics.txt → ...e_algebra/test_operators__arithmetics.txt
diff --git a/...gebra/test_operators__conditional_and.txt → ...gebra/test_operators__conditional_and.txt b/...gebra/test_operators__conditional_and.txt → ...gebra/test_operators__conditional_and.txt
diff --git a/...lgebra/test_operators__conditional_or.txt → ...lgebra/test_operators__conditional_or.txt b/...lgebra/test_operators__conditional_or.txt → ...lgebra/test_operators__conditional_or.txt
diff --git a/...te_algebra/test_operators__relational.txt → ...te_algebra/test_operators__relational.txt b/...te_algebra/test_operators__relational.txt → ...te_algebra/test_operators__relational.txt
diff --git a/...anslate_algebra/test_operators__unary.txt → ...anslate_algebra/test_operators__unary.txt b/...anslate_algebra/test_operators__unary.txt → ...anslate_algebra/test_operators__unary.txt
diff --git a/...ranslate_algebra/test_other__service1.txt → ...ranslate_algebra/test_other__service1.txt b/...ranslate_algebra/test_other__service1.txt → ...ranslate_algebra/test_other__service1.txt
diff --git a/...ranslate_algebra/test_other__service2.txt → ...ranslate_algebra/test_other__service2.txt b/...ranslate_algebra/test_other__service2.txt → ...ranslate_algebra/test_other__service2.txt
diff --git a/..._translate_algebra/test_other__values.txt → .../translate_algebra/test_other__values.txt b/..._translate_algebra/test_other__values.txt → .../translate_algebra/test_other__values.txt
diff --git a/.../test_property_path__alternative_path.txt → .../test_property_path__alternative_path.txt b/.../test_property_path__alternative_path.txt → .../test_property_path__alternative_path.txt
diff --git a/...ebra/test_property_path__inverse_path.txt → ...ebra/test_property_path__inverse_path.txt b/...ebra/test_property_path__inverse_path.txt → ...ebra/test_property_path__inverse_path.txt
diff --git a/...t_property_path__negated_property_set.txt → ...t_property_path__negated_property_set.txt b/...t_property_path__negated_property_set.txt → ...t_property_path__negated_property_set.txt
diff --git a/.../test_property_path__one_or_more_path.txt → .../test_property_path__one_or_more_path.txt b/.../test_property_path__one_or_more_path.txt → .../test_property_path__one_or_more_path.txt
diff --git a/...ra/test_property_path__predicate_path.txt → ...ra/test_property_path__predicate_path.txt b/...ra/test_property_path__predicate_path.txt → ...ra/test_property_path__predicate_path.txt
diff --git a/...bra/test_property_path__sequence_path.txt → ...bra/test_property_path__sequence_path.txt b/...bra/test_property_path__sequence_path.txt → ...bra/test_property_path__sequence_path.txt
diff --git a/...test_property_path__zero_or_more_path.txt → ...test_property_path__zero_or_more_path.txt b/...test_property_path__zero_or_more_path.txt → ...test_property_path__zero_or_more_path.txt
diff --git a/.../test_property_path__zero_or_one_path.txt → .../test_property_path__zero_or_one_path.txt b/.../test_property_path__zero_or_one_path.txt → .../test_property_path__zero_or_one_path.txt
diff --git a/...bra/test_solution_modifiers__distinct.txt → ...bra/test_solution_modifiers__distinct.txt b/...bra/test_solution_modifiers__distinct.txt → ...bra/test_solution_modifiers__distinct.txt
diff --git a/...bra/test_solution_modifiers__order_by.txt → ...bra/test_solution_modifiers__order_by.txt b/...bra/test_solution_modifiers__order_by.txt → ...bra/test_solution_modifiers__order_by.txt
diff --git a/...ebra/test_solution_modifiers__project.txt → ...ebra/test_solution_modifiers__project.txt b/...ebra/test_solution_modifiers__project.txt → ...ebra/test_solution_modifiers__project.txt
diff --git a/...ebra/test_solution_modifiers__reduced.txt → ...ebra/test_solution_modifiers__reduced.txt b/...ebra/test_solution_modifiers__reduced.txt → ...ebra/test_solution_modifiers__reduced.txt
diff --git a/...lgebra/test_solution_modifiers__slice.txt → ...lgebra/test_solution_modifiers__slice.txt b/...lgebra/test_solution_modifiers__slice.txt → ...lgebra/test_solution_modifiers__slice.txt
diff --git a/.../test_solution_modifiers__to_multiset.txt → .../test_solution_modifiers__to_multiset.txt b/.../test_solution_modifiers__to_multiset.txt → .../test_solution_modifiers__to_multiset.txt