Move wiring autoloader tests

tests/unit/wiring/provider_ids/__init__.py

@@ -0,0 +1 @@
+"""Tests for wiring based on provider instance identification."""

tests/unit/wiring/provider_ids/test_autoloader_py36.py

@@ -0,0 +1,33 @@
+"""Auto loader tests."""
+
+import contextlib
+import importlib
+
+from pytest import fixture
+from dependency_injector.wiring import register_loader_containers, unregister_loader_containers
+
+from wiringsamples import module
+from wiringsamples.service import Service
+from wiringsamples.container import Container
+
+
+@fixture
+def container():
+    container = Container()
+
+    yield container
+
+    with contextlib.suppress(ValueError):
+        unregister_loader_containers(container)
+    container.unwire()
+    importlib.reload(module)
+
+
+def test_register_container(container: Container) -> None:
+    register_loader_containers(container)
+    importlib.reload(module)
+    importlib.import_module("wiringsamples.imports")
+
+    service = module.test_function()
+
+    assert isinstance(service, Service)

tests/unit/wiring/string_ids/__init__.py

@@ -0,0 +1 @@
+"""Tests for wiring based on provider string name identification."""

tests/unit/wiring/string_ids/test_autoloader_py36.py

@@ -0,0 +1,33 @@
+"""Auto loader tests."""
+
+import contextlib
+import importlib
+
+from pytest import fixture
+from dependency_injector.wiring import register_loader_containers, unregister_loader_containers
+
+from wiringstringidssamples import module
+from wiringstringidssamples.service import Service
+from wiringstringidssamples.container import Container
+
+
+@fixture
+def container():
+    container = Container()
+
+    yield container
+
+    with contextlib.suppress(ValueError):
+        unregister_loader_containers(container)
+    container.unwire()
+    importlib.reload(module)
+
+
+def test_register_container(container: Container) -> None:
+    register_loader_containers(container)
+    importlib.reload(module)
+    importlib.import_module("wiringsamples.imports")
+
+    service = module.test_function()
+
+    assert isinstance(service, Service)

tests/unit/wiring/test_wiring_py36.py

@@ -1,6 +1,4 @@
-import contextlib
 from decimal import Decimal
-import importlib
 import unittest
 
 from dependency_injector.wiring import (
@@ -8,8 +6,6 @@ from dependency_injector.wiring import (
     Provide,
     Provider,
     Closing,
-    register_loader_containers,
-    unregister_loader_containers,
 )
 from dependency_injector import containers, errors
 
@@ -544,30 +540,3 @@ class WiringAsyncInjectionsTest(AsyncTestCase):
         self.assertIs(resource2, asyncinjections.resource2)
         self.assertEqual(asyncinjections.resource2.init_counter, 2)
         self.assertEqual(asyncinjections.resource2.shutdown_counter, 2)
-
-
-class AutoLoaderTest(unittest.TestCase):
-
-    container: Container
-
-    def setUp(self) -> None:
-        self.container = Container(config={"a": {"b": {"c": 10}}})
-        importlib.reload(module)
-
-    def tearDown(self) -> None:
-        with contextlib.suppress(ValueError):
-            unregister_loader_containers(self.container)
-
-        self.container.unwire()
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        importlib.reload(module)
-
-    def test_register_container(self):
-        register_loader_containers(self.container)
-        importlib.reload(module)
-        importlib.import_module("wiringsamples.imports")
-
-        service = module.test_function()
-        self.assertIsInstance(service, Service)

tests/unit/wiring/test_wiring_string_ids_py36.py

@@ -411,29 +411,3 @@ class WiringAsyncInjectionsTest(AsyncTestCase):
         self.assertIs(resource2, asyncinjections.resource2)
         self.assertEqual(asyncinjections.resource2.init_counter, 2)
         self.assertEqual(asyncinjections.resource2.shutdown_counter, 2)
-
-
-class AutoLoaderTest(unittest.TestCase):
-
-    container: Container
-
-    def setUp(self) -> None:
-        self.container = Container(config={"a": {"b": {"c": 10}}})
-        importlib.reload(module)
-
-    def tearDown(self) -> None:
-        with contextlib.suppress(ValueError):
-            unregister_loader_containers(self.container)
-
-        self.container.unwire()
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        importlib.reload(module)
-
-    def test_register_container(self):
-        register_loader_containers(self.container)
-        importlib.reload(module)
-
-        service = module.test_function()
-        self.assertIsInstance(service, Service)