From fcca087b51efd6431f172427af364c1be9fd2336 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Tue, 23 May 2023 10:41:06 +0200 Subject: [PATCH] adjusted tests --- tests/test_mainwin.py | 32 +++++++++++++++++--------------- tests/test_plotdesc.py | 1 + 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/tests/test_mainwin.py b/tests/test_mainwin.py index 2ec4d2a..53751d9 100644 --- a/tests/test_mainwin.py +++ b/tests/test_mainwin.py @@ -14,7 +14,7 @@ from grum.mainwin import MainWindow from grum.mdi import MDIArea, MDISubMultiPlot, MDISubPlot from grum.menus import BarMenu from grum.menus.rclickmenu import RClickMenu -from grum.descs import PlotDescription +from grum.descs import Description, PlotDescription from grum.rpc import RPCServerThread @@ -47,7 +47,7 @@ class TestMainWin: for key in mw.lst.lst.items: assert isinstance(mw.lst.lst.get(key), DictListItem) - assert isinstance(mw.lst.lst.get(key).value, PlotDescription) + assert isinstance(mw.lst.lst.get(key).value, Description) assert isinstance(mw.lst.menu, RClickMenu) assert isinstance(mw.menu_settings, BarMenu) @@ -65,7 +65,7 @@ class TestMainWin: xlabel = "xlabel" ylabel = "ylabel" cfg = {"title": title, "xlabel": xlabel, "ylabel": ylabel} - spy_sig_make_new_plot = QSignalSpy(mw.sig_make_new_plot) + spy_sig_make_new_subwin = QSignalSpy(mw.sig_make_new_subwin) mw.new_plot(name, cfg=cfg) @@ -76,28 +76,28 @@ class TestMainWin: assert mw.lst.lst.get(name).value.ylabel == ylabel assert mw.menu_settings.checkboxes["Open new plots"].isChecked() - assert len(spy_sig_make_new_plot) == 1 # assert called once - assert spy_sig_make_new_plot[0][0] == name # assert called with name - assert isinstance(spy_sig_make_new_plot[0][1], PlotDescription) + assert len(spy_sig_make_new_subwin) == 1 # assert called once + assert spy_sig_make_new_subwin[0][0] == name # assert called with name + assert isinstance(spy_sig_make_new_subwin[0][1], PlotDescription) mw.menu_settings.checkboxes["Open new plots"].setChecked(False) assert mw.menu_settings.checkboxes["Open new plots"].isChecked() == False - spy_sig_make_new_plot = QSignalSpy(mw.sig_make_new_plot) + spy_sig_make_new_subwin = QSignalSpy(mw.sig_make_new_subwin) mw.new_plot("new_name", cfg) - assert len(spy_sig_make_new_plot) == 0 # assert not called + assert len(spy_sig_make_new_subwin) == 0 # assert not called mw.menu_settings.checkboxes["Open new plots"].setChecked(True) assert mw.menu_settings.checkboxes["Open new plots"].isChecked() == True - spy_sig_make_new_plot = QSignalSpy(mw.sig_make_new_plot) + spy_sig_make_new_subwin = QSignalSpy(mw.sig_make_new_subwin) new_name_item = mw.lst.lst.get("new_name") sub = MDISubPlot("new_name", new_name_item.value) mw.mdi.add(sub) mw.new_plot("new_name", cfg) - assert len(spy_sig_make_new_plot) == 0 # assert not called + assert len(spy_sig_make_new_subwin) == 0 # assert not called def test_append_data(self): @@ -122,17 +122,19 @@ class TestMainWin: assert sine_item.set_alarm.call_args[0][0] == False - def test_on_make_new_plot(self): + def test_on_make_new_subwin(self): mw = self.mw mw.make_subwin = mock.MagicMock() - args = (1, 2, "name") - kwargs = {"title": "plot_title"} + name = "test" + cfg = {"title": "title"} - mw.on_make_new_plot(args, kwargs) + desc = PlotDescription(name, *cfg) - mw.make_subwin.assert_called_once_with(MDISubPlot, args, kwargs) + mw.on_make_new_subwin(name, desc) + + mw.make_subwin.assert_called_once_with(MDISubPlot, name, desc) def test_on_dclick_list_item(self): diff --git a/tests/test_plotdesc.py b/tests/test_plotdesc.py index 5cf2263..0d46110 100644 --- a/tests/test_plotdesc.py +++ b/tests/test_plotdesc.py @@ -78,6 +78,7 @@ def test_to_dict(): "xs": [1, 2], "ylabel": "plot_ylabel", "ys": [3, 4], + "type": "plot" }