Merge pull request #84 from DiamondLightSource/update_electron_analyser_tests_to_use_functions_from_dodal

Update electron analyser tests to use functions from dodal

Author: oliwenmandiamond

tests/electron_analyser/conftest.py

@@ -1,14 +1,17 @@
-from typing import get_args, get_origin
-
 import pytest
 from bluesky import RunEngine
-from dodal.devices.electron_analyser import ElectronAnalyserDetectorImpl
+from dodal.beamlines import b07, i09
+from dodal.devices.electron_analyser import ElectronAnalyserDetector
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
+from dodal.testing.electron_analyser import create_detector
 from ophyd_async.core import SignalR, init_devices
 from ophyd_async.sim import SimMotor
 
-from tests.electron_analyser.util import TEST_SPECS_SEQUENCE, TEST_VGSCIENTA_SEQUENCE
+from tests.electron_analyser.util import (
+    TEST_SPECS_SEQUENCE,
+    TEST_VGSCIENTA_SEQUENCE,
+)
 
 
 @pytest.fixture
@@ -28,30 +31,28 @@ async def energy_sources(
     return {"source1": dcm_energy.user_readback, "source2": pgm_energy.user_readback}
 
 
-@pytest.fixture
+@pytest.fixture(
+    params=[
+        VGScientaDetector[i09.LensMode, i09.PsuMode, i09.PassEnergy],
+        SpecsDetector[b07.LensMode, b07.PsuMode],
+    ]
+)
 async def sim_analyser(
-    detector_class: type[ElectronAnalyserDetectorImpl],
+    request: pytest.FixtureRequest,
     energy_sources: dict[str, SignalR[float]],
     RE: RunEngine,
-) -> ElectronAnalyserDetectorImpl:
-    # ToDo - this needs to use what dodal uses once this is implemented
-    # https://github.com/DiamondLightSource/dodal/issues/1396
-    parameters = {
-        "prefix": "TEST:",
-        "lens_mode_type": get_args(detector_class)[0],
-        "psu_mode_type": get_args(detector_class)[1],
-        "energy_sources": energy_sources,
-    }
-    if get_origin(detector_class) is VGScientaDetector:
-        parameters["pass_energy_type"] = get_args(detector_class)[2]
-
-    async with init_devices(mock=True, connect=True):
-        sim_detector = detector_class(**parameters)
-    return sim_detector
+) -> ElectronAnalyserDetector:
+    with init_devices(mock=True):
+        sim_analyser = await create_detector(
+            request.param,
+            prefix="TEST:",
+            energy_sources=energy_sources,
+        )
+    return sim_analyser
 
 
 @pytest.fixture
-def sequence_file(sim_analyser: ElectronAnalyserDetectorImpl) -> str:
+def sequence_file(sim_analyser: ElectronAnalyserDetector) -> str:
     if isinstance(sim_analyser, VGScientaDetector):
         return TEST_VGSCIENTA_SEQUENCE
     elif isinstance(sim_analyser, SpecsDetector):

tests/electron_analyser/plan_stubs/test_analyser_per_step.py

@@ -9,34 +9,19 @@
 from bluesky import RunEngine
 from bluesky import plan_stubs as bps
 from bluesky.protocols import Movable, Readable, Triggerable
-from dodal.beamlines import b07, i09
 from dodal.devices.electron_analyser import (
     ElectronAnalyserDetector,
     ElectronAnalyserRegionDetector,
     GenericElectronAnalyserDetector,
     GenericElectronAnalyserRegionDetector,
 )
-from dodal.devices.electron_analyser.specs import SpecsDetector
-from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
 from ophyd.status import Status
 from ophyd_async.sim import SimMotor
 
 from sm_bluesky.electron_analyser.plan_stubs import analyser_per_step as aps
 from tests.electron_analyser.util import analyser_setup_for_scan
 
 
-@pytest.fixture(
-    params=[
-        VGScientaDetector[i09.LensMode, i09.PsuMode, i09.PassEnergy],
-        SpecsDetector[b07.LensMode, b07.PsuMode],
-    ]
-)
-def detector_class(
-    request: pytest.FixtureRequest,
-) -> type[ElectronAnalyserDetector]:
-    return request.param
-
-
 @pytest.fixture
 def region_detectors(
     sim_analyser: ElectronAnalyserDetector, sequence_file: str

tests/electron_analyser/plans/test_analyser_scans.py

@@ -1,17 +1,14 @@
 from collections.abc import Sequence
 
 import pytest
+from bluesky import RunEngine
 from bluesky.protocols import Readable
-from bluesky.run_engine import RunEngine
-from dodal.beamlines import b07, i09
 from dodal.devices.electron_analyser import (
     ElectronAnalyserDetector,
     ElectronAnalyserRegionDetector,
     GenericElectronAnalyserDetector,
     GenericElectronAnalyserRegionDetector,
 )
-from dodal.devices.electron_analyser.specs import SpecsDetector
-from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
 from ophyd_async.sim import SimMotor
 
 from sm_bluesky.electron_analyser.plans.analyser_scans import (
@@ -23,18 +20,6 @@
 from tests.electron_analyser.util import analyser_setup_for_scan
 
 
-@pytest.fixture(
-    params=[
-        VGScientaDetector[i09.LensMode, i09.PsuMode, i09.PassEnergy],
-        SpecsDetector[b07.LensMode, b07.PsuMode],
-    ]
-)
-def detector_class(
-    request: pytest.FixtureRequest,
-) -> type[ElectronAnalyserDetector]:
-    return request.param
-
-
 @pytest.fixture(params=[0, 1, 2])
 def extra_detectors(
     request: pytest.FixtureRequest,