Skip to content

Commit 81ebac8

Browse files
committed
Move LoadMuonNexus algorithm tests to correct test library
1 parent 74d4a59 commit 81ebac8

16 files changed

+21
-44
lines changed

Framework/Algorithms/test/RemoveBinsTest.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "MantidAPI/AnalysisDataService.h"
1616
#include "MantidAPI/Axis.h"
1717
#include "MantidAlgorithms/RemoveBins.h"
18-
#include "MantidDataHandling/LoadMuonNexus2.h"
1918
#include "MantidDataObjects/Workspace2D.h"
2019
#include "MantidFrameworkTestHelpers/WorkspaceCreationHelper.h"
2120
#include "MantidHistogramData/LinearGenerator.h"

Framework/DataHandling/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,6 @@ set(TEST_FILES
526526
LoadMcStasNexusTest.h
527527
LoadMcStasTest.h
528528
LoadMuonLogTest.h
529-
LoadMuonNexus1Test.h
530-
LoadMuonNexus2Test.h
531529
LoadMuonNexusV2Test.h
532530
LoadNGEMTest.h
533531
LoadNXSPETest.h

Framework/DataHandling/test/GroupDetectors2Test.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "MantidAPI/NumericAxis.h"
1818
#include "MantidAPI/SpectraAxis.h"
1919
#include "MantidAPI/SpectrumInfo.h"
20-
#include "MantidDataHandling/LoadMuonNexus1.h"
2120
#include "MantidDataHandling/MaskDetectors.h"
2221
#include "MantidDataObjects/ScanningWorkspaceBuilder.h"
2322
#include "MantidDataObjects/WorkspaceCreation.h"
@@ -27,6 +26,7 @@
2726
#include "MantidIndexing/IndexInfo.h"
2827
#include "MantidKernel/DateAndTime.h"
2928
#include "MantidKernel/UnitFactory.h"
29+
#include "MantidMuon/LoadMuonNexus1.h"
3030
#include "MantidTypes/SpectrumDefinition.h"
3131

3232
#include <Poco/Path.h>
@@ -405,7 +405,7 @@ class GroupDetectors2Test : public CxxTest::TestSuite {
405405
}
406406

407407
void testReadingFromXML() {
408-
Mantid::DataHandling::LoadMuonNexus1 nxLoad;
408+
Mantid::Algorithms::LoadMuonNexus1 nxLoad;
409409
nxLoad.initialize();
410410

411411
// Now set required filename and output workspace name
@@ -444,7 +444,7 @@ class GroupDetectors2Test : public CxxTest::TestSuite {
444444
}
445445

446446
void testReadingFromXMLCheckDuplicateIndex() {
447-
Mantid::DataHandling::LoadMuonNexus1 nxLoad;
447+
Mantid::Algorithms::LoadMuonNexus1 nxLoad;
448448
nxLoad.initialize();
449449

450450
// Now set required filename and output workspace name
@@ -483,7 +483,7 @@ class GroupDetectors2Test : public CxxTest::TestSuite {
483483
}
484484

485485
void testReadingFromXMLCheckDublicateIndex2() {
486-
Mantid::DataHandling::LoadMuonNexus1 nxLoad;
486+
Mantid::Algorithms::LoadMuonNexus1 nxLoad;
487487
nxLoad.initialize();
488488

489489
// Now set required filename and output workspace name

Framework/DataHandling/test/LoadMuonNexusTest.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

Framework/DataHandling/test/LoadRawSaveNxsLoadNxsTest.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "MantidAPI/Axis.h"
1111
#include "MantidAPI/FrameworkManager.h"
1212
#include "MantidDataHandling/LoadInstrument.h"
13-
#include "MantidDataHandling/LoadMuonNexus.h"
1413
#include "MantidDataHandling/LoadNexus.h"
1514
#include "MantidDataHandling/LoadNexusProcessed.h"
1615
#include "MantidDataHandling/LoadRaw3.h"

Framework/DataHandling/test/SaveNexusProcessedTest.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "MantidAPI/WorkspaceGroup.h"
1919
#include "MantidDataHandling/LoadEmptyInstrument.h"
2020
#include "MantidDataHandling/LoadInstrument.h"
21-
#include "MantidDataHandling/LoadMuonNexus.h"
2221
#include "MantidDataHandling/LoadNexus.h"
2322
#include "MantidDataHandling/LoadRaw3.h"
2423
#include "MantidDataHandling/SaveNexusProcessed.h"

Framework/DataHandling/test/SaveNexusTest.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include "MantidAPI/AnalysisDataService.h"
2020
#include "MantidAPI/FrameworkManager.h"
21-
#include "MantidDataHandling/LoadMuonNexus.h"
2221
#include "MantidDataHandling/LoadNexus.h"
2322
#include "MantidDataHandling/SaveNexus.h"
2423
#include "MantidFrameworkTestHelpers/WorkspaceCreationHelper.h"

Framework/Muon/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ set(TEST_FILES
6767
CalMuonDetectorPhasesTest.h
6868
ConvertFitFunctionForMuonTFAsymmetryTest.h
6969
LoadAndApplyMuonDetectorGroupingTest.h
70+
LoadMuonNexus1Test.h
71+
LoadMuonNexus2Test.h
7072
MuonAlgorithmHelperTest.h
7173
EstimateMuonAsymmetryFromCountsTest.h
7274
MuonGroupDetectorsTest.h

Framework/Muon/test/AlphaCalcTest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "MantidAPI/Workspace.h"
1414
#include "MantidDataHandling/GroupDetectors.h"
1515
#include "MantidDataHandling/LoadInstrument.h"
16-
#include "MantidDataHandling/LoadMuonNexus2.h"
1716
#include "MantidDataObjects/Workspace2D.h"
1817
#include "MantidMuon/AlphaCalc.h"
18+
#include "MantidMuon/LoadMuonNexus2.h"
1919
#include <stdexcept>
2020

2121
using namespace Mantid::Algorithms;
@@ -93,5 +93,5 @@ class AlphaCalcTest : public CxxTest::TestSuite {
9393

9494
private:
9595
AlphaCalc alphaCalc;
96-
Mantid::DataHandling::LoadMuonNexus2 loader;
96+
Mantid::Algorithms::LoadMuonNexus2 loader;
9797
};

Framework/Muon/test/ApplyDeadTimeCorrTest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include "MantidAPI/IAlgorithm.h"
1313
#include "MantidAPI/TableRow.h"
1414
#include "MantidAPI/Workspace.h"
15-
#include "MantidDataHandling/LoadMuonNexus2.h"
1615
#include "MantidDataObjects/TableWorkspace.h"
1716
#include "MantidDataObjects/Workspace2D.h"
1817
#include "MantidFrameworkTestHelpers/WorkspaceCreationHelper.h"
1918
#include "MantidMuon/ApplyDeadTimeCorr.h"
19+
#include "MantidMuon/LoadMuonNexus2.h"
2020

2121
#include <stdexcept>
2222

@@ -212,7 +212,7 @@ class ApplyDeadTimeCorrTest : public CxxTest::TestSuite {
212212
* @returns :: Workspace with loaded data
213213
*/
214214
MatrixWorkspace_sptr loadDataFromFile() {
215-
Mantid::DataHandling::LoadMuonNexus2 loader;
215+
Mantid::Algorithms::LoadMuonNexus2 loader;
216216
loader.initialize();
217217
loader.setChild(true);
218218
loader.setPropertyValue("Filename", "emu00006473.nxs");

0 commit comments

Comments
 (0)