tests: update tests after API change to ArgDefaults

srfoster65 · Nov 1, 2023 · c715730 · c715730
1 parent 2b90de5
commit c715730
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/tests/test_arg_defaults.py b/tests/test_arg_defaults.py
@@ -23,8 +23,9 @@ class Test:
             """Test Class"""
 
             def __init__(self, arg1=None):
+                name = "arg1"
                 default_value = "arg1_default"
-                defaults = {"arg1": ArgDefaults(default_value=default_value)}
+                defaults = [ArgDefaults(name=name, default_value=default_value)]
                 arg_init = ClassArgInit(defaults=defaults)
                 assert arg_init.args.arg1.values.default == default_value
 
@@ -34,13 +35,14 @@ def test_env_name(self):
         """
         Test overriding env_name
         """
-        
+
         class Test:
             """Test Class"""
 
             def __init__(self, arg1=None):
+                name = "arg1"
                 env_name = "ENV1"
-                defaults = {"arg1": ArgDefaults(env_name=env_name)}
+                defaults = [ArgDefaults(name=name, env_name=env_name)]
                 arg_init = ClassArgInit(defaults=defaults)
                 assert arg_init.args.arg1.env_name == env_name
 
@@ -55,11 +57,10 @@ class Test:
             """Test Class"""
 
             def __init__(self, arg1=None):
+                name = "arg1"
                 env_name = "ENV1"
                 disable_env = True
-                defaults = {
-                    "arg1": ArgDefaults(env_name=env_name, disable_env=disable_env)
-                }
+                defaults = [ArgDefaults(name=name, env_name=env_name, disable_env=disable_env)]
                 arg_init = ClassArgInit(defaults=defaults)
                 assert arg_init.args.arg1.env_name is None
 

diff --git a/tests/test_arg_priority.py b/tests/test_arg_priority.py
@@ -22,9 +22,9 @@ class TestArgPriority:
         "prefix, arg_value, envs, defaults, expected",
         [
             # Priority order
-            (None, "arg1_value", {"ARG1": "env1_value"}, {"arg1": ArgDefaults(default_value="default")}, Expected("arg1", "arg1_value")),
-            (None, None, {"ARG1": "env1_value"}, {"arg1": ArgDefaults(default_value="default")}, Expected("arg1", "env1_value")),
-            (None, None, None, {"arg1": ArgDefaults(default_value="default")}, Expected("arg1", "default")),
+            (None, "arg1_value", {"ARG1": "env1_value"}, [ArgDefaults(name="arg1", default_value="default")], Expected("arg1", "arg1_value")),
+            (None, None, {"ARG1": "env1_value"}, [ArgDefaults(name="arg1", default_value="default")], Expected("arg1", "env1_value")),
+            (None, None, None, [ArgDefaults(name="arg1", default_value="default")], Expected("arg1", "default")),
             (None, None, None, None, Expected("arg1", None)),
         ],
     )

diff --git a/tests/test_env_priority.py b/tests/test_env_priority.py
@@ -23,7 +23,7 @@ class TestEnvPriority:
         [
             (None, "arg1_value", {"ARG1": "env1_value"}, None, Expected("arg1", "env1_value")),
             (None, "arg1_value", None, None, Expected("arg1", "env1_value")),
-            (None, None, None, {"arg1": ArgDefaults(default_value="default")}, Expected("arg1", "default")),
+            (None, None, None, [ArgDefaults(name="arg1", default_value="default")], Expected("arg1", "default")),
             (None, None, None, None, Expected("arg1", None)),
         ],
     )
@@ -52,7 +52,8 @@ def test_function_default(self):
         """
 
         def test(arg1="func_default"):
-            args = FunctionArgInit(defaults={"arg1": ArgDefaults(default_value="default")}).args
+            defaults = [ArgDefaults(name="arg1", default_value="default")]
+            args = FunctionArgInit(defaults=defaults).args
             assert args["arg1"] == "func_default"
 
         test()

diff --git a/tests/test_env_variants.py b/tests/test_env_variants.py
@@ -21,9 +21,9 @@ class TestEnvVariants:
         "prefix, arg_value, envs, defaults, expected",
         [
             ("prefix", None, {"PREFIX_ARG1": "env1_value"}, None, Expected("arg1", "env1_value")),
-            ("prefix", None, {"ENV1": "env1_value"}, {"arg1": ArgDefaults(env_name="ENV1")}, Expected("arg1", "env1_value")),
-            (None, None, {"ARG1": "env1_value"}, {"arg1": ArgDefaults(default_value="default", disable_env=True)}, Expected("arg1", "default")),
-            (None, None, {"ENV1": "env1_value"}, {"arg1": ArgDefaults(default_value="default", env_name="ENV1", disable_env=True)}, Expected("arg1", "default")),
+            ("prefix", None, {"ENV1": "env1_value"}, [ArgDefaults(name="arg1", env_name="ENV1")], Expected("arg1", "env1_value")),
+            (None, None, {"ARG1": "env1_value"}, [ArgDefaults(name="arg1", default_value="default", disable_env=True)], Expected("arg1", "default")),
+            (None, None, {"ENV1": "env1_value"}, [ArgDefaults(name="arg1", default_value="default", env_name="ENV1", disable_env=True)], Expected("arg1", "default")),
         ],
     )
     def test_env_variants(self, prefix, arg_value, envs, defaults, expected):

diff --git a/tests/test_print.py b/tests/test_print.py
@@ -53,12 +53,13 @@ def test_defaults_repr(self):
         """
 
         arg1_defaults = ArgDefaults(
-            default_value="default", env_name="ENV", disable_env="True"
+            name="arg1", default_value="default", env_name="ENV", disable_env="True"
         )
-        defaults = {"arg1": arg1_defaults}
+        defaults = [arg1_defaults]
         out = repr(defaults)
         expected = (
             "<ArgDefaults("
+            "name=arg1, "
             "default_value=default, "
             "env_name=ENV, "
             "disable_env=True)"