fix tests

Author: annie-xd-wang

test/controller/sub_controllers/test_camera_view.py

@@ -93,6 +93,7 @@ def setup_class(self, dummy_controller):
             "number_z_steps": np.random.randint(0, 100),
             "stack_cycling_mode": "per_stack",
             "selected_channels": 3,
+            "image_mode": "z-stack"
         }
 
     def test_init(self):
@@ -403,8 +404,12 @@ def test_digital_zoom(self):
 
     @pytest.mark.parametrize("onoff", [True, False])
     def test_left_click(self, onoff):
-
         self.camera_view.add_crosshair = MagicMock()
+        self.camera_view.digital_zoom = MagicMock()
+        self.camera_view.detect_saturation = MagicMock()
+        self.camera_view.down_sample_image = MagicMock()
+        self.camera_view.transpose_image = MagicMock()
+        self.camera_view.scale_image_intensity = MagicMock()
         self.camera_view.apply_lut = MagicMock()
         self.camera_view.populate_image = MagicMock()
         event = MagicMock()
@@ -415,7 +420,6 @@ def test_left_click(self, onoff):
         self.camera_view.left_click(event)
 
         self.camera_view.add_crosshair.assert_called()
-        self.camera_view.apply_lut.assert_called()
         self.camera_view.populate_image.assert_called()
         assert self.camera_view.apply_cross_hair == (not onoff)
 
@@ -564,8 +568,8 @@ def mocked_PhotoImage(img):
     def test_initialize_non_live_display(self):
         # Create test buffer and microscope_state
         camera_parameters = {
-            "x_pixels": np.random.randint(1, 200),
-            "y_pixels": np.random.randint(1, 200),
+            "img_x_pixels": np.random.randint(1, 200),
+            "img_y_pixels": np.random.randint(1, 200),
         }
 
         # Call the function
@@ -587,10 +591,10 @@ def test_initialize_non_live_display(self):
             == self.camera_view.number_of_channels * self.camera_view.number_of_slices
         )
         assert self.camera_view.original_image_width == int(
-            camera_parameters["x_pixels"]
+            camera_parameters["img_x_pixels"]
         )
         assert self.camera_view.original_image_height == int(
-            camera_parameters["y_pixels"]
+            camera_parameters["img_y_pixels"]
         )
         assert self.camera_view.canvas_width_scale == float(
             self.camera_view.original_image_width / self.camera_view.canvas_width
@@ -610,16 +614,20 @@ def test_retrieve_image_slice_from_volume(self):
     @pytest.mark.parametrize("transpose", [True, False])
     def test_display_image(self, transpose):
         self.camera_view.initialize_non_live_display(
-            self.microscope_state, {"x_pixels": 100, "y_pixels": 100}
+            self.microscope_state, {"img_x_pixels": 100, "img_y_pixels": 100}
         )
-
+        self.camera_view.digital_zoom = MagicMock()
+        self.camera_view.detect_saturation = MagicMock()
+        self.camera_view.down_sample_image = MagicMock()
+        self.camera_view.scale_image_intensity = MagicMock()
+        self.camera_view.apply_lut = MagicMock()
+        self.camera_view.populate_image = MagicMock()
         images = np.random.rand(10, 100, 100)
 
         self.camera_view.transpose = transpose
         count = 0
         self.camera_view.image_count = count
         self.camera_view.image_metrics = {"Channel": MagicMock()}
-        self.camera_view.process_image = MagicMock()
         self.camera_view.update_max_counts = MagicMock()
         self.camera_view.flip_flags = {"x": False, "y": False}
 
@@ -661,22 +669,20 @@ def test_display_image(self, transpose):
     def test_add_crosshair(self):
 
         # Arrange
-        image = np.random.rand(500, 500)
-        self.camera_view.down_sampled_image = image
+        x = self.camera_view.canvas_width
+        y = self.camera_view.canvas_height
+        image = np.random.rand(x, y)
         self.camera_view.apply_cross_hair = True
-        num = np.random.randint(1, 50)
-        self.camera_view.crosshair_x = num
-        self.camera_view.crosshair_y = num
 
         # Act
-        self.camera_view.add_crosshair()
+        image2 = self.camera_view.add_crosshair(image)
 
         # Assert
         assert np.all(
-            self.camera_view.cross_hair_image[:, self.camera_view.crosshair_x] == 1
+            image2[:, self.camera_view.zoom_rect[0][1]//2] == 1
         )
         assert np.all(
-            self.camera_view.cross_hair_image[self.camera_view.crosshair_y, :] == 1
+            image2[self.camera_view.zoom_rect[1][1]//2, :] == 1
         )
 
     def test_apply_LUT(self):
@@ -691,10 +697,9 @@ def test_update_LUT(self):
     def test_detect_saturation(self):
         test_image = np.random.randint(0, 2**16, size=(100, 100))
         test_image[:50, :50] = 2**16 - 1  # set top left corner to saturation value
-        self.camera_view.zoom_image = test_image
 
         # Call the function to detect saturation
-        self.camera_view.detect_saturation()
+        self.camera_view.detect_saturation(test_image)
 
         # Assert that the saturated pixels were correctly detected
         assert np.all(self.camera_view.saturated_pixels == 2**16 - 1)

test/controller/test_controller.py

@@ -2,6 +2,7 @@
 from types import SimpleNamespace
 from unittest.mock import MagicMock, ANY
 import pytest
+import numpy
 
 
 class DummySplashScreen:
@@ -500,11 +501,24 @@ def test_execute_random(controller):
 
 
 def test_capture_image(controller):
+
+    count = 0
+    def get_image_id():
+        nonlocal count
+        count += 1
+        if count >= 10:
+            return "stop"
+        return numpy.random.randint(0, 10)
+    
+    width = controller.configuration["experiment"]["CameraParameters"]["img_x_pixels"]
+    height = controller.configuration["experiment"]["CameraParameters"]["img_y_pixels"]
+    images = numpy.random.rand(10, width, height)
+    controller.data_buffer = images
     work_thread = MagicMock()
     work_thread.join = MagicMock()
     controller.threads_pool.createThread = MagicMock()
     controller.threads_pool.createThread.return_value = work_thread
-    controller.show_img_pipe.recv = MagicMock()
+    controller.show_img_pipe.recv = get_image_id
     controller.show_img_pipe.poll = MagicMock()
     controller.show_img_pipe.poll.return_value = False