fix tests

Author: annie-xd-wang

test/controller/sub_controllers/test_camera_settings.py

@@ -183,20 +183,23 @@ def test_attr(self):
             assert hasattr(self.camera_settings, attr)
 
     def test_populate_experiment_values(self):
+        microscope_name = self.camera_settings.parent_controller.configuration[
+            "experiment"
+        ]["MicroscopeState"]["microscope_name"]
         self.camera_settings.parent_controller.configuration["experiment"][
             "CameraParameters"
-        ]["readout_time"] = 0.1
+        ][microscope_name]["readout_time"] = 0.1
         # Populate widgets with values from experiment file and check
         self.camera_settings.populate_experiment_values()
         camera_setting_dict = self.camera_settings.parent_controller.configuration[
             "experiment"
-        ]["CameraParameters"]
+        ]["CameraParameters"][microscope_name]
 
         # Checking values altered are correct
         assert dict(self.camera_settings.camera_setting_dict) == dict(
             self.camera_settings.parent_controller.configuration["experiment"][
                 "CameraParameters"
-            ]
+            ][microscope_name]
         )
         assert (
             str(self.camera_settings.mode_widgets["Sensor"].get())
@@ -228,14 +231,12 @@ def test_populate_experiment_values(self):
             == camera_setting_dict["y_pixels"]
         )
 
-        assert (
-            self.camera_settings.roi_widgets["Top_X"].get()
-            == camera_setting_dict.get("top_x", 0)
-        )
-        assert (
-            self.camera_settings.roi_widgets["Top_Y"].get()
-            == camera_setting_dict.get("top_y", 0)
-        )
+        assert self.camera_settings.roi_widgets[
+            "Top_X"
+        ].get() == camera_setting_dict.get("top_x", 0)
+        assert self.camera_settings.roi_widgets[
+            "Top_Y"
+        ].get() == camera_setting_dict.get("top_y", 0)
         if camera_setting_dict.get("is_centered", True):
             assert (
                 str(self.camera_settings.roi_widgets["Top_X"].widget["state"])
@@ -253,7 +254,9 @@ def test_populate_experiment_values(self):
         )
 
         # Exposure Time
-        channels = self.camera_settings.microscope_state_dict["channels"]
+        channels = self.camera_settings.parent_controller.configuration["experiment"][
+            "MicroscopeState"
+        ]["channels"]
         exposure_time = channels[list(channels.keys())[0]]["camera_exposure_time"]
         assert (
             self.camera_settings.framerate_widgets["exposure_time"].get()
@@ -268,11 +271,14 @@ def test_populate_experiment_values(self):
     @pytest.mark.parametrize("mode", ["Normal", "Light-Sheet"])
     def test_update_experiment_values(self, mode):
 
+        microscope_name = self.camera_settings.parent_controller.configuration[
+            "experiment"
+        ]["MicroscopeState"]["microscope_name"]
         # Setup basic default experiment
         self.camera_settings.camera_setting_dict = (
             self.camera_settings.parent_controller.configuration["experiment"][
                 "CameraParameters"
-            ]
+            ][microscope_name]
         )
 
         # Setting up new values in widgets
@@ -329,9 +335,12 @@ def test_update_experiment_values(self, mode):
     @pytest.mark.parametrize("mode", ["Normal", "Light-Sheet"])
     def test_update_sensor_mode(self, mode):
         self.camera_settings.populate_experiment_values()
+        microscope_name = self.camera_settings.parent_controller.configuration[
+            "experiment"
+        ]["MicroscopeState"]["microscope_name"]
         camera_setting_dict = self.camera_settings.parent_controller.configuration[
             "experiment"
-        ]["CameraParameters"]
+        ]["CameraParameters"][microscope_name]
 
         # Set mode
         self.camera_settings.mode_widgets["Sensor"].widget.set(mode)

test/model/features/test_restful_features.py

@@ -100,7 +100,9 @@ def setUp(self):
             "rest_api_config": {"Ilastik": {"url": "http://example.com/ilastik"}},
             "experiment": {
                 "MicroscopeState": {"microscope_name": "Nanoscale", "zoom": "1.0"},
-                "CameraParameters": {"x_pixels": "2048", "y_pixels": "2048"},
+                "CameraParameters": {
+                    "Nanoscale": {"x_pixels": "2048", "y_pixels": "2048"},
+                },
                 "StageParameters": {
                     "x": "100",
                     "y": "100",
@@ -125,6 +127,7 @@ def setUp(self):
         self.mock_model.display_ilastik_segmentation = True
         self.mock_model.mark_ilastik_position = False
         self.mock_model.event_queue = MagicMock()
+        self.mock_model.active_microscope_name = "Nanoscale"
 
         self.ilastik_segmentation = IlastikSegmentation(self.mock_model)
 

test/model/features/test_volume_search.py

@@ -198,7 +198,12 @@ def test_box_volume_search(self):
         from navigate.tools.sdf import volume_from_sdf, box
 
         M = int(self.config["number_z_steps"])
-        self.model.configuration["experiment"]["CameraParameters"]["x_pixels"] = self.N
+        microscope_name = self.model.configuration["experiment"]["MicroscopeState"][
+            "microscope_name"
+        ]
+        self.model.configuration["experiment"]["CameraParameters"][microscope_name][
+            "x_pixels"
+        ] = self.N
         self.lxy = (
             np.random.randint(int(0.1 * self.N), int(0.4 * self.N))
             * self.curr_pixel_size

test/model/metadata_sources/test_metadata.py

@@ -41,8 +41,15 @@ def test_metadata_shape(dummy_model):
 
     md.configuration = dummy_model.configuration
 
-    txs = dummy_model.configuration["experiment"]["CameraParameters"]["img_x_pixels"]
-    tys = dummy_model.configuration["experiment"]["CameraParameters"]["img_y_pixels"]
+    microscope_name = dummy_model.configuration["experiment"]["MicroscopeState"][
+        "microscope_name"
+    ]
+    txs = dummy_model.configuration["experiment"]["CameraParameters"][microscope_name][
+        "img_x_pixels"
+    ]
+    tys = dummy_model.configuration["experiment"]["CameraParameters"][microscope_name][
+        "img_y_pixels"
+    ]
     tzs = dummy_model.configuration["experiment"]["MicroscopeState"]["number_z_steps"]
     tts = dummy_model.configuration["experiment"]["MicroscopeState"]["timepoints"]
     tcs = sum(