Refactor microscopy response series tests to use updated mock objects

Author: alessandratrapani

src/pynwb/tests/test_constructors.py

@@ -246,30 +246,17 @@ def test_constructor_microscopy_response_series():
 
 
 def test_constructor_microscopy_response_series_with_microscopy_series():
-    microscope = mock_Microscope()
-    excitation_light_path = mock_ExcitationLightPath()
-    planar_imaging_space = mock_PlanarImagingSpace()
-    emission_light_path = mock_EmissionLightPath()
 
+    microscopyrig = mock_MicroscopyRig()
+    microscopychannel = mock_MicroscopyChannel()
+    number_of_rois = 10
+    planar_imaging_space = mock_PlanarImagingSpace()
     microscopy_series = mock_PlanarMicroscopySeries(
-        microscope=microscope,
-        excitation_light_path=excitation_light_path,
+        microscopy_channel=microscopychannel,
+        microscopy_rig=microscopyrig,
         planar_imaging_space=planar_imaging_space,
-        emission_light_path=emission_light_path,
     )
-    # TODO: replace code above with comment below when
-    # https://github.com/catalystneuro/ndx-microscopy/pull/61 and
-    # https://github.com/catalystneuro/ndx-microscopy/pull/59 are merged
-    # microscopyrig = mock_MicroscopyRig()
-    # microscopychannel = mock_MicroscopyChannel()
-    # microscopy_series = mock_PlanarMicroscopySeries(
-    #     microscopychannel=microscopychannel,
-    #     microscopyrig=microscopyrig,
-    #     planar_imaging_space=planar_imaging_space,
-    # )
-    number_of_rois = 10
-    planar_imaging_space = mock_PlanarImagingSpace()
-    segmentation = mock_Segmentation2D(planar_imaging_space=planar_imaging_space, number_of_rois=number_of_rois)
+    segmentation = mock_PlanarSegmentation(planar_imaging_space=planar_imaging_space, number_of_rois=number_of_rois)
     rois = segmentation.create_roi_table_region(
         description="test region",
         region=[x for x in range(number_of_rois)],

src/pynwb/tests/test_roundtrip.py

@@ -354,8 +354,6 @@ def test_roundtrip(self):
 class TestMultiChannelMicroscopyContainerSimpleRoundtrip(pynwb_TestCase):
     """Simple roundtrip test for MultiChannelMicroscopyContainer."""
 
-    # TODO change to this once MicroscopyRig and MicroscopyChannel are available
-
     def setUp(self):
         self.nwbfile_path = "test_multi_channel_microscopy_container_roundtrip.nwb"