RDFLib · nicholascar · Apr 4, 2022 · Mar 31, 2022 · Apr 1, 2022 · Apr 2, 2022
diff --git a/test/a.n3 b/test/a.n3
diff --git a/test/csv/realestate.csv → test/consistent_test_data/csv/realestate.csv b/test/csv/realestate.csv → test/consistent_test_data/csv/realestate.csv
diff --git a/test/store_performance.py b/test/store_performance.py
diff --git a/test/test_aggregate_graphs.py → test/test_graph/test_aggregate_graphs.py b/test/test_aggregate_graphs.py → test/test_graph/test_aggregate_graphs.py
diff --git a/test/test_canonicalization.py → test/test_graph/test_canonicalization.py b/test/test_canonicalization.py → test/test_graph/test_canonicalization.py
@@ -14,7 +14,7 @@
 from io import StringIO
 import unittest
 
-from .testutils import GraphHelper
+from test.testutils import GraphHelper
 
 
 def get_digest_value(rdf, mimetype):

diff --git a/test/test_diff.py → test/test_graph/test_diff.py b/test/test_diff.py → test/test_graph/test_diff.py
@@ -6,7 +6,7 @@
 from rdflib.namespace import RDF, FOAF
 from rdflib import Graph
 from rdflib.term import Node, BNode, Literal
-from .testutils import GraphHelper
+from test.testutils import GraphHelper
 
 """Test for graph_diff - much more extensive testing
 would certainly be possible"""

diff --git a/test/test_slice.py → test/test_graph/test_slice.py b/test/test_slice.py → test/test_graph/test_slice.py
diff --git a/test/test_variants.py → test/test_graph/test_variants.py b/test/test_variants.py → test/test_graph/test_variants.py
@@ -28,7 +28,7 @@
 from rdflib.term import URIRef
 from rdflib.util import guess_format
 
-TEST_DIR = Path(__file__).parent.absolute()
+TEST_DIR = Path(__file__).parent.parent.absolute()
 VARIANTS_DIR = TEST_DIR / "variants"
 
 # Put files from other directories in here.

diff --git a/test/test_980.py → test/test_issues/test_issue980.py b/test/test_980.py → test/test_issues/test_issue980.py
diff --git a/test/test_datetime.py → test/test_literal/test_datetime.py b/test/test_datetime.py → test/test_literal/test_datetime.py
diff --git a/test/test_duration.py → test/test_literal/test_duration.py b/test/test_duration.py → test/test_literal/test_duration.py
diff --git a/test/test_hex_binary.py → test/test_literal/test_hex_binary.py b/test/test_hex_binary.py → test/test_literal/test_hex_binary.py
diff --git a/test/test_literal.py → test/test_literal/test_literal.py b/test/test_literal.py → test/test_literal/test_literal.py
diff --git a/test/test_normalizedString.py → test/test_literal/test_normalized_string.py b/test/test_normalizedString.py → test/test_literal/test_normalized_string.py
diff --git a/test/test_term.py → test/test_literal/test_term.py b/test/test_term.py → test/test_literal/test_term.py
diff --git a/test/test_tokendatatype.py → test/test_literal/test_tokendatatype.py b/test/test_tokendatatype.py → test/test_literal/test_tokendatatype.py
diff --git a/test/test_comparison.py → ...literal/test_uriref_literal_comparison.py b/test/test_comparison.py → ...literal/test_uriref_literal_comparison.py
diff --git a/test/test_xmlliterals.py → test/test_literal/test_xmlliterals.py b/test/test_xmlliterals.py → test/test_literal/test_xmlliterals.py
diff --git a/test/test_b64_binary.py → test/test_misc/test_b64_binary.py b/test/test_b64_binary.py → test/test_misc/test_b64_binary.py
diff --git a/test/test_bnode_ncname.py → test/test_misc/test_bnode_ncname.py b/test/test_bnode_ncname.py → test/test_misc/test_bnode_ncname.py
diff --git a/test/test_conventions.py → test/test_misc/test_conventions.py b/test/test_conventions.py → test/test_misc/test_conventions.py
diff --git a/test/test_create_input_source.py → test/test_misc/test_create_input_source.py b/test/test_create_input_source.py → test/test_misc/test_create_input_source.py
diff --git a/test/test_parse_file_guess_format.py → ...test_misc/test_parse_file_guess_format.py b/test/test_parse_file_guess_format.py → ...test_misc/test_parse_file_guess_format.py
diff --git a/test/test_path_div_future.py → test/test_misc/test_path_div_future.py b/test/test_path_div_future.py → test/test_misc/test_path_div_future.py
diff --git a/test/test_plugins.py → test/test_misc/test_plugins.py b/test/test_plugins.py → test/test_misc/test_plugins.py
@@ -14,7 +14,7 @@
 from rdflib import Graph
 from rdflib.parser import Parser
 
-TEST_DIR = Path(__file__).parent
+TEST_DIR = Path(__file__).parent.parent
 TEST_PLUGINS_DIR = TEST_DIR / "plugins"
 
 

diff --git a/test/test_prefixTypes.py → test/test_misc/test_prefix_types.py b/test/test_prefixTypes.py → test/test_misc/test_prefix_types.py
diff --git a/test/test_resource.py → test/test_misc/test_resource.py b/test/test_resource.py → test/test_misc/test_resource.py
diff --git a/test/test_definednamespace_creator.py → ...amespace/test_definednamespace_creator.py b/test/test_definednamespace_creator.py → ...amespace/test_definednamespace_creator.py
@@ -8,8 +8,8 @@ def test_definednamespace_creator_qb():
     Tests basic use of DefinedNamespace creator script using QB
     """
 
-    definednamespace_script = Path(__file__).parent.parent / "rdflib" / "tools" / "defined_namespace_creator.py"
-    qb_data_file = Path(__file__).parent / "defined_namespaces" / "qb.ttl"
+    definednamespace_script = Path(__file__).parent.parent.parent / "rdflib" / "tools" / "defined_namespace_creator.py"
+    qb_data_file = Path(__file__).parent.parent / "defined_namespaces" / "qb.ttl"
     print("\n")
     print(f"Using {definednamespace_script}...")
     print(f"Testing {qb_data_file}...")
@@ -48,8 +48,8 @@ def test_definednamespace_creator_fake():
     RDF file of unknonwn type
     """
 
-    definednamespace_script = Path(__file__).parent.parent / "rdflib" / "tools" / "defined_namespace_creator.py"
-    qb_data_file = Path(__file__).parent / "defined_namespaces" / "fake.xxx"
+    definednamespace_script = Path(__file__).parent.parent.parent / "rdflib" / "tools" / "defined_namespace_creator.py"
+    qb_data_file = Path(__file__).parent.parent / "defined_namespaces" / "fake.xxx"
     print("\n")
     print(f"Using {definednamespace_script}...")
     print(f"Testing {qb_data_file}...(expected to fail)")
@@ -74,8 +74,8 @@ def test_definednamespace_creator_bad_ns():
     supplied namespace doesn't end in # or /
     """
 
-    definednamespace_script = Path(__file__).parent.parent / "rdflib" / "tools" / "defined_namespace_creator.py"
-    qb_data_file = Path(__file__).parent / "defined_namespaces" / "fake.xxx"
+    definednamespace_script = Path(__file__).parent.parent.parent / "rdflib" / "tools" / "defined_namespace_creator.py"
+    qb_data_file = Path(__file__).parent.parent / "defined_namespaces" / "fake.xxx"
     print("\n")
     print(f"Using {definednamespace_script}...")
     print(f"Testing {qb_data_file}...(expected to fail - bad NS given)")

diff --git a/test/test_definednamespace_dir.py → ...st_namespace/test_definednamespace_dir.py b/test/test_definednamespace_dir.py → ...st_namespace/test_definednamespace_dir.py
diff --git a/test/test_namespace.py → test/test_namespace/test_namespace.py b/test/test_namespace.py → test/test_namespace/test_namespace.py
diff --git a/test/test_empty_xml_base.py → test/test_parsers/test_empty_xml_base.py b/test/test_empty_xml_base.py → test/test_parsers/test_empty_xml_base.py
diff --git a/test/test_rdf_lists.py → ...test_parsers/test_n3parse_of_rdf_lists.py b/test/test_rdf_lists.py → ...test_parsers/test_n3parse_of_rdf_lists.py
diff --git a/test/test_rules.py b/test/test_rules.py
diff --git a/test/test_finalnewline.py → test/test_serializers/test_finalnewline.py b/test/test_finalnewline.py → test/test_serializers/test_finalnewline.py
diff --git a/test/test_sparql_agg_distinct.py → test/test_sparql/test_agg_distinct.py b/test/test_sparql_agg_distinct.py → test/test_sparql/test_agg_distinct.py
diff --git a/test/test_sparql_agg_undef.py → test/test_sparql/test_agg_undef.py b/test/test_sparql_agg_undef.py → test/test_sparql/test_agg_undef.py
diff --git a/test/test_sparql_construct_bindings.py → test/test_sparql/test_construct_bindings.py b/test/test_sparql_construct_bindings.py → test/test_sparql/test_construct_bindings.py
@@ -3,7 +3,7 @@
 from rdflib.compare import isomorphic
 
 import unittest
-from .testutils import eq_
+from test.testutils import eq_
 
 class TestConstructInitBindings(unittest.TestCase):
     def test_construct_init_bindings(self):

diff --git a/test/test_sparql_datetime.py → test/test_sparql/test_datetime_processing.py b/test/test_sparql_datetime.py → test/test_sparql/test_datetime_processing.py
@@ -2,7 +2,7 @@
 from rdflib.plugins.sparql import prepareQuery
 from rdflib.compare import isomorphic
 import rdflib
-from .testutils import eq_
+from test.testutils import eq_
 from pprint import pprint
 import io
 

diff --git a/test/test_evaluate_bind.py → test/test_sparql/test_evaluate_bind.py b/test/test_evaluate_bind.py → test/test_sparql/test_evaluate_bind.py
diff --git a/test/test_expressions.py → test/test_sparql/test_expressions.py b/test/test_expressions.py → test/test_sparql/test_expressions.py
@@ -7,7 +7,7 @@
 
 from rdflib import Variable, Literal
 
-from .testutils import eq_ as eq
+from test.testutils import eq_ as eq
 
 
 def _eval(e, ctx=None):

diff --git a/test/test_initbindings.py → test/test_sparql/test_initbindings.py b/test/test_initbindings.py → test/test_sparql/test_initbindings.py
diff --git a/test/test_sparql_operators.py → test/test_sparql/test_operators.py b/test/test_sparql_operators.py → test/test_sparql/test_operators.py
diff --git a/test/test_sparql_prepare.py → test/test_sparql/test_prepare.py b/test/test_sparql_prepare.py → test/test_sparql/test_prepare.py
@@ -34,7 +34,7 @@ def test_prepare_query():
 
     g = Graph()
     g.parse(
-        location=os.path.join(os.path.dirname(__file__), "..", "examples", "foaf.n3"),
+        location=os.path.join(os.path.dirname(__file__), "..", "..", "examples", "foaf.n3"),
         format="n3",
     )
 

diff --git a/test/test_sparql_service.py → test/test_sparql/test_service.py b/test/test_sparql_service.py → test/test_sparql/test_service.py
@@ -2,7 +2,7 @@
 from rdflib.plugins.sparql import prepareQuery
 from rdflib.compare import isomorphic
 
-from . import helper
+from test import helper
 
 
 def test_service():

diff --git a/test/test_sparql.py → test/test_sparql/test_sparql.py b/test/test_sparql.py → test/test_sparql/test_sparql.py
@@ -4,7 +4,7 @@
 from rdflib.compare import isomorphic
 from rdflib.term import Variable
 
-from .testutils import eq_
+from test.testutils import eq_
 
 
 def test_graph_prefix():

diff --git a/test/test_sparql_parser.py → test/test_sparql/test_sparql_parser.py b/test/test_sparql_parser.py → test/test_sparql/test_sparql_parser.py
diff --git a/test/test_translate_algebra.py → test/test_sparql/test_translate_algebra.py b/test/test_translate_algebra.py → test/test_sparql/test_translate_algebra.py
@@ -15,7 +15,7 @@
 
 @pytest.fixture
 def data_path() -> Path:
-    return Path(__file__).parent / "translate_algebra"
+    return Path(__file__).parent.parent / "translate_algebra"
 
 
 @dataclass

diff --git a/test/test_tsvresults.py → test/test_sparql/test_tsvresults.py b/test/test_tsvresults.py → test/test_sparql/test_tsvresults.py
diff --git a/test/test_nodepickler.py → test/test_store/test_nodepickler.py b/test/test_nodepickler.py → test/test_store/test_nodepickler.py
diff --git a/test/test_csv2rdf.py → test/test_tools/test_csv2rdf.py b/test/test_csv2rdf.py → test/test_tools/test_csv2rdf.py
@@ -8,7 +8,7 @@
 
 class CSV2RDFTest(unittest.TestCase):
     def setUp(self):
-        self.REALESTATE_FILE_PATH = Path(__file__).parent / "csv" / "realestate.csv"
+        self.REALESTATE_FILE_PATH = Path(__file__).parent.parent / "consistent_test_data" / "csv" / "realestate.csv"
 
     def test_csv2rdf_cli(self):
         completed = subprocess.run(