RDFLib · aucampia · Apr 24, 2022 · Apr 23, 2022
diff --git a/test/variants/README.md → test/data/variants/README.md b/test/variants/README.md → test/data/variants/README.md
diff --git a/test/variants/rdf11trig_eg2-asserts.json → .../data/variants/rdf11trig_eg2-asserts.json b/test/variants/rdf11trig_eg2-asserts.json → .../data/variants/rdf11trig_eg2-asserts.json
diff --git a/test/variants/rdf11trig_eg2.hext → test/data/variants/rdf11trig_eg2.hext b/test/variants/rdf11trig_eg2.hext → test/data/variants/rdf11trig_eg2.hext
diff --git a/test/variants/rdf11trig_eg2.jsonld → test/data/variants/rdf11trig_eg2.jsonld b/test/variants/rdf11trig_eg2.jsonld → test/data/variants/rdf11trig_eg2.jsonld
diff --git a/test/variants/rdf11trig_eg2.nq → test/data/variants/rdf11trig_eg2.nq b/test/variants/rdf11trig_eg2.nq → test/data/variants/rdf11trig_eg2.nq
diff --git a/test/variants/rdf11trig_eg2.trig → test/data/variants/rdf11trig_eg2.trig b/test/variants/rdf11trig_eg2.trig → test/data/variants/rdf11trig_eg2.trig
diff --git a/test/variants/rdf_prefix-asserts.json → test/data/variants/rdf_prefix-asserts.json b/test/variants/rdf_prefix-asserts.json → test/data/variants/rdf_prefix-asserts.json
diff --git a/test/variants/rdf_prefix.jsonld → test/data/variants/rdf_prefix.jsonld b/test/variants/rdf_prefix.jsonld → test/data/variants/rdf_prefix.jsonld
diff --git a/test/variants/rdf_prefix.ttl → test/data/variants/rdf_prefix.ttl b/test/variants/rdf_prefix.ttl → test/data/variants/rdf_prefix.ttl
diff --git a/test/variants/schema_only_base-asserts.json → ...ta/variants/schema_only_base-asserts.json b/test/variants/schema_only_base-asserts.json → ...ta/variants/schema_only_base-asserts.json
diff --git a/test/variants/schema_only_base.hext → test/data/variants/schema_only_base.hext b/test/variants/schema_only_base.hext → test/data/variants/schema_only_base.hext
diff --git a/test/variants/schema_only_base.n3 → test/data/variants/schema_only_base.n3 b/test/variants/schema_only_base.n3 → test/data/variants/schema_only_base.n3
diff --git a/test/variants/schema_only_base.nt → test/data/variants/schema_only_base.nt b/test/variants/schema_only_base.nt → test/data/variants/schema_only_base.nt
diff --git a/test/variants/schema_only_base.ttl → test/data/variants/schema_only_base.ttl b/test/variants/schema_only_base.ttl → test/data/variants/schema_only_base.ttl
diff --git a/test/variants/simple_quad-asserts.json → test/data/variants/simple_quad-asserts.json b/test/variants/simple_quad-asserts.json → test/data/variants/simple_quad-asserts.json
diff --git a/test/variants/simple_quad.hext → test/data/variants/simple_quad.hext b/test/variants/simple_quad.hext → test/data/variants/simple_quad.hext
diff --git a/test/variants/simple_quad.jsonld → test/data/variants/simple_quad.jsonld b/test/variants/simple_quad.jsonld → test/data/variants/simple_quad.jsonld
diff --git a/test/variants/simple_quad.nq → test/data/variants/simple_quad.nq b/test/variants/simple_quad.nq → test/data/variants/simple_quad.nq
diff --git a/test/variants/simple_quad.trig → test/data/variants/simple_quad.trig b/test/variants/simple_quad.trig → test/data/variants/simple_quad.trig
diff --git a/test/variants/simple_triple-asserts.json → .../data/variants/simple_triple-asserts.json b/test/variants/simple_triple-asserts.json → .../data/variants/simple_triple-asserts.json
diff --git a/...ants/simple_triple-variant-prefix_dot.ttl → ...ants/simple_triple-variant-prefix_dot.ttl b/...ants/simple_triple-variant-prefix_dot.ttl → ...ants/simple_triple-variant-prefix_dot.ttl
diff --git a/test/variants/simple_triple.hext → test/data/variants/simple_triple.hext b/test/variants/simple_triple.hext → test/data/variants/simple_triple.hext
diff --git a/test/variants/simple_triple.nq → test/data/variants/simple_triple.nq b/test/variants/simple_triple.nq → test/data/variants/simple_triple.nq
diff --git a/test/variants/simple_triple.nt → test/data/variants/simple_triple.nt b/test/variants/simple_triple.nt → test/data/variants/simple_triple.nt
diff --git a/test/variants/special_chars-asserts.json → .../data/variants/special_chars-asserts.json b/test/variants/special_chars-asserts.json → .../data/variants/special_chars-asserts.json
diff --git a/test/variants/special_chars.hext → test/data/variants/special_chars.hext b/test/variants/special_chars.hext → test/data/variants/special_chars.hext
diff --git a/test/variants/special_chars.nt → test/data/variants/special_chars.nt b/test/variants/special_chars.nt → test/data/variants/special_chars.nt
diff --git a/test/variants/special_chars.ttl → test/data/variants/special_chars.ttl b/test/variants/special_chars.ttl → test/data/variants/special_chars.ttl
diff --git a/test/variants/xml_literal-asserts.json → test/data/variants/xml_literal-asserts.json b/test/variants/xml_literal-asserts.json → test/data/variants/xml_literal-asserts.json
diff --git a/.../variants/xml_literal-variant-control.ttl → .../variants/xml_literal-variant-control.ttl b/.../variants/xml_literal-variant-control.ttl → .../variants/xml_literal-variant-control.ttl
diff --git a/test/variants/xml_literal.hext → test/data/variants/xml_literal.hext b/test/variants/xml_literal.hext → test/data/variants/xml_literal.hext
diff --git a/test/variants/xml_literal.nt → test/data/variants/xml_literal.nt b/test/variants/xml_literal.nt → test/data/variants/xml_literal.nt
diff --git a/test/variants/xml_literal.rdf → test/data/variants/xml_literal.rdf b/test/variants/xml_literal.rdf → test/data/variants/xml_literal.rdf
diff --git a/test/variants/xml_literal.ttl → test/data/variants/xml_literal.ttl b/test/variants/xml_literal.ttl → test/data/variants/xml_literal.ttl
diff --git a/test/test_graph/test_variants.py b/test/test_graph/test_variants.py
@@ -4,6 +4,7 @@
 import re
 from dataclasses import dataclass, field
 from pathlib import Path, PurePath
+from test.data import TEST_DATA_DIR
 from test.testutils import GraphHelper
 from typing import (
     ClassVar,
@@ -30,7 +31,7 @@
 from rdflib.util import guess_format
 
 TEST_DIR = Path(__file__).parent.parent.absolute()
-VARIANTS_DIR = TEST_DIR / "variants"
+VARIANTS_DIR = TEST_DATA_DIR / "variants"
 
 # Put files from other directories in here.
 EXTRA_FILES: List[Path] = []
@@ -132,7 +133,7 @@ def for_directory(
 
 
 GRAPH_VARIANT_DICT = {
-    **GraphVariants.for_directory(VARIANTS_DIR, TEST_DIR),
+    **GraphVariants.for_directory(VARIANTS_DIR, TEST_DATA_DIR),
     **GraphVariants.for_files(EXTRA_FILES, TEST_DIR),
 }
 

diff --git a/test/test_roundtrip.py b/test/test_roundtrip.py
@@ -40,7 +40,6 @@
 
 """
 
-TEST_DIR = Path(__file__).parent
 NT_DATA_DIR = Path(TEST_DATA_DIR) / "suites" / "nt_misc"
 INVALID_NT_FILES = {
     # illegal literal as subject
@@ -287,11 +286,11 @@ def test_n3(checker: Callable[[str, str, Path], None], args: Tuple[str, str, Pat
 
 
 EXTRA_FILES = [
-    (TEST_DIR / "variants" / "special_chars.nt", "ntriples"),
-    (TEST_DIR / "variants" / "xml_literal.rdf", "xml"),
-    (TEST_DIR / "variants" / "rdf_prefix.jsonld", "json-ld"),
-    (TEST_DIR / "variants" / "simple_quad.trig", "trig"),
-    (TEST_DIR / "variants" / "rdf11trig_eg2.trig", "trig"),
+    (TEST_DATA_DIR / "variants" / "special_chars.nt", "ntriples"),
+    (TEST_DATA_DIR / "variants" / "xml_literal.rdf", "xml"),
+    (TEST_DATA_DIR / "variants" / "rdf_prefix.jsonld", "json-ld"),
+    (TEST_DATA_DIR / "variants" / "simple_quad.trig", "trig"),
+    (TEST_DATA_DIR / "variants" / "rdf11trig_eg2.trig", "trig"),
     (TEST_DATA_DIR / "example-lots_of_graphs.n3", "n3"),
     (TEST_DATA_DIR / "issue156.n3", "n3"),
 ]