From 926680d0f99d7b95250f1e1c233cd070b9e339d3 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Wed, 13 Oct 2021 12:38:25 -0400 Subject: [PATCH] Move wiring autoloader tests --- tests/unit/wiring/provider_ids/__init__.py | 1 + .../provider_ids/test_autoloader_py36.py | 33 +++++++++++++++++++ tests/unit/wiring/string_ids/__init__.py | 1 + .../wiring/string_ids/test_autoloader_py36.py | 33 +++++++++++++++++++ tests/unit/wiring/test_wiring_py36.py | 31 ----------------- .../wiring/test_wiring_string_ids_py36.py | 26 --------------- 6 files changed, 68 insertions(+), 57 deletions(-) create mode 100644 tests/unit/wiring/provider_ids/__init__.py create mode 100644 tests/unit/wiring/provider_ids/test_autoloader_py36.py create mode 100644 tests/unit/wiring/string_ids/__init__.py create mode 100644 tests/unit/wiring/string_ids/test_autoloader_py36.py diff --git a/tests/unit/wiring/provider_ids/__init__.py b/tests/unit/wiring/provider_ids/__init__.py new file mode 100644 index 00000000..4947ead7 --- /dev/null +++ b/tests/unit/wiring/provider_ids/__init__.py @@ -0,0 +1 @@ +"""Tests for wiring based on provider instance identification.""" diff --git a/tests/unit/wiring/provider_ids/test_autoloader_py36.py b/tests/unit/wiring/provider_ids/test_autoloader_py36.py new file mode 100644 index 00000000..9dc15d3b --- /dev/null +++ b/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) diff --git a/tests/unit/wiring/string_ids/__init__.py b/tests/unit/wiring/string_ids/__init__.py new file mode 100644 index 00000000..cc5689cc --- /dev/null +++ b/tests/unit/wiring/string_ids/__init__.py @@ -0,0 +1 @@ +"""Tests for wiring based on provider string name identification.""" diff --git a/tests/unit/wiring/string_ids/test_autoloader_py36.py b/tests/unit/wiring/string_ids/test_autoloader_py36.py new file mode 100644 index 00000000..f7e1aa48 --- /dev/null +++ b/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) diff --git a/tests/unit/wiring/test_wiring_py36.py b/tests/unit/wiring/test_wiring_py36.py index e423c398..ebed1b8e 100644 --- a/tests/unit/wiring/test_wiring_py36.py +++ b/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) diff --git a/tests/unit/wiring/test_wiring_string_ids_py36.py b/tests/unit/wiring/test_wiring_string_ids_py36.py index 01a5df4d..5da7815f 100644 --- a/tests/unit/wiring/test_wiring_string_ids_py36.py +++ b/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)