bec-widgets 0.44.4__py3-none-any.whl → 0.45.0__py3-none-any.whl

tests/test_config_dialog.py

@@ -2,12 +2,13 @@
 import os
 from unittest.mock import MagicMock
 
+import pytest
 import yaml
+from qtpy.QtWidgets import QTableWidgetItem, QTabWidget
 
-import pytest
-from qtpy.QtWidgets import QTabWidget, QTableWidgetItem
+from bec_widgets.widgets.monitor.config_dialog import ConfigDialog
 
-from bec_widgets.widgets import ConfigDialog
+from .client_mocks import mocked_client
 
 
 def load_test_config(config_name):
@@ -18,69 +19,6 @@ def load_test_config(config_name):
     return config
 
 
-class FakeDevice:
-    """Fake minimal positioner class for testing."""
-
-    def __init__(self, name, enabled=True):
-        self.name = name
-        self.enabled = enabled
-        self.signals = {self.name: {"value": 1.0}}
-        self.description = {self.name: {"source": self.name}}
-
-    def __contains__(self, item):
-        return item == self.name
-
-    @property
-    def _hints(self):
-        return [self.name]
-
-    def set_value(self, fake_value: float = 1.0) -> None:
-        """
-        Setup fake value for device readout
-        Args:
-            fake_value(float): Desired fake value
-        """
-        self.signals[self.name]["value"] = fake_value
-
-    def describe(self) -> dict:
-        """
-        Get the description of the device
-        Returns:
-            dict: Description of the device
-        """
-        return self.description
-
-
-def get_mocked_device(device_name: str):
-    """
-    Helper function to mock the devices
-    Args:
-        device_name(str): Name of the device to mock
-    """
-    return FakeDevice(name=device_name, enabled=True)
-
-
-@pytest.fixture(scope="function")
-def mocked_client():
-    # Create a dictionary of mocked devices
-    device_names = ["samx", "gauss_bpm", "gauss_adc1", "gauss_adc2", "gauss_adc3", "bpm4i"]
-    mocked_devices = {name: get_mocked_device(name) for name in device_names}
-
-    # Create a MagicMock object
-    client = MagicMock()
-
-    # Mock the device_manager.devices attribute
-    client.device_manager.devices = MagicMock()
-    client.device_manager.devices.__getitem__.side_effect = lambda x: mocked_devices.get(x)
-    client.device_manager.devices.__contains__.side_effect = lambda x: x in mocked_devices
-
-    # Set each device as an attribute of the mock
-    for name, device in mocked_devices.items():
-        setattr(client.device_manager.devices, name, device)
-
-    return client
-
-
 @pytest.fixture(scope="function")
 def config_dialog(qtbot, mocked_client):
     client = mocked_client

tests/test_editor.py

@@ -2,13 +2,11 @@
 
 import os
 import tempfile
-from unittest.mock import MagicMock
-from unittest.mock import patch, mock_open
+from unittest.mock import MagicMock, mock_open, patch
 
 import pytest
-
-from qtpy.QtWidgets import QTextEdit
 from qtpy.Qsci import QsciScintilla
+from qtpy.QtWidgets import QTextEdit
 
 from bec_widgets.widgets.editor.editor import AutoCompleter, BECEditor
 

tests/test_eiger_plot.py

@@ -1,10 +1,12 @@
 # pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
 import json
 from unittest.mock import MagicMock, patch
+
 import numpy as np
 import pyqtgraph as pg
 import pytest
 import zmq
+
 from bec_widgets.examples.eiger_plot.eiger_plot import EigerPlot
 
 

tests/test_generate_cli_client.py

@@ -1,7 +1,9 @@
-import pytest
-from bec_widgets.cli.generate_cli import ClientGenerator
 from textwrap import dedent
+
 import black
+import pytest
+
+from bec_widgets.cli.generate_cli import ClientGenerator
 
 
 # Mock classes to test the generator

tests/test_motor_control.py

@@ -1,16 +1,9 @@
 # pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
-from unittest.mock import patch
-from bec_lib.device import Positioner
+from unittest.mock import MagicMock, patch
+
 import pytest
-from unittest.mock import MagicMock
+from bec_lib.devicemanager import DeviceContainer
 
-from bec_widgets.widgets import (
-    MotorControlSelection,
-    MotorControlAbsolute,
-    MotorControlRelative,
-    MotorThread,
-    MotorCoordinateTable,
-)
 from bec_widgets.examples import (
     MotorControlApp,
     MotorControlMap,
@@ -18,8 +11,16 @@ from bec_widgets.examples import (
     MotorControlPanelAbsolute,
     MotorControlPanelRelative,
 )
+from bec_widgets.widgets import (
+    MotorControlAbsolute,
+    MotorControlRelative,
+    MotorControlSelection,
+    MotorCoordinateTable,
+    MotorThread,
+)
 from bec_widgets.widgets.motor_control.motor_control import MotorActions
 
+from .client_mocks import mocked_client
 
 CONFIG_DEFAULT = {
     "motor_control": {
@@ -53,81 +54,6 @@ CONFIG_DEFAULT = {
     ],
 }
 
-#######################################################
-# Client and devices fixture
-#######################################################
-
-
-class FakeDevice:
-    """Fake minimal positioner class for testing."""
-
-    def __init__(self, name, enabled=True, limits=None, read_value=1.0):
-        super().__init__()
-        self.name = name
-        self.enabled = enabled
-        self.read_value = read_value
-        self.limits = limits or (-100, 100)  # Default limits if not provided
-
-    def read(self):
-        """Simulates reading the current position of the device."""
-        return {self.name: {"value": self.read_value}}
-
-    def move(self, value, relative=False):
-        """Simulates moving the device to a new position."""
-        if relative:
-            self.read_value += value
-        else:
-            self.read_value = value
-        # Respect the limits
-        self.read_value = max(min(self.read_value, self.limits[1]), self.limits[0])
-
-    @property
-    def readback(self):
-        return MagicMock(get=MagicMock(return_value=self.read_value))
-
-    def describe(self):
-        """Describes the device."""
-        return {self.name: {"source": self.name, "dtype": "number", "shape": []}}
-
-
-@pytest.fixture
-def mocked_client():
-    client = MagicMock()
-
-    # Setup the fake devices
-    motors = {
-        "samx": FakeDevice("samx", limits=[-10, 10], read_value=2.0),
-        "samy": FakeDevice("samy", limits=[-5, 5], read_value=3.0),
-        "aptrx": FakeDevice("aptrx", read_value=4.0),
-        "aptry": FakeDevice("aptry", read_value=5.0),
-    }
-
-    client.device_manager.devices = MagicMock()
-    client.device_manager.devices.__getitem__.side_effect = lambda x: motors.get(x, FakeDevice(x))
-    client.device_manager.devices.enabled_devices = list(motors.values())
-
-    # Mock the scans.mv method
-    def mock_mv(*args, relative=False):
-        # Extracting motor and value pairs
-        for i in range(0, len(args), 2):
-            motor = args[i]
-            value = args[i + 1]
-            motor.move(value, relative=relative)
-        return MagicMock(wait=MagicMock())  # Simulate wait method of the move status object
-
-    client.scans = MagicMock(mv=mock_mv)
-
-    # Ensure isinstance check for Positioner passes
-    original_isinstance = isinstance
-
-    def isinstance_mock(obj, class_info):
-        if class_info == Positioner:
-            return True
-        return original_isinstance(obj, class_info)
-
-    with patch("builtins.isinstance", new=isinstance_mock):
-        yield client
-
 
 #######################################################
 # Motor Thread
@@ -141,7 +67,7 @@ def motor_thread(mocked_client):
 def test_motor_thread_initialization(mocked_client):
     motor_thread = MotorThread(client=mocked_client)
     assert motor_thread.client == mocked_client
-    assert isinstance(motor_thread.dev, MagicMock)
+    assert isinstance(motor_thread.dev, DeviceContainer)
 
 
 def test_get_all_motors_names(mocked_client):
@@ -176,12 +102,16 @@ def test_move_motor_absolute_by_run(mocked_client):
 
 def test_move_motor_relative_by_run(mocked_client):
     motor_thread = MotorThread(client=mocked_client)
+
+    initial_value = motor_thread.dev["samx"].read()["samx"]["value"]
+    move_value = 2.0
+    expected_value = initial_value + move_value
     motor_thread.motor = "samx"
-    motor_thread.value = 2.0
+    motor_thread.value = move_value
     motor_thread.action = MotorActions.MOVE_RELATIVE
     motor_thread.run()
 
-    assert mocked_client.device_manager.devices["samx"].read_value == 4.0
+    assert mocked_client.device_manager.devices["samx"].read_value == expected_value
 
 
 def test_motor_thread_move_absolute(motor_thread):
@@ -292,8 +222,12 @@ def test_absolute_initialization(motor_absolute_widget):
 
 
 def test_absolute_save_current_coordinates(motor_absolute_widget):
-    motor_absolute_widget.client.device_manager["samx"].set_value(2.0)
-    motor_absolute_widget.client.device_manager["samy"].set_value(3.0)
+    motor_x_value = motor_absolute_widget.client.device_manager.devices["samx"].read()["samx"][
+        "value"
+    ]
+    motor_y_value = motor_absolute_widget.client.device_manager.devices["samy"].read()["samy"][
+        "value"
+    ]
     motor_absolute_widget.change_motors("samx", "samy")
 
     emitted_coordinates = []
@@ -306,8 +240,7 @@ def test_absolute_save_current_coordinates(motor_absolute_widget):
     # Trigger saving current coordinates
     motor_absolute_widget.pushButton_save.click()
 
-    # Default position of samx and samy are 2.0 and 3.0 respectively
-    assert emitted_coordinates == [(2.0, 3.0)]
+    assert emitted_coordinates == [(motor_x_value, motor_y_value)]
 
 
 def test_absolute_set_absolute_coordinates(motor_absolute_widget):

tests/test_motor_map.py

@@ -1,9 +1,12 @@
 # pylint: disable = no-name-in-module,missing-module-docstring, missing-function-docstring
 from unittest.mock import MagicMock
+
 import pytest
 
 from bec_widgets.widgets import MotorMap
 
+from .client_mocks import mocked_client
+
 CONFIG_DEFAULT = {
     "plot_settings": {
         "colormap": "Greys",
@@ -60,68 +63,6 @@ CONFIG_ONE_DEVICE = {
 }
 
 
-class FakeDevice:
-    """Fake minimal positioner class for testing."""
-
-    def __init__(self, name, enabled=True, limits=None, read_value=1.0):
-        self.name = name
-        self.enabled = enabled
-        self.signals = {self.name: {"value": 1.0}}
-        self.description = {self.name: {"source": self.name}}
-        self.limits = limits if limits is not None else [0, 0]
-        self.read_value = read_value
-
-    def set_read_value(self, value):
-        self.read_value = value
-
-    def read(self):
-        return {self.name: {"value": self.read_value}}
-
-    def set_limits(self, limits):
-        self.limits = limits
-
-    def __contains__(self, item):
-        return item == self.name
-
-    @property
-    def _hints(self):
-        return [self.name]
-
-    def set_value(self, fake_value: float = 1.0) -> None:
-        """
-        Setup fake value for device readout
-        Args:
-            fake_value(float): Desired fake value
-        """
-        self.signals[self.name]["value"] = fake_value
-
-    def describe(self) -> dict:
-        """
-        Get the description of the device
-        Returns:
-            dict: Description of the device
-        """
-        return self.description
-
-
-@pytest.fixture
-def mocked_client():
-    client = MagicMock()
-
-    # Mocking specific motors with their limits
-    motors = {
-        "samx": FakeDevice("samx", limits=[-10, 10], read_value=2.0),
-        "samy": FakeDevice("samy", limits=[-5, 5], read_value=3.0),
-        "aptrx": FakeDevice("aptrx", read_value=4.0),
-        "aptry": FakeDevice("aptry", read_value=5.0),
-    }
-
-    client.device_manager.devices = MagicMock()
-    client.device_manager.devices.__getitem__.side_effect = lambda x: motors.get(x, FakeDevice(x))
-
-    return client
-
-
 @pytest.fixture(scope="function")
 def motor_map(qtbot, mocked_client):
     widget = MotorMap(client=mocked_client)
@@ -143,12 +84,15 @@ def test_motor_limits_initialization(motor_map):
 
 def test_motor_initial_position(motor_map):
     motor_map.precision = 2
+
+    motor_map_dev = motor_map.client.device_manager.devices
+
     # Example test to check if motor initial positions are correctly initialized
     expected_positions = {
-        ("samx", "samx"): 2.0,
-        ("samy", "samy"): 3.0,
-        ("aptrx", "aptrx"): 4.0,
-        ("aptry", "aptry"): 5.0,
+        ("samx", "samx"): motor_map_dev["samx"].read()["samx"]["value"],
+        ("samy", "samy"): motor_map_dev["samy"].read()["samy"]["value"],
+        ("aptrx", "aptrx"): motor_map_dev["aptrx"].read()["aptrx"]["value"],
+        ("aptry", "aptry"): motor_map_dev["aptry"].read()["aptry"]["value"],
     }
     for (motor_name, entry), expected_position in expected_positions.items():
         actual_position = motor_map._get_motor_init_position(motor_name, entry)

tests/test_plot_base.py

@@ -1,5 +1,6 @@
 # pylint: disable=missing-function-docstring, missing-module-docstring, unused-import
 import pytest
+
 from .client_mocks import mocked_client
 from .test_bec_figure import bec_figure
 

tests/test_scan_control.py

@@ -6,8 +6,8 @@ from unittest.mock import MagicMock
 import pytest
 from qtpy.QtWidgets import QLineEdit
 
-from bec_widgets.widgets import ScanControl
 from bec_widgets.utils.widget_io import WidgetIO
+from bec_widgets.widgets import ScanControl
 
 from .test_msgs.available_scans_message import available_scans_message
 

tests/test_stream_plot.py

@@ -1,11 +1,11 @@
 # pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
+import threading
 from unittest import mock
 
 import numpy as np
 import pytest
-from bec_lib import messages, RedisConnector
+from bec_lib import RedisConnector, messages
 from pytestqt import qtbot
-import threading
 
 from bec_widgets.examples.stream_plot.stream_plot import StreamPlot
 

tests/test_validator_errors.py

@@ -1,11 +1,12 @@
 # pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
 import pytest
 from pydantic import ValidationError
+
 from bec_widgets.validation.monitor_config_validator import (
-    MonitorConfigValidator,
-    Signal,
     AxisSignal,
+    MonitorConfigValidator,
     PlotConfig,
+    Signal,
 )
 
 from .test_bec_monitor import mocked_client
@@ -84,7 +85,7 @@ def test_plot_config_no_source_type_provided(setup_devices):
 def test_plot_config_history_source_type(setup_devices):
     history_source = {
         "type": "history",
-        "scanID": "valid_scan_id",
+        "scan_id": "valid_scan_id",
         "signals": {"x": [{"name": "samx"}], "y": [{"name": "samx"}]},
     }
 
@@ -92,7 +93,7 @@ def test_plot_config_history_source_type(setup_devices):
 
     assert len(plot_config.sources) == 1
     assert plot_config.sources[0].type == "history"
-    assert plot_config.sources[0].scanID == "valid_scan_id"
+    assert plot_config.sources[0].scan_id == "valid_scan_id"
 
 
 def test_plot_config_redis_source_type(setup_devices):

tests/test_waveform1d.py

@@ -4,7 +4,8 @@ from unittest.mock import MagicMock
 import numpy as np
 import pytest
 
-from bec_widgets.widgets.plots.waveform1d import SignalData, Signal, CurveConfig
+from bec_widgets.widgets.plots.waveform1d import CurveConfig, Signal, SignalData
+
 from .client_mocks import mocked_client
 from .test_bec_figure import bec_figure
 
@@ -80,8 +81,20 @@ def test_create_waveform1D_by_config(bec_figure):
                 "source": "scan_segment",
                 "signals": {
                     "source": "scan_segment",
-                    "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None},
-                    "y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None},
+                    "x": {
+                        "name": "samx",
+                        "entry": "samx",
+                        "unit": None,
+                        "modifier": None,
+                        "limits": None,
+                    },
+                    "y": {
+                        "name": "bpm4i",
+                        "entry": "bpm4i",
+                        "unit": None,
+                        "modifier": None,
+                        "limits": None,
+                    },
                 },
             },
             "curve-custom": {
@@ -217,8 +230,8 @@ def test_change_curve_appearance_methods(bec_figure, qtbot):
     assert c1.config.source == "scan_segment"
     assert c1.config.signals.model_dump() == {
         "source": "scan_segment",
-        "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None},
-        "y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None},
+        "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None, "limits": None},
+        "y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None, "limits": None},
     }
 
 
@@ -245,8 +258,8 @@ def test_change_curve_appearance_args(bec_figure):
     assert c1.config.source == "scan_segment"
     assert c1.config.signals.model_dump() == {
         "source": "scan_segment",
-        "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None},
-        "y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None},
+        "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None, "limits": None},
+        "y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None, "limits": None},
     }
 
 
@@ -338,8 +351,14 @@ def test_curve_add_by_config(bec_figure):
         "source": "scan_segment",
         "signals": {
             "source": "scan_segment",
-            "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None},
-            "y": {"name": "bpm4i", "entry": "bpm4i", "unit": None, "modifier": None},
+            "x": {"name": "samx", "entry": "samx", "unit": None, "modifier": None, "limits": None},
+            "y": {
+                "name": "bpm4i",
+                "entry": "bpm4i",
+                "unit": None,
+                "modifier": None,
+                "limits": None,
+            },
         },
     }
 
@@ -365,7 +384,7 @@ def test_scan_update(bec_figure, qtbot):
             "gauss_adc1": {"gauss_adc1": {"value": 8}},
             "gauss_adc2": {"gauss_adc2": {"value": 9}},
         },
-        "scanID": 1,
+        "scan_id": 1,
     }
     # Mock scan_storage.find_scan_by_ID
     mock_scan_data_waveform = MagicMock()
@@ -400,8 +419,8 @@ def test_scan_history_with_val_access(bec_figure, qtbot):
     mock_scan_storage.find_scan_by_ID.return_value = MagicMock(data=mock_scan_data)
     w1.queue.scan_storage = mock_scan_storage
 
-    fake_scanID = "fake_scanID"
-    w1.scan_history(scanID=fake_scanID)
+    fake_scan_id = "fake_scan_id"
+    w1.scan_history(scan_id=fake_scan_id)
 
     qtbot.wait(500)
 

tests/test_widget_io.py

@@ -1,13 +1,6 @@
 # pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
 import pytest
-from qtpy.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
-    QLineEdit,
-    QComboBox,
-    QTableWidget,
-    QSpinBox,
-)
+from qtpy.QtWidgets import QComboBox, QLineEdit, QSpinBox, QTableWidget, QVBoxLayout, QWidget
 
 from bec_widgets.utils.widget_io import WidgetHierarchy
 

tests/test_yaml_dialog.py

@@ -2,9 +2,10 @@
 import os
 import tempfile
 from unittest.mock import patch
+
 import pytest
 import yaml
-from qtpy.QtWidgets import QWidget, QVBoxLayout, QPushButton
+from qtpy.QtWidgets import QPushButton, QVBoxLayout, QWidget
 
 from bec_widgets.utils.yaml_dialog import load_yaml, save_yaml