added missing tests for initialize - need to fix lint and add raising…

… errors
Opentrons · Dec 18, 2024 · efd2eba · efd2eba
1 parent 92fa9b4
commit efd2eba
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 10 deletions.
diff --git a/api/src/opentrons/protocol_engine/commands/absorbance_reader/initialize.py b/api/src/opentrons/protocol_engine/commands/absorbance_reader/initialize.py
@@ -116,7 +116,7 @@ async def execute(self, params: InitializeParams) -> SuccessData[InitializeResul
             )
 
         state_update.initialize_absorbance_reader(
-            params.moduleId,
+            params.moduleId,  # should this be the verified id?
             params.measureMode,
             params.sampleWavelengths,
             params.referenceWavelength,

diff --git a/api/src/opentrons/protocol_engine/state/update_types.py b/api/src/opentrons/protocol_engine/state/update_types.py
@@ -630,12 +630,13 @@ def initialize_absorbance_reader(
         reference_wave_length: typing.Optional[int],
     ) -> Self:
         self.module_state_update = ModuleStateUpdate(
-            module_id=module_id, module_type="absorbanceReaderType"
-        )
-        self.initialize_absorbance_reader_update = AbsorbanceReaderInitializeUpdate(
-            measure_mode=measure_mode,
-            sample_wave_lengths=sample_wave_lengths,
-            reference_wave_length=reference_wave_length,
+            module_id=module_id,
+            module_type="absorbanceReaderType",
+            initialize_absorbance_reader_update=AbsorbanceReaderInitializeUpdate(
+                measure_mode=measure_mode,
+                sample_wave_lengths=sample_wave_lengths,
+                reference_wave_length=reference_wave_length,
+            ),
         )
         return self
 

diff --git a/api/tests/opentrons/protocol_engine/commands/absorbance_reader/test_initialize.py b/api/tests/opentrons/protocol_engine/commands/absorbance_reader/test_initialize.py
@@ -1,9 +1,13 @@
 """Test absorbance reader initilize command."""
+import pytest
 from decoy import Decoy
+from typing import List
 
+from opentrons.drivers.types import ABSMeasurementMode
 from opentrons.hardware_control.modules import AbsorbanceReader
 
 from opentrons.protocol_engine.execution import EquipmentHandler
+from opentrons.protocol_engine.state import update_types
 from opentrons.protocol_engine.state.state import StateView
 from opentrons.protocol_engine.state.module_substates import (
     AbsorbanceReaderSubState,
@@ -19,16 +23,23 @@
 )
 
 
+@pytest.mark.parametrize(
+    "input_sample_wave_length, input_measure_mode", [([1, 2], "multi"), ([1], "single")]
+)
 async def test_absorbance_reader_implementation(
     decoy: Decoy,
     state_view: StateView,
     equipment: EquipmentHandler,
+    input_sample_wave_length: List[int],
+    input_measure_mode: str,
 ) -> None:
     """It should validate, find hardware module if not virtualized, and disengage."""
     subject = InitializeImpl(state_view=state_view, equipment=equipment)
 
     params = InitializeParams(
-        moduleId="unverified-module-id", measureMode="single", sampleWavelengths=[1, 2]
+        moduleId="unverified-module-id",
+        measureMode=input_measure_mode,
+        sampleWavelengths=input_sample_wave_length,
     )
 
     mabsorbance_module_substate = decoy.mock(cls=AbsorbanceReaderSubState)
@@ -45,7 +56,29 @@ async def test_absorbance_reader_implementation(
         absorbance_module_hw
     )
 
+    decoy.when((absorbance_module_hw.supported_wavelengths)).then_return([1, 2])
+
     result = await subject.execute(params=params)
 
-    decoy.verify(await absorbance_module_hw.set_sample_wavelength(), times=1)
-    assert result == SuccessData(public=InitializeResult())
+    decoy.verify(
+        await absorbance_module_hw.set_sample_wavelength(
+            ABSMeasurementMode(params.measureMode),
+            params.sampleWavelengths,
+            reference_wavelength=params.referenceWavelength,
+        ),
+        times=1,
+    )
+    assert result == SuccessData(
+        public=InitializeResult(),
+        state_update=update_types.StateUpdate(
+            module_state_update=update_types.ModuleStateUpdate(
+                module_id="unverified-module-id",
+                module_type="absorbanceReaderType",
+                initialize_absorbance_reader_update=update_types.AbsorbanceReaderInitializeUpdate(
+                    measure_mode=input_measure_mode,
+                    sample_wave_lengths=input_sample_wave_length,
+                    reference_wave_length=None,
+                ),
+            )
+        ),
+    )