diff --git a/tests/unit/samples/wiringsamples/__init__.py b/tests/unit/samples/wiring/__init__.py similarity index 100% rename from tests/unit/samples/wiringsamples/__init__.py rename to tests/unit/samples/wiring/__init__.py diff --git a/tests/unit/samples/wiringsamples/asyncinjections.py b/tests/unit/samples/wiring/asyncinjections.py similarity index 100% rename from tests/unit/samples/wiringsamples/asyncinjections.py rename to tests/unit/samples/wiring/asyncinjections.py diff --git a/tests/unit/samples/wiringsamples/container.py b/tests/unit/samples/wiring/container.py similarity index 100% rename from tests/unit/samples/wiringsamples/container.py rename to tests/unit/samples/wiring/container.py diff --git a/tests/unit/samples/wiringsamples/imports.py b/tests/unit/samples/wiring/imports.py similarity index 100% rename from tests/unit/samples/wiringsamples/imports.py rename to tests/unit/samples/wiring/imports.py diff --git a/tests/unit/samples/wiringsamples/module.py b/tests/unit/samples/wiring/module.py similarity index 100% rename from tests/unit/samples/wiringsamples/module.py rename to tests/unit/samples/wiring/module.py diff --git a/tests/unit/samples/wiringsamples/module_invalid_attr_injection.py b/tests/unit/samples/wiring/module_invalid_attr_injection.py similarity index 100% rename from tests/unit/samples/wiringsamples/module_invalid_attr_injection.py rename to tests/unit/samples/wiring/module_invalid_attr_injection.py diff --git a/tests/unit/samples/wiringsamples/package/__init__.py b/tests/unit/samples/wiring/package/__init__.py similarity index 100% rename from tests/unit/samples/wiringsamples/package/__init__.py rename to tests/unit/samples/wiring/package/__init__.py diff --git a/tests/unit/samples/wiringsamples/package/subpackage/__init__.py b/tests/unit/samples/wiring/package/subpackage/__init__.py similarity index 100% rename from tests/unit/samples/wiringsamples/package/subpackage/__init__.py rename to tests/unit/samples/wiring/package/subpackage/__init__.py diff --git a/tests/unit/samples/wiringsamples/package/subpackage/submodule.py b/tests/unit/samples/wiring/package/subpackage/submodule.py similarity index 100% rename from tests/unit/samples/wiringsamples/package/subpackage/submodule.py rename to tests/unit/samples/wiring/package/subpackage/submodule.py diff --git a/tests/unit/samples/wiringsamples/queuemodule.py b/tests/unit/samples/wiring/queuemodule.py similarity index 100% rename from tests/unit/samples/wiringsamples/queuemodule.py rename to tests/unit/samples/wiring/queuemodule.py diff --git a/tests/unit/samples/wiringsamples/resourceclosing.py b/tests/unit/samples/wiring/resourceclosing.py similarity index 100% rename from tests/unit/samples/wiringsamples/resourceclosing.py rename to tests/unit/samples/wiring/resourceclosing.py diff --git a/tests/unit/samples/wiringsamples/service.py b/tests/unit/samples/wiring/service.py similarity index 100% rename from tests/unit/samples/wiringsamples/service.py rename to tests/unit/samples/wiring/service.py diff --git a/tests/unit/samples/wiringsamples/wire_relative_string_names.py b/tests/unit/samples/wiring/wire_relative_string_names.py similarity index 100% rename from tests/unit/samples/wiringsamples/wire_relative_string_names.py rename to tests/unit/samples/wiring/wire_relative_string_names.py diff --git a/tests/unit/samples/wiringstringidssamples/__init__.py b/tests/unit/samples/wiringstringids/__init__.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/__init__.py rename to tests/unit/samples/wiringstringids/__init__.py diff --git a/tests/unit/samples/wiringstringidssamples/asyncinjections.py b/tests/unit/samples/wiringstringids/asyncinjections.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/asyncinjections.py rename to tests/unit/samples/wiringstringids/asyncinjections.py diff --git a/tests/unit/samples/wiringstringidssamples/container.py b/tests/unit/samples/wiringstringids/container.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/container.py rename to tests/unit/samples/wiringstringids/container.py diff --git a/tests/unit/samples/wiringstringidssamples/module.py b/tests/unit/samples/wiringstringids/module.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/module.py rename to tests/unit/samples/wiringstringids/module.py diff --git a/tests/unit/samples/wiringstringidssamples/module_invalid_attr_injection.py b/tests/unit/samples/wiringstringids/module_invalid_attr_injection.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/module_invalid_attr_injection.py rename to tests/unit/samples/wiringstringids/module_invalid_attr_injection.py diff --git a/tests/unit/samples/wiringstringidssamples/package/__init__.py b/tests/unit/samples/wiringstringids/package/__init__.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/package/__init__.py rename to tests/unit/samples/wiringstringids/package/__init__.py diff --git a/tests/unit/samples/wiringstringidssamples/package/subpackage/__init__.py b/tests/unit/samples/wiringstringids/package/subpackage/__init__.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/package/subpackage/__init__.py rename to tests/unit/samples/wiringstringids/package/subpackage/__init__.py diff --git a/tests/unit/samples/wiringstringidssamples/package/subpackage/submodule.py b/tests/unit/samples/wiringstringids/package/subpackage/submodule.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/package/subpackage/submodule.py rename to tests/unit/samples/wiringstringids/package/subpackage/submodule.py diff --git a/tests/unit/samples/wiringstringidssamples/resourceclosing.py b/tests/unit/samples/wiringstringids/resourceclosing.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/resourceclosing.py rename to tests/unit/samples/wiringstringids/resourceclosing.py diff --git a/tests/unit/samples/wiringstringidssamples/service.py b/tests/unit/samples/wiringstringids/service.py similarity index 100% rename from tests/unit/samples/wiringstringidssamples/service.py rename to tests/unit/samples/wiringstringids/service.py diff --git a/tests/unit/wiring/provider_ids/test_async_injections_py36.py b/tests/unit/wiring/provider_ids/test_async_injections_py36.py index 0db66f94..f17f19c7 100644 --- a/tests/unit/wiring/provider_ids/test_async_injections_py36.py +++ b/tests/unit/wiring/provider_ids/test_async_injections_py36.py @@ -2,7 +2,7 @@ from pytest import fixture, mark -from wiringsamples import asyncinjections +from samples.wiring import asyncinjections @fixture(autouse=True) diff --git a/tests/unit/wiring/provider_ids/test_autoloader_py36.py b/tests/unit/wiring/provider_ids/test_autoloader_py36.py index 88c7cbf1..becafe18 100644 --- a/tests/unit/wiring/provider_ids/test_autoloader_py36.py +++ b/tests/unit/wiring/provider_ids/test_autoloader_py36.py @@ -6,9 +6,9 @@ import importlib from dependency_injector.wiring import register_loader_containers, unregister_loader_containers from pytest import fixture -from wiringsamples import module -from wiringsamples.service import Service -from wiringsamples.container import Container +from samples.wiring import module +from samples.wiring.service import Service +from samples.wiring.container import Container @fixture @@ -26,7 +26,15 @@ def container(): 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) + + +def test_numpy_scipy_and_builtins_dont_break_wiring(container: Container) -> None: + register_loader_containers(container) + importlib.reload(module) + importlib.import_module("samples.wiring.imports") service = module.test_function() diff --git a/tests/unit/wiring/provider_ids/test_main_py36.py b/tests/unit/wiring/provider_ids/test_main_py36.py index 11362e5f..15ac31c0 100644 --- a/tests/unit/wiring/provider_ids/test_main_py36.py +++ b/tests/unit/wiring/provider_ids/test_main_py36.py @@ -6,9 +6,9 @@ from dependency_injector import errors from dependency_injector.wiring import Closing, Provide, Provider, wire from pytest import fixture, mark, raises -from wiringsamples import module, package, resourceclosing -from wiringsamples.service import Service -from wiringsamples.container import Container, SubContainer +from samples.wiring import module, package, resourceclosing +from samples.wiring.service import Service +from samples.wiring.container import Container, SubContainer @fixture(autouse=True) @@ -42,19 +42,19 @@ def resourceclosing_container(): def test_package_lookup(): - from wiringsamples.package import test_package_function + from samples.wiring.package import test_package_function service = test_package_function() assert isinstance(service, Service) def test_package_subpackage_lookup(): - from wiringsamples.package.subpackage import test_package_function + from samples.wiring.package.subpackage import test_package_function service = test_package_function() assert isinstance(service, Service) def test_package_submodule_lookup(): - from wiringsamples.package.subpackage.submodule import test_function + from samples.wiring.package.subpackage.submodule import test_function service = test_function() assert isinstance(service, Service) @@ -66,7 +66,7 @@ def test_module_attributes_wiring(): def test_module_attribute_wiring_with_invalid_marker(container: Container): - from wiringsamples import module_invalid_attr_injection + from samples.wiring import module_invalid_attr_injection with raises(Exception, match="Unknown type of marker {0}".format(module_invalid_attr_injection.service)): container.wire(modules=[module_invalid_attr_injection]) @@ -241,12 +241,12 @@ def test_unwire_class_method(container: Container): def test_unwire_package_function(container: Container): container.unwire() - from wiringsamples.package.subpackage.submodule import test_function + from samples.wiring.package.subpackage.submodule import test_function assert isinstance(test_function(), Provide) def test_unwire_package_function_by_reference(container: Container): - from wiringsamples.package.subpackage import submodule + from samples.wiring.package.subpackage import submodule container.unwire() assert isinstance(submodule.test_function(), Provide) diff --git a/tests/unit/wiring/string_ids/test_async_injections_py36.py b/tests/unit/wiring/string_ids/test_async_injections_py36.py index 92cecf4f..cff13ce5 100644 --- a/tests/unit/wiring/string_ids/test_async_injections_py36.py +++ b/tests/unit/wiring/string_ids/test_async_injections_py36.py @@ -2,7 +2,7 @@ from pytest import fixture, mark -from wiringstringidssamples import asyncinjections +from samples.wiringstringids import asyncinjections @fixture(autouse=True) diff --git a/tests/unit/wiring/string_ids/test_autoloader_py36.py b/tests/unit/wiring/string_ids/test_autoloader_py36.py index 215afad0..98e4a4f1 100644 --- a/tests/unit/wiring/string_ids/test_autoloader_py36.py +++ b/tests/unit/wiring/string_ids/test_autoloader_py36.py @@ -6,9 +6,9 @@ import importlib from dependency_injector.wiring import register_loader_containers, unregister_loader_containers from pytest import fixture -from wiringstringidssamples import module -from wiringstringidssamples.service import Service -from wiringstringidssamples.container import Container +from samples.wiringstringids import module +from samples.wiringstringids.service import Service +from samples.wiringstringids.container import Container @fixture @@ -26,8 +26,6 @@ def container(): 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/test_dynamic_container_py36.py b/tests/unit/wiring/string_ids/test_dynamic_container_py36.py index 4d5a576e..e6250b37 100644 --- a/tests/unit/wiring/string_ids/test_dynamic_container_py36.py +++ b/tests/unit/wiring/string_ids/test_dynamic_container_py36.py @@ -3,8 +3,8 @@ from dependency_injector import containers, providers from pytest import fixture -from wiringstringidssamples import module, package -from wiringstringidssamples.service import Service +from samples.wiringstringids import module, package +from samples.wiringstringids.service import Service @fixture(autouse=True) diff --git a/tests/unit/wiring/string_ids/test_main_py36.py b/tests/unit/wiring/string_ids/test_main_py36.py index 04dd4e12..4c8f2e55 100644 --- a/tests/unit/wiring/string_ids/test_main_py36.py +++ b/tests/unit/wiring/string_ids/test_main_py36.py @@ -6,9 +6,9 @@ from dependency_injector import errors from dependency_injector.wiring import Closing, Provide, Provider, wire from pytest import fixture, mark, raises -from wiringstringidssamples import module, package, resourceclosing -from wiringstringidssamples.service import Service -from wiringstringidssamples.container import Container, SubContainer +from samples.wiringstringids import module, package, resourceclosing +from samples.wiringstringids.service import Service +from samples.wiringstringids.container import Container, SubContainer @fixture(autouse=True) @@ -42,19 +42,19 @@ def resourceclosing_container(): def test_package_lookup(): - from wiringstringidssamples.package import test_package_function + from samples.wiringstringids.package import test_package_function service = test_package_function() assert isinstance(service, Service) def test_package_subpackage_lookup(): - from wiringstringidssamples.package.subpackage import test_package_function + from samples.wiringstringids.package.subpackage import test_package_function service = test_package_function() assert isinstance(service, Service) def test_package_submodule_lookup(): - from wiringstringidssamples.package.subpackage.submodule import test_function + from samples.wiringstringids.package.subpackage.submodule import test_function service = test_function() assert isinstance(service, Service) @@ -66,7 +66,7 @@ def test_module_attributes_wiring(): def test_module_attribute_wiring_with_invalid_marker(container: Container): - from wiringstringidssamples import module_invalid_attr_injection + from samples.wiringstringids import module_invalid_attr_injection with raises(Exception, match="Unknown type of marker {0}".format(module_invalid_attr_injection.service)): container.wire(modules=[module_invalid_attr_injection]) @@ -241,12 +241,12 @@ def test_unwire_class_method(container: Container): def test_unwire_package_function(container: Container): container.unwire() - from wiringstringidssamples.package.subpackage.submodule import test_function + from samples.wiringstringids.package.subpackage.submodule import test_function assert isinstance(test_function(), Provide) def test_unwire_package_function_by_reference(container: Container): - from wiringstringidssamples.package.subpackage import submodule + from samples.wiringstringids.package.subpackage import submodule container.unwire() assert isinstance(submodule.test_function(), Provide) diff --git a/tests/unit/wiring/test_module_as_package_py36.py b/tests/unit/wiring/test_module_as_package_py36.py index 8ad74bbe..dbb5cc67 100644 --- a/tests/unit/wiring/test_module_as_package_py36.py +++ b/tests/unit/wiring/test_module_as_package_py36.py @@ -2,9 +2,9 @@ from pytest import fixture -from wiringsamples import module -from wiringsamples.service import Service -from wiringsamples.container import Container +from samples.wiring import module +from samples.wiring.service import Service +from samples.wiring.container import Container @fixture diff --git a/tests/unit/wiring/test_string_module_names_py36.py b/tests/unit/wiring/test_string_module_names_py36.py index 1bfa58a0..04930a0b 100644 --- a/tests/unit/wiring/test_string_module_names_py36.py +++ b/tests/unit/wiring/test_string_module_names_py36.py @@ -2,10 +2,10 @@ 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 +from samples.wiring import module +from samples.wiring.service import Service +from samples.wiring.container import Container +from samples.wiring.wire_relative_string_names import wire_with_relative_string_names @fixture @@ -17,14 +17,14 @@ def container(): def test_absolute_names(container: Container): container.wire( - modules=["wiringsamples.module"], - packages=["wiringsamples.package"], + modules=["samples.wiring.module"], + packages=["samples.wiring.package"], ) service = module.test_function() assert isinstance(service, Service) - from wiringsamples.package.subpackage.submodule import test_function + from samples.wiring.package.subpackage.submodule import test_function service = test_function() assert isinstance(service, Service) @@ -33,13 +33,13 @@ def test_relative_names_with_explicit_package(container: Container): container.wire( modules=[".module"], packages=[".package"], - from_package="wiringsamples", + from_package="samples.wiring", ) service = module.test_function() assert isinstance(service, Service) - from wiringsamples.package.subpackage.submodule import test_function + from samples.wiring.package.subpackage.submodule import test_function service = test_function() assert isinstance(service, Service) @@ -50,7 +50,7 @@ def test_relative_names_with_auto_package(container: Container): service = module.test_function() assert isinstance(service, Service) - from wiringsamples.package.subpackage.submodule import test_function + from samples.wiring.package.subpackage.submodule import test_function service = test_function() assert isinstance(service, Service) diff --git a/tests/unit/wiring/test_wiring_config_in_container_py36.py b/tests/unit/wiring/test_wiring_config_in_container_py36.py index cb45f2df..a4ac1fbe 100644 --- a/tests/unit/wiring/test_wiring_config_in_container_py36.py +++ b/tests/unit/wiring/test_wiring_config_in_container_py36.py @@ -4,9 +4,9 @@ from dependency_injector import containers from dependency_injector.wiring import Provide from pytest import fixture, mark -from wiringsamples import module -from wiringsamples.service import Service -from wiringsamples.container import Container +from samples.wiring import module +from samples.wiring.service import Service +from samples.wiring.container import Container @fixture(autouse=True) @@ -23,8 +23,8 @@ def container(wiring_config: containers.WiringConfiguration): "wiring_config", [ containers.WiringConfiguration( - modules=["wiringsamples.module"], - packages=["wiringsamples.package"], + modules=["samples.wiring.module"], + packages=["samples.wiring.package"], ), ], ) @@ -32,7 +32,7 @@ def test_absolute_names(): service = module.test_function() assert isinstance(service, Service) - from wiringsamples.package.subpackage.submodule import test_function + from samples.wiring.package.subpackage.submodule import test_function service = test_function() assert isinstance(service, Service) @@ -43,7 +43,7 @@ def test_absolute_names(): containers.WiringConfiguration( modules=[".module"], packages=[".package"], - from_package="wiringsamples", + from_package="samples.wiring", ), ], ) @@ -51,7 +51,7 @@ def test_relative_names_with_explicit_package(): service = module.test_function() assert isinstance(service, Service) - from wiringsamples.package.subpackage.submodule import test_function + from samples.wiring.package.subpackage.submodule import test_function service = test_function() assert isinstance(service, Service) @@ -69,7 +69,7 @@ def test_relative_names_with_auto_package(): service = module.test_function() assert isinstance(service, Service) - from wiringsamples.package.subpackage.submodule import test_function + from samples.wiring.package.subpackage.submodule import test_function service = test_function() assert isinstance(service, Service) diff --git a/tests/unit/wiring/test_with_stdlib_queue_py36.py b/tests/unit/wiring/test_with_stdlib_queue_py36.py index 86989575..f80ce981 100644 --- a/tests/unit/wiring/test_with_stdlib_queue_py36.py +++ b/tests/unit/wiring/test_with_stdlib_queue_py36.py @@ -2,8 +2,8 @@ from pytest import fixture -from wiringsamples import queuemodule -from wiringsamples.container import Container +from samples.wiring import queuemodule +from samples.wiring.container import Container @fixture