refac tests

test/test_datastore.py

@@ -30,6 +30,14 @@ class TestDataStoreByVariable:
     def ds(self):
         return DataStoreByVariable()
 
+    @pytest.fixture
+    def ds_with_content(self, ds):
+        ds.set("tester1", 1, "general")
+        ds.set("tester2", 11, "general")
+        ds.set("tester2", 10, "general.sub")
+        ds.set("tester3", 21, "general")
+        return ds
+
     def test_put(self, ds):
         ds.set("number", 3, "general.subscope")
         assert ds._store["number"]["general.subscope"] == 3
@@ -131,15 +139,18 @@ class TestDataStoreByVariable:
         assert ds.search_scope("general.sub.sub", current_scope_only=False, return_all=True) == \
             [("number", "general.sub.sub", "ABC"), ("number1", "general.sub", 22), ("number2", "general.sub.sub", 3)]
 
-    def test_create_args_dict(self, ds):
-        ds.set("tester1", 1, "general")
-        ds.set("tester2", 11, "general")
-        ds.set("tester2", 10, "general.sub")
-        ds.set("tester3", 21, "general")
+    def test_create_args_dict_default_scope(self, ds_with_content):
         args = ["tester1", "tester2", "tester3", "tester4"]
-        assert ds.create_args_dict(args) == {"tester1": 1, "tester2": 11, "tester3": 21}
-        assert ds.create_args_dict(args, "general.sub") == {"tester1": 1, "tester2": 10, "tester3": 21}
-        assert ds.create_args_dict(["notAvail", "alsonot"]) == {}
+        assert ds_with_content.create_args_dict(args) == {"tester1": 1, "tester2": 11, "tester3": 21}
+
+    def test_create_args_dict_given_scope(self, ds_with_content):
+        args = ["tester1", "tester2", "tester3", "tester4"]
+        assert ds_with_content.create_args_dict(args, "general.sub") == {"tester1": 1, "tester2": 10, "tester3": 21}
+
+    def test_create_args_dict_missing_entry(self, ds_with_content):
+        args = ["tester1", "notAvail", "tester4"]
+        assert ds_with_content.create_args_dict(["notAvail", "alsonot"]) == {}
+        assert ds_with_content.create_args_dict(args) == {"tester1": 1}
 
     def test_set_args_from_dict(self, ds):
         ds.set_args_from_dict({"tester1": 1, "tester2": 10, "tester3": 21})
@@ -157,6 +168,14 @@ class TestDataStoreByScope:
     def ds(self):
         return DataStoreByScope()
 
+    @pytest.fixture
+    def ds_with_content(self, ds):
+        ds.set("tester1", 1, "general")
+        ds.set("tester2", 11, "general")
+        ds.set("tester2", 10, "general.sub")
+        ds.set("tester3", 21, "general")
+        return ds
+
     def test_put_with_scope(self, ds):
         ds.set("number", 3, "general.subscope")
         assert ds._store["general.subscope"]["number"] == 3
@@ -258,15 +277,18 @@ class TestDataStoreByScope:
         assert ds.search_scope("general.sub.sub", current_scope_only=False, return_all=True) == \
             [("number", "general.sub.sub", "ABC"), ("number1", "general.sub", 22), ("number2", "general.sub.sub", 3)]
 
-    def test_create_args_dict(self, ds):
-        ds.set("tester1", 1, "general")
-        ds.set("tester2", 11, "general")
-        ds.set("tester2", 10, "general.sub")
-        ds.set("tester3", 21, "general")
+    def test_create_args_dict_default_scope(self, ds_with_content):
         args = ["tester1", "tester2", "tester3", "tester4"]
-        assert ds.create_args_dict(args) == {"tester1": 1, "tester2": 11, "tester3": 21}
-        assert ds.create_args_dict(args, "general.sub") == {"tester1": 1, "tester2": 10, "tester3": 21}
-        assert ds.create_args_dict(["notAvail", "alsonot"]) == {}
+        assert ds_with_content.create_args_dict(args) == {"tester1": 1, "tester2": 11, "tester3": 21}
+
+    def test_create_args_dict_given_scope(self, ds_with_content):
+        args = ["tester1", "tester2", "tester3", "tester4"]
+        assert ds_with_content.create_args_dict(args, "general.sub") == {"tester1": 1, "tester2": 10, "tester3": 21}
+
+    def test_create_args_dict_missing_entry(self, ds_with_content):
+        args = ["tester1", "notAvail", "tester4"]
+        assert ds_with_content.create_args_dict(["notAvail", "alsonot"]) == {}
+        assert ds_with_content.create_args_dict(args) == {"tester1": 1}
 
     def test_set_args_from_dict(self, ds):
         ds.set_args_from_dict({"tester1": 1, "tester2": 10, "tester3": 21})

test/test_modules/test_pre_processing.py

@@ -101,13 +101,3 @@ class TestPreProcessing:
         assert dummy_list[val] == list(range(10, 13))
         assert dummy_list[test] == list(range(13, 15))
         assert dummy_list[train_val] == list(range(0, 13))
-
-    def test_create_args_dict_default_scope(self, obj_super_init):
-        assert obj_super_init.data_store.create_args_dict(["NAME1", "NAME2"]) == {"NAME1": 1, "NAME2": 2}
-
-    def test_create_args_dict_given_scope(self, obj_super_init):
-        assert obj_super_init.data_store.create_args_dict(["NAME1", "NAME2"], scope="general.sub") == {"NAME1": 10, "NAME2": 2}
-
-    def test_create_args_dict_missing_entry(self, obj_super_init):
-        assert obj_super_init.data_store.create_args_dict(["NAME5", "NAME2"]) == {"NAME2": 2}
-        assert obj_super_init.data_store.create_args_dict(["NAME4", "NAME2"]) == {"NAME2": 2}