refs #4328. Relocate and mock-test smart ptr.

mantidproject · Jan 17, 2012 · 6cea8e6 · 6cea8e6
1 parent 23c8661
commit 6cea8e6
Showing 1 changed file with 3 additions and 40 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/test/WorkspaceMementoTest.h b/Code/Mantid/MantidQt/CustomInterfaces/test/WorkspaceMementoTest.h
@@ -22,7 +22,7 @@ class WorkspaceMementoTest : public CxxTest::TestSuite
 
 private:
 
-/// Mock class
+/// Mock Workspace Memento helper
 class MockWorkspaceMemento : public WorkspaceMemento
 {
 public:
@@ -35,43 +35,6 @@ class MockWorkspaceMemento : public WorkspaceMemento
   ~MockWorkspaceMemento(){};
 };
 
-/// Helper type. Concrete Workspace Memento.
-class ConcreteWorkspaceMemento : public WorkspaceMemento
-{
-public:
-
-  virtual std::string getId() const
-  {
-    throw std::runtime_error("Not implemented");
-  }
-
-  virtual std::string locationType() const 
-  {
-    throw std::runtime_error("Not implemented");
-  }
-
-  virtual bool checkStillThere() const
-  {
-    throw std::runtime_error("Not implemented");
-  }
-
-  virtual Mantid::API::Workspace_sptr fetchIt(FetchProtocol) const
-  {
-    throw std::runtime_error("Not implemented");
-  }
-
-  virtual void cleanUp()
-  {
-    throw std::runtime_error("Not implemented");
-  }
-
-  virtual Mantid::API::Workspace_sptr applyActions()
-  {
-    throw std::runtime_error("Not implemented");
-  }
-};
-
-
 public:
 
   void testGetEmptyUB()
@@ -98,13 +61,13 @@ class ConcreteWorkspaceMemento : public WorkspaceMemento
 
   void testStatusWithoutUB()
   {
-    ConcreteWorkspaceMemento memento;
+    MockWorkspaceMemento memento;
     TS_ASSERT_EQUALS(WorkspaceMemento::NoOrientedLattice, memento.generateStatus());
   }
 
   void testStatusWithUB()
   {
-    ConcreteWorkspaceMemento memento;
+    MockWorkspaceMemento memento;
     memento.setUB(1, 2, 3, 4, 5, 6, 7, 8, 9);
     TS_ASSERT_EQUALS(WorkspaceMemento::Ready, memento.generateStatus());
   }