Refs #10223 Fix warnings in Refl UI test

mantidproject · Sep 11, 2014 · 0972975 · 0972975
1 parent 0e0e34b
commit 0972975
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflLoadedMainViewPresenterTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflLoadedMainViewPresenterTest.h
@@ -507,6 +507,8 @@ class ReflLoadedMainViewPresenterTest : public CxxTest::TestSuite
     EXPECT_CALL(mockView, getSelectedRowIndexes())
       .Times(1)
       .WillRepeatedly(Return(rowlist));
+    EXPECT_CALL(mockView, setProgressRange(0,4)).Times(1);
+    EXPECT_CALL(mockView, setProgress(_)).Times(4);
     ReflLoadedMainViewPresenter presenter(createWorkspace(),&mockView);
     ITableWorkspace_sptr ws = AnalysisDataService::Instance().retrieveWS<ITableWorkspace>("TestWorkspace");
     presenter.notify(ProcessFlag);

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h b/Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h
@@ -25,6 +25,8 @@ class ConstructView : public ReflMainView
   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>());
   virtual ~ConstructView(){}
 };
@@ -39,6 +41,8 @@ class MockView : public ReflMainView
   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>());
   virtual ~MockView(){}
 };
@@ -63,6 +67,8 @@ class FakeView : public ReflMainView
   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>());
   virtual ~FakeView(){}
 };
@@ -80,6 +86,8 @@ class AddDelProcView : public ReflMainView
   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>());
   virtual ~AddDelProcView(){}
   void addDataForTest()