From 6b758eb8943ef80519c4016765b2dd64c48a1b18 Mon Sep 17 00:00:00 2001
From: appel_c <christian.appel@psi.ch>
Date: Sun, 30 Nov 2025 22:23:45 +0100
Subject: [PATCH] refactor(status): cleanup, remove error in test using 'and'
 instead of &

---
 ophyd_devices/utils/psi_device_base_utils.py | 17 +++++++++++------
 tests/test_utils.py                          |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ophyd_devices/utils/psi_device_base_utils.py b/ophyd_devices/utils/psi_device_base_utils.py
index fdf4eee..8dd41ae 100644
--- a/ophyd_devices/utils/psi_device_base_utils.py
+++ b/ophyd_devices/utils/psi_device_base_utils.py
@@ -75,12 +75,17 @@ class AndStatus(StatusBase):
     If any of the two Status objects fails, the combined status will fail
     with the exception of the first Status to fail.
 
-    Parameters
-    ----------
-    left: StatusBase
-        The left-hand Status object
-    right: StatusBase
-        The right-hand Status object
+    Args:
+        left (StatusBase): Left status object.
+        right (StatusBase): Right status object.
+
+    Examples:
+        >>> status1 = StatusBase(device1)
+        >>> status2 = StatusBase(device2)
+        >>> status3 = StatusBase(device3)
+        >>> combined_status = AndStatus(status1, status2)
+        >>> combined_status = status1 & status2
+        >>> combined_status = status1 & status2 & status3
     """
 
     def __init__(self, left, right, **kwargs):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 7aa83e6..e835fb8 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -970,7 +970,7 @@ def test_patched_status_objects():
     dev_status = DeviceStatus(device=dev)
 
     st = Status()
-    and_st = st and dev_status
+    and_st = st & dev_status
     assert dev_status.device == dev
     dev_status.set_exception(RuntimeError("device error"))
     with pytest.raises(RuntimeError):