From 150432032a81dc69007ed6f6e6329af2daff8f33 Mon Sep 17 00:00:00 2001
From: Roman Mogylatov <rmogilatov@gmail.com>
Date: Wed, 13 Oct 2021 18:33:19 -0400
Subject: [PATCH] Migrate wiring string module and package names tests

---
 .../test_string_module_names_py36.py          | 57 +++++++++++++++++++
 tests/unit/wiring/test_wiring_py36.py         | 47 ---------------
 2 files changed, 57 insertions(+), 47 deletions(-)
 create mode 100644 tests/unit/wiring/provider_ids/test_string_module_names_py36.py

diff --git a/tests/unit/wiring/provider_ids/test_string_module_names_py36.py b/tests/unit/wiring/provider_ids/test_string_module_names_py36.py
new file mode 100644
index 00000000..1bfa58a0
--- /dev/null
+++ b/tests/unit/wiring/provider_ids/test_string_module_names_py36.py
@@ -0,0 +1,57 @@
+"""Tests for string module and package names."""
+
+from pytest import fixture
+
+from wiringsamples import module
+from wiringsamples.service import Service
+from wiringsamples.container import Container
+from wiringsamples.wire_relative_string_names import wire_with_relative_string_names
+
+
+@fixture
+def container():
+    container = Container()
+    yield container
+    container.unwire()
+
+
+def test_absolute_names(container: Container):
+    container.wire(
+        modules=["wiringsamples.module"],
+        packages=["wiringsamples.package"],
+    )
+
+    service = module.test_function()
+    assert isinstance(service, Service)
+
+    from wiringsamples.package.subpackage.submodule import test_function
+    service = test_function()
+    assert isinstance(service, Service)
+
+
+def test_relative_names_with_explicit_package(container: Container):
+    container.wire(
+        modules=[".module"],
+        packages=[".package"],
+        from_package="wiringsamples",
+    )
+
+    service = module.test_function()
+    assert isinstance(service, Service)
+
+    from wiringsamples.package.subpackage.submodule import test_function
+    service = test_function()
+    assert isinstance(service, Service)
+
+
+def test_relative_names_with_auto_package(container: Container):
+    wire_with_relative_string_names(container)
+
+    service = module.test_function()
+    assert isinstance(service, Service)
+
+    from wiringsamples.package.subpackage.submodule import test_function
+    service = test_function()
+    assert isinstance(service, Service)
+
+
diff --git a/tests/unit/wiring/test_wiring_py36.py b/tests/unit/wiring/test_wiring_py36.py
index 9296bf50..97a90638 100644
--- a/tests/unit/wiring/test_wiring_py36.py
+++ b/tests/unit/wiring/test_wiring_py36.py
@@ -27,53 +27,6 @@ sys.path.append(_SAMPLES_DIR)
 from wiringsamples import module
 from wiringsamples.service import Service
 from wiringsamples.container import Container
-from wiringsamples.wire_relative_string_names import wire_with_relative_string_names
-
-
-class WiringWithStringModuleAndPackageNamesTest(unittest.TestCase):
-
-    container: Container
-
-    def setUp(self) -> None:
-        self.container = Container()
-        self.addCleanup(self.container.unwire)
-
-    def test_absolute_names(self):
-        self.container.wire(
-            modules=["wiringsamples.module"],
-            packages=["wiringsamples.package"],
-        )
-
-        service = module.test_function()
-        self.assertIsInstance(service, Service)
-
-        from wiringsamples.package.subpackage.submodule import test_function
-        service = test_function()
-        self.assertIsInstance(service, Service)
-
-    def test_relative_names_with_explicit_package(self):
-        self.container.wire(
-            modules=[".module"],
-            packages=[".package"],
-            from_package="wiringsamples",
-        )
-
-        service = module.test_function()
-        self.assertIsInstance(service, Service)
-
-        from wiringsamples.package.subpackage.submodule import test_function
-        service = test_function()
-        self.assertIsInstance(service, Service)
-
-    def test_relative_names_with_auto_package(self):
-        wire_with_relative_string_names(self.container)
-
-        service = module.test_function()
-        self.assertIsInstance(service, Service)
-
-        from wiringsamples.package.subpackage.submodule import test_function
-        service = test_function()
-        self.assertIsInstance(service, Service)
 
 
 class WiringWithWiringConfigInTheContainerTest(unittest.TestCase):