Added more test

Author: eadwinCode

tests/test_application/test_testclient_factory.py

@@ -76,7 +76,7 @@ def test_test_client_factory_create_test_module(tmpdir):
 def test_client_factory_create_test_module_from_module():
     reflect.metadata(
         metadata_key=MODULE_METADATA.PROVIDERS,
-        metadata_value=ProviderConfig(base_type=IFoo, use_class=Foo),
+        metadata_value=[ProviderConfig(base_type=IFoo, use_class=Foo)],
     )(
         ApplicationModule
     )  # dynamically add IFoo to ApplicationModule Providers

tests/test_controller/test_controller_inheritance.py

@@ -44,7 +44,7 @@ def endpoint_once(self):
 
     reflect.define_metadata(
         CONTROLLER_CLASS_KEY,
-        type("slme", (), {}),
+        None,
         AnotherSampleController.endpoint_once,
     )
 

tests/test_modules/test_module_ref.py

@@ -234,7 +234,7 @@ def test_module_template_ref_get_all_routers_fails_for_invalid_controller():
     some_invalid_controller = type("SomeInvalidController", (), {})
     with reflect.context():
         reflect.define_metadata(
-            MODULE_METADATA.CONTROLLERS, some_invalid_controller, ModuleBaseExample
+            MODULE_METADATA.CONTROLLERS, [some_invalid_controller], ModuleBaseExample
         )
         config = Config()
         container = EllarInjector(auto_bind=False).container

tests/test_reflect.py

@@ -15,18 +15,18 @@ def test_define_metadata_creates_attribute_dict(random_type):
 def test_define_metadata_without_default(random_type):
     key = "FrameworkName"
 
-    reflect.define_metadata(key, "Ellar", random_type, default_value=None)
+    reflect.define_metadata(key, "Ellar", random_type)
     assert reflect.get_metadata(key, random_type) == "Ellar"
-    reflect.define_metadata(key, "Starlette", random_type, default_value=None)
-    assert reflect.get_metadata(key, random_type) == ["Ellar", "Starlette"]
+    reflect.define_metadata(key, "Starlette", random_type)
+    assert reflect.get_metadata(key, random_type) == "Starlette"
 
 
 def test_define_metadata_with_existing_tuple(random_type):
-    reflect.define_metadata("B", "EllarB", random_type, default_value=tuple())
+    reflect.define_metadata("B", ("EllarB",), random_type)
     assert reflect.get_metadata("B", random_type) == ("EllarB",)
 
-    reflect.define_metadata("B", "AnotherEllar", random_type)
-    reflect.define_metadata("B", "AnotherEllarC", random_type)
+    reflect.define_metadata("B", ("AnotherEllar",), random_type)
+    reflect.define_metadata("B", ("AnotherEllarC",), random_type)
     assert reflect.get_metadata("B", random_type) == (
         "EllarB",
         "AnotherEllar",
@@ -35,11 +35,11 @@ def test_define_metadata_with_existing_tuple(random_type):
 
 
 def test_define_metadata_with_existing_list(random_type):
-    reflect.define_metadata("B", "Ellar", random_type, default_value=[])
+    reflect.define_metadata("B", ["Ellar"], random_type)
     assert reflect.get_metadata("B", random_type) == ["Ellar"]
 
-    reflect.define_metadata("B", "AnotherEllar", random_type)
-    reflect.define_metadata("B", "AnotherEllarD", random_type)
+    reflect.define_metadata("B", ["AnotherEllar"], random_type)
+    reflect.define_metadata("B", ["AnotherEllarD"], random_type)
     assert reflect.get_metadata("B", random_type) == [
         "Ellar",
         "AnotherEllar",
@@ -48,7 +48,7 @@ def test_define_metadata_with_existing_list(random_type):
 
 
 def test_define_metadata_with_existing_dict(random_type):
-    reflect.define_metadata("C", dict(C="EllarC"), random_type, default_value=dict())
+    reflect.define_metadata("C", dict(C="EllarC"), random_type)
     assert reflect.get_metadata("C", random_type) == dict(C="EllarC")
 
     reflect.define_metadata("C", dict(D="EllarD"), random_type)
@@ -59,8 +59,8 @@ def test_define_metadata_with_existing_dict(random_type):
 
 
 def test_define_metadata_with_existing_set(random_type):
-    reflect.define_metadata("A", "EllarA", random_type, default_value=set())
-    reflect.define_metadata("A", "AnotherEllar", random_type)
+    reflect.define_metadata("A", {"EllarA"}, random_type)
+    reflect.define_metadata("A", {"AnotherEllar"}, random_type)
     assert reflect.get_metadata("A", random_type) == {"AnotherEllar", "EllarA"}
 
 
@@ -152,3 +152,10 @@ def function_new():
 def test_define_metadata_raise_exception():
     with pytest.raises(Exception, match="`target` is not a valid type"):
         reflect.define_metadata("defined_key_c", "Eadwin", "defined_key_c")
+
+    with pytest.raises(Exception, match="`target` is not a valid type"):
+        reflect.define_metadata("defined_key_c", "Eadwin", None)
+
+
+def test_define_metadata_overrides_existing_collection_of_different_type():
+    pass

tests/test_reflector.py

@@ -0,0 +1,72 @@
+from ellar.reflect import reflect
+from ellar.services.reflector import Reflector
+
+reflector = Reflector()
+
+
+class SampleTarget:
+    pass
+
+
+def test_should_reflect_metadata():
+    key = "key"
+    value = "value"
+    reflect.define_metadata(key, value, SampleTarget)
+    assert reflector.get(key, SampleTarget) == value
+
+
+def test_should_reflect_metadata_of_all_targets():
+    key = "key"
+    value = "value"
+    reflect.define_metadata(key, value, SampleTarget)
+    assert reflector.get_all(key, *[SampleTarget]) == [value]
+
+
+def test_should_return_an_empty_array_when_there_are_no_targets():
+    key = "key"
+    assert reflector.get_all_and_merge(key, *[]) == []
+
+
+def test_should_reflect_metadata_of_all_targets_and_concat_arrays():
+    key = "key"
+    value = "value"
+    reflect.define_metadata(key, [value], SampleTarget)
+    assert reflector.get_all_and_merge(key, *[SampleTarget, SampleTarget]) == [
+        value,
+        value,
+    ]
+
+
+def test_should_reflect_metadata_of_all_targets_in_an_arrays():
+    key = "key"
+    value = "value"
+    reflect.define_metadata(key, value, SampleTarget)
+    assert reflector.get_all_and_merge(
+        key, *[SampleTarget, SampleTarget, SampleTarget]
+    ) == [value, value, value]
+
+
+def test_should_reflect_metadata_of_all_targets_and_merge_an_object(random_type):
+    key = "key"
+    value = dict(test="test")
+    reflect.define_metadata(key, value, SampleTarget)
+    assert reflector.get_all_and_merge(key, *[SampleTarget, SampleTarget]) == value
+
+
+def test_should_reflect_metadata_of_all_targets_and_merge_different_objects(
+    random_type,
+):
+    key = "key"
+    value = dict(test="test")
+    reflect.define_metadata(key, value, SampleTarget)
+    reflect.define_metadata(key, dict(test_2="test_2"), SampleTarget)
+    assert reflector.get_all_and_merge(key, *[SampleTarget, SampleTarget]) == dict(
+        test="test", test_2="test_2"
+    )
+
+
+def test_should_reflect_metadata_of_all_targets_and_return_a_first_not_undefined_value():
+    key = "key"
+    value = "value"
+    reflect.define_metadata(key, value, SampleTarget)
+    assert reflector.get_all_and_override(key, *[SampleTarget, SampleTarget]) == value

tests/test_routing/test_extra_args.py

@@ -2,8 +2,7 @@
 
 from starlette.responses import Response
 
-from ellar.common import Context, Query, Res, get, set_metadata
-from ellar.constants import EXTRA_ROUTE_ARGS_KEY
+from ellar.common import Context, Query, Res, extra_args, get
 from ellar.core import TestClientFactory
 from ellar.core.connection import Request
 from ellar.core.context import IExecutionContext
@@ -22,12 +21,14 @@ def add_additional_signature_to_endpoint(func):
     query2 = ExtraEndpointArg(
         name="query2", annotation=str
     )  # will default to Query during computation
-    extra_args = [query1, query2]
-    set_metadata(EXTRA_ROUTE_ARGS_KEY, extra_args)(func)
+
+    extra_args(query1, query2)(func)
 
     @wraps(func)
     def _wrapper(*args, **kwargs):
         # RESOLVING EXTRA ARGS
+        # All extra args must be resolved before calling route function
+        # else extra argument will be pushed to the route function
         resolved_query1 = query1.resolve(kwargs)
         resolved_query2 = query2.resolve(kwargs)
 
@@ -47,8 +48,8 @@ def add_extra_non_field_extra_args(func):
         name="response", annotation=Response, default_value=Res()
     )
 
-    set_metadata(EXTRA_ROUTE_ARGS_KEY, response)(func)
-    set_metadata(EXTRA_ROUTE_ARGS_KEY, context)(func)
+    extra_args(response)(func)
+    extra_args(context)(func)
 
     @wraps(func)
     def _wrapper(*args, **kwargs):