From 2ef5ddfe4c364ed65fc2735726cb78041b30568f Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Sun, 28 Feb 2021 20:15:42 -0500 Subject: [PATCH] Update tests with typing --- tests/unit/samples/wiringsamples/module.py | 11 +++++++---- tests/unit/samples/wiringstringidssamples/module.py | 13 +++++++------ tests/unit/wiring/test_wiring_py36.py | 4 ++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/tests/unit/samples/wiringsamples/module.py b/tests/unit/samples/wiringsamples/module.py index a1fb992e..c61b27b9 100644 --- a/tests/unit/samples/wiringsamples/module.py +++ b/tests/unit/samples/wiringsamples/module.py @@ -3,20 +3,23 @@ from decimal import Decimal from typing import Callable +from dependency_injector import providers from dependency_injector.wiring import inject, Provide, Provider from .container import Container, SubContainer from .service import Service -service = Provide[Container.service] -service_provider = Provider[Container.service] +service: Service = Provide[Container.service] +service_provider: providers.Provider[Service] = Provider[Container.service] +undefined: providers.Provider = Provide[providers.Provider()] class TestClass: - service = Provide[Container.service] - service_provider = Provider[Container.service] + service: Service = Provide[Container.service] + service_provider: providers.Provider[Service] = Provider[Container.service] + undefined: providers.Provider = Provide[providers.Provider()] @inject def __init__(self, service: Service = Provide[Container.service]): diff --git a/tests/unit/samples/wiringstringidssamples/module.py b/tests/unit/samples/wiringstringidssamples/module.py index b3284e51..159237c7 100644 --- a/tests/unit/samples/wiringstringidssamples/module.py +++ b/tests/unit/samples/wiringstringidssamples/module.py @@ -3,6 +3,7 @@ from decimal import Decimal from typing import Callable +from dependency_injector import providers from dependency_injector.wiring import ( inject, Provide, @@ -19,16 +20,16 @@ from .container import Container from .service import Service -service = Provide['service'] -service_provider = Provider['service'] -undefined = Provide['undefined'] +service: Service = Provide['service'] +service_provider: providers.Provider[Service] = Provider['service'] +undefined: providers.Provider = Provide['undefined'] class TestClass: - service = Provide['service'] - service_provider = Provider['service'] - undefined = Provide['undefined'] + service: Service = Provide['service'] + service_provider: providers.Provider[Service] = Provider['service'] + undefined: providers.Provider = Provide['undefined'] @inject def __init__(self, service: Service = Provide['service']): diff --git a/tests/unit/wiring/test_wiring_py36.py b/tests/unit/wiring/test_wiring_py36.py index 62136386..51a71c1c 100644 --- a/tests/unit/wiring/test_wiring_py36.py +++ b/tests/unit/wiring/test_wiring_py36.py @@ -68,6 +68,7 @@ class WiringTest(unittest.TestCase): def test_module_attributes_wiring(self): self.assertIsInstance(module.service, Service) self.assertIsInstance(module.service_provider(), Service) + self.assertIsInstance(module.undefined, Provide) def test_class_wiring(self): test_class_object = module.TestClass() @@ -105,6 +106,7 @@ class WiringTest(unittest.TestCase): def test_class_attribute_wiring(self): self.assertIsInstance(module.TestClass.service, Service) self.assertIsInstance(module.TestClass.service_provider(), Service) + self.assertIsInstance(module.TestClass.undefined, Provide) def test_function_wiring(self): service = module.test_function() @@ -228,11 +230,13 @@ class WiringTest(unittest.TestCase): self.container.unwire() self.assertIsInstance(module.service, Provide) self.assertIsInstance(module.service_provider, Provider) + self.assertIsInstance(module.undefined, Provide) def test_unwire_class_attributes(self): self.container.unwire() self.assertIsInstance(module.TestClass.service, Provide) self.assertIsInstance(module.TestClass.service_provider, Provider) + self.assertIsInstance(module.TestClass.undefined, Provide) def test_wire_multiple_containers(self): sub_container = SubContainer()