simplify addMeta call

tercen · Nov 27, 2023 · 6425ceb · 6425ceb
1 parent 725127c
commit 6425ceb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 63 deletions.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='tercen_python_client',
-    version='0.9.1',
+    version='0.9.2',
     packages=find_packages(exclude=['tests']),
     install_requires=[
         'numpy==1.22.*',

diff --git a/tercen/model/impl.py b/tercen/model/impl.py
@@ -888,7 +888,8 @@ def getMeta(self, key, defaultValue=None):
 
     return defaultValue
 
-def addMeta(self, p:Pair):
+def addMeta(self, key:str, value:str):
+    p = Pair({"key":key, "value":value})
     self.removeMeta(p.key)
     self.meta.append(p)
 

diff --git a/tests/test_inherit.py b/tests/test_inherit.py
@@ -4,84 +4,44 @@
 from tercen.model.impl import Task, GitProjectTask, Pair, Document
 
 class TestTercen(unittest.TestCase):
-    def test_inherit_task_base(self):
-        task = Task()
 
+    def meta_test_function(self, obj):
         p1 = Pair({"key":"Key01", "value":"Value01"})
-        task.addMeta(p1)
+        obj.addMeta("Key01","Value01")
 
 
-        assert(task.hasMeta("Key01") == True)
-        assert(task.hasMeta("Key02") == False)
+        assert(obj.hasMeta("Key01") == True)
+        assert(obj.hasMeta("Key02") == False)
 
-        assert(task.getMeta("Key01") == "Value01")
-        assert(task.getMeta("Key02") == None)
-        assert(task.getMeta("Key02", defaultValue="") == "")
+        assert(obj.getMeta("Key01") == "Value01")
+        assert(obj.getMeta("Key02") == None)
+        assert(obj.getMeta("Key02", defaultValue="") == "")
 
-        p2 = task.getMetaPair("Key01")
+        p2 = obj.getMetaPair("Key01")
         assert(p1.key == p2.key)
         assert(p1.value == p2.value)
 
 
-        p3 = Pair({"key":"Key01", "value":"Value04"})
-        task.addMeta(p3)
-        assert(task.getMeta("Key01") == "Value04")
-
-        task.removeMeta("Key01")
-        assert(task.getMeta("Key01") == None)
-
-    def test_inherit_task_derived(self):
-        task = GitProjectTask()
-
-        p1 = Pair({"key":"Key01", "value":"Value01"})
-        task.addMeta(p1)
-
-
-        assert(task.hasMeta("Key01") == True)
-        assert(task.hasMeta("Key02") == False)
+        p3 = Pair({"key":"Key01", "value":"Value01"})
+        obj.addMeta("Key01","Value04")
+        assert(obj.getMeta("Key01") == "Value04")
 
-        assert(task.getMeta("Key01") == "Value01")
-        assert(task.getMeta("Key02") == None)
-        assert(task.getMeta("Key02", defaultValue="") == "")
+        obj.removeMeta("Key01")
+        assert(obj.getMeta("Key01") == None)
 
-        p2 = task.getMetaPair("Key01")
-        assert(p1.key == p2.key)
-        assert(p1.value == p2.value)
+    def test_inherit_task_base(self):
+        task = Task()
+        self.meta_test_function(task)
 
 
-        p3 = Pair({"key":"Key01", "value":"Value04"})
-        task.addMeta(p3)
-        assert(task.getMeta("Key01") == "Value04")
+    def test_inherit_task_derived(self):
+        task = GitProjectTask()
+        self.meta_test_function(task)
 
-        task.removeMeta("Key01")
-        assert(task.getMeta("Key01") == None)
 
     def test_inherit_document(self):
-        task = Document()
-
-        p1 = Pair({"key":"Key01", "value":"Value01"})
-        task.addMeta(p1)
-
-
-        assert(task.hasMeta("Key01") == True)
-        assert(task.hasMeta("Key02") == False)
-
-        assert(task.getMeta("Key01") == "Value01")
-        assert(task.getMeta("Key02") == None)
-        assert(task.getMeta("Key02", defaultValue="") == "")
-
-        p2 = task.getMetaPair("Key01")
-        assert(p1.key == p2.key)
-        assert(p1.value == p2.value)
-
-
-        p3 = Pair({"key":"Key01", "value":"Value04"})
-        task.addMeta(p3)
-        assert(task.getMeta("Key01") == "Value04")
-
-        task.removeMeta("Key01")
-        assert(task.getMeta("Key01") == None)
-
+        doc = Document()
+        self.meta_test_function(doc)
 
 if __name__ == '__main__':
     unittest.main()