Move LoadMuonNexus algorithm tests to correct test library

robertapplin · robertapplin · commit f479d299b500 · 2024-10-29T12:23:42.000Z
diff --git a/Framework/Algorithms/test/RemoveBinsTest.h b/Framework/Algorithms/test/RemoveBinsTest.h
@@ -15,7 +15,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/Axis.h"
 #include "MantidAlgorithms/RemoveBins.h"
-#include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidFrameworkTestHelpers/WorkspaceCreationHelper.h"
 #include "MantidHistogramData/LinearGenerator.h"
diff --git a/Framework/DataHandling/CMakeLists.txt b/Framework/DataHandling/CMakeLists.txt
@@ -526,8 +526,6 @@ set(TEST_FILES
     LoadMcStasNexusTest.h
     LoadMcStasTest.h
     LoadMuonLogTest.h
-    LoadMuonNexus1Test.h
-    LoadMuonNexus2Test.h
     LoadMuonNexusV2Test.h
     LoadNGEMTest.h
     LoadNXSPETest.h
diff --git a/Framework/DataHandling/test/GroupDetectors2Test.h b/Framework/DataHandling/test/GroupDetectors2Test.h
@@ -17,7 +17,6 @@
 #include "MantidAPI/NumericAxis.h"
 #include "MantidAPI/SpectraAxis.h"
 #include "MantidAPI/SpectrumInfo.h"
-#include "MantidDataHandling/LoadMuonNexus1.h"
 #include "MantidDataHandling/MaskDetectors.h"
 #include "MantidDataObjects/ScanningWorkspaceBuilder.h"
 #include "MantidDataObjects/WorkspaceCreation.h"
@@ -27,6 +26,7 @@
 #include "MantidIndexing/IndexInfo.h"
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/UnitFactory.h"
+#include "MantidMuon/LoadMuonNexus1.h"
 #include "MantidTypes/SpectrumDefinition.h"
 
 #include <Poco/Path.h>
@@ -405,7 +405,7 @@ class GroupDetectors2Test : public CxxTest::TestSuite {
   }
 
   void testReadingFromXML() {
-    Mantid::DataHandling::LoadMuonNexus1 nxLoad;
+    Mantid::Algorithms::LoadMuonNexus1 nxLoad;
     nxLoad.initialize();
 
     // Now set required filename and output workspace name
@@ -444,7 +444,7 @@ class GroupDetectors2Test : public CxxTest::TestSuite {
   }
 
   void testReadingFromXMLCheckDuplicateIndex() {
-    Mantid::DataHandling::LoadMuonNexus1 nxLoad;
+    Mantid::Algorithms::LoadMuonNexus1 nxLoad;
     nxLoad.initialize();
 
     // Now set required filename and output workspace name
@@ -483,7 +483,7 @@ class GroupDetectors2Test : public CxxTest::TestSuite {
   }
 
   void testReadingFromXMLCheckDublicateIndex2() {
-    Mantid::DataHandling::LoadMuonNexus1 nxLoad;
+    Mantid::Algorithms::LoadMuonNexus1 nxLoad;
     nxLoad.initialize();
 
     // Now set required filename and output workspace name
diff --git a/Framework/DataHandling/test/LoadMuonNexusTest.h b/Framework/DataHandling/test/LoadMuonNexusTest.h
diff --git a/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h b/Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h
@@ -10,7 +10,6 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidDataHandling/LoadInstrument.h"
-#include "MantidDataHandling/LoadMuonNexus.h"
 #include "MantidDataHandling/LoadNexus.h"
 #include "MantidDataHandling/LoadNexusProcessed.h"
 #include "MantidDataHandling/LoadRaw3.h"
diff --git a/Framework/DataHandling/test/SaveNexusProcessedTest.h b/Framework/DataHandling/test/SaveNexusProcessedTest.h
@@ -18,7 +18,6 @@
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/LoadEmptyInstrument.h"
 #include "MantidDataHandling/LoadInstrument.h"
-#include "MantidDataHandling/LoadMuonNexus.h"
 #include "MantidDataHandling/LoadNexus.h"
 #include "MantidDataHandling/LoadRaw3.h"
 #include "MantidDataHandling/SaveNexusProcessed.h"
diff --git a/Framework/DataHandling/test/SaveNexusTest.h b/Framework/DataHandling/test/SaveNexusTest.h
@@ -18,7 +18,6 @@
 
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/FrameworkManager.h"
-#include "MantidDataHandling/LoadMuonNexus.h"
 #include "MantidDataHandling/LoadNexus.h"
 #include "MantidDataHandling/SaveNexus.h"
 #include "MantidFrameworkTestHelpers/WorkspaceCreationHelper.h"
diff --git a/Framework/Muon/CMakeLists.txt b/Framework/Muon/CMakeLists.txt
@@ -67,6 +67,8 @@ set(TEST_FILES
     CalMuonDetectorPhasesTest.h
     ConvertFitFunctionForMuonTFAsymmetryTest.h
     LoadAndApplyMuonDetectorGroupingTest.h
+    LoadMuonNexus1Test.h
+    LoadMuonNexus2Test.h
     MuonAlgorithmHelperTest.h
     EstimateMuonAsymmetryFromCountsTest.h
     MuonGroupDetectorsTest.h
diff --git a/Framework/Muon/test/AlphaCalcTest.h b/Framework/Muon/test/AlphaCalcTest.h
@@ -13,9 +13,9 @@
 #include "MantidAPI/Workspace.h"
 #include "MantidDataHandling/GroupDetectors.h"
 #include "MantidDataHandling/LoadInstrument.h"
-#include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidMuon/AlphaCalc.h"
+#include "MantidMuon/LoadMuonNexus2.h"
 #include <stdexcept>
 
 using namespace Mantid::Algorithms;
@@ -93,5 +93,5 @@ class AlphaCalcTest : public CxxTest::TestSuite {
 
 private:
   AlphaCalc alphaCalc;
-  Mantid::DataHandling::LoadMuonNexus2 loader;
+  Mantid::Algorithms::LoadMuonNexus2 loader;
 };
diff --git a/Framework/Muon/test/ApplyDeadTimeCorrTest.h b/Framework/Muon/test/ApplyDeadTimeCorrTest.h
@@ -12,11 +12,11 @@
 #include "MantidAPI/IAlgorithm.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidAPI/Workspace.h"
-#include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidDataObjects/TableWorkspace.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidFrameworkTestHelpers/WorkspaceCreationHelper.h"
 #include "MantidMuon/ApplyDeadTimeCorr.h"
+#include "MantidMuon/LoadMuonNexus2.h"
 
 #include <stdexcept>
 
@@ -212,7 +212,7 @@ class ApplyDeadTimeCorrTest : public CxxTest::TestSuite {
    * @returns :: Workspace with loaded data
    */
   MatrixWorkspace_sptr loadDataFromFile() {
-    Mantid::DataHandling::LoadMuonNexus2 loader;
+    Mantid::Algorithms::LoadMuonNexus2 loader;
     loader.initialize();
     loader.setChild(true);
     loader.setPropertyValue("Filename", "emu00006473.nxs");
diff --git a/Framework/Muon/test/ApplyMuonDetectorGroupPairingTest.h b/Framework/Muon/test/ApplyMuonDetectorGroupPairingTest.h
@@ -15,7 +15,6 @@
 #include "MantidAPI/Workspace.h"
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidAlgorithms/CompareWorkspaces.h"
-#include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidDataObjects/TableWorkspace.h"
 #include "MantidKernel/PhysicalConstants.h"
 
diff --git a/Framework/Muon/test/AsymmetryCalcTest.h b/Framework/Muon/test/AsymmetryCalcTest.h
@@ -15,9 +15,9 @@
 #include "MantidAPI/WorkspaceGroup.h"
 #include "MantidDataHandling/GroupDetectors.h"
 #include "MantidDataHandling/LoadInstrument.h"
-#include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidMuon/AsymmetryCalc.h"
+#include "MantidMuon/LoadMuonNexus2.h"
 #include <algorithm>
 #include <stdexcept>
 
@@ -168,7 +168,7 @@ class AsymmetryCalcTest : public CxxTest::TestSuite {
 private:
   /// Load data from file
   MatrixWorkspace_sptr loadDataFile() {
-    Mantid::DataHandling::LoadMuonNexus2 loader;
+    Mantid::Algorithms::LoadMuonNexus2 loader;
     loader.initialize();
     loader.setChild(true);
     loader.setPropertyValue("Filename", "emu00006473.nxs");
diff --git a/Framework/Muon/test/CalMuonDeadTimeTest.h b/Framework/Muon/test/CalMuonDeadTimeTest.h
@@ -13,10 +13,10 @@
 #include "MantidAPI/IAlgorithm.h"
 #include "MantidAPI/Run.h"
 #include "MantidAPI/Workspace.h"
-#include "MantidDataHandling/LoadMuonNexus1.h"
 #include "MantidDataObjects/TableWorkspace.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidMuon/CalMuonDeadTime.h"
+#include "MantidMuon/LoadMuonNexus1.h"
 #include <stdexcept>
 
 using namespace Mantid::Algorithms;
@@ -93,7 +93,7 @@ class CalMuonDeadTimeTest : public CxxTest::TestSuite {
 private:
   // Load the muon nexus file
   MatrixWorkspace_sptr loadData() {
-    Mantid::DataHandling::LoadMuonNexus1 loader;
+    Mantid::Algorithms::LoadMuonNexus1 loader;
     loader.initialize();
     loader.setChild(true);
     loader.setPropertyValue("Filename", "emu00006473.nxs");
diff --git a/Framework/Muon/test/LoadMuonNexus1Test.h b/Framework/Muon/test/LoadMuonNexus1Test.h
@@ -9,8 +9,8 @@
 // These includes seem to make the difference between initialization of the
 // workspace names (workspace2D/1D etc), instrument classes and not for this
 // test case.
-#include "MantidDataHandling/LoadInstrument.h"
 #include "MantidDataObjects/TableWorkspace.h"
+#include "MantidDataObjects/Workspace2D.h"
 #include "MantidDataObjects/WorkspaceSingleValue.h"
 
 #include <cxxtest/TestSuite.h>
@@ -24,16 +24,16 @@
 #include "MantidAPI/Sample.h"
 #include "MantidAPI/ScopedWorkspace.h"
 #include "MantidAPI/WorkspaceGroup.h"
-#include "MantidDataHandling/LoadMuonNexus1.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/Unit.h"
+#include "MantidMuon/LoadMuonNexus1.h"
 
 #include <Poco/Path.h>
 
 using namespace Mantid::API;
+using namespace Mantid::Algorithms;
 using namespace Mantid::Kernel;
-using namespace Mantid::DataHandling;
 using namespace Mantid::DataObjects;
 
 class LoadMuonNexus1Test : public CxxTest::TestSuite {
diff --git a/Framework/Muon/test/LoadMuonNexus2Test.h b/Framework/Muon/test/LoadMuonNexus2Test.h
@@ -9,7 +9,6 @@
 // These includes seem to make the difference between initialization of the
 // workspace names (workspace2D/1D etc), instrument classes and not for this
 // test case.
-#include "MantidDataHandling/LoadInstrument.h"
 #include "MantidDataObjects/WorkspaceSingleValue.h"
 
 #include <cxxtest/TestSuite.h>
@@ -19,14 +18,14 @@
 #include "MantidAPI/Axis.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/Run.h"
-#include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/Unit.h"
+#include "MantidMuon/LoadMuonNexus2.h"
 
 using namespace Mantid::API;
+using namespace Mantid::Algorithms;
 using namespace Mantid::Kernel;
-using namespace Mantid::DataHandling;
 using namespace Mantid::DataObjects;
 using Mantid::detid_t;
 using Mantid::Types::Core::DateAndTime;
diff --git a/Framework/Muon/test/PlotAsymmetryByLogValueTest.h b/Framework/Muon/test/PlotAsymmetryByLogValueTest.h
@@ -13,7 +13,6 @@
 #include "MantidAPI/TextAxis.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataHandling/LoadInstrument.h"
-#include "MantidDataHandling/LoadMuonNexus.h"
 #include "MantidDataHandling/SaveNexus.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidMuon/PlotAsymmetryByLogValue.h"
diff --git a/Framework/WorkflowAlgorithms/test/MuonProcessTest.h b/Framework/WorkflowAlgorithms/test/MuonProcessTest.h
@@ -10,12 +10,12 @@
 
 #include "MantidAPI/ScopedWorkspace.h"
 #include "MantidAPI/TableRow.h"
-#include "MantidDataHandling/LoadMuonNexus2.h"
 #include "MantidDataObjects/TableWorkspace.h"
+#include "MantidMuon/LoadMuonNexus2.h"
 
 #include "MantidWorkflowAlgorithms/MuonProcess.h"
 
-using Mantid::DataHandling::LoadMuonNexus2;
+using Mantid::Algorithms::LoadMuonNexus2;
 using Mantid::WorkflowAlgorithms::MuonProcess;
 
 using namespace Mantid::Kernel;
