bec-widgets 0.93.2__py3-none-any.whl → 0.93.3__py3-none-any.whl

tests/unit_tests/test_bec_figure.py

@@ -9,18 +9,11 @@ from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap
 from bec_widgets.widgets.figure.plots.waveform.waveform import BECWaveform
 
 from .client_mocks import mocked_client
+from .conftest import create_widget
 
 
-@pytest.fixture
-def bec_figure(qtbot, mocked_client):
-    widget = BECFigure(client=mocked_client)
-    qtbot.addWidget(widget)
-    qtbot.waitExposed(widget)
-    yield widget
-    widget.close()
-
-
-def test_bec_figure_init(bec_figure):
+def test_bec_figure_init(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     assert bec_figure is not None
     assert bec_figure.client is not None
     assert isinstance(bec_figure, BECFigure)
@@ -34,7 +27,8 @@ def test_bec_figure_init_with_config(mocked_client):
     assert widget.config.theme == "dark"
 
 
-def test_bec_figure_add_remove_plot(bec_figure):
+def test_bec_figure_add_remove_plot(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     initial_count = len(bec_figure._widgets)
 
     # Adding 3 widgets -  2 WaveformBase and 1 PlotBase
@@ -64,7 +58,8 @@ def test_bec_figure_add_remove_plot(bec_figure):
     assert bec_figure._widgets[w1.gui_id].config.widget_class == "BECWaveform"
 
 
-def test_add_different_types_of_widgets(bec_figure):
+def test_add_different_types_of_widgets(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     plt = bec_figure.plot(x_name="samx", y_name="bpm4i")
     im = bec_figure.image("eiger")
     motor_map = bec_figure.motor_map("samx", "samy")
@@ -74,7 +69,8 @@ def test_add_different_types_of_widgets(bec_figure):
     assert motor_map.__class__ == BECMotorMap
 
 
-def test_access_widgets_access_errors(bec_figure):
+def test_access_widgets_access_errors(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     bec_figure.plot(row=0, col=0)
 
     # access widget by non-existent coordinates
@@ -96,7 +92,8 @@ def test_access_widgets_access_errors(bec_figure):
         )
 
 
-def test_add_plot_to_occupied_position(bec_figure):
+def test_add_plot_to_occupied_position(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     bec_figure.plot(row=0, col=0)
 
     with pytest.raises(ValueError) as excinfo:
@@ -104,7 +101,8 @@ def test_add_plot_to_occupied_position(bec_figure):
         assert "Position at row 0 and column 0 is already occupied." in str(excinfo.value)
 
 
-def test_remove_plots(bec_figure):
+def test_remove_plots(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     w1 = bec_figure.plot(row=0, col=0)
     w2 = bec_figure.plot(row=0, col=1)
     w3 = bec_figure.plot(row=1, col=0)
@@ -134,7 +132,8 @@ def test_remove_plots(bec_figure):
     assert len(bec_figure._widgets) == 1
 
 
-def test_remove_plots_by_coordinates_ints(bec_figure):
+def test_remove_plots_by_coordinates_ints(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     w1 = bec_figure.plot(row=0, col=0)
     w2 = bec_figure.plot(row=0, col=1)
 
@@ -145,7 +144,8 @@ def test_remove_plots_by_coordinates_ints(bec_figure):
     assert len(bec_figure._widgets) == 1
 
 
-def test_remove_plots_by_coordinates_tuple(bec_figure):
+def test_remove_plots_by_coordinates_tuple(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     w1 = bec_figure.plot(row=0, col=0)
     w2 = bec_figure.plot(row=0, col=1)
 
@@ -156,7 +156,8 @@ def test_remove_plots_by_coordinates_tuple(bec_figure):
     assert len(bec_figure._widgets) == 1
 
 
-def test_remove_plot_by_id_error(bec_figure):
+def test_remove_plot_by_id_error(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     bec_figure.plot()
 
     with pytest.raises(ValueError) as excinfo:
@@ -164,7 +165,8 @@ def test_remove_plot_by_id_error(bec_figure):
         assert "Widget with ID 'non_existent_widget' does not exist." in str(excinfo.value)
 
 
-def test_remove_plot_by_coordinates_error(bec_figure):
+def test_remove_plot_by_coordinates_error(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     bec_figure.plot(row=0, col=0)
 
     with pytest.raises(ValueError) as excinfo:
@@ -172,7 +174,8 @@ def test_remove_plot_by_coordinates_error(bec_figure):
         assert "No widget at coordinates (0, 1)" in str(excinfo.value)
 
 
-def test_remove_plot_by_providing_nothing(bec_figure):
+def test_remove_plot_by_providing_nothing(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     bec_figure.plot(row=0, col=0)
 
     with pytest.raises(ValueError) as excinfo:
@@ -192,7 +195,8 @@ def test_remove_plot_by_providing_nothing(bec_figure):
 #     assert bec_figure.backgroundBrush().color().name() == "#000000"
 
 
-def test_change_layout(bec_figure):
+def test_change_layout(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     w1 = bec_figure.plot(row=0, col=0)
     w2 = bec_figure.plot(row=0, col=1)
     w3 = bec_figure.plot(row=1, col=0)
@@ -215,7 +219,8 @@ def test_change_layout(bec_figure):
     assert bec_figure[0, 3] == w4
 
 
-def test_clear_all(bec_figure):
+def test_clear_all(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     bec_figure.plot(row=0, col=0)
     bec_figure.plot(row=0, col=1)
     bec_figure.plot(row=1, col=0)
@@ -227,7 +232,8 @@ def test_clear_all(bec_figure):
     assert np.shape(bec_figure.grid) == (0,)
 
 
-def test_shortcuts(bec_figure):
+def test_shortcuts(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     plt = bec_figure.plot(x_name="samx", y_name="bpm4i")
     im = bec_figure.image("eiger")
     motor_map = bec_figure.motor_map("samx", "samy")
@@ -240,7 +246,8 @@ def test_shortcuts(bec_figure):
     assert motor_map.__class__ == BECMotorMap
 
 
-def test_plot_access_factory(bec_figure):
+def test_plot_access_factory(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     plt_00 = bec_figure.plot(x_name="samx", y_name="bpm4i")
     plt_01 = bec_figure.plot(x_name="samx", y_name="bpm4i", row=0, col=1)
     plt_10 = bec_figure.plot(new=True)

tests/unit_tests/test_bec_image.py

@@ -6,8 +6,10 @@ import pytest
 from bec_lib import messages
 from qtpy.QtGui import QFontInfo
 
+from bec_widgets.widgets.figure import BECFigure
+
 from .client_mocks import mocked_client
-from .test_bec_figure import bec_figure
+from .conftest import create_widget
 
 
 @pytest.fixture
@@ -15,7 +17,8 @@ def bec_image_show(bec_figure):
     yield bec_figure.image("eiger")
 
 
-def test_on_image_update(bec_image_show):
+def test_on_image_update(qtbot, mocked_client):
+    bec_image_show = create_widget(qtbot, BECFigure, client=mocked_client).image("eiger")
     data = np.random.rand(100, 100)
     msg = messages.DeviceMonitor2DMessage(device="eiger", data=data, metadata={"scan_id": "12345"})
     bec_image_show.on_image_update(msg.content, msg.metadata)
@@ -23,7 +26,8 @@ def test_on_image_update(bec_image_show):
     assert np.array_equal(img.get_data(), data)
 
 
-def test_autorange_on_image_update(bec_image_show):
+def test_autorange_on_image_update(qtbot, mocked_client):
+    bec_image_show = create_widget(qtbot, BECFigure, client=mocked_client).image("eiger")
     # Check if autorange mode "mean" works, should be default
     data = np.random.rand(100, 100)
     msg = messages.DeviceMonitor2DMessage(device="eiger", data=data, metadata={"scan_id": "12345"})

tests/unit_tests/test_bec_image_widget.py

@@ -15,7 +15,6 @@ def image_widget(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture

tests/unit_tests/test_bec_motor_map.py

@@ -2,14 +2,16 @@ import numpy as np
 import pytest
 from bec_lib.messages import DeviceMessage
 
+from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap, MotorMapConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import SignalData
 
 from .client_mocks import mocked_client
-from .test_bec_figure import bec_figure
+from .conftest import create_widget
 
 
-def test_motor_map_init(bec_figure):
+def test_motor_map_init(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     default_config = MotorMapConfig(widget_class="BECMotorMap")
 
     mm = bec_figure.motor_map(config=default_config.model_dump())
@@ -18,7 +20,8 @@ def test_motor_map_init(bec_figure):
     assert mm.config == default_config
 
 
-def test_motor_map_change_motors(bec_figure):
+def test_motor_map_change_motors(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
 
     assert mm.motor_x == "samx"
@@ -32,7 +35,8 @@ def test_motor_map_change_motors(bec_figure):
     assert mm.config.signals.y == SignalData(name="samz", entry="samz", limits=[-8, 8])
 
 
-def test_motor_map_get_limits(bec_figure):
+def test_motor_map_get_limits(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
     expected_limits = {"samx": [-10, 10], "samy": [-5, 5]}
 
@@ -41,7 +45,8 @@ def test_motor_map_get_limits(bec_figure):
         assert actual_limit == expected_limit
 
 
-def test_motor_map_get_init_position(bec_figure):
+def test_motor_map_get_init_position(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
     mm.set_precision(2)
 
@@ -57,7 +62,8 @@ def test_motor_map_get_init_position(bec_figure):
         assert actual_position == expected_position
 
 
-def test_motor_movement_updates_position_and_database(bec_figure):
+def test_motor_movement_updates_position_and_database(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
     motor_map_dev = mm.client.device_manager.devices
 
@@ -85,7 +91,8 @@ def test_motor_movement_updates_position_and_database(bec_figure):
     assert mm.database_buffer["y"] == init_positions["samy"]
 
 
-def test_scatter_plot_rendering(bec_figure):
+def test_scatter_plot_rendering(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
     motor_map_dev = mm.client.device_manager.devices
 
@@ -115,7 +122,8 @@ def test_scatter_plot_rendering(bec_figure):
     ), "Scatter plot Y data should retain last known position"
 
 
-def test_plot_visualization_consistency(bec_figure):
+def test_plot_visualization_consistency(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
     mm.change_motors("samx", "samy")
     # Simulate updating the plot with new data
@@ -133,7 +141,8 @@ def test_plot_visualization_consistency(bec_figure):
     ), "Plot not updated correctly with new data"
 
 
-def test_change_background_value(bec_figure, qtbot):
+def test_change_background_value(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
 
     assert mm.config.background_value == 25
@@ -146,7 +155,8 @@ def test_change_background_value(bec_figure, qtbot):
     assert np.all(mm.plot_components["limit_map"].image == 50.0)
 
 
-def test_motor_map_init_from_config(bec_figure):
+def test_motor_map_init_from_config(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     config = {
         "widget_class": "BECMotorMap",
         "gui_id": "mm_id",
@@ -200,7 +210,8 @@ def test_motor_map_init_from_config(bec_figure):
     assert mm._config_dict == config
 
 
-def test_motor_map_set_scatter_size(bec_figure, qtbot):
+def test_motor_map_set_scatter_size(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
 
     assert mm.config.scatter_size == 5
@@ -213,7 +224,8 @@ def test_motor_map_set_scatter_size(bec_figure, qtbot):
     assert mm.plot_components["scatter"].opts["size"] == 10
 
 
-def test_motor_map_change_precision(bec_figure):
+def test_motor_map_change_precision(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
 
     assert mm.config.precision == 2
@@ -221,7 +233,8 @@ def test_motor_map_change_precision(bec_figure):
     assert mm.config.precision == 10
 
 
-def test_motor_map_set_color(bec_figure, qtbot):
+def test_motor_map_set_color(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
 
     assert mm.config.color == (255, 255, 255, 255)
@@ -231,7 +244,8 @@ def test_motor_map_set_color(bec_figure, qtbot):
     assert mm.config.color == (0, 0, 0, 255)
 
 
-def test_motor_map_get_data_max_points(bec_figure, qtbot):
+def test_motor_map_get_data_max_points(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     mm = bec_figure.motor_map("samx", "samy")
     motor_map_dev = mm.client.device_manager.devices
 

tests/unit_tests/test_bec_queue.py

@@ -93,7 +93,6 @@ def bec_queue(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_bec_queue(bec_queue, bec_queue_msg_full):

tests/unit_tests/test_bec_status_box.py

@@ -20,7 +20,6 @@ def status_box(qtbot, mocked_client, service_status_fixture):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_update_top_item(status_box):

tests/unit_tests/test_color_map_selector.py

@@ -10,7 +10,6 @@ def color_map_selector(qtbot):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_color_map_selector_init(color_map_selector):

tests/unit_tests/test_device_input_base.py

@@ -19,7 +19,6 @@ def device_input_base(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_device_input_base_init(device_input_base):

tests/unit_tests/test_device_input_widgets.py

@@ -12,7 +12,6 @@ def device_input_combobox(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -28,7 +27,6 @@ def device_input_combobox_with_config(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -43,7 +41,6 @@ def device_input_combobox_with_kwargs(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_device_input_combobox_init(device_input_combobox):
@@ -101,7 +98,6 @@ def device_input_line_edit(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -117,7 +113,6 @@ def device_input_line_edit_with_config(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -132,7 +127,6 @@ def device_input_line_edit_with_kwargs(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_device_input_line_edit_init(device_input_line_edit):

tests/unit_tests/test_motor_map_widget.py

@@ -16,7 +16,6 @@ def motor_map_widget(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 @pytest.fixture
@@ -139,7 +138,6 @@ def motor_map_settings(qtbot):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_display_current_settings(motor_map_settings):

tests/unit_tests/test_plot_base.py

@@ -4,18 +4,22 @@ from unittest import mock
 import pytest
 from qtpy.QtGui import QFontInfo
 
+from bec_widgets.widgets.figure import BECFigure
+
 from .client_mocks import mocked_client
-from .test_bec_figure import bec_figure
+from .conftest import create_widget
 
 
-def test_init_plot_base(bec_figure):
+def test_init_plot_base(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     plot_base = bec_figure.add_widget(widget_type="BECPlotBase", widget_id="test_plot")
     assert plot_base is not None
     assert plot_base.config.widget_class == "BECPlotBase"
     assert plot_base.config.gui_id == "test_plot"
 
 
-def test_plot_base_axes_by_separate_methods(bec_figure):
+def test_plot_base_axes_by_separate_methods(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     plot_base = bec_figure.add_widget(widget_type="BECPlotBase", widget_id="test_plot")
 
     plot_base.set_title("Test Title")
@@ -65,7 +69,8 @@ def test_plot_base_axes_by_separate_methods(bec_figure):
         assert mock_set_title.call_args == call
 
 
-def test_plot_base_axes_added_by_kwargs(bec_figure):
+def test_plot_base_axes_added_by_kwargs(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
     plot_base = bec_figure.add_widget(widget_type="BECPlotBase", widget_id="test_plot")
 
     plot_base.set(

tests/unit_tests/test_ring_progress_bar.py

@@ -18,7 +18,6 @@ def ring_progress_bar(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_bar_init(ring_progress_bar):

tests/unit_tests/test_scan_control.py

@@ -220,7 +220,6 @@ def scan_control(qtbot, mocked_client):  # , mock_dev):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_populate_scans(scan_control, mocked_client):

tests/unit_tests/test_setting_dialog.py

@@ -16,7 +16,6 @@ def setting_widget(qtbot):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_setting_widget_initialization(setting_widget):
@@ -61,8 +60,8 @@ def settings_dialog(qtbot, setting_widget):
     qtbot.addWidget(dialog)
     qtbot.waitExposed(dialog)
     yield dialog, parent_widget, setting_widget
-    dialog.close()
     parent_widget.close()
+    parent_widget.deleteLater()
 
 
 def test_settings_dialog_initialization(settings_dialog):

tests/unit_tests/test_stop_button.py

@@ -13,7 +13,6 @@ def stop_button(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_stop_button(stop_button):

tests/unit_tests/test_text_box_widget.py

@@ -14,7 +14,6 @@ def text_box_widget(qtbot, mocked_client):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_textbox_widget(text_box_widget):

tests/unit_tests/test_toggle.py

@@ -10,7 +10,6 @@ def toggle(qtbot):
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     yield widget
-    widget.close()
 
 
 def test_toggle(toggle):

tests/unit_tests/test_vscode_widget.py

@@ -14,9 +14,9 @@ from .client_mocks import mocked_client
 def vscode_widget(qtbot, mocked_client):
     with mock.patch("bec_widgets.widgets.vscode.vscode.subprocess.Popen") as mock_popen:
         widget = VSCodeEditor(client=mocked_client)
-        # qtbot.addWidget(widget)
+        qtbot.addWidget(widget)
+        qtbot.waitExposed(widget)
         yield widget
-        # widget.close()
 
 
 def test_vscode_widget(qtbot, vscode_widget):