Re #9483. Fixing unit tests that don't compile.

mantidproject · May 20, 2014 · 57e1f77 · 57e1f77
1 parent 2795c85
commit 57e1f77
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/CurveFitting/test/LeBailFitTest.h b/Code/Mantid/Framework/CurveFitting/test/LeBailFitTest.h
@@ -15,6 +15,7 @@
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidAPI/WorkspaceFactory.h"
+#include "MantidDataObjects/TableWorkspace.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -23,6 +24,7 @@
 
 using namespace Mantid;
 using namespace Mantid::CurveFitting;
+using namespace Mantid::DataObjects;
 using namespace Mantid::API;
 using namespace WorkspaceCreationHelper;
 
@@ -50,10 +52,10 @@ class LeBailFitTest : public CxxTest::TestSuite
 
     //  Profile parameters from backgroundless setup
     map<string, double> modmap;
-    DataObjects::TableWorkspace_sptr parameterws = createPeakParameterWorkspace(modmap, 1);
+    TableWorkspace_sptr parameterws = createPeakParameterWorkspace(modmap, 1);
 
     //  Add reflection (111) and (110)
-    DataObjects::TableWorkspace_sptr hklws;
+    TableWorkspace_sptr hklws;
     double h110 = 660.0/0.0064;
     double h111 = 1370.0/0.008;
     std::vector<double> peakheights;
@@ -154,10 +156,10 @@ class LeBailFitTest : public CxxTest::TestSuite
 
     //  Profile parameters from backgroundless setup
     map<string, double> modmap;
-    DataObjects::TableWorkspace_sptr parameterws = createPeakParameterWorkspace(modmap, 9);
+    TableWorkspace_sptr parameterws = createPeakParameterWorkspace(modmap, 9);
 
     //  Add reflection (220)
-    DataObjects::TableWorkspace_sptr hklws;
+    TableWorkspace_sptr hklws;
     double h220 = 660.0/0.0064;
     std::vector<double> peakheights;
     peakheights.push_back(h220);

diff --git a/Code/Mantid/Framework/CurveFitting/test/NeutronBk2BkExpConvPVoigtTest.h b/Code/Mantid/Framework/CurveFitting/test/NeutronBk2BkExpConvPVoigtTest.h
@@ -5,6 +5,7 @@
 
 #include "MantidCurveFitting/NeutronBk2BkExpConvPVoigt.h"
 
+using namespace std;
 using Mantid::CurveFitting::NeutronBk2BkExpConvPVoigt;
 
 class NeutronBk2BkExpConvPVoigtTest : public CxxTest::TestSuite

diff --git a/Code/Mantid/Framework/CurveFitting/test/ThermalNeutronBk2BkExpAlphaTest.h b/Code/Mantid/Framework/CurveFitting/test/ThermalNeutronBk2BkExpAlphaTest.h
@@ -5,6 +5,7 @@
 
 #include "MantidCurveFitting/ThermalNeutronBk2BkExpAlpha.h"
 
+using namespace Mantid;
 using Mantid::CurveFitting::ThermalNeutronBk2BkExpAlpha;
 
 class ThermalNeutronBk2BkExpAlphaTest : public CxxTest::TestSuite

diff --git a/Code/Mantid/Framework/CurveFitting/test/ThermalNeutronBk2BkExpBetaTest.h b/Code/Mantid/Framework/CurveFitting/test/ThermalNeutronBk2BkExpBetaTest.h
@@ -5,6 +5,7 @@
 
 #include "MantidCurveFitting/ThermalNeutronBk2BkExpBeta.h"
 
+using namespace Mantid;
 using Mantid::CurveFitting::ThermalNeutronBk2BkExpBeta;
 
 class ThermalNeutronBk2BkExpBetaTest : public CxxTest::TestSuite

diff --git a/Code/Mantid/Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h b/Code/Mantid/Framework/CurveFitting/test/ThermalNeutronBk2BkExpConvPVoigtTest.h
@@ -10,6 +10,7 @@
 
 using namespace Mantid;
 using namespace Kernel;
+using namespace std;
 using Mantid::CurveFitting::ThermalNeutronBk2BkExpConvPVoigt;
 
 class ThermalNeutronBk2BkExpConvPVoigtTest : public CxxTest::TestSuite

diff --git a/Code/Mantid/Framework/CurveFitting/test/ThermalNeutronBk2BkExpSigmaTest.h b/Code/Mantid/Framework/CurveFitting/test/ThermalNeutronBk2BkExpSigmaTest.h
@@ -6,6 +6,7 @@
 #include "MantidCurveFitting/ThermalNeutronBk2BkExpSigma.h"
 
 using Mantid::CurveFitting::ThermalNeutronBk2BkExpSigma;
+using namespace Mantid;
 
 class ThermalNeutronBk2BkExpSigmaTest : public CxxTest::TestSuite
 {

diff --git a/Code/Mantid/Framework/Geometry/test/PointGroupTest.h b/Code/Mantid/Framework/Geometry/test/PointGroupTest.h
@@ -10,6 +10,7 @@
 #include "MantidGeometry/Crystal/PointGroup.h"
 
 using namespace Mantid;
+using namespace Mantid::Kernel;
 using namespace Mantid::Geometry;
 
 class PointGroupTest : public CxxTest::TestSuite

diff --git a/Code/Mantid/Framework/MDEvents/test/MDHistoWorkspaceTest.h b/Code/Mantid/Framework/MDEvents/test/MDHistoWorkspaceTest.h
@@ -19,6 +19,7 @@
 #include "MantidAPI/ExperimentInfo.h"
 #include "MantidKernel/Strings.h"
 
+using namespace Mantid::DataObjects;
 using namespace Mantid::MDEvents;
 using namespace Mantid::Geometry;
 using namespace Mantid::API;

diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiMockInstrumentHelpers.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiMockInstrumentHelpers.h
@@ -13,6 +13,8 @@
 #include "MantidGeometry/Instrument/FitParameter.h"
 #include "MantidKernel/Interpolation.h"
 
+using namespace Mantid::Geometry;
+
 namespace Mantid {
 namespace Poldi {
 

diff --git a/Code/Mantid/Framework/SINQ/test/PoldiFitPeaks1DTest.h b/Code/Mantid/Framework/SINQ/test/PoldiFitPeaks1DTest.h
@@ -18,6 +18,7 @@ using Mantid::Poldi::PoldiFitPeaks1D;
 using namespace Mantid::Poldi;
 using namespace Mantid::API;
 using namespace Mantid::CurveFitting;
+using namespace Mantid::Kernel;
 
 class PoldiFitPeaks1D;
 

diff --git a/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h b/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h
@@ -14,6 +14,7 @@
 
 using namespace Mantid::Poldi;
 using namespace Mantid::API;
+using namespace Mantid::DataObjects;
 
 class PoldiPeakCollectionTest;
 

diff --git a/Code/Mantid/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h b/Code/Mantid/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h
@@ -21,7 +21,8 @@
 #include <boost/algorithm/string.hpp>
 #include "MantidKernel/ConfigService.h"
 using Mantid::Kernel::ConfigService;
-using Mantid::Kernel::ConfigServiceImpl; 
+using Mantid::Kernel::ConfigServiceImpl;
+using Mantid::Kernel::DateAndTime;
 using namespace std; 
 using Mantid::API::ScriptRepositoryImpl;
 using Mantid::API::ScriptRepoException;