L2SS-786: Split up some tests and avoid duplication of asserts across tests

tangostationcontrol/tangostationcontrol/test/devices/test_observation_control_device.py

@@ -65,6 +65,8 @@ class TestObservationControlDevice(base.TestCase, test_observation_base.TestObse
             self.on_device_assert(proxy)
 
             self.assertFalse(proxy.is_any_observation_running())
+            self.assertFalse(proxy.is_observation_running(12345))
+            self.assertFalse(proxy.is_observation_running(54321))
 
     def test_check_and_convert_parameters_invalid_id(self):
         """Test invalid parameter detection"""
@@ -120,6 +122,26 @@ class TestObservationControlDevice(base.TestCase, test_observation_base.TestObse
             self.assertTrue(proxy.is_any_observation_running())
             self.assertTrue(proxy.is_observation_running(12345))
 
+    @mock.patch.object(
+        observation_control.ObservationControl, 'delete_dynamic_device')
+    def test_start_observation_multiple(self, m_delete_device):
+        """Test starting multiple observations"""
+        self.mock_dynamic_devices()
+
+        second_observation_json = json.loads(self.VALID_JSON)
+        second_observation_json['observation_id'] = 54321
+
+        with DeviceTestContext(observation_control.ObservationControl,
+                               process=True) as proxy:
+            self.on_device_assert(proxy)
+
+            proxy.start_observation(self.VALID_JSON)
+            proxy.start_observation(json.dumps(second_observation_json))
+
+            self.assertTrue(proxy.is_any_observation_running())
+            self.assertTrue(proxy.is_observation_running(12345))
+            self.assertTrue(proxy.is_observation_running(54321))
+
     def test_stop_observation_invalid_id(self):
         """Test stop_observation exceptions for invalid ids"""
 
@@ -138,6 +160,20 @@ class TestObservationControlDevice(base.TestCase, test_observation_base.TestObse
 
             self.assertRaises(DevFailed, proxy.stop_observation, 2)
 
+    def test_is_any_observation_running_after_stop_all_observations(self):
+        """Test whether is_any_observation_running conforms when we start & stop an observation"""
+        self.mock_dynamic_devices()
+
+        with DeviceTestContext(observation_control.ObservationControl,
+                               process=True) as proxy:
+            self.on_device_assert(proxy)
+
+            proxy.start_observation(self.VALID_JSON)
+            proxy.stop_all_observations()
+
+            # Test false
+            self.assertFalse(proxy.is_any_observation_running())
+
     def test_start_stop_observation(self):
         """Test starting and stopping an observation"""
         self.mock_dynamic_devices()
@@ -148,15 +184,9 @@ class TestObservationControlDevice(base.TestCase, test_observation_base.TestObse
 
             # uses ID 12345
             proxy.start_observation(self.VALID_JSON)
-
-            # Test true
-            self.assertTrue(proxy.is_any_observation_running())
-            self.assertTrue(proxy.is_observation_running(12345))
-
             proxy.stop_observation(12345)
 
             # Test false
-            self.assertFalse(proxy.is_any_observation_running())
             self.assertFalse(proxy.is_observation_running(12345))
 
     def test_start_multi_stop_all_observation(self):
@@ -173,11 +203,8 @@ class TestObservationControlDevice(base.TestCase, test_observation_base.TestObse
             # uses ID 12345
             proxy.start_observation(self.VALID_JSON)
             proxy.start_observation(json.dumps(second_observation_json))
-
-            self.assertTrue(proxy.is_any_observation_running())
-            self.assertTrue(proxy.is_observation_running(12345))
-            self.assertTrue(proxy.is_observation_running(54321))
-
             proxy.stop_all_observations()
 
-            self.assertFalse(proxy.is_any_observation_running())
+            # Test false
+            self.assertFalse(proxy.is_observation_running(12345))
+            self.assertFalse(proxy.is_observation_running(54321))