make some tests more strict, re #12610

mantidproject · Aug 12, 2015 · 639f604 · 639f604
1 parent 41bd8f0
commit 639f604
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/EnggDiffractionPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/EnggDiffractionPresenterTest.h
@@ -63,6 +63,11 @@ class EnggDiffractionPresenterTest : public CxxTest::TestSuite {
     EXPECT_CALL(mockView, currentCalibSettings()).Times(1).WillOnce(
         Return(calibSettings));
 
+    const std::string mockFname = "foo.par";
+    EXPECT_CALL(mockView, askExistingCalibFilename()).Times(1).WillOnce(Return(mockFname));
+    EXPECT_CALL(mockView, newCalibLoaded(testing::_, testing::_, mockFname))
+        .Times(1);
+
     // No errors/warnings
     EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
     EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
@@ -83,6 +88,10 @@ class EnggDiffractionPresenterTest : public CxxTest::TestSuite {
     EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(0);
     EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(1);
 
+    // does not update the current calibration as it must have failed
+    EXPECT_CALL(mockView, newCalibLoaded(testing::_, testing::_, testing::_))
+        .Times(0);
+
     pres.notify(IEnggDiffractionPresenter::CalcCalib);
   }
 
@@ -118,6 +127,10 @@ class EnggDiffractionPresenterTest : public CxxTest::TestSuite {
     EXPECT_CALL(mockView, userWarning(testing::_, testing::_)).Times(0);
     EXPECT_CALL(mockView, userError(testing::_, testing::_)).Times(1);
 
+    // does not update the current calibration as it must have failed
+    EXPECT_CALL(mockView, newCalibLoaded(testing::_, testing::_, testing::_))
+        .Times(0);
+
     TS_ASSERT_THROWS_NOTHING(pres.notify(IEnggDiffractionPresenter::CalcCalib));
   }
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h b/Code/Mantid/MantidQt/CustomInterfaces/test/EnggDiffractionViewMock.h
@@ -10,26 +10,31 @@ class MockEnggDiffractionView
     : public MantidQt::CustomInterfaces::IEnggDiffractionView {
 
 public:
-  // void userWarning(const std::string &warn, const std::string &description);
+  // virtual void userWarning(const std::string &warn, const std::string
+  // &description);
   MOCK_METHOD2(userWarning,
                void(const std::string &warn, const std::string &description));
 
-  // void userError(const std::string &err, const std::string &description);
+  // virtual void userError(const std::string &err, const std::string
+  // &description);
   MOCK_METHOD2(userError,
                void(const std::string &err, const std::string &description));
 
-  // std::string askNewCalibrationFilename(const std::string &suggestedFname) =
-  // 0;
+  // virtual std::string askNewCalibrationFilename(const std::string
+  // &suggestedFname);
   MOCK_METHOD1(askNewCalibrationFilename,
                std::string(const std::string &suggestedFname));
 
+  // std::string askExistingCalibFilename();
+  MOCK_METHOD0(askExistingCalibFilename, std::string());
+
   // std::vector<std::string> logMsgs() const;
   MOCK_CONST_METHOD0(logMsgs, std::vector<std::string>());
 
   // virtual std::string getRBNumber() const;
   MOCK_CONST_METHOD0(getRBNumber, std::string());
 
-  // EnggDiffCalibSettings currentCalibSettings() const;
+  // virtual EnggDiffCalibSettings currentCalibSettings() const;
   MOCK_CONST_METHOD0(currentCalibSettings,
                      MantidQt::CustomInterfaces::EnggDiffCalibSettings());
 
@@ -42,6 +47,9 @@ class MockEnggDiffractionView
   // virtual std::string currentCeriaNo() const;
   MOCK_CONST_METHOD0(currentCeriaNo, std::string());
 
+  // virtual std::string currentCalibFile() const;
+  MOCK_CONST_METHOD0(currentCalibFile, std::string());
+
   // virtual std::string newVanadiumNo() const;
   MOCK_CONST_METHOD0(newVanadiumNo, std::string());
 
@@ -51,6 +59,11 @@ class MockEnggDiffractionView
   // virtual std::string outCalibFilename() const;
   MOCK_CONST_METHOD0(outCalibFilename, std::string());
 
+  // virtual void newCalibLoaded(const std::string &vanadiumNo, const
+  // std::string &ceriaNo, std::string &fname);
+  MOCK_METHOD3(newCalibLoaded, void(const std::string &, const std::string &,
+                                    const std::string &));
+
   // void saveSettings() const;
   MOCK_CONST_METHOD0(saveSettings, void());
 };