Add setters tests for coverage

dls-controls · Jul 15, 2016 · d83a3a0 · d83a3a0
1 parent 9efde3e
commit d83a3a0
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 4 deletions.
diff --git a/malcolm/core/request.py b/malcolm/core/request.py
@@ -111,7 +111,7 @@ def __init__(self, context=None, response_queue=None,
             context(): Context of Put
             response_queue(Queue): Queue to return to
             endpoint(list[str]): Path to target Block substructure
-            value(str): Value to put to endpoint
+            value(): Value to put to endpoint e.g. String, dict
         """
 
         super(Put, self).__init__(context, response_queue)

diff --git a/tests/test_core/test_request.py b/tests/test_core/test_request.py
@@ -85,6 +85,10 @@ def test_init(self):
         self.assertEqual(self.endpoint, self.get.endpoint)
         self.assertEqual("malcolm:core/Get:1.0", self.get.typeid)
 
+    def test_setters(self):
+        self.get.set_endpoint(["BL18I:XSPRESS3", "state", "value2"])
+        self.assertEquals(["BL18I:XSPRESS3", "state", "value2"], self.get.endpoint)
+
 
 class TestPut(unittest.TestCase):
 
@@ -103,6 +107,13 @@ def test_init(self):
         self.assertEqual(self.value, self.put.value)
         self.assertEqual("malcolm:core/Put:1.0", self.put.typeid)
 
+    def test_setters(self):
+        self.put.set_endpoint(["BL18I:XSPRESS3", "state", "value2"])
+        self.assertEquals(["BL18I:XSPRESS3", "state", "value2"], self.put.endpoint)
+
+        self.put.set_value("7")
+        self.assertEquals("7", self.put.value)
+
 
 class TestPost(unittest.TestCase):
 
@@ -121,6 +132,13 @@ def test_init(self):
         self.assertEqual(self.parameters, self.post.parameters)
         self.assertEqual("malcolm:core/Post:1.0", self.post.typeid)
 
+    def test_setters(self):
+        self.post.set_endpoint(["BL18I:XSPRESS3", "state", "value2"])
+        self.assertEquals(["BL18I:XSPRESS3", "state", "value2"], self.post.endpoint)
+
+        self.post.set_parameters(dict(arg1=2, arg2=False))
+        self.assertEquals(dict(arg1=2, arg2=False), self.post.parameters)
+
 
 class TestSubscribe(unittest.TestCase):
 
@@ -139,5 +157,12 @@ def test_init(self):
         self.assertEqual(self.delta, self.subscribe.delta)
         self.assertEqual("malcolm:core/Subscribe:1.0", self.subscribe.typeid)
 
+    def test_setters(self):
+        self.subscribe.set_endpoint(["BL18I:XSPRESS3", "state", "value2"])
+        self.assertEquals(["BL18I:XSPRESS3", "state", "value2"], self.subscribe.endpoint)
+
+        self.subscribe.set_delta(False)
+        self.assertFalse(self.subscribe.delta)
+
 if __name__ == "__main__":
     unittest.main(verbosity=2)
diff --git a/tests/test_core/test_response.py b/tests/test_core/test_response.py
@@ -19,7 +19,7 @@ def test_init(self):
         self.assertEquals(None, r.typeid)
         self.assertEquals(context, r.context)
 
-    def test_return_response(self):
+    def test_Return(self):
         context = Mock()
         r = Return(123, context)
         self.assertEquals(123, r.id_)
@@ -29,6 +29,9 @@ def test_return_response(self):
         r = Return(123, Mock(), {"key": "value"})
         self.assertEquals({"key": "value"}, r.value)
 
+        r.set_value({"key": "value2"})
+        self.assertEquals({"key": "value2"}, r.value)
+
     def test_Error(self):
         context = Mock()
         r = Error(123, context, "Test Error")
@@ -37,22 +40,31 @@ def test_Error(self):
         self.assertEquals("malcolm:core/Error:1.0", r.typeid)
         self.assertEquals(context, r.context)
 
-    def test_return_update(self):
+        r.set_message("Test Error 2")
+        self.assertEquals("Test Error 2", r.message)
+
+    def test_Update(self):
         context = Mock()
         value = {"attribute": "value"}
         r = Update(123, context, value)
         self.assertEquals(123, r.id_)
         self.assertEquals(context, r.context)
         self.assertEquals({"attribute": "value"}, r.value)
 
-    def test_return_delta(self):
+        r.set_value({"key": "value2"})
+        self.assertEquals({"key": "value2"}, r.value)
+
+    def test_Delta(self):
         context = Mock()
         changes = [[["path"], "value"]]
         r = Delta(123, context, changes)
         self.assertEquals(123, r.id_)
         self.assertEquals(context, r.context)
         self.assertEquals(changes, r.changes)
 
+        r.set_changes([[["path"], "value2"]])
+        self.assertEquals([[["path"], "value2"]], r.changes)
+
     def test_repr(self):
         r = Response(123, Mock())
         s = r.__repr__()