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.

Author: aucampia

test/conftest.py

@@ -3,13 +3,13 @@
 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")

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

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
 

test/test_graph/test_graph.py

@@ -7,7 +7,7 @@
 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
 

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

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

test/test_graph/test_variants.py

@@ -5,7 +5,7 @@
 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,

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

test/test_parsers/test_nquads_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

test/test_parsers/test_nt_w3c.py

@@ -3,7 +3,7 @@
 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