All unit tests pass after making setName private. Re #7253

mantidproject · Jun 7, 2013 · b8dd98c · b8dd98c
1 parent 106e30d
commit b8dd98c
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 24 deletions.
diff --git a/Code/Mantid/Framework/API/test/MultiPeriodGroupAlgorithmTest.h b/Code/Mantid/Framework/API/test/MultiPeriodGroupAlgorithmTest.h
@@ -119,9 +119,11 @@ class MultiPeriodGroupAlgorithmTest : public CxxTest::TestSuite
     group->addWorkspace(a);
     group->addWorkspace(b);
     add_periods_logs(group);
-    AnalysisDataService::Instance().addOrReplace(a->name(), a);
-    AnalysisDataService::Instance().addOrReplace(b->name(), b);
-    AnalysisDataService::Instance().addOrReplace(group->name(), group);
+//    AnalysisDataService::Instance().addOrReplace(a->name(), a);
+//    AnalysisDataService::Instance().addOrReplace(b->name(), b);
+    AnalysisDataService::Instance().addOrReplace(name+"_1", a);
+    AnalysisDataService::Instance().addOrReplace(name+"_2", b);
+    AnalysisDataService::Instance().addOrReplace(name, group);
     return group;
   }
 

diff --git a/Code/Mantid/Framework/API/test/WorkspaceGroupTest.h b/Code/Mantid/Framework/API/test/WorkspaceGroupTest.h
@@ -194,6 +194,7 @@ class WorkspaceGroupTest : public CxxTest::TestSuite
   {
     WorkspaceGroup_sptr group(new WorkspaceGroup());
     //group->setName("name");
+    AnalysisDataService::Instance().add("name",group);
     TSM_ASSERT( "Empty group is not similar", !group->areNamesSimilar() );
 
     boost::shared_ptr<WorkspaceTester> ws(new WorkspaceTester());

diff --git a/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h b/Code/Mantid/Framework/Algorithms/test/MergeRunsTest.h
@@ -55,9 +55,9 @@ class MergeRunsTest : public CxxTest::TestSuite
     //group->setName("group1");
     group->addWorkspace(a);
     group->addWorkspace(b); // No multiperiod logs added.
-    AnalysisDataService::Instance().addOrReplace(a->name(), a);
-    AnalysisDataService::Instance().addOrReplace(b->name(), b);
-    AnalysisDataService::Instance().addOrReplace(group->name(), group);
+    AnalysisDataService::Instance().addOrReplace("a1", a);
+    AnalysisDataService::Instance().addOrReplace("b1", b);
+    AnalysisDataService::Instance().addOrReplace("group1", group);
     return group;
   }
 
@@ -75,9 +75,12 @@ class MergeRunsTest : public CxxTest::TestSuite
     const bool calculateNPeriods = false;
     const int nPeriods = 0;
     add_periods_logs(group, calculateNPeriods, nPeriods);
-    AnalysisDataService::Instance().addOrReplace(a->name(), a);
-    AnalysisDataService::Instance().addOrReplace(a->name(), b);
-    AnalysisDataService::Instance().addOrReplace(group->name(), group);
+    // the two workspaces get same name?
+//    AnalysisDataService::Instance().addOrReplace(a->name(), a);
+//    AnalysisDataService::Instance().addOrReplace(a->name(), b);
+    AnalysisDataService::Instance().addOrReplace("a2", a);
+    AnalysisDataService::Instance().addOrReplace("b2", b);
+    AnalysisDataService::Instance().addOrReplace("group2", group);
     return group;
   }
 
@@ -95,9 +98,12 @@ class MergeRunsTest : public CxxTest::TestSuite
     const bool calculateNPeriods = false;
     const int nPeriods = 5;
     add_periods_logs(group, calculateNPeriods, nPeriods);
-    AnalysisDataService::Instance().addOrReplace(a->name(), a);
-    AnalysisDataService::Instance().addOrReplace(a->name(), b);
-    AnalysisDataService::Instance().addOrReplace(group->name(), group);
+    // the two workspaces get same name?
+//    AnalysisDataService::Instance().addOrReplace(a->name(), a);
+//    AnalysisDataService::Instance().addOrReplace(a->name(), b);
+    AnalysisDataService::Instance().addOrReplace("a4", a);
+    AnalysisDataService::Instance().addOrReplace("b4", b);
+    AnalysisDataService::Instance().addOrReplace("group4", group);
     return group;
   }
 
@@ -113,9 +119,9 @@ class MergeRunsTest : public CxxTest::TestSuite
     group->addWorkspace(a);
     group->addWorkspace(b);
     add_periods_logs(group);
-    AnalysisDataService::Instance().addOrReplace(a->name(), a);
-    AnalysisDataService::Instance().addOrReplace(b->name(), b);
-    AnalysisDataService::Instance().addOrReplace(group->name(), group);
+    AnalysisDataService::Instance().addOrReplace("a3", a);
+    AnalysisDataService::Instance().addOrReplace("b3", b);
+    AnalysisDataService::Instance().addOrReplace("group3", group);
     return group;
   }
 
@@ -711,7 +717,7 @@ class MergeRunsTest : public CxxTest::TestSuite
     aCorrupted->addWorkspace(second);
     aCorrupted->addWorkspace(first);
     //aCorrupted->setName("aCorrupted");
-    Mantid::API::AnalysisDataService::Instance().addOrReplace(aCorrupted->getName(), aCorrupted);
+    Mantid::API::AnalysisDataService::Instance().addOrReplace("aCorrupted", aCorrupted);
 
     do_test_validation_throws(aCorrupted, a);
   }

diff --git a/Code/Mantid/Framework/Algorithms/test/PlusMinusTest.in.h b/Code/Mantid/Framework/Algorithms/test/PlusMinusTest.in.h
@@ -965,8 +965,8 @@ class @PLUSMINUSTEST_CLASS@ : public CxxTest::TestSuite
       int outputWorkspaceWillBe = 0
       )
   {
-    lhs->setName("MinusTest_lhs");
-    rhs->setName("MinusTest_rhs");
+    //lhs->setName("MinusTest_lhs");
+    //rhs->setName("MinusTest_rhs");
     switch (outputWorkspaceWillBe)
     {
     case 0:

diff --git a/Code/Mantid/Framework/Algorithms/test/SumSpectraTest.h b/Code/Mantid/Framework/Algorithms/test/SumSpectraTest.h
@@ -216,6 +216,7 @@ class SumSpectraTest : public CxxTest::TestSuite
 
   void testRebinnedOutputSum()
   {
+      AnalysisDataService::Instance().clear();
     RebinnedOutput_sptr ws = WorkspaceCreationHelper::CreateRebinnedOutputWorkspace();
     std::string inName = "rebinTest";
     std::string outName = "rebin_sum";

diff --git a/Code/Mantid/Framework/DataHandling/test/LoadTest.h b/Code/Mantid/Framework/DataHandling/test/LoadTest.h
@@ -486,13 +486,13 @@ class LoadTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS(output->getNumberOfEntries(),2);
     MatrixWorkspace_sptr ws1 = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>("MUSR00015189_MUSR00015190_MUSR00015191_MUSR00015192_1");
     TS_ASSERT(ws1);
-    TS_ASSERT_DELTA(ws1->readY(0)[0], 28.0, 1e-12);
-    TS_ASSERT_DELTA(ws1->readY(6)[4], 2.0, 1e-12);
+    TS_ASSERT_DELTA(ws1->readY(0)[0], 16.0, 1e-12);
+    TS_ASSERT_DELTA(ws1->readY(6)[4], 1.0, 1e-12);
 
     MatrixWorkspace_sptr ws2 = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>("MUSR00015189_MUSR00015190_MUSR00015191_MUSR00015192_2");
     TS_ASSERT(ws2);
-    TS_ASSERT_DELTA(ws2->readY(0)[5], 1.0, 1e-12);
-    TS_ASSERT_DELTA(ws2->readY(8)[0], 3.0, 1e-12);
+    TS_ASSERT_DELTA(ws2->readY(0)[5], 2.0, 1e-12);
+    TS_ASSERT_DELTA(ws2->readY(8)[0], 6.0, 1e-12);
 
     removeGroupFromADS(output);
   }

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDComponentsTest.h b/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDComponentsTest.h
@@ -87,7 +87,7 @@ void testPreprocDetLogic()
      auto TableWS3= pAlg->preprocessDetectorsPositions(ws2Dp);
      TS_ASSERT(TableWSs.get()!=TableWS3.get());
 
-     TS_ASSERT_EQUALS("ServiceTableWS",TableWS3->getName());
+     TS_ASSERT_EQUALS("",TableWS3->getName()); // if WS isn't in the ADS it doesn't have a name
      TSM_ASSERT("Should not add service WS to the data service",!AnalysisDataService::Instance().doesExist("ServiceTableWS"));
 
      // now it does not calulates new workspace and takes old from data service
@@ -311,4 +311,4 @@ void maskAllDetectors(const std::string &wsName)
 }
 
 };
-#endif
+#endif
diff --git a/Code/Mantid/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp b/Code/Mantid/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
@@ -935,6 +935,7 @@ namespace WorkspaceCreationHelper
    {
      RebinnedOutput_sptr outputWS = Mantid::DataObjects::RebinnedOutput_sptr(new RebinnedOutput());
      //outputWS->setName("rebinTest");
+     Mantid::API::AnalysisDataService::Instance().add("rebinTest",outputWS);
 
      // Set Q ('y') axis binning
      MantidVec qbins;