refs #9135 fixed unit test for different case monitors ws

mantidproject · Apr 8, 2014 · 11334d8 · 11334d8
1 parent 4cd3a86
commit 11334d8
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/test/LoadRaw3Test.h b/Code/Mantid/Framework/DataHandling/test/LoadRaw3Test.h
@@ -448,7 +448,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
     Workspace2D_sptr output2D = boost::dynamic_pointer_cast<Workspace2D>(output);
 
     Workspace_sptr monitoroutput;
-    TS_ASSERT_THROWS_NOTHING(monitoroutput = AnalysisDataService::Instance().retrieve(outputSpace+"_Monitors"));
+    TS_ASSERT_THROWS_NOTHING(monitoroutput = AnalysisDataService::Instance().retrieve(outputSpace+"_monitors"));
     Workspace2D_sptr monitoroutput2D = boost::dynamic_pointer_cast<Workspace2D>(monitoroutput);
     // Should be 2584 for file HET15869.RAW
     TS_ASSERT_EQUALS( output2D->getNumberHistograms(), 2580);
@@ -526,7 +526,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
     TS_ASSERT_EQUALS(loader6.getPropertyValue("Filename"),output2D->run().getProperty("Filename")->value());
     TS_ASSERT_EQUALS(loader6.getPropertyValue("Filename"),monitoroutput2D->run().getProperty("Filename")->value());
     AnalysisDataService::Instance().remove(outputSpace);
-    AnalysisDataService::Instance().remove(outputSpace+"_Monitors");
+    AnalysisDataService::Instance().remove(outputSpace+"_monitors");
   }
 
   void testSeparateMonitorsMultiPeriod()
@@ -544,9 +544,9 @@ class LoadRaw3Test : public CxxTest::TestSuite
     TS_ASSERT_THROWS_NOTHING(work_out = AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>("multiperiod"));
 
     WorkspaceGroup_sptr monitor_work_out;
-    TS_ASSERT_THROWS_NOTHING(monitor_work_out = AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>("multiperiod_Monitors"));
+    TS_ASSERT_THROWS_NOTHING(monitor_work_out = AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>("multiperiod_monitors"));
 
-    Workspace_sptr monitorwsSptr=AnalysisDataService::Instance().retrieve("multiperiod_Monitors");
+    Workspace_sptr monitorwsSptr=AnalysisDataService::Instance().retrieve("multiperiod_monitors");
     WorkspaceGroup_sptr monitorsptrWSGrp=boost::dynamic_pointer_cast<WorkspaceGroup>(monitorwsSptr);
 
 
@@ -556,7 +556,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
     for (;it!=monitorwsNamevec.end();it++)
     {	std::stringstream count;
     count <<period;
-    std::string wsName="multiperiod_Monitors_"+count.str();
+    std::string wsName="multiperiod_monitors_"+count.str();
     TS_ASSERT_EQUALS(*it,wsName)
     period++;
     }
@@ -645,7 +645,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
     /// ADS should only contain single group with given name as the spectrum list contains only monitors
     AnalysisDataServiceImpl& ads = AnalysisDataService::Instance();
     TSM_ASSERT("Expected workspace is not in the ADS", ads.doesExist(outputWSName));
-    TSM_ASSERT("A separate monitor workspace has been found when it should not be", !ads.doesExist(outputWSName + "_Monitors"))
+    TSM_ASSERT("A separate monitor workspace has been found when it should not be", !ads.doesExist(outputWSName + "_monitors"))
 
     // Check group is correct
     const size_t nperiods(2);
@@ -665,7 +665,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
       TSM_ASSERT(msg.str(),outputGroup->contains(wsname.str()));
 
       wsname.str("");
-      wsname << outputWSName << "_Monitors_" << i;
+      wsname << outputWSName << "_monitors_" << i;
       msg.str("");
       msg << "Expected NOT to find workspace '" << wsname.str() << "' in the ADS.";
       TSM_ASSERT(msg.str(), !ads.doesExist(wsname.str()));
@@ -784,7 +784,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
     Workspace2D_sptr output2D = boost::dynamic_pointer_cast<Workspace2D>(output);
 
     Workspace_sptr monitoroutput;
-    TS_ASSERT_THROWS_NOTHING(monitoroutput = AnalysisDataService::Instance().retrieve("outWS_Monitors"));
+    TS_ASSERT_THROWS_NOTHING(monitoroutput = AnalysisDataService::Instance().retrieve("outWS_monitors"));
     Workspace2D_sptr monitoroutput2D = boost::dynamic_pointer_cast<Workspace2D>(monitoroutput);
 
     // Should be 6 for selected input
@@ -797,7 +797,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
 
     // Check two Y arrays have the same number of elements
     TS_ASSERT_EQUALS( output2D->dataY(2).size(), output2D->dataY(3).size() );
-    AnalysisDataService::Instance().remove("outWS_Monitors");
+    AnalysisDataService::Instance().remove("outWS_monitors");
     AnalysisDataService::Instance().remove("outWS");
 
     // Check one particular value
@@ -825,7 +825,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
     Workspace2D_sptr output2D = boost::dynamic_pointer_cast<Workspace2D>(output);
 
     Workspace_sptr monitoroutput;
-    TS_ASSERT_THROWS_NOTHING(monitoroutput = AnalysisDataService::Instance().retrieve("outWS_Monitors"));
+    TS_ASSERT_THROWS_NOTHING(monitoroutput = AnalysisDataService::Instance().retrieve("outWS_monitors"));
     Workspace2D_sptr monitoroutput2D = boost::dynamic_pointer_cast<Workspace2D>(monitoroutput);
 
 
@@ -834,7 +834,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
 
     TS_ASSERT_EQUALS( monitoroutput2D->getNumberHistograms(),3 );
 
-    AnalysisDataService::Instance().remove("outWS_Monitors");
+    AnalysisDataService::Instance().remove("outWS_monitors");
     AnalysisDataService::Instance().remove("outWS");
   }
   //no monitors in the selected range
@@ -933,10 +933,10 @@ class LoadRaw3Test : public CxxTest::TestSuite
     TS_ASSERT_THROWS_NOTHING( output = AnalysisDataService::Instance().retrieve("managedws2") );
     TS_ASSERT( dynamic_cast<ManagedWorkspace2D*>(output.get()) )
     Workspace_sptr output1;
-    TS_ASSERT_THROWS_NOTHING( output1 = AnalysisDataService::Instance().retrieve("managedws2_Monitors") );
+    TS_ASSERT_THROWS_NOTHING( output1 = AnalysisDataService::Instance().retrieve("managedws2_monitors") );
     // TS_ASSERT( dynamic_cast<ManagedWorkspace2D*>(output1.get()) )
     AnalysisDataService::Instance().remove("managedws2");
-    AnalysisDataService::Instance().remove("managedws2_Monitors");
+    AnalysisDataService::Instance().remove("managedws2_monitors");
     conf.setString(managed,oldValue);
   }