get cor and tilt from view and added in expected values

Author: ashmeigh

mantidimaging/gui/test/gui_system_reconstruction_test.py

@@ -44,28 +44,34 @@ def tearDown(self) -> None:
         self.assertFalse(self.main_window.isVisible())
 
     def test_correlate(self):
-        expected_initial_cor = self.recon_window.presenter.model.last_cor.value
-        expected_initial_tilt = self.recon_window.presenter.model.auto_find_correlation(progress=None)[1].value
+        expected_initial_cor = self.recon_window.rotation_centre
+        expected_initial_tilt = self.recon_window.tilt
+
+        expected_final_cor = 66.0
+        expected_final_tilt = 1.070368
 
         for _ in range(5):
             QTest.mouseClick(self.recon_window.correlateBtn, Qt.MouseButton.LeftButton)
             QTest.qWait(SHORT_DELAY)
-
             wait_until(lambda: self.recon_window.correlateBtn.isEnabled())
             wait_until(lambda: len(self.recon_window.presenter.async_tracker) == 0)
 
-        final_cor_value = self.recon_window.presenter.model.last_cor.value
-        final_tilt_value = self.recon_window.presenter.model.auto_find_correlation(progress=None)[1].value
+        final_cor_value = self.recon_window.rotation_centre
+        final_tilt_value = self.recon_window.tilt
 
-        if final_cor_value != expected_initial_cor:
-            assert final_cor_value != expected_initial_cor
+        assert final_cor_value != expected_initial_cor
+        assert final_tilt_value != expected_initial_tilt
 
-        assert final_tilt_value == expected_initial_tilt
+        assert final_cor_value == expected_final_cor
+        assert final_tilt_value == expected_final_tilt
 
     @pytest.mark.xfail(reason="Unresolved, see #1641")
     def test_minimise(self):
-        expected_initial_cor = self.recon_window.presenter.model.last_cor.value
-        expected_initial_tilt = self.recon_window.presenter.model.auto_find_correlation(progress=None)[1].value
+        expected_cor = 64.0
+        expected_tilt = 0.0
+
+        initial_cor = self.recon_window.rotation_centre
+        initial_tilt = self.recon_window.tilt
 
         for i in range(2, 6):
             QTimer.singleShot(SHORT_DELAY, lambda i=i: self._click_InputDialog(set_int=i))
@@ -76,13 +82,14 @@ def test_minimise(self):
             wait_until(lambda: len(self.recon_window.presenter.async_tracker) == 0)
             QTest.qWait(SHORT_DELAY)
 
-        final_cor_value = self.recon_window.presenter.model.last_cor.value
-        final_tilt_value = self.recon_window.presenter.model.auto_find_correlation(progress=None)[1].value
+        final_cor_value = self.recon_window.rotation_centre
+        final_tilt_value = self.recon_window.tilt
 
-        if final_cor_value != expected_initial_cor:
-            assert final_cor_value != expected_initial_cor
+        assert initial_cor == expected_cor
+        assert initial_tilt == expected_tilt
 
-        assert final_tilt_value == expected_initial_tilt
+        assert final_cor_value == expected_cor
+        assert final_tilt_value == expected_tilt
 
     @classmethod
     def _click_cor_inspect(cls):