refs #9428. Fix errors and tests.

Error in IntegratePeaksUsingClusters test introduced (previously) and now fixed. Windows disambiguation of exact enum to use.
mantidproject · May 12, 2014 · 4a5a430 · 4a5a430
1 parent c7172bd
commit 4a5a430
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/Crystal/test/CMakeLists.txt b/Code/Mantid/Framework/Crystal/test/CMakeLists.txt
@@ -9,7 +9,7 @@ if ( CXXTEST_FOUND )
                         ../../TestHelpers/src/WorkspaceCreationHelper.cpp
                         ../../TestHelpers/src/MDEventsTestHelper.cpp )
   cxxtest_add_test ( CrystalTest ${TEST_FILES} )
-  target_link_libraries ( CrystalTest Crystal DataHandling MDEvents MDAlgorithms ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES})
+  target_link_libraries ( CrystalTest Crystal DataHandling MDEvents MDAlgorithms Algorithms ${GMOCK_LIBRARIES} ${GTEST_LIBRARIES})
   add_dependencies ( FrameworkTests CrystalTest )
   # Add to the 'FrameworkTests' group in VS
   set_property ( TARGET CrystalTest PROPERTY FOLDER "UnitTests" )

diff --git a/Code/Mantid/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h b/Code/Mantid/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h
@@ -60,9 +60,7 @@ namespace
     auto mdworkspaceAlg = AlgorithmManager::Instance().createUnmanaged("CreateMDWorkspace");
     mdworkspaceAlg->setChild(true);
     mdworkspaceAlg->initialize();
-    mdworkspaceAlg->setProperty("Dimensionality", 3);
-    std::vector<int> numbersOfBins = std::vector<int>(3, 10);
-    mdworkspaceAlg->setProperty("NumberOfBins", numbersOfBins);
+    mdworkspaceAlg->setProperty("Dimensions", 3);
     std::vector<double> extents = boost::assign::list_of(min)(max)(min)(max)(min)(max).convert_to_container<std::vector<double> >();
     mdworkspaceAlg->setProperty("Extents", extents);
     mdworkspaceAlg->setPropertyValue("Names", "H,K,L");

diff --git a/Code/Mantid/Framework/Crystal/test/PeakClusterProjectionTest.h b/Code/Mantid/Framework/Crystal/test/PeakClusterProjectionTest.h
@@ -33,7 +33,7 @@ class PeakClusterProjectionTest: public CxxTest::TestSuite
   IPeaksWorkspace_sptr create_peaks_WS(Instrument_sptr inst) const
   {
     PeaksWorkspace* pPeaksWS = new PeaksWorkspace();
-    pPeaksWS->setCoordinateSystem(HKL);
+    pPeaksWS->setCoordinateSystem(Mantid::API::HKL);
     IPeaksWorkspace_sptr peakWS(pPeaksWS);
     peakWS->setInstrument(inst);
     return peakWS;
@@ -107,7 +107,7 @@ class PeakClusterProjectionTest: public CxxTest::TestSuite
   void test_throws_if_mdws_is_less_than_three_dimensional()
   {
     IMDHistoWorkspace_sptr inWS = MDEventsTestHelper::makeFakeMDHistoWorkspace(1, 2, 1);
-    inWS->setCoordinateSystem(HKL);
+    inWS->setCoordinateSystem(Mantid::API::HKL);
 
     TSM_ASSERT_THROWS("Must be +3 dimensional", PeakClusterProjection object(inWS),
         std::invalid_argument&);