From 57e1f77da81549c9c12010c4465dfab0c08dfc61 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Tue, 20 May 2014 10:02:27 -0400 Subject: [PATCH] Re #9483. Fixing unit tests that don't compile. --- .../Mantid/Framework/CurveFitting/test/LeBailFitTest.h | 10 ++++++---- .../CurveFitting/test/NeutronBk2BkExpConvPVoigtTest.h | 1 + .../test/ThermalNeutronBk2BkExpAlphaTest.h | 1 + .../CurveFitting/test/ThermalNeutronBk2BkExpBetaTest.h | 1 + .../test/ThermalNeutronBk2BkExpConvPVoigtTest.h | 1 + .../test/ThermalNeutronBk2BkExpSigmaTest.h | 1 + Code/Mantid/Framework/Geometry/test/PointGroupTest.h | 1 + .../Framework/MDEvents/test/MDHistoWorkspaceTest.h | 1 + .../PoldiUtilities/PoldiMockInstrumentHelpers.h | 2 ++ Code/Mantid/Framework/SINQ/test/PoldiFitPeaks1DTest.h | 1 + .../Framework/SINQ/test/PoldiPeakCollectionTest.h | 1 + .../ScriptRepository/test/ScriptRepositoryTestImpl.h | 3 ++- 12 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Code/Mantid/Framework/CurveFitting/test/LeBailFitTest.h b/Code/Mantid/Framework/CurveFitting/test/LeBailFitTest.h index 53fedd936059..e117ea93a7ce 100644 --- 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 #include @@ -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 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 peakheights; @@ -154,10 +156,10 @@ class LeBailFitTest : public CxxTest::TestSuite // Profile parameters from backgroundless setup map 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 peakheights; peakheights.push_back(h220); diff --git a/Code/Mantid/Framework/CurveFitting/test/NeutronBk2BkExpConvPVoigtTest.h b/Code/Mantid/Framework/CurveFitting/test/NeutronBk2BkExpConvPVoigtTest.h index 38e105f296a5..84be27958a86 100644 --- 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 index 8b182eb92ad1..25df863b2c1b 100644 --- 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 index e02a5cd07573..286db3e5804f 100644 --- 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 index 6ecf9e094509..a41b21003049 100644 --- 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 index 7d65eb9aff37..070a7dd7fefa 100644 --- 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 index 4d0eb5af364d..ee2be8c0ae35 100644 --- 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 index b1df579ba8ec..89644c241c81 100644 --- 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 index b1365ea65d04..b171b5ca8e93 100644 --- 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 index 16ad33b952e5..8d8b7b9f78d0 100644 --- 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 index 2a0bbdb6fb3a..983010e3d7e6 100644 --- 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 index 94d4118462e2..e8423a696a03 100644 --- a/Code/Mantid/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h +++ b/Code/Mantid/Framework/ScriptRepository/test/ScriptRepositoryTestImpl.h @@ -21,7 +21,8 @@ #include #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;