fix: rename DeviceBox to PositionerBox, fix test for validation

tests/unit_tests/test_bec_dock.py

@@ -127,10 +127,12 @@ def test_toolbar_add_plot_motor_map(bec_dock_area):
     assert bec_dock_area.panels["motor_map_1"].widgets[0].config.widget_class == "BECMotorMapWidget"
 
 
-def test_toolbar_add_device_device_box(bec_dock_area):
-    bec_dock_area.toolbar.widgets["menu_devices"].widgets["device_box"].trigger()
-    assert "device_box_1" in bec_dock_area.panels
-    assert bec_dock_area.panels["device_box_1"].widgets[0].config.widget_class == "DeviceBox"
+def test_toolbar_add_device_positioner_box(bec_dock_area):
+    bec_dock_area.toolbar.widgets["menu_devices"].widgets["positioner_box"].trigger()
+    assert "positioner_box_1" in bec_dock_area.panels
+    assert (
+        bec_dock_area.panels["positioner_box_1"].widgets[0].config.widget_class == "PositionerBox"
+    )
 
 
 def test_toolbar_add_utils_queue(bec_dock_area):

tests/unit_tests/test_device_box.py

@@ -1,98 +0,0 @@
-from unittest import mock
-
-import pytest
-from bec_lib.endpoints import MessageEndpoints
-from bec_lib.messages import ScanQueueMessage
-from qtpy.QtGui import QValidator
-
-from bec_widgets.widgets.device_box.device_box import DeviceBox
-
-from .client_mocks import mocked_client
-
-
-@pytest.fixture
-def device_box(qtbot, mocked_client):
-    with mock.patch("bec_widgets.widgets.device_box.device_box.uuid.uuid4") as mock_uuid:
-        mock_uuid.return_value = "fake_uuid"
-        db = DeviceBox(device="samx", client=mocked_client)
-        qtbot.addWidget(db)
-        yield db
-
-
-def test_device_box(device_box):
-    assert device_box.device == "samx"
-    data = device_box.dev["samx"].read()
-
-    setpoint_text = device_box.ui.setpoint.text()
-    # check that the setpoint is taken correctly after init
-    assert float(setpoint_text) == data["samx_setpoint"]["value"]
-
-    # check that the precision is taken correctly after init
-    precision = device_box.dev["samx"].precision
-    assert setpoint_text == f"{data['samx_setpoint']['value']:.{precision}f}"
-
-    # check that the step size is set according to the device precision
-    assert device_box.ui.step_size.value() == 10**-precision * 10
-
-
-def test_device_box_update_limits(device_box):
-    device_box._limits = None
-    device_box.update_limits([0, 10])
-    assert device_box._limits == [0, 10]
-    assert device_box.setpoint_validator.bottom() == 0
-    assert device_box.setpoint_validator.top() == 10
-    assert device_box.setpoint_validator.validate("100", 0) == (
-        QValidator.State.Intermediate,
-        "100",
-        0,
-    )
-
-    device_box.update_limits(None)
-    assert device_box._limits is None
-    assert device_box.setpoint_validator.validate("100", 0) == (
-        QValidator.State.Acceptable,
-        "100",
-        0,
-    )
-
-
-def test_device_box_on_stop(device_box):
-    with mock.patch.object(device_box.client.connector, "send") as mock_send:
-        device_box.on_stop()
-        params = {"device": "samx", "rpc_id": "fake_uuid", "func": "stop", "args": [], "kwargs": {}}
-        msg = ScanQueueMessage(
-            scan_type="device_rpc",
-            parameter=params,
-            queue="emergency",
-            metadata={"RID": "fake_uuid", "response": False},
-        )
-        mock_send.assert_called_once_with(MessageEndpoints.scan_queue_request(), msg)
-
-
-def test_device_box_setpoint_change(device_box):
-    with mock.patch.object(device_box.dev["samx"], "move") as mock_move:
-        device_box.ui.setpoint.setText("100")
-        device_box.on_setpoint_change()
-        mock_move.assert_called_once_with(100, relative=False)
-
-
-def test_device_box_on_tweak_right(device_box):
-    with mock.patch.object(device_box.dev["samx"], "move") as mock_move:
-        device_box.ui.step_size.setValue(0.1)
-        device_box.on_tweak_right()
-        mock_move.assert_called_once_with(0.1, relative=True)
-
-
-def test_device_box_on_tweak_left(device_box):
-    with mock.patch.object(device_box.dev["samx"], "move") as mock_move:
-        device_box.ui.step_size.setValue(0.1)
-        device_box.on_tweak_left()
-        mock_move.assert_called_once_with(-0.1, relative=True)
-
-
-def test_device_box_setpoint_out_of_range(device_box):
-    device_box.update_limits([0, 10])
-    device_box.ui.setpoint.setText("100")
-    device_box.on_setpoint_change()
-    assert device_box.ui.setpoint.text() == "100"
-    assert device_box.ui.setpoint.hasAcceptableInput() == False

tests/unit_tests/test_positioner_box.py

@@ -0,0 +1,104 @@
+from unittest import mock
+
+import pytest
+from bec_lib.device import Positioner
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.messages import ScanQueueMessage
+from qtpy.QtGui import QValidator
+
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
+
+from .client_mocks import mocked_client
+
+
+@pytest.fixture
+def positioner_box(qtbot, mocked_client):
+    with mock.patch("bec_widgets.widgets.positioner_box.positioner_box.uuid.uuid4") as mock_uuid:
+        mock_uuid.return_value = "fake_uuid"
+        with mock.patch(
+            "bec_widgets.widgets.positioner_box.positioner_box.PositionerBox._check_device_is_valid",
+            return_value=True,
+        ):
+            db = PositionerBox(device="samx", client=mocked_client)
+            qtbot.addWidget(db)
+            yield db
+
+
+def test_positioner_box(positioner_box):
+    assert positioner_box.device == "samx"
+    data = positioner_box.dev["samx"].read()
+    # Avoid check for Positioner class from BEC in _init_device
+
+    setpoint_text = positioner_box.ui.setpoint.text()
+    # check that the setpoint is taken correctly after init
+    assert float(setpoint_text) == data["samx_setpoint"]["value"]
+
+    # check that the precision is taken correctly after isnit
+    precision = positioner_box.dev["samx"].precision
+    assert setpoint_text == f"{data['samx_setpoint']['value']:.{precision}f}"
+
+    # check that the step size is set according to the device precision
+    assert positioner_box.ui.step_size.value() == 10**-precision * 10
+
+
+def test_positioner_box_update_limits(positioner_box):
+    positioner_box._limits = None
+    positioner_box.update_limits([0, 10])
+    assert positioner_box._limits == [0, 10]
+    assert positioner_box.setpoint_validator.bottom() == 0
+    assert positioner_box.setpoint_validator.top() == 10
+    assert positioner_box.setpoint_validator.validate("100", 0) == (
+        QValidator.State.Intermediate,
+        "100",
+        0,
+    )
+
+    positioner_box.update_limits(None)
+    assert positioner_box._limits is None
+    assert positioner_box.setpoint_validator.validate("100", 0) == (
+        QValidator.State.Acceptable,
+        "100",
+        0,
+    )
+
+
+def test_positioner_box_on_stop(positioner_box):
+    with mock.patch.object(positioner_box.client.connector, "send") as mock_send:
+        positioner_box.on_stop()
+        params = {"device": "samx", "rpc_id": "fake_uuid", "func": "stop", "args": [], "kwargs": {}}
+        msg = ScanQueueMessage(
+            scan_type="device_rpc",
+            parameter=params,
+            queue="emergency",
+            metadata={"RID": "fake_uuid", "response": False},
+        )
+        mock_send.assert_called_once_with(MessageEndpoints.scan_queue_request(), msg)
+
+
+def test_positioner_box_setpoint_change(positioner_box):
+    with mock.patch.object(positioner_box.dev["samx"], "move") as mock_move:
+        positioner_box.ui.setpoint.setText("100")
+        positioner_box.on_setpoint_change()
+        mock_move.assert_called_once_with(100, relative=False)
+
+
+def test_positioner_box_on_tweak_right(positioner_box):
+    with mock.patch.object(positioner_box.dev["samx"], "move") as mock_move:
+        positioner_box.ui.step_size.setValue(0.1)
+        positioner_box.on_tweak_right()
+        mock_move.assert_called_once_with(0.1, relative=True)
+
+
+def test_positioner_box_on_tweak_left(positioner_box):
+    with mock.patch.object(positioner_box.dev["samx"], "move") as mock_move:
+        positioner_box.ui.step_size.setValue(0.1)
+        positioner_box.on_tweak_left()
+        mock_move.assert_called_once_with(-0.1, relative=True)
+
+
+def test_positioner_box_setpoint_out_of_range(positioner_box):
+    positioner_box.update_limits([0, 10])
+    positioner_box.ui.setpoint.setText("100")
+    positioner_box.on_setpoint_change()
+    assert positioner_box.ui.setpoint.text() == "100"
+    assert positioner_box.ui.setpoint.hasAcceptableInput() == False