Update to use default motor mock in ophyd_async (#1724)

* Fix new import locations

* Fix tests against default motor vals

* Remove unnecessary motor patches

* Pin to ophyd-async branch

* Remove commented out import

* Update ophyd-async version

Author: DominicOram

docs/how-to/write-tests.md

@@ -7,7 +7,7 @@ Testing is essential to maintain the integrity and reliability of the codebase.
 - **Unit Tests**: Place unit tests for individual components in the `tests` directory, but take care to mirror the file structure of the `src` folder with the corresponding code files. Use the `test_*.py` naming convention for test files.
 - **System Tests**: Tests that interact with DLS infrastructure, network, and filesystem should be placed in the top-level `systems_test` folder. This separation ensures that these tests are easily identifiable and can be run independently from unit tests.
 
-Useful functions for testing that can be reused across multiple tests for common devices and for external plan repositories belong in the `dodal/testing` directory. For example, when mocking a `Motor` device, all of the signals will default to zero, which will cause errors when trying to move. The `patch_motor` and `patch_all_motors` functions, found in `dodal.testing`, will populate the mocked motor with useful default values for the signals so that it can still be used in tests.
+Useful functions for testing that can be reused across multiple tests for common devices and for external plan repositories belong in the `dodal/testing` directory.
 
 
 ## Writing a test for a device

pyproject.toml

@@ -14,7 +14,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async[ca,pva]>=0.13.7",
+    "ophyd-async[ca,pva]>=v0.14.0",
     "bluesky>=1.14.5",
     "pyepics",
     "pillow",
@@ -48,7 +48,7 @@ dev = [
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
     "myst-parser",
-    "ophyd_async[sim]>=v0.13.6",
+    "ophyd_async[sim]>=v0.14.0",
     "pipdeptree",
     "pre-commit",
     "psutil",

src/dodal/devices/detector/det_resolution.py

@@ -10,14 +10,16 @@ def _get_detector_radius_mm(detector_params: DetectorParams):
     return 0.5 * _get_detector_max_size_mm(detector_params)
 
 
-def _get_detector_max_size_mm(detector_params):
+def _get_detector_max_size_mm(detector_params: DetectorParams):
     return max(
         detector_params.detector_size_constants.det_dimension.width,
         detector_params.detector_size_constants.det_dimension.height,
     )
 
 
-def _get_beam_xy_accounting_for_roi(detector_params, det_distance_mm):
+def _get_beam_xy_accounting_for_roi(
+    detector_params: DetectorParams, det_distance_mm: float
+):
     beam_x = detector_params.beam_xy_converter.get_beam_xy_from_det_dist(
         det_distance_mm, Axis.X_AXIS
     )

src/dodal/testing/__init__.py

@@ -6,8 +6,7 @@
 
 import pytest
 from aiohttp.client_exceptions import ClientConnectorError
-from ophyd_async.core import init_devices
-from ophyd_async.testing import set_mock_value
+from ophyd_async.core import init_devices, set_mock_value
 from tests.devices.oav.conftest import (
     oav_beam_centre_pv_fs,  # noqa: F401
     oav_beam_centre_pv_roi,  # noqa: F401

src/dodal/testing/setup.py

@@ -1,7 +1,7 @@
 import pytest
 from bluesky import RunEngine
 from bluesky.utils import MsgGenerator
-from ophyd_async.testing import set_mock_value
+from ophyd_async.core import set_mock_value
 
 from dodal.common.beamlines.commissioning_mode import read_commissioning_mode
 from dodal.devices.baton import Baton

system_tests/test_oav_to_redis_system.py

@@ -6,8 +6,7 @@
 from unittest.mock import patch
 
 import pytest
-from ophyd_async.core import init_devices
-from ophyd_async.testing import set_mock_value
+from ophyd_async.core import init_devices, set_mock_value
 
 from conftest import mock_attributes_table
 from dodal.common.beamlines import beamline_parameters, beamline_utils

tests/common/beamlines/test_commissioning_mode.py

@@ -5,14 +5,12 @@
 
 from dodal.beamlines import aithre
 from dodal.devices.aithre_lasershaping.goniometer import Goniometer
-from dodal.testing import patch_all_motors
 
 
 @pytest.fixture
 def goniometer() -> Goniometer:
     with init_devices(mock=True):
         gonio = aithre.goniometer(connect_immediately=True, mock=True)
-    patch_all_motors(gonio)
     return gonio
 
 

tests/conftest.py

@@ -35,13 +35,13 @@ async def test_read_config_includes(mock_ccmc: ChannelCutMonochromator):
         {
             f"{mock_ccmc.name}-_xyz-x-motor_egu": partial_reading(""),
             f"{mock_ccmc.name}-_xyz-x-offset": partial_reading(0.0),
-            f"{mock_ccmc.name}-_xyz-x-velocity": partial_reading(0.0),
+            f"{mock_ccmc.name}-_xyz-x-velocity": partial_reading(1000.0),
             f"{mock_ccmc.name}-_xyz-y-motor_egu": partial_reading(""),
             f"{mock_ccmc.name}-_xyz-y-offset": partial_reading(0.0),
-            f"{mock_ccmc.name}-_xyz-y-velocity": partial_reading(0.0),
+            f"{mock_ccmc.name}-_xyz-y-velocity": partial_reading(1000.0),
             f"{mock_ccmc.name}-_xyz-z-motor_egu": partial_reading(""),
             f"{mock_ccmc.name}-_xyz-z-offset": partial_reading(0.0),
-            f"{mock_ccmc.name}-_xyz-z-velocity": partial_reading(0.0),
+            f"{mock_ccmc.name}-_xyz-z-velocity": partial_reading(1000.0),
         },
     )