Migrate dict provider tests

tests/unit/providers/test_dict_py2_py3.py

@@ -1,22 +1,20 @@
-"""Dependency injector dict provider unit tests."""
+"""Dict provider tests."""
 
 import sys
 
-import unittest
-
 from dependency_injector import providers
 
 
-class DictTests(unittest.TestCase):
-
-    def test_is_provider(self):
+def test_is_provider():
     assert providers.is_provider(providers.Dict()) is True
 
-    def test_provided_instance_provider(self):
+
+def test_provided_instance_provider():
     provider = providers.Dict()
     assert isinstance(provider.provided, providers.ProvidedInstance)
 
-    def test_init_with_non_string_keys(self):
+
+def test_init_with_non_string_keys():
     a1 = object()
     a2 = object()
     provider = providers.Dict({a1: "i1", a2: "i2"})
@@ -29,7 +27,8 @@ class DictTests(unittest.TestCase):
 
     assert dict1 is not dict2
 
-    def test_init_with_string_and_non_string_keys(self):
+
+def test_init_with_string_and_non_string_keys():
     a1 = object()
     provider = providers.Dict({a1: "i1"}, a2="i2")
 
@@ -41,7 +40,8 @@ class DictTests(unittest.TestCase):
 
     assert dict1 is not dict2
 
-    def test_call_with_init_keyword_args(self):
+
+def test_call_with_init_keyword_args():
     provider = providers.Dict(a1="i1", a2="i2")
 
     dict1 = provider()
@@ -52,29 +52,34 @@ class DictTests(unittest.TestCase):
 
     assert dict1 is not dict2
 
-    def test_call_with_context_keyword_args(self):
+
+def test_call_with_context_keyword_args():
     provider = providers.Dict(a1="i1", a2="i2")
     assert provider(a3="i3", a4="i4") == {"a1": "i1", "a2": "i2", "a3": "i3", "a4": "i4"}
 
-    def test_call_with_provider(self):
+
+def test_call_with_provider():
     provider = providers.Dict(
         a1=providers.Factory(str, "i1"),
         a2=providers.Factory(str, "i2"),
     )
     assert provider() == {"a1": "i1", "a2": "i2"}
 
-    def test_fluent_interface(self):
+
+def test_fluent_interface():
     provider = providers.Dict() \
         .add_kwargs(a1="i1", a2="i2")
     assert provider() == {"a1": "i1", "a2": "i2"}
 
-    def test_add_kwargs(self):
+
+def test_add_kwargs():
     provider = providers.Dict() \
         .add_kwargs(a1="i1") \
         .add_kwargs(a2="i2")
     assert provider.kwargs == {"a1": "i1", "a2": "i2"}
 
-    def test_add_kwargs_non_string_keys(self):
+
+def test_add_kwargs_non_string_keys():
     a1 = object()
     a2 = object()
     provider = providers.Dict() \
@@ -82,20 +87,23 @@ class DictTests(unittest.TestCase):
         .add_kwargs({a2: "i2"})
     assert provider.kwargs == {a1: "i1", a2: "i2"}
 
-    def test_add_kwargs_string_and_non_string_keys(self):
+
+def test_add_kwargs_string_and_non_string_keys():
     a2 = object()
     provider = providers.Dict() \
         .add_kwargs(a1="i1") \
         .add_kwargs({a2: "i2"})
     assert provider.kwargs == {"a1": "i1", a2: "i2"}
 
-    def test_set_kwargs(self):
+
+def test_set_kwargs():
     provider = providers.Dict() \
         .add_kwargs(a1="i1", a2="i2") \
         .set_kwargs(a3="i3", a4="i4")
     assert provider.kwargs == {"a3": "i3", "a4": "i4"}
 
-    def test_set_kwargs_non_string_keys(self):
+
+def test_set_kwargs_non_string_keys():
     a3 = object()
     a4 = object()
     provider = providers.Dict() \
@@ -103,20 +111,23 @@ class DictTests(unittest.TestCase):
         .set_kwargs({a3: "i3", a4: "i4"})
     assert provider.kwargs == {a3: "i3", a4: "i4"}
 
-    def test_set_kwargs_string_and_non_string_keys(self):
+
+def test_set_kwargs_string_and_non_string_keys():
     a3 = object()
     provider = providers.Dict() \
         .add_kwargs(a1="i1", a2="i2") \
         .set_kwargs({a3: "i3"}, a4="i4")
     assert provider.kwargs == {a3: "i3", "a4": "i4"}
 
-    def test_clear_kwargs(self):
+
+def test_clear_kwargs():
     provider = providers.Dict() \
         .add_kwargs(a1="i1", a2="i2") \
         .clear_kwargs()
     assert provider.kwargs == {}
 
-    def test_call_overridden(self):
+
+def test_call_overridden():
     provider = providers.Dict(a1="i1", a2="i2")
     overriding_provider1 = providers.Dict(a2="i2", a3="i3")
     overriding_provider2 = providers.Dict(a3="i3", a4="i4")
@@ -131,7 +142,8 @@ class DictTests(unittest.TestCase):
     assert instance1 == {"a3": "i3", "a4": "i4"}
     assert instance2 == {"a3": "i3", "a4": "i4"}
 
-    def test_deepcopy(self):
+
+def test_deepcopy():
     provider = providers.Dict(a1="i1", a2="i2")
 
     provider_copy = providers.deepcopy(provider)
@@ -140,7 +152,8 @@ class DictTests(unittest.TestCase):
     assert provider.kwargs == provider_copy.kwargs
     assert isinstance(provider, providers.Dict)
 
-    def test_deepcopy_from_memo(self):
+
+def test_deepcopy_from_memo():
     provider = providers.Dict(a1="i1", a2="i2")
     provider_copy_memo = providers.Dict(a1="i1", a2="i2")
 
@@ -151,7 +164,8 @@ class DictTests(unittest.TestCase):
 
     assert provider_copy is provider_copy_memo
 
-    def test_deepcopy_kwargs(self):
+
+def test_deepcopy_kwargs():
     provider = providers.Dict()
     dependent_provider1 = providers.Factory(list)
     dependent_provider2 = providers.Factory(dict)
@@ -170,7 +184,8 @@ class DictTests(unittest.TestCase):
     assert dependent_provider2.cls is dependent_provider_copy2.cls
     assert dependent_provider2 is not dependent_provider_copy2
 
-    def test_deepcopy_kwargs_non_string_keys(self):
+
+def test_deepcopy_kwargs_non_string_keys():
     a1 = object()
     a2 = object()
 
@@ -191,7 +206,8 @@ class DictTests(unittest.TestCase):
     assert dependent_provider2.cls is dependent_provider_copy2.cls
     assert dependent_provider2 is not dependent_provider_copy2
 
-    def test_deepcopy_overridden(self):
+
+def test_deepcopy_overridden():
     provider = providers.Dict()
     object_provider = providers.Object(object())
 
@@ -207,7 +223,8 @@ class DictTests(unittest.TestCase):
     assert object_provider is not object_provider_copy
     assert isinstance(object_provider_copy, providers.Object)
 
-    def test_deepcopy_with_sys_streams(self):
+
+def test_deepcopy_with_sys_streams():
     provider = providers.Dict()
     provider.add_kwargs(stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr)
 
@@ -219,7 +236,8 @@ class DictTests(unittest.TestCase):
     assert provider.kwargs["stdout"] is sys.stdout
     assert provider.kwargs["stderr"] is sys.stderr
 
-    def test_repr(self):
+
+def test_repr():
     provider = providers.Dict(a1=1, a2=2)
     assert repr(provider) == (
         "<dependency_injector.providers."

tests/unit/providers/test_list_py2_py3.py

@@ -1,4 +1,4 @@
-"""Dependency injector list provider unit tests."""
+"""List provider tests."""
 
 import sys