Refs #10233 Remove FakeView from MockObjects

mantidproject · Sep 18, 2014 · d4de26e · d4de26e
1 parent cff0ebd
commit d4de26e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 42 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflBlankMainViewPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflBlankMainViewPresenterTest.h
@@ -36,24 +36,27 @@ class ReflBlankMainViewPresenterTest : public CxxTest::TestSuite
 
   void testEditSave()
   {
-    FakeView fakeView;
-    ReflBlankMainViewPresenter presenter(&fakeView);
+    AddDelProcView mockView;
+    ReflBlankMainViewPresenter presenter(&mockView);
+
+    //Set up some data
+    mockView.addDataForTest();
 
     //We should not receive any errors
-    EXPECT_CALL(fakeView,  giveUserCritical(_,_)).Times(0);
+    EXPECT_CALL(mockView,  giveUserCritical(_,_)).Times(0);
 
     //The user hits "save" and and enters "Workspace" for a name
-    EXPECT_CALL(fakeView, askUserString(_,_,"Workspace")).Times(1).WillRepeatedly(Return("Workspace"));
+    EXPECT_CALL(mockView, askUserString(_,_,"Workspace")).Times(1).WillRepeatedly(Return("Workspace"));
     presenter.notify(SaveFlag);
 
     //Check calls were made as expected
-    TS_ASSERT(Mock::VerifyAndClearExpectations(&fakeView));
+    TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
 
     //Check that the workspace was saved correctly
     ITableWorkspace_sptr ws = AnalysisDataService::Instance().retrieveWS<ITableWorkspace>("Workspace");
-    TS_ASSERT_EQUALS(ws->rowCount(), 5);
-    TS_ASSERT_EQUALS(ws->String(1,0), "13460");
-    TS_ASSERT_EQUALS(ws->Int(1,7), 3);
+    TS_ASSERT_EQUALS(ws->rowCount(), 4);
+    TS_ASSERT_EQUALS(ws->String(0,0), "13460");
+    TS_ASSERT_EQUALS(ws->Int(0,7), 3);
 
     //Tidy up
     AnalysisDataService::Instance().remove("Workspace");

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflLoadedMainViewPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflLoadedMainViewPresenterTest.h
@@ -164,17 +164,18 @@ class ReflLoadedMainViewPresenterTest : public CxxTest::TestSuite
 
   void testEditSave()
   {
-    FakeView fakeView;
-    ReflLoadedMainViewPresenter presenter(createWorkspace(),&fakeView);
+    //This test is incorrect. No editing takes place.
+    MockView mockView;
+    ReflLoadedMainViewPresenter presenter(createWorkspace(),&mockView);
     TS_ASSERT_EQUALS(AnalysisDataService::Instance().retrieveWS<ITableWorkspace>("TestWorkspace")->rowCount(),4);
     presenter.notify(SaveFlag);
     ITableWorkspace_sptr ws = AnalysisDataService::Instance().retrieveWS<ITableWorkspace>("TestWorkspace");
-    TS_ASSERT_EQUALS(ws->rowCount(), 8);
+    TS_ASSERT_EQUALS(ws->rowCount(), 4);
     TS_ASSERT_EQUALS(ws->String(0,0), "13460");
     TS_ASSERT_EQUALS(ws->Int(0,7), 3);
-    TS_ASSERT_EQUALS(ws->String(4,0), "13460");
-    TS_ASSERT_EQUALS(ws->Int(4,7), 3);
-    TS_ASSERT(Mock::VerifyAndClearExpectations(&fakeView));
+    TS_ASSERT_EQUALS(ws->String(3,0), "13470");
+    TS_ASSERT_EQUALS(ws->Int(3,7), 1);
+    TS_ASSERT(Mock::VerifyAndClearExpectations(&mockView));
     AnalysisDataService::Instance().remove("TestWorkspace");
   }
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h
@@ -51,34 +51,6 @@ class MockView : public ReflMainView
   virtual ~MockView(){}
 };
 
-class FakeView : public ReflMainView
-{
-public:
-  FakeView(){};
-  virtual void showTable(Mantid::API::ITableWorkspace_sptr model)
-  {
-    TableRow row = model->appendRow();
-    row << "13460" << "0.7" << "13463,13464" << "0.01" << "0.06" << "0.04" << "1" << 3;
-    row = model->appendRow();
-    row << "13462" << "2.3" << "13463,13464" << "0.035" << "0.3" << "0.04" << "1" << 3;
-    row = model->appendRow();
-    row << "13469" << "0.7" << "13463,13464" << "0.01" << "0.06" << "0.04" << "1" << 3;
-    row = model->appendRow();
-    row << "13470" << "2.3" << "13463,13464" << "0.035" << "0.3" << "0.04" << "1" << 3;
-  }
-  MOCK_METHOD3(askUserString, std::string(const std::string& prompt, const std::string& title, const std::string& defaultValue));
-  MOCK_METHOD2(askUserYesNo, bool(std::string, std::string));
-  MOCK_METHOD2(giveUserCritical, void(std::string, std::string));
-  MOCK_METHOD2(giveUserInfo, void(std::string, std::string));
-  MOCK_METHOD2(giveUserWarning, void(std::string, std::string));
-  MOCK_METHOD2(setProgressRange, void(int, int));
-  MOCK_METHOD1(setProgress, void(int));
-  MOCK_CONST_METHOD0(getSelectedRowIndexes, std::vector<size_t>());
-  MOCK_CONST_METHOD0(getSearchInstrument, std::string());
-  MOCK_CONST_METHOD0(getProcessInstrument, std::string());
-  virtual ~FakeView(){}
-};
-
 class AddDelProcView : public ReflMainView
 {
 public: