Avoid double-algorithm registration in tests. Refs #7263

mantidproject · Jul 4, 2013 · 6e678e5 · 6e678e5
1 parent 4d64a81
commit 6e678e5
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/Code/Mantid/Framework/API/test/AlgorithmTest.h b/Code/Mantid/Framework/API/test/AlgorithmTest.h
@@ -91,13 +91,13 @@ class ToyAlgorithmThree : public Algorithm
 };
 
 
-class WorkspaceAlgorithm : public Algorithm
+class StubbedWorkspaceAlgorithm : public Algorithm
 {
 public:
-  WorkspaceAlgorithm() : Algorithm() {}
-  virtual ~WorkspaceAlgorithm() {}
+  StubbedWorkspaceAlgorithm() : Algorithm() {}
+  virtual ~StubbedWorkspaceAlgorithm() {}
 
-  const std::string name() const { return "WorkspaceAlgorithm";}
+  const std::string name() const { return "StubbedWorkspaceAlgorithm";}
   int version() const  { return 1;}
   const std::string category() const { return "Cat;Leopard;Mink";}
   void init()
@@ -127,16 +127,16 @@ class WorkspaceAlgorithm : public Algorithm
     setProperty("OutputWorkspace2", out2);
   }
 };
-DECLARE_ALGORITHM( WorkspaceAlgorithm)
+DECLARE_ALGORITHM( StubbedWorkspaceAlgorithm)
 
 
-class WorkspaceAlgorithm2 : public Algorithm
+class StubbedWorkspaceAlgorithm2 : public Algorithm
 {
 public:
-  WorkspaceAlgorithm2() : Algorithm() {}
-  virtual ~WorkspaceAlgorithm2() {}
+  StubbedWorkspaceAlgorithm2() : Algorithm() {}
+  virtual ~StubbedWorkspaceAlgorithm2() {}
 
-  const std::string name() const { return "WorkspaceAlgorithm2";}
+  const std::string name() const { return "StubbedWorkspaceAlgorithm2";}
   int version() const  { return 2;}
   const std::string category() const { return "Cat;Leopard;Mink";}
   void init()
@@ -148,14 +148,14 @@ class WorkspaceAlgorithm2 : public Algorithm
   {
   }
 };
-DECLARE_ALGORITHM(WorkspaceAlgorithm2)
+DECLARE_ALGORITHM(StubbedWorkspaceAlgorithm2)
 
 class AlgorithmWithValidateInputs : public Algorithm
 {
 public:
   AlgorithmWithValidateInputs() : Algorithm() {}
   virtual ~AlgorithmWithValidateInputs() {}
-  const std::string name() const { return "WorkspaceAlgorithm2";}
+  const std::string name() const { return "StubbedWorkspaceAlgorithm2";}
   int version() const  { return 1;}
   const std::string category() const { return "Cat;Leopard;Mink";}
   void init()
@@ -500,7 +500,7 @@ class AlgorithmTest : public CxxTest::TestSuite
       boost::shared_ptr<WorkspaceTester> ws(new WorkspaceTester());
       AnalysisDataService::Instance().addOrReplace("ws" + Strings::toString(i), ws);
     }
-    WorkspaceAlgorithm alg;
+    StubbedWorkspaceAlgorithm alg;
     alg.initialize();
     alg.setPropertyValue("InputWorkspace1", in1);
     alg.setPropertyValue("InputWorkspace2", in2);
@@ -542,7 +542,7 @@ class AlgorithmTest : public CxxTest::TestSuite
       // Get a write lock.
       WriteLock _lock(*ws1);
       // The algorithm would hang waiting for the write-lock to release if the property were locking.
-      WorkspaceAlgorithm2 alg;
+      StubbedWorkspaceAlgorithm2 alg;
       alg.initialize();
       alg.setPropertyValue("NonLockingInputWorkspace", "ws1");
       alg.execute();
@@ -552,7 +552,7 @@ class AlgorithmTest : public CxxTest::TestSuite
       // Acquire a scoped read-lock on ws1.
       ReadLock _lock(*ws1);
       // The algo would lock up when trying to WRITE-lock the workspace again
-      WorkspaceAlgorithm2 alg;
+      StubbedWorkspaceAlgorithm2 alg;
       alg.initialize();
       alg.setPropertyValue("NonLockingOutputWorkspace", "ws1");
       alg.execute();
@@ -608,7 +608,7 @@ class AlgorithmTest : public CxxTest::TestSuite
     makeWorkspaceGroup(group2, contents2);
     makeWorkspaceGroup(group3, contents3);
 
-    WorkspaceAlgorithm alg;
+    StubbedWorkspaceAlgorithm alg;
     alg.initialize();
     alg.setPropertyValue("InputWorkspace1", group1);
     alg.setPropertyValue("InputWorkspace2", group2);