test: move test utility modules into `test/utils/` (#1879)

This patch moves all test utility modules into `test/utils/` and the
tests for these modules into `test/utils/test/`.

This is to make test utilities more organized and in preparation for
adding more test utilities related to test suites.

30 files changed, 39 insertions, 36 deletions

diff --git a/test/conftest.py b/test/conftest.py
index 927e2ba8..9548b192 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -3,13 +3,13 @@ import pytest
 from rdflib import Graph
 
 from .data import TEST_DATA_DIR
-from .earl import EarlReporter
+from .utils.earl import EarlReporter
 
 pytest_plugins = [EarlReporter.__module__]
 
 # This is here so that asserts from these modules are formatted for human
 # readibility.
-pytest.register_assert_rewrite("test.testutils")
+pytest.register_assert_rewrite("test.utils")
 
 
 @pytest.fixture(scope="session")
diff --git a/test/test_graph/test_canonicalization.py b/test/test_graph/test_canonicalization.py
index 8ce1c782..0c69d202 100644
--- a/test/test_graph/test_canonicalization.py
+++ b/test/test_graph/test_canonicalization.py
@@ -1,7 +1,7 @@
 import unittest
 from collections import Counter
 from io import StringIO
-from test.testutils import GraphHelper
+from test.utils import GraphHelper
 from typing import Set, Tuple
 
 import pytest
diff --git a/test/test_graph/test_diff.py b/test/test_graph/test_diff.py
index 318eb7a1..a6e22f0b 100644
--- a/test/test_graph/test_diff.py
+++ b/test/test_graph/test_diff.py
@@ -1,5 +1,5 @@
 import unittest
-from test.testutils import GraphHelper
+from test.utils import GraphHelper
 from typing import Set, Tuple
 from unittest.case import expectedFailure
 
diff --git a/test/test_graph/test_graph.py b/test/test_graph/test_graph.py
index bc001336..c9543755 100644
--- a/test/test_graph/test_graph.py
+++ b/test/test_graph/test_graph.py
@@ -7,7 +7,7 @@ import unittest
 from pathlib import Path
 from tempfile import mkdtemp, mkstemp
 from test.data import TEST_DATA_DIR, bob, cheese, hates, likes, michel, pizza, tarek
-from test.testutils import GraphHelper, get_unique_plugin_names
+from test.utils import GraphHelper, get_unique_plugin_names
 from typing import Callable, Optional, Set
 from urllib.error import HTTPError, URLError
 
diff --git a/test/test_graph/test_graph_http.py b/test/test_graph/test_graph_http.py
index 41ae355a..6ff73f6d 100644
--- a/test/test_graph/test_graph_http.py
+++ b/test/test_graph/test_graph_http.py
@@ -1,11 +1,6 @@
 import unittest
 from http.server import BaseHTTPRequestHandler
-from test.testutils import (
-    GraphHelper,
-    MockHTTPResponse,
-    SimpleHTTPMock,
-    ctx_http_server,
-)
+from test.utils import GraphHelper, MockHTTPResponse, SimpleHTTPMock, ctx_http_server
 from urllib.error import HTTPError
 
 from rdflib import Graph, Namespace
diff --git a/test/test_graph/test_skolemization.py b/test/test_graph/test_skolemization.py
index 31b35482..f045bf8d 100644
--- a/test/test_graph/test_skolemization.py
+++ b/test/test_graph/test_skolemization.py
@@ -1,6 +1,6 @@
 import logging
 import re
-from test.testutils import GraphHelper
+from test.utils import GraphHelper
 from typing import Pattern, Union
 
 import pytest
diff --git a/test/test_graph/test_variants.py b/test/test_graph/test_variants.py
index 404461ef..be78342f 100644
--- a/test/test_graph/test_variants.py
+++ b/test/test_graph/test_variants.py
@@ -5,7 +5,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 test.utils import GraphHelper
 from typing import (
     ClassVar,
     Collection,
diff --git a/test/test_issues/test_issue274.py b/test/test_issues/test_issue274.py
index bbff8a10..a982577f 100644
--- a/test/test_issues/test_issue274.py
+++ b/test/test_issues/test_issue274.py
@@ -1,4 +1,4 @@
-from test.testutils import eq_
+from test.utils import eq_
 from unittest import TestCase
 
 import pytest
diff --git a/test/test_parsers/test_nquads_w3c.py b/test/test_parsers/test_nquads_w3c.py
index ca361f0c..e3e735e2 100644
--- a/test/test_parsers/test_nquads_w3c.py
+++ b/test/test_parsers/test_nquads_w3c.py
@@ -4,7 +4,7 @@ test suite."""
 
 import os
 from test.data import TEST_DATA_DIR
-from test.manifest import RDFT, RDFTest, read_manifest
+from test.utils.manifest import RDFT, RDFTest, read_manifest
 from typing import Callable, Dict
 
 import pytest
diff --git a/test/test_parsers/test_nt_w3c.py b/test/test_parsers/test_nt_w3c.py
index bf23f1c4..a9ebfb8b 100644
--- a/test/test_parsers/test_nt_w3c.py
+++ b/test/test_parsers/test_nt_w3c.py
@@ -3,7 +3,7 @@ test suite."""
 import os
 from test import TEST_DIR
 from test.data import TEST_DATA_DIR
-from test.manifest import RDFT, RDFTest, read_manifest
+from test.utils.manifest import RDFT, RDFTest, read_manifest
 from typing import Callable, Dict
 
 import pytest
diff --git a/test/test_parsers/test_trig_w3c.py b/test/test_parsers/test_trig_w3c.py
index 25b07f09..f07ff985 100644
--- a/test/test_parsers/test_trig_w3c.py
+++ b/test/test_parsers/test_trig_w3c.py
@@ -4,7 +4,7 @@
 
 import os
 from test.data import TEST_DATA_DIR
-from test.manifest import RDFT, RDFTest, read_manifest
+from test.utils.manifest import RDFT, RDFTest, read_manifest
 from typing import Callable, Dict
 
 import pytest
diff --git a/test/test_parsers/test_turtle_w3c.py b/test/test_parsers/test_turtle_w3c.py
index fb8440d5..adea0640 100644
--- a/test/test_parsers/test_turtle_w3c.py
+++ b/test/test_parsers/test_turtle_w3c.py
@@ -4,8 +4,8 @@ test suite."""
 import os
 from pathlib import Path
 from test.data import TEST_DATA_DIR
-from test.manifest import RDFT, RDFTest, read_manifest
-from test.testutils import file_uri_to_path
+from test.utils import file_uri_to_path
+from test.utils.manifest import RDFT, RDFTest, read_manifest
 from typing import Callable, Dict, Set
 
 import pytest
diff --git a/test/test_roundtrip.py b/test/test_roundtrip.py
index 4fc18e72..00ad8157 100644
--- a/test/test_roundtrip.py
+++ b/test/test_roundtrip.py
@@ -3,7 +3,7 @@ import os.path
 from json.decoder import JSONDecodeError
 from pathlib import Path
 from test.data import TEST_DATA_DIR
-from test.testutils import GraphHelper
+from test.utils import GraphHelper
 from typing import Callable, Collection, Iterable, List, Optional, Set, Tuple, Union
 from xml.sax import SAXParseException
 
diff --git a/test/test_serializers/test_serializer.py b/test/test_serializers/test_serializer.py
index 66cf064c..7f6ab102 100644
--- a/test/test_serializers/test_serializer.py
+++ b/test/test_serializers/test_serializer.py
@@ -2,7 +2,7 @@ import itertools
 import logging
 import re
 from pathlib import Path
-from test.testutils import GraphHelper
+from test.utils import GraphHelper
 from typing import Tuple, cast
 
 import pytest
diff --git a/test/test_sparql/test_construct_bindings.py b/test/test_sparql/test_construct_bindings.py
index 3713fe10..f8600998 100644
--- a/test/test_sparql/test_construct_bindings.py
+++ b/test/test_sparql/test_construct_bindings.py
@@ -1,5 +1,5 @@
 import unittest
-from test.testutils import eq_
+from test.utils import eq_
 
 from rdflib import BNode, Graph, Literal, URIRef
 from rdflib.compare import isomorphic
diff --git a/test/test_sparql/test_datetime_processing.py b/test/test_sparql/test_datetime_processing.py
index 86fce8db..b3179d55 100644
--- a/test/test_sparql/test_datetime_processing.py
+++ b/test/test_sparql/test_datetime_processing.py
@@ -1,6 +1,6 @@
 import io
 from pprint import pprint
-from test.testutils import eq_
+from test.utils import eq_
 
 import rdflib
 from rdflib import XSD, BNode, Graph, Literal, URIRef
diff --git a/test/test_sparql/test_dawg.py b/test/test_sparql/test_dawg.py
index 96fb3d3f..32408f05 100644
--- a/test/test_sparql/test_dawg.py
+++ b/test/test_sparql/test_dawg.py
@@ -9,8 +9,8 @@ from pathlib import PurePath
 # http://www.w3.org/2009/sparql/docs/tests/data-sparql11/
 #           syntax-update-2/manifest#syntax-update-other-01
 from test import TEST_DIR
-from test.manifest import MF, UP, RDFTest, ResultType, read_manifest
-from test.testutils import file_uri_to_path
+from test.utils import file_uri_to_path
+from test.utils.manifest import MF, UP, RDFTest, ResultType, read_manifest
 
 import pytest
 
diff --git a/test/test_sparql/test_expressions.py b/test/test_sparql/test_expressions.py
index fb96f3ac..a547d40a 100644
--- a/test/test_sparql/test_expressions.py
+++ b/test/test_sparql/test_expressions.py
@@ -1,5 +1,5 @@
 from functools import partial
-from test.testutils import eq_ as eq
+from test.utils import eq_ as eq
 
 import rdflib.plugins.sparql.parser as p
 from rdflib import Literal, Variable
diff --git a/test/test_sparql/test_service.py b/test/test_sparql/test_service.py
index bfb92398..9798f3df 100644
--- a/test/test_sparql/test_service.py
+++ b/test/test_sparql/test_service.py
@@ -1,4 +1,4 @@
-from test import helper
+from test.utils import helper
 
 from rdflib import Graph, Literal, URIRef, Variable
 from rdflib.compare import isomorphic
diff --git a/test/test_sparql/test_sparql.py b/test/test_sparql/test_sparql.py
index 7fbbcd9e..a16461d9 100644
--- a/test/test_sparql/test_sparql.py
+++ b/test/test_sparql/test_sparql.py
@@ -1,5 +1,5 @@
 import logging
-from test.testutils import eq_
+from test.utils import eq_
 from typing import Any, Callable, Mapping, Sequence, Type
 
 import pytest
diff --git a/test/test_store/test_namespace_binding.py b/test/test_store/test_namespace_binding.py
index 0856a7ed..dfe7ff7f 100644
--- a/test/test_store/test_namespace_binding.py
+++ b/test/test_store/test_namespace_binding.py
@@ -3,7 +3,7 @@ import itertools
 import logging
 from dataclasses import dataclass, field
 from pathlib import Path
-from test.testutils import pytest_mark_filter
+from test.utils import pytest_mark_filter
 from typing import Any, Callable, Dict, Set, Union
 
 import pytest
diff --git a/test/test_store/test_store_sparqlstore.py b/test/test_store/test_store_sparqlstore.py
index c544b9f2..c2f93c95 100644
--- a/test/test_store/test_store_sparqlstore.py
+++ b/test/test_store/test_store_sparqlstore.py
@@ -2,8 +2,7 @@ import re
 import socket
 import unittest
 from http.server import BaseHTTPRequestHandler, HTTPServer
-from test import helper
-from test.testutils import MockHTTPResponse, ServedSimpleHTTPMock
+from test.utils import MockHTTPResponse, ServedSimpleHTTPMock, helper
 from threading import Thread
 from typing import Callable, ClassVar, Type
 from unittest.mock import patch
diff --git a/test/test_store/test_store_sparqlupdatestore_mock.py b/test/test_store/test_store_sparqlupdatestore_mock.py
index b1a63e05..b66d6a39 100644
--- a/test/test_store/test_store_sparqlupdatestore_mock.py
+++ b/test/test_store/test_store_sparqlupdatestore_mock.py
@@ -1,5 +1,5 @@
 import unittest
-from test.testutils import MockHTTPResponse, ServedSimpleHTTPMock
+from test.utils import MockHTTPResponse, ServedSimpleHTTPMock
 from typing import ClassVar
 
 from rdflib import Namespace
diff --git a/test/test_turtle_quoting.py b/test/test_turtle_quoting.py
index 02a218da..bdafd071 100644
--- a/test/test_turtle_quoting.py
+++ b/test/test_turtle_quoting.py
@@ -14,7 +14,7 @@ from rdflib.graph import ConjunctiveGraph, Graph
 from rdflib.plugins.parsers import ntriples
 from rdflib.term import Literal, URIRef
 
-from .testutils import GraphHelper
+from .utils import GraphHelper
 
 # https://www.w3.org/TR/turtle/#string
 string_escape_map = {
diff --git a/test/testutils.py b/test/utils/__init__.py
index 812ca4b7..5166a70b 100644
--- a/test/testutils.py
+++ b/test/utils/__init__.py
@@ -1,3 +1,10 @@
+"""
+This module contains test utilities.
+
+The tests for test utilities should be placed inside `test.utils.test`
+(``test/utils/tests/``).
+"""
+
 from __future__ import print_function
 
 import datetime
diff --git a/test/earl.py b/test/utils/earl.py
index 8b7ba896..e44480bb 100644
--- a/test/earl.py
+++ b/test/utils/earl.py
@@ -5,7 +5,7 @@ import enum
 import logging
 from datetime import datetime
 from pathlib import Path
-from test.manifest import RDFT
+from test.utils.manifest import RDFT
 from typing import TYPE_CHECKING, Generator, Optional, Tuple, cast
 
 import pytest
diff --git a/test/helper.py b/test/utils/helper.py
index 21bd9d9d..21bd9d9d 100644
--- a/test/helper.py
+++ b/test/utils/helper.py
diff --git a/test/manifest.py b/test/utils/manifest.py
index 50146ff2..50146ff2 100644
--- a/test/manifest.py
+++ b/test/utils/manifest.py
diff --git a/test/utils/test/__init__.py b/test/utils/test/__init__.py
new file mode 100644
index 00000000..4034ca86
--- /dev/null
+++ b/test/utils/test/__init__.py
@@ -0,0 +1,3 @@
+"""
+This module contains tests for test utility modules inside `test.utils` (i.e. ``test/utils/``).
+"""
diff --git a/test/test_testutils.py b/test/utils/test/test_testutils.py
index 2d712d3b..0a12b222 100644
--- a/test/test_testutils.py
+++ b/test/utils/test/test_testutils.py
@@ -1,6 +1,7 @@
 import os
 from dataclasses import dataclass
 from pathlib import PurePosixPath, PureWindowsPath
+from test.utils import GraphHelper, file_uri_to_path
 from typing import Optional
 
 import pytest
@@ -8,8 +9,6 @@ import pytest
 from rdflib.graph import ConjunctiveGraph, Graph
 from rdflib.term import URIRef
 
-from .testutils import GraphHelper, file_uri_to_path
-
 
 def check(
     file_uri: str,