Skip to content

Commit 548e0ea

Browse files
committed
ensure correct validation of COR and tilt values in test_correlate and test_minimise
1 parent 55a01ed commit 548e0ea

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#2281 : TestGuiSystemReconstruction test_correlate should check COR and tilt

mantidimaging/gui/test/gui_system_reconstruction_test.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,29 @@ def tearDown(self) -> None:
4444
self.assertFalse(self.main_window.isVisible())
4545

4646
def test_correlate(self):
47+
expected_initial_cor = self.recon_window.presenter.model.last_cor.value
48+
expected_initial_tilt = self.recon_window.presenter.model.auto_find_correlation(progress=None)[1].value
49+
4750
for _ in range(5):
4851
QTest.mouseClick(self.recon_window.correlateBtn, Qt.MouseButton.LeftButton)
4952
QTest.qWait(SHORT_DELAY)
53+
5054
wait_until(lambda: self.recon_window.correlateBtn.isEnabled())
5155
wait_until(lambda: len(self.recon_window.presenter.async_tracker) == 0)
5256

57+
final_cor_value = self.recon_window.presenter.model.last_cor.value
58+
final_tilt_value = self.recon_window.presenter.model.auto_find_correlation(progress=None)[1].value
59+
60+
if final_cor_value != expected_initial_cor:
61+
assert final_cor_value != expected_initial_cor
62+
63+
assert final_tilt_value == expected_initial_tilt
64+
5365
@pytest.mark.xfail(reason="Unresolved, see #1641")
5466
def test_minimise(self):
67+
expected_initial_cor = self.recon_window.presenter.model.last_cor.value
68+
expected_initial_tilt = self.recon_window.presenter.model.auto_find_correlation(progress=None)[1].value
69+
5570
for i in range(2, 6):
5671
QTimer.singleShot(SHORT_DELAY, lambda i=i: self._click_InputDialog(set_int=i))
5772
QTest.mouseClick(self.recon_window.minimiseBtn, Qt.MouseButton.LeftButton)
@@ -61,6 +76,14 @@ def test_minimise(self):
6176
wait_until(lambda: len(self.recon_window.presenter.async_tracker) == 0)
6277
QTest.qWait(SHORT_DELAY)
6378

79+
final_cor_value = self.recon_window.presenter.model.last_cor.value
80+
final_tilt_value = self.recon_window.presenter.model.auto_find_correlation(progress=None)[1].value
81+
82+
if final_cor_value != expected_initial_cor:
83+
assert final_cor_value != expected_initial_cor
84+
85+
assert final_tilt_value == expected_initial_tilt
86+
6487
@classmethod
6588
def _click_cor_inspect(cls):
6689
"""

0 commit comments

Comments
 (0)