From f9e7b5a9036f3e78e0186b15e625305700e26fc5 Mon Sep 17 00:00:00 2001 From: nstelter Date: Wed, 17 Sep 2025 17:38:39 -0700 Subject: [PATCH] wip fix tests --- pydm/tests/test_data/valid_display_test_file.py | 2 +- pydm/tests/widgets/test_scatterplot.py | 2 +- pydm/tests/widgets/test_slider.py | 11 ++++++++++- pydm/tests/widgets/test_timeplot.py | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pydm/tests/test_data/valid_display_test_file.py b/pydm/tests/test_data/valid_display_test_file.py index 6081d1f58..ad4b27386 100644 --- a/pydm/tests/test_data/valid_display_test_file.py +++ b/pydm/tests/test_data/valid_display_test_file.py @@ -16,7 +16,7 @@ def __init__(self, parent=None, args=None, macros=None): self.button = PyDMPushButton() self.button.clicked.connect(self.delete_widget) - self.label = PyDMLabel(init_channel="TST:Val1") + self.label = PyDMLabel(init_channel="ca://TST:Val1") def print_file(self): print(f"{no_display_test_file}") diff --git a/pydm/tests/widgets/test_scatterplot.py b/pydm/tests/widgets/test_scatterplot.py index 5a5a45f88..45f54fe58 100644 --- a/pydm/tests/widgets/test_scatterplot.py +++ b/pydm/tests/widgets/test_scatterplot.py @@ -81,7 +81,7 @@ def test_scatterplotcurveitem_to_dict(qtbot, y_addr, x_addr, redraw_mode, buffer assert dictionary["name"] == name -@pytest.mark.parametrize("new_address", ["new_address", "", None]) +@pytest.mark.parametrize("new_address", ["ca://new_address", "", None]) def test_scatterplotcurveitem_properties_and_setters(qtbot, new_address): plot_curve_item = ScatterPlotCurveItem(new_address, new_address, bufferSizeChannelAddress=new_address) diff --git a/pydm/tests/widgets/test_slider.py b/pydm/tests/widgets/test_slider.py index 8caed24cb..5a4faae7b 100644 --- a/pydm/tests/widgets/test_slider.py +++ b/pydm/tests/widgets/test_slider.py @@ -152,7 +152,16 @@ def test_getHandleRect(slider_fixture, request): def test_getPositions(slider_fixture, request): """Test getPositions method.""" test_slider = request.getfixturevalue(slider_fixture) - event = QMouseEvent(QEvent.MouseButtonPress, QPoint(50, 10), Qt.LeftButton, Qt.LeftButton, Qt.NoModifier) + pos = QPoint(50, 10) + event = QMouseEvent( + QEvent.MouseButtonPress, + pos, # local position + pos, # window position + pos, # screen position + Qt.LeftButton, + Qt.LeftButton, + Qt.NoModifier, + ) handle_pos, click_pos = test_slider.getPositions(event) assert isinstance(handle_pos, float) assert isinstance(click_pos, int) diff --git a/pydm/tests/widgets/test_timeplot.py b/pydm/tests/widgets/test_timeplot.py index da35a0f23..fff59ab4d 100644 --- a/pydm/tests/widgets/test_timeplot.py +++ b/pydm/tests/widgets/test_timeplot.py @@ -152,7 +152,7 @@ def test_timeplotcurveitem_to_dict(qtbot, channel_address, name): ) -@pytest.mark.parametrize("new_address", ["new_address", "", None]) +@pytest.mark.parametrize("new_address", ["ca://new_address", "", None]) def test_timeplotcurveitem_properties_and_setters(qtbot, new_address): pydm_timeplot_curve_item = TimePlotCurveItem()