Add unit test for original fault

Refs #8935

Code/Mantid/Framework/DataHandling/test/RenameLogTest.h

@@ -23,7 +23,6 @@ public:
   static RenameLogTest *createSuite() { return new RenameLogTest(); }
   static void destroySuite( RenameLogTest *suite ) { delete suite; }
 
-
   void test_Init()
   {
     RenameLog renlog;
@@ -32,37 +31,39 @@ public:
     TS_ASSERT(renlog.isInitialized());
   }
 
-  void test_Rename(){
 
+  void test_Rename()
+  {
     // 1. Generate workspace & 2 logs
-    API::MatrixWorkspace_sptr mWS = API::WorkspaceFactory::Instance().create("Workspace2D", 1, 100, 100);
+    API::MatrixWorkspace_sptr testWS = generateTestWorkspace();
 
-    Kernel::TimeSeriesProperty<double> *p1 = new Kernel::TimeSeriesProperty<double>("OriginalLog");
+    // 2. Add workspace to data serive
+    AnalysisDataService::Instance().addOrReplace("TestDummy", testWS);
 
-    int64_t t1_ns = 1000000;
-    int64_t dt_ns = 400;
-    double v1 = -1.0;
-    size_t num1 = 10;
-    std::vector<Kernel::DateAndTime> rawtimes;
-    std::vector<double> rawvalues;
+    // 3. Running
+    RenameLog renlog;
+    renlog.initialize();
 
-    for (size_t i=0; i<num1; i ++){
-      Kernel::DateAndTime time(t1_ns);
-      p1->addValue(time, v1);
+    TS_ASSERT_THROWS_NOTHING(renlog.setPropertyValue("Workspace", "TestDummy"));
+    TS_ASSERT_THROWS_NOTHING(renlog.setProperty("OriginalLogName", "OriginalLog"));
+    TS_ASSERT_THROWS_NOTHING(renlog.setProperty("NewLogName", "NewLog"));
 
-      rawtimes.push_back(time);
-      rawvalues.push_back(v1);
+    renlog.execute();
+    TS_ASSERT(renlog.isExecuted());
 
-      t1_ns += dt_ns;
-      v1 = -v1;
-    }
+    // 4. Check
+    API::MatrixWorkspace_sptr resultWS = AnalysisDataService::Instance().retrieveWS<API::MatrixWorkspace>("TestDummy");
+    verifyLog(resultWS, "NewLog");
+  }
 
-    mWS->mutableRun().addProperty(p1);
 
-    // 2. Add workspace to data serive
-    AnalysisDataService::Instance().addOrReplace("TestDummy", mWS);
+  void test_RenameCloned()
+  {
+    API::MatrixWorkspace_sptr testWS = generateTestWorkspace();
+    API::MatrixWorkspace_sptr clonedWS = WorkspaceFactory::Instance().create(testWS);
+    AnalysisDataService::Instance().addOrReplace("TestDummy", testWS);
+    AnalysisDataService::Instance().addOrReplace("TestClonedDummy", clonedWS);
 
-    // 3. Running
     RenameLog renlog;
     renlog.initialize();
 
@@ -73,23 +74,69 @@ public:
     renlog.execute();
     TS_ASSERT(renlog.isExecuted());
 
-    // 4. Check
-    API::MatrixWorkspace_sptr rWS = AnalysisDataService::Instance().retrieveWS<API::MatrixWorkspace>("TestDummy");
+    // Verify modified logs on original workspace
+    API::MatrixWorkspace_sptr resultWS = AnalysisDataService::Instance().retrieveWS<API::MatrixWorkspace>("TestDummy");
+    verifyLog(resultWS, "NewLog");
 
+    // Verify original logs on cloned workspace
+    resultWS = AnalysisDataService::Instance().retrieveWS<API::MatrixWorkspace>("TestClonedDummy");
+    verifyLog(resultWS, "OriginalLog");
+  }
+
+
+private:
+  API::MatrixWorkspace_sptr generateTestWorkspace()
+  {
+    API::MatrixWorkspace_sptr testWS = API::WorkspaceFactory::Instance().create("Workspace2D", 1, 100, 100);
+
+    Kernel::TimeSeriesProperty<double> *p1 = new Kernel::TimeSeriesProperty<double>("OriginalLog");
+
+    int64_t t1_ns = 1000000;
+    int64_t dt_ns = 400;
+    double v1 = -1.0;
+
+    m_num1 = 10;
+    m_rawTimes.clear();
+    m_rawValues.clear();
+
+    for (size_t i=0; i<m_num1; i ++)
+    {
+      Kernel::DateAndTime time(t1_ns);
+      p1->addValue(time, v1);
+
+      m_rawTimes.push_back(time);
+      m_rawValues.push_back(v1);
+
+      t1_ns += dt_ns;
+      v1 = -v1;
+    }
+
+    testWS->mutableRun().addProperty(p1);
+
+    return testWS;
+  }
+
+
+  void verifyLog(API::MatrixWorkspace_sptr resultWS, const std::string logName)
+  {
     Kernel::TimeSeriesProperty<double> *rp;
-    TS_ASSERT_THROWS_NOTHING(rp = dynamic_cast<Kernel::TimeSeriesProperty<double>* >(rWS->run().getProperty("NewLog")));
-    rp = dynamic_cast<Kernel::TimeSeriesProperty<double>* >(rWS->run().getProperty("NewLog"));
+    TS_ASSERT_THROWS_NOTHING(rp = dynamic_cast<Kernel::TimeSeriesProperty<double>* >(resultWS->run().getProperty(logName)));
+    rp = dynamic_cast<Kernel::TimeSeriesProperty<double>* >(resultWS->run().getProperty(logName));
 
     std::vector<Kernel::DateAndTime> newtimes = rp->timesAsVector();
-    TS_ASSERT_EQUALS(newtimes.size(), num1);
-    for (size_t i=0; i<num1; i ++){
+    TS_ASSERT_EQUALS(newtimes.size(), m_num1);
+    for (size_t i=0; i<m_num1; i ++)
+    {
       double newvalue;
-      TS_ASSERT_THROWS_NOTHING(newvalue= rp->getSingleValue(rawtimes[i]));
-      newvalue= rp->getSingleValue(rawtimes[i]);
-      TS_ASSERT_DELTA(newvalue, rawvalues[i], 1.0E-8);
+      TS_ASSERT_THROWS_NOTHING(newvalue= rp->getSingleValue(m_rawTimes[i]));
+      newvalue= rp->getSingleValue(m_rawTimes[i]);
+      TS_ASSERT_DELTA(newvalue, m_rawValues[i], 1.0E-8);
     }
   }
 
+  size_t m_num1;
+  std::vector<Kernel::DateAndTime> m_rawTimes;
+  std::vector<double> m_rawValues;
 
 };