diff --git a/Framework/API/test/ExperimentInfoTest.h b/Framework/API/test/ExperimentInfoTest.h
index ca354f7e2650c26790b3821a9ffe5a1bc6ad36bb..61725422e5037ff3b8c53e9f601c03534ce4afc1 100644
--- a/Framework/API/test/ExperimentInfoTest.h
+++ b/Framework/API/test/ExperimentInfoTest.h
@@ -573,7 +573,7 @@ public:
void testHelper_ValidDateOverlap() {
const std::string instDir =
ConfigService::Instance().getInstrumentDirectory();
- const std::string testDir = instDir + "IDFs_for_UNIT_TESTING";
+ const std::string testDir = instDir + "unit_testing";
ConfigService::Instance().setString("instrumentDefinition.directory",
testDir);
ExperimentInfo helper;
diff --git a/Framework/API/test/FileFinderTest.h b/Framework/API/test/FileFinderTest.h
index 42c4ef8ed82acdc9c2e063ef2d175cf9ff820b04..a4c0d39cc371a44dcdef557843fa4446fcac88af 100644
--- a/Framework/API/test/FileFinderTest.h
+++ b/Framework/API/test/FileFinderTest.h
@@ -411,7 +411,7 @@ public:
Poco::File fileOn2(pathOn2);
std::string pathOn3 = FileFinder::Instance().getFullPath(
- "IDFs_for_UNIT_TESTING/IDF_for_UNiT_TESTiNG.xMl");
+ "unit_testing/IDF_for_UNiT_TESTiNG.xMl");
Poco::File fileOn3(pathOn3);
std::string pathOn4 = FileFinder::Instance().getFullPath("CSp78173.Raw");
diff --git a/Framework/API/test/LiveListenerFactoryTest.h b/Framework/API/test/LiveListenerFactoryTest.h
index f25533a764de9647bb3281844e5b5c3a78175d3d..bde282aa041fa0befb544ea45054d2150a906a8d 100644
--- a/Framework/API/test/LiveListenerFactoryTest.h
+++ b/Framework/API/test/LiveListenerFactoryTest.h
@@ -73,7 +73,7 @@ public:
auto &config = Kernel::ConfigService::Instance();
Poco::Path testFile =
Poco::Path(config.getInstrumentDirectory())
- .resolve("IDFs_for_UNIT_TESTING/UnitTestFacilities.xml");
+ .resolve("unit_testing/UnitTestFacilities.xml");
// Load the test facilities file
config.updateFacilities(testFile.toString());
}
diff --git a/Framework/Algorithms/test/ApplyCalibrationTest.h b/Framework/Algorithms/test/ApplyCalibrationTest.h
index 3f5a11ecdcf6bb6ff513a62d3f5a278939b55c18..942e058bb3749e7a0e69eed68c7bdf8c52815213 100644
--- a/Framework/Algorithms/test/ApplyCalibrationTest.h
+++ b/Framework/Algorithms/test/ApplyCalibrationTest.h
@@ -106,7 +106,7 @@ public:
Mantid::DataHandling::LoadEmptyInstrument loader;
loader.initialize();
loader.setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/MAPS_Definition_Reduced.xml");
+ "Filename", "unit_testing/MAPS_Definition_Reduced.xml");
loader.setPropertyValue("OutputWorkspace", wsName);
loader.execute();
AnalysisDataServiceImpl &dataStore = AnalysisDataService::Instance();
diff --git a/Framework/Algorithms/test/ClearInstrumentParametersTest.h b/Framework/Algorithms/test/ClearInstrumentParametersTest.h
index 55ed0823d9a620117abf45cd90f70d0bd681ca7b..fedbcf382307b13c8ea7157c280ff05175ccac37 100644
--- a/Framework/Algorithms/test/ClearInstrumentParametersTest.h
+++ b/Framework/Algorithms/test/ClearInstrumentParametersTest.h
@@ -91,7 +91,7 @@ public:
TS_ASSERT_THROWS_NOTHING(AnalysisDataService::Instance().add(wsName, ws2D));
loaderIDF2.setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2.xml");
+ "Filename", "unit_testing/IDF_for_UNIT_TESTING2.xml");
loaderIDF2.setPropertyValue("Workspace", wsName);
loaderIDF2.setProperty("RewriteSpectraMap",
Mantid::Kernel::OptionalBool(true));
diff --git a/Framework/Algorithms/test/He3TubeEfficiencyTest.h b/Framework/Algorithms/test/He3TubeEfficiencyTest.h
index fe34cc1789e0bc36029c86526994f35f938d5004..406838bb1f6548c79f4cd1fd78d6502e3278f462 100644
--- a/Framework/Algorithms/test/He3TubeEfficiencyTest.h
+++ b/Framework/Algorithms/test/He3TubeEfficiencyTest.h
@@ -54,7 +54,7 @@ void createWorkspace2DInADS(const std::string inputWS) {
LoadInstrument loader;
loader.initialize();
loader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/DUM_Definition.xml");
+ "unit_testing/DUM_Definition.xml");
loader.setPropertyValue("Workspace", inputWS);
loader.setProperty("RewriteSpectraMap", Mantid::Kernel::OptionalBool(true));
loader.execute();
@@ -69,7 +69,7 @@ void createEventWorkspaceInADS(const std::string inputEvWS) {
LoadInstrument loader;
loader.initialize();
loader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/DUM_Definition.xml");
+ "unit_testing/DUM_Definition.xml");
loader.setPropertyValue("Workspace", inputEvWS);
loader.setProperty("RewriteSpectraMap", Mantid::Kernel::OptionalBool(true));
loader.execute();
diff --git a/Framework/Crystal/test/CentroidPeaksTest.h b/Framework/Crystal/test/CentroidPeaksTest.h
index caae459e7a5a21cc0e7a60183b6b70ff640d1be9..ae66dcb4be1352a4b4f5f658c2204fa842b97563 100644
--- a/Framework/Crystal/test/CentroidPeaksTest.h
+++ b/Framework/Crystal/test/CentroidPeaksTest.h
@@ -45,7 +45,7 @@ public:
*/
EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
int numPixels = 10000;
int numBins = 16;
@@ -60,7 +60,7 @@ public:
LoadInstrument *loadInst = new LoadInstrument();
loadInst->initialize();
loadInst->setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml");
+ "Filename", "unit_testing/MINITOPAZ_Definition.xml");
loadInst->setProperty("Workspace", retVal);
loadInst->setProperty("RewriteSpectraMap",
Mantid::Kernel::OptionalBool(true));
diff --git a/Framework/Crystal/test/LoadIsawUBTest.h b/Framework/Crystal/test/LoadIsawUBTest.h
index f9f42c2b629dfbd60d4ce359240649adcd10b155..260656ba67f2833d0754dbaf04201651fd0ba4f8 100644
--- a/Framework/Crystal/test/LoadIsawUBTest.h
+++ b/Framework/Crystal/test/LoadIsawUBTest.h
@@ -96,7 +96,7 @@ MaskPeaksWorkspace("TOPAZ_3007", "peaks")
FrameworkManager::Instance().exec(
"LoadInstrument", 6, "Workspace", "TOPAZ_3007", "Filename",
- "IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml", "RewriteSpectraMap",
+ "unit_testing/MINITOPAZ_Definition.xml", "RewriteSpectraMap",
"True");
// Match the goniometer angles
diff --git a/Framework/Crystal/test/NormaliseVanadiumTest.h b/Framework/Crystal/test/NormaliseVanadiumTest.h
index f546f1fa14973a0a12592211eeee760932371360..a5755b3515518ea4323afa00f4e6f6ba4daaa1e2 100644
--- a/Framework/Crystal/test/NormaliseVanadiumTest.h
+++ b/Framework/Crystal/test/NormaliseVanadiumTest.h
@@ -41,7 +41,7 @@ namespace {
*/
EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
int numPixels = 10000;
int numBins = 16;
@@ -54,7 +54,7 @@ EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
LoadInstrument *loadInst = new LoadInstrument();
loadInst->initialize();
loadInst->setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml");
+ "unit_testing/MINITOPAZ_Definition.xml");
loadInst->setProperty<MatrixWorkspace_sptr>("Workspace", retVal);
loadInst->setProperty("RewriteSpectraMap",
Mantid::Kernel::OptionalBool(true));
diff --git a/Framework/Crystal/test/PeakIntegrationTest.h b/Framework/Crystal/test/PeakIntegrationTest.h
index 54d85fe192aa76ce53e2a795363c6d00d49e43b8..3380193b03b632b294fa70675c1ab72ecd3882bb 100644
--- a/Framework/Crystal/test/PeakIntegrationTest.h
+++ b/Framework/Crystal/test/PeakIntegrationTest.h
@@ -47,7 +47,7 @@ public:
*/
EventWorkspace_sptr createDiffractionEventWorkspace(int numEvents) {
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
int numPixels = 10000;
int numBins = 16;
@@ -62,7 +62,7 @@ public:
LoadInstrument *loadInst = new LoadInstrument();
loadInst->initialize();
loadInst->setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml");
+ "Filename", "unit_testing/MINITOPAZ_Definition.xml");
loadInst->setProperty<MatrixWorkspace_sptr>("Workspace", retVal);
loadInst->setProperty("RewriteSpectraMap",
Mantid::Kernel::OptionalBool(true));
diff --git a/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h b/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
index bfaf264e4911ac3d43e6169a3b3707f14f3a1aa0..d3cf7434c1dd09bba225f57e9ab2d945b2f834ae 100644
--- a/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
+++ b/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
@@ -399,14 +399,14 @@ public:
LoadInstrument loader;
loader.initialize();
loader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/REFL_Definition.xml");
+ "unit_testing/REFL_Definition.xml");
loader.setProperty("Workspace", workspace);
loader.setProperty("RewriteSpectraMap", OptionalBool(true));
loader.execute();
LoadParameterFile paramLoader;
paramLoader.initialize();
paramLoader.setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/REFL_Parameters_Fredrikze.xml");
+ "Filename", "unit_testing/REFL_Parameters_Fredrikze.xml");
paramLoader.setProperty("Workspace", workspace);
paramLoader.execute();
diff --git a/Framework/DataHandling/test/GroupDetectors2Test.h b/Framework/DataHandling/test/GroupDetectors2Test.h
index fb8c68270cd44a9d6b1b089772ecb8e8242fa54a..b546f5815dad21bcf8f95ba58686ee158f4cb0fe 100644
--- a/Framework/DataHandling/test/GroupDetectors2Test.h
+++ b/Framework/DataHandling/test/GroupDetectors2Test.h
@@ -452,7 +452,7 @@ public:
groupAlg.setPropertyValue("InputWorkspace", outputSpace + "_1");
groupAlg.setPropertyValue("OutputWorkspace", "boevs");
groupAlg.setPropertyValue(
- "MapFile", "IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping.xml");
+ "MapFile", "unit_testing/MUSR_Detector_Grouping.xml");
TS_ASSERT_THROWS_NOTHING(groupAlg.execute());
TS_ASSERT(groupAlg.isExecuted());
@@ -498,7 +498,7 @@ public:
groupAlg.setPropertyValue("OutputWorkspace", "boevs");
groupAlg.setPropertyValue(
"MapFile",
- "IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping_dublicate.xml");
+ "unit_testing/MUSR_Detector_Grouping_dublicate.xml");
TS_ASSERT_THROWS_NOTHING(groupAlg.execute());
TS_ASSERT(groupAlg.isExecuted());
@@ -544,7 +544,7 @@ public:
groupAlg.setPropertyValue("OutputWorkspace", "boevs");
groupAlg.setPropertyValue(
"MapFile",
- "IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping_dublicate2.xml");
+ "unit_testing/MUSR_Detector_Grouping_dublicate2.xml");
TS_ASSERT_THROWS_NOTHING(groupAlg.execute());
TS_ASSERT(groupAlg.isExecuted());
diff --git a/Framework/DataHandling/test/LoadEmptyInstrumentTest.h b/Framework/DataHandling/test/LoadEmptyInstrumentTest.h
index dea6f1e520bb33a4c76c4a5674bdf811342c6654..b20b591486f917bedce84022a68258e9d5fa45a2 100644
--- a/Framework/DataHandling/test/LoadEmptyInstrumentTest.h
+++ b/Framework/DataHandling/test/LoadEmptyInstrumentTest.h
@@ -52,7 +52,7 @@ public:
const std::string &idf_file_contents) {
const std::string instrument_dir =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/";
+ "/unit_testing/";
return ScopedFile(idf_file_contents, idf_filename, instrument_dir);
}
@@ -155,7 +155,7 @@ public:
TS_ASSERT_THROWS_NOTHING(loader.initialize());
TS_ASSERT(loader.isInitialized());
loader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2.xml");
+ "unit_testing/IDF_for_UNIT_TESTING2.xml");
inputFile = loader.getPropertyValue("Filename");
wsName = "LoadEmptyInstrumentParamTest";
loader.setPropertyValue("OutputWorkspace", wsName);
@@ -443,7 +443,7 @@ public:
TS_ASSERT_THROWS_NOTHING(loader.initialize());
TS_ASSERT(loader.isInitialized());
loader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING4.xml");
+ "unit_testing/IDF_for_UNIT_TESTING4.xml");
inputFile = loader.getPropertyValue("Filename");
wsName = "LoadEmptyInstrumentParamTest";
loader.setPropertyValue("OutputWorkspace", wsName);
@@ -721,7 +721,7 @@ public:
TS_ASSERT_THROWS_NOTHING(loader.initialize());
TS_ASSERT(loader.isInitialized());
loader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/DUM_Definition.xml");
+ "unit_testing/DUM_Definition.xml");
loader.setProperty("MakeEventWorkspace", asEvent);
inputFile = loader.getPropertyValue("Filename");
wsName = "LoadEmptyDUMInstrumentTest";
@@ -924,7 +924,7 @@ public:
loaderEMU2.initialize();
loaderEMU2.setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/EMU_for_UNIT_TESTING.XML");
+ "Filename", "unit_testing/EMU_for_UNIT_TESTING.XML");
wsName = "LoadEmptyInstrumentParamEMU2Test";
loaderEMU2.setPropertyValue("OutputWorkspace", wsName);
diff --git a/Framework/DataHandling/test/LoadInstrumentTest.h b/Framework/DataHandling/test/LoadInstrumentTest.h
index 3165e86d54801280bb789a663be39fc7d27b1769..377746e2fa39df0a54131974a6df86aa1750004b 100644
--- a/Framework/DataHandling/test/LoadInstrumentTest.h
+++ b/Framework/DataHandling/test/LoadInstrumentTest.h
@@ -346,7 +346,7 @@ public:
void testExecHRP2() {
// Test Parameter file in instrument folder is used by an IDF file not in
// the instrument folder
- doTestParameterFileSelection("IDFs_for_UNIT_TESTING/HRPD_Definition.xml",
+ doTestParameterFileSelection("unit_testing/HRPD_Definition.xml",
"HRPD_Parameters.xml", "S");
}
@@ -356,7 +356,7 @@ public:
// with an extension of its name after the 'Definition' not present in a
// parameter file.
doTestParameterFileSelection(
- "IDFs_for_UNIT_TESTING/HRPD_Definition_Test3.xml",
+ "unit_testing/HRPD_Definition_Test3.xml",
"HRPD_Parameters.xml", "S");
}
@@ -366,16 +366,16 @@ public:
// with the same extension ('_Test4') of its name after the 'Definition' or
// 'Parameter'.
doTestParameterFileSelection(
- "IDFs_for_UNIT_TESTING/HRPD_Definition_Test4.xml",
- "IDFs_for_UNIT_TESTING/HRPD_Parameters_Test4.xml", "T");
+ "unit_testing/HRPD_Definition_Test4.xml",
+ "unit_testing/HRPD_Parameters_Test4.xml", "T");
}
void testExecHRP5() {
// Test Parameter file outside instrument folder is used by an IDF file in
// the same folder
doTestParameterFileSelection(
- "IDFs_for_UNIT_TESTING/HRPDTEST_Definition.xml",
- "IDFs_for_UNIT_TESTING/HRPDTEST_Parameters.xml", "U");
+ "unit_testing/HRPDTEST_Definition.xml",
+ "unit_testing/HRPDTEST_Parameters.xml", "U");
}
void testExecHRP6() {
@@ -386,8 +386,8 @@ public:
// even though there is a definition file without an extension in the same
// folder.
doTestParameterFileSelection(
- "IDFs_for_UNIT_TESTING/HRPDTEST_Definition_Test6.xml",
- "IDFs_for_UNIT_TESTING/HRPDTEST_Parameters_Test6.xml", "V");
+ "unit_testing/HRPDTEST_Definition_Test6.xml",
+ "unit_testing/HRPDTEST_Parameters_Test6.xml", "V");
}
void testExecHRP7() {
@@ -396,7 +396,7 @@ public:
// with an extension of its name after the 'Definition' not present in a
// parameter file.
doTestParameterFileSelection(
- "IDFs_for_UNIT_TESTING/HRPDTEST_Definition_Test7.xml",
+ "unit_testing/HRPDTEST_Definition_Test7.xml",
"HRPDTEST_Parameters.xml", "U");
}
@@ -408,7 +408,7 @@ public:
LoadInstrument loader;
loader.initialize();
loader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/INDIRECT_Definition.xml");
+ "unit_testing/INDIRECT_Definition.xml");
MatrixWorkspace_sptr ws =
WorkspaceFactory::Instance().create("Workspace2D", 1, 1, 1);
loader.setProperty("Workspace", ws);
@@ -689,7 +689,7 @@ private:
const auto ¶mMap = output->constInstrumentParameters();
// It's "X0" in parameter file
- // IDFs_for_UNIT_TESTING/HRPD_Parameters_Test4.xml
+ // unit_testing/HRPD_Parameters_Test4.xml
Parameter_sptr param = paramMap.getRecursive(&(*comp), par, "fitting");
TS_ASSERT(param);
if (param != nullptr) {
diff --git a/Framework/DataHandling/test/LoadIsawDetCalTest.h b/Framework/DataHandling/test/LoadIsawDetCalTest.h
index be40ff9ce40988228310be213adb549a026bd3cc..4ac0d4681e66383427f2d300a2b95f2fadc108b4 100644
--- a/Framework/DataHandling/test/LoadIsawDetCalTest.h
+++ b/Framework/DataHandling/test/LoadIsawDetCalTest.h
@@ -76,7 +76,7 @@ public:
void testMINITOPAZ() {
const std::string wsName("testMINITOPAZ");
- loadEmptyInstrument("IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml",
+ loadEmptyInstrument("unit_testing/MINITOPAZ_Definition.xml",
wsName);
// generate test file
diff --git a/Framework/DataHandling/test/LoadNexusProcessedTest.h b/Framework/DataHandling/test/LoadNexusProcessedTest.h
index 41dd0aeb815a4c34a5d4415f1a95380c6705635d..73c2e68fcb995261fcb6f741d7059d3e86e942d6 100644
--- a/Framework/DataHandling/test/LoadNexusProcessedTest.h
+++ b/Framework/DataHandling/test/LoadNexusProcessedTest.h
@@ -726,7 +726,7 @@ public:
// Loading a peaks workspace without a instrument from an IDF doesn't work
// ...
const std::string filename = FileFinder::Instance().getFullPath(
- "IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml");
+ "unit_testing/MINITOPAZ_Definition.xml");
InstrumentDefinitionParser parser(filename, "MINITOPAZ",
Strings::loadFile(filename));
auto instrument = parser.parseXML(nullptr);
@@ -771,7 +771,7 @@ public:
// Loading a peaks workspace without a instrument from an IDF doesn't work
// ...
const std::string filename = FileFinder::Instance().getFullPath(
- "IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml");
+ "unit_testing/MINITOPAZ_Definition.xml");
InstrumentDefinitionParser parser(filename, "MINITOPAZ",
Strings::loadFile(filename));
auto instrument = parser.parseXML(nullptr);
diff --git a/Framework/DataHandling/test/LoadParameterFileTest.h b/Framework/DataHandling/test/LoadParameterFileTest.h
index c6e01e8c8640248beed29ac1cafacc57165a52b5..2f85ff975f429a63168f1de5270446019220eb94 100644
--- a/Framework/DataHandling/test/LoadParameterFileTest.h
+++ b/Framework/DataHandling/test/LoadParameterFileTest.h
@@ -52,7 +52,7 @@ public:
TS_ASSERT_THROWS_NOTHING(pLoaderPF->initialize());
pLoaderPF->setPropertyValue(
"Filename",
- "IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2_paramFile.xml");
+ "unit_testing/IDF_for_UNIT_TESTING2_paramFile.xml");
pLoaderPF->setPropertyValue("Workspace", wsName);
TS_ASSERT_THROWS_NOTHING(pLoaderPF->execute());
TS_ASSERT(pLoaderPF->isExecuted());
@@ -227,7 +227,7 @@ public:
// Path to test input file assumes Test directory checked out from git
pLoadInstrument->setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2.xml");
+ "Filename", "unit_testing/IDF_for_UNIT_TESTING2.xml");
// inputFile = loaderIDF2.getPropertyValue("Filename");
pLoadInstrument->setPropertyValue("Workspace", wsName);
pLoadInstrument->setProperty("RewriteSpectraMap",
diff --git a/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h b/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
index fb01473922c5660872b375a2fdb2a07fc7165bda..129e247147271e8249bcce74e82523beaf61a89c 100644
--- a/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
+++ b/Framework/DataHandling/test/ModifyDetectorDotDatFileTest.h
@@ -37,7 +37,7 @@ public:
loader = new Mantid::DataHandling::LoadEmptyInstrument;
loader->initialize();
TS_ASSERT_THROWS_NOTHING(loader->setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/MAPS_Definition_Reduced.xml"));
+ "Filename", "unit_testing/MAPS_Definition_Reduced.xml"));
loader->setPropertyValue("OutputWorkspace", ads_name);
TS_ASSERT_THROWS_NOTHING(loader->execute());
TS_ASSERT(loader->isExecuted());
diff --git a/Framework/DataHandling/test/SaveNexusProcessedTest.h b/Framework/DataHandling/test/SaveNexusProcessedTest.h
index 9dbcd4a769c92e3c67a99769a5d6ff5821611a75..5ea48ae9041f852681021e42fd66f286ba6d90cf 100644
--- a/Framework/DataHandling/test/SaveNexusProcessedTest.h
+++ b/Framework/DataHandling/test/SaveNexusProcessedTest.h
@@ -831,7 +831,7 @@ public:
LoadEmptyInstrument createWorkspace;
createWorkspace.initialize();
createWorkspace.setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml");
+ "Filename", "unit_testing/IDF_for_UNIT_TESTING.xml");
createWorkspace.setPropertyValue("OutputWorkspace", "testSpace");
createWorkspace.execute();
auto ws = boost::dynamic_pointer_cast<Workspace2D>(
diff --git a/Framework/DataHandling/test/SaveParameterFileTest.h b/Framework/DataHandling/test/SaveParameterFileTest.h
index 79dcd088eb8931686a6609756fd648c45b028eaa..5350a6d83611294bcfd143fdd664078e671860bc 100644
--- a/Framework/DataHandling/test/SaveParameterFileTest.h
+++ b/Framework/DataHandling/test/SaveParameterFileTest.h
@@ -182,7 +182,7 @@ public:
TS_ASSERT_THROWS_NOTHING(AnalysisDataService::Instance().add(wsName, ws2D));
loaderIDF2.setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2.xml");
+ "Filename", "unit_testing/IDF_for_UNIT_TESTING2.xml");
loaderIDF2.setPropertyValue("Workspace", wsName);
loaderIDF2.setProperty("RewriteSpectraMap",
Mantid::Kernel::OptionalBool(true));
diff --git a/Framework/Geometry/test/IDFObjectTest.h b/Framework/Geometry/test/IDFObjectTest.h
index c72de2c9113c8dadc31e861b51b355715839fc08..9707bc9f4ca2fdc3f31204d489ca9582cc0bfffa 100644
--- a/Framework/Geometry/test/IDFObjectTest.h
+++ b/Framework/Geometry/test/IDFObjectTest.h
@@ -37,7 +37,7 @@ public:
void testExists() {
const std::string filename =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING.xml";
IDFObject obj(filename);
TS_ASSERT(obj.exists());
}
@@ -56,7 +56,7 @@ public:
void testGetParentDirectory() {
const Poco::Path expectedDir =
Poco::Path(ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/");
+ "/unit_testing/");
std::string filename = expectedDir.toString() + "IDF_for_UNIT_TESTING.xml";
IDFObject obj(filename);
TS_ASSERT_EQUALS(expectedDir.toString(),
@@ -66,7 +66,7 @@ public:
void testGetFullPath() {
const std::string filename =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING.xml";
IDFObject obj(filename);
TS_ASSERT_EQUALS(Poco::Path(filename).toString(),
obj.getFileFullPath().toString());
@@ -75,7 +75,7 @@ public:
void testGetExtension() {
const std::string filename =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING.xml";
IDFObject obj(filename);
TS_ASSERT_EQUALS(".xml", obj.getExtension());
}
@@ -84,7 +84,7 @@ public:
const std::string filenameonly = "IDF_for_UNIT_TESTING.xml";
const std::string filename =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/" + filenameonly;
+ "/unit_testing/" + filenameonly;
IDFObject obj(filename);
TS_ASSERT_EQUALS(filenameonly, obj.getFileNameOnly());
}
@@ -92,7 +92,7 @@ public:
void testGetMangledName() {
const std::string filename =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING.xml";
Poco::Path path(filename);
@@ -137,7 +137,7 @@ public:
void testGetFileFullPathStr() {
const std::string filename =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING.xml";
IDFObject obj(filename);
TS_ASSERT_EQUALS(Poco::Path(filename).toString(), obj.getFileFullPathStr());
}
diff --git a/Framework/Geometry/test/InstrumentDefinitionParserTest.h b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
index 3774124a36b9d663d9c90237b56066b848de486e..cc5c409a29def4c67ccd33275673d6bb550bdaf8 100644
--- a/Framework/Geometry/test/InstrumentDefinitionParserTest.h
+++ b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
@@ -104,7 +104,7 @@ private:
const std::string instrument_dir =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/";
+ "/unit_testing/";
std::string vtp_dir = ConfigService::Instance().getVTPFileDirectory();
if (!put_vtp_next_to_IDF) {
vtp_dir = ConfigService::Instance().getTempDir();
@@ -120,7 +120,7 @@ private:
const std::string &idf_file_contents) {
const std::string instrument_dir =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/";
+ "/unit_testing/";
return ScopedFile(idf_file_contents, idf_filename, instrument_dir);
}
@@ -137,7 +137,7 @@ public:
void test_extract_ref_info() {
std::string filename = ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING.xml";
std::string xmlText = Strings::loadFile(filename);
boost::shared_ptr<const Instrument> i;
@@ -158,7 +158,7 @@ public:
void test_extract_ref_info_theta_sign() {
std::string filename = ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING6.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING6.xml";
std::string xmlText = Strings::loadFile(filename);
boost::shared_ptr<const Instrument> i;
@@ -179,7 +179,7 @@ public:
{
std::string filenameNoExt =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING";
+ "/unit_testing/IDF_for_UNIT_TESTING";
std::string filename = filenameNoExt + ".xml";
std::string xmlText = Strings::loadFile(filename);
boost::shared_ptr<const Instrument> i;
@@ -482,7 +482,7 @@ public:
// Definition File
{
std::string filename = ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING2.xml";
std::string xmlText = Strings::loadFile(filename);
boost::shared_ptr<const Instrument> i;
@@ -544,7 +544,7 @@ public:
void test_parse_RectangularDetector() {
std::string filename =
ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_RECTANGULAR_UNIT_TESTING.xml";
+ "/unit_testing/IDF_for_RECTANGULAR_UNIT_TESTING.xml";
std::string xmlText = Strings::loadFile(filename);
boost::shared_ptr<const Instrument> i;
@@ -597,7 +597,7 @@ public:
// testing through Loading IDF_for_UNIT_TESTING5.xml method adjust()
void testAdjust() {
std::string filename = ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING5.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING5.xml";
std::string xmlText = Strings::loadFile(filename);
boost::shared_ptr<const Instrument> i;
@@ -874,7 +874,7 @@ public:
detid_t numDetectors,
bool rethrow = false) {
std::string filename = ConfigService::Instance().getInstrumentDirectory() +
- "/IDFs_for_UNIT_TESTING/IDF_for_locations_test.xml";
+ "/unit_testing/IDF_for_locations_test.xml";
std::string contents = Strings::loadFile(filename);
@@ -1055,7 +1055,7 @@ public:
void testLoadingAndParsing() {
const std::string filename =
m_instrumentDirectoryPath +
- "/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml";
+ "/unit_testing/IDF_for_UNIT_TESTING.xml";
const std::string xmlText = Strings::loadFile(filename);
boost::shared_ptr<const Instrument> instrument;
diff --git a/Framework/Kernel/test/GlobTest.h b/Framework/Kernel/test/GlobTest.h
index a8b4c3bf778b27cd1ec582bf91854fdd506a9375..6b15832189542eee75ec18dc95950609e4cda4b1 100644
--- a/Framework/Kernel/test/GlobTest.h
+++ b/Framework/Kernel/test/GlobTest.h
@@ -121,7 +121,7 @@ public:
void test_filename_contains_directory() {
Poco::Path pattern(base.toString() + "instrument",
- "IDFs_for_UNIT_TESTING/DUM_Definition.xml");
+ "unit_testing/DUM_Definition.xml");
std::set<std::string> files;
Glob::glob(pattern, files);
diff --git a/Framework/Kernel/test/MultiFileNameParserTest.h b/Framework/Kernel/test/MultiFileNameParserTest.h
index c474a998f519f72772596ffec732fb58ae4d3a81..587ee3c7b59e287927df4bda9602cd8e9bc08fa1 100644
--- a/Framework/Kernel/test/MultiFileNameParserTest.h
+++ b/Framework/Kernel/test/MultiFileNameParserTest.h
@@ -480,7 +480,7 @@ public:
void test_instrument_with_multiple_padding() {
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
Parser parser;
parser.parse("TESTHISTOLISTENER123,299-301");
diff --git a/Framework/LiveData/test/ISISHistoDataListenerTest.h b/Framework/LiveData/test/ISISHistoDataListenerTest.h
index ed5334aa842f5e9761d192cd3c1a034477bb4c92..a48de9c566ba39126758206126fc4d33a2c64898 100644
--- a/Framework/LiveData/test/ISISHistoDataListenerTest.h
+++ b/Framework/LiveData/test/ISISHistoDataListenerTest.h
@@ -61,7 +61,7 @@ public:
// cannot make it work for linux
#ifdef _WIN32
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
FakeISISHistoDAE dae;
dae.initialize();
@@ -146,7 +146,7 @@ public:
void test_Receiving_multiperiod_data() {
#ifdef _WIN32
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
FakeISISHistoDAE dae;
dae.initialize();
@@ -253,7 +253,7 @@ public:
void test_Receiving_selected_periods() {
#ifdef _WIN32
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
FakeISISHistoDAE dae;
dae.initialize();
@@ -303,7 +303,7 @@ public:
void test_Receiving_selected_monitors() {
#ifdef _WIN32
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
FakeISISHistoDAE dae;
dae.initialize();
@@ -360,7 +360,7 @@ public:
void test_invalid_spectra_numbers() {
#ifdef _WIN32
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
FakeISISHistoDAE dae;
dae.initialize();
@@ -399,7 +399,7 @@ public:
void test_no_period() {
#ifdef _WIN32
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
FakeISISHistoDAE dae;
dae.initialize();
diff --git a/Framework/LiveData/test/KafkaEventStreamDecoderTest.h b/Framework/LiveData/test/KafkaEventStreamDecoderTest.h
index 02fc110d55dd8b6c6d173cccc51af0ae6bd4d5b1..86cbb9717a884367106c2ffb2250fab0adec9539 100644
--- a/Framework/LiveData/test/KafkaEventStreamDecoderTest.h
+++ b/Framework/LiveData/test/KafkaEventStreamDecoderTest.h
@@ -38,13 +38,13 @@ public:
auto baseInstDir = config.getInstrumentDirectory();
Poco::Path testFile =
Poco::Path(baseInstDir)
- .resolve("IDFs_for_UNIT_TESTING/UnitTestFacilities.xml");
+ .resolve("unit_testing/UnitTestFacilities.xml");
// Load the test facilities file
config.updateFacilities(testFile.toString());
config.setFacility("TEST");
// Update instrument search directory
config.setString("instrumentDefinition.directory",
- baseInstDir + "/IDFs_for_UNIT_TESTING");
+ baseInstDir + "/unit_testing");
}
void tearDown() override {
diff --git a/Framework/LiveData/test/LiveDataAlgorithmTest.h b/Framework/LiveData/test/LiveDataAlgorithmTest.h
index f2ffb79a4dd5d366d648b9c95034250aab4b7ab1..629fd22dd07effbd30575b56323f3e2d61f7c957 100644
--- a/Framework/LiveData/test/LiveDataAlgorithmTest.h
+++ b/Framework/LiveData/test/LiveDataAlgorithmTest.h
@@ -69,7 +69,7 @@ public:
void test_validateInputs() {
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
LiveDataAlgorithmImpl alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize())
diff --git a/Framework/LiveData/test/LoadLiveDataTest.h b/Framework/LiveData/test/LoadLiveDataTest.h
index 895ddfc678990ca56fe7d81e74a3977c5168c656..95aedb8bf47331581b704fd9898b9671bdc120fb 100644
--- a/Framework/LiveData/test/LoadLiveDataTest.h
+++ b/Framework/LiveData/test/LoadLiveDataTest.h
@@ -61,7 +61,7 @@ public:
ILiveListener_sptr listener = ILiveListener_sptr(),
bool makeThrow = false) {
FacilityHelper::ScopedFacilities loadTESTFacility(
- "IDFs_for_UNIT_TESTING/UnitTestFacilities.xml", "TEST");
+ "unit_testing/UnitTestFacilities.xml", "TEST");
LoadLiveData alg;
TS_ASSERT_THROWS_NOTHING(alg.initialize())
diff --git a/Framework/LiveData/test/MonitorLiveDataTest.h b/Framework/LiveData/test/MonitorLiveDataTest.h
index 7d92f8224052b58456a0cf70c7eebd700f790191..33965b1c399a6565174dae4045823e40e37bda45 100644
--- a/Framework/LiveData/test/MonitorLiveDataTest.h
+++ b/Framework/LiveData/test/MonitorLiveDataTest.h
@@ -42,7 +42,7 @@ public:
static void destroySuite(MonitorLiveDataTest *suite) { delete suite; }
MonitorLiveDataTest()
- : loadTESTFacility("IDFs_for_UNIT_TESTING/UnitTestFacilities.xml",
+ : loadTESTFacility("unit_testing/UnitTestFacilities.xml",
"TEST") {}
void setUp() override {
diff --git a/Framework/LiveData/test/StartLiveDataTest.h b/Framework/LiveData/test/StartLiveDataTest.h
index 2330a63b31765ca6426f2c82e822781ef077b8e6..cbcab1f18a76f4c9e828ef57956843235d39bbfb 100644
--- a/Framework/LiveData/test/StartLiveDataTest.h
+++ b/Framework/LiveData/test/StartLiveDataTest.h
@@ -38,7 +38,7 @@ public:
static void destroySuite(StartLiveDataTest *suite) { delete suite; }
StartLiveDataTest()
- : loadTESTFacility("IDFs_for_UNIT_TESTING/UnitTestFacilities.xml",
+ : loadTESTFacility("unit_testing/UnitTestFacilities.xml",
"TEST") {}
void test_Init() {
diff --git a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
index 4149da46745b32f65bb5c14cff597a19baf80371..37b14e9f4ac679b4ef5d42a87cde5ae2e3974716 100644
--- a/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
+++ b/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py
@@ -54,7 +54,7 @@ class ConfigServiceTest(unittest.TestCase):
def test_update_and_set_facility(self):
self.assertFalse("TEST" in config.getFacilityNames())
- ConfigService.updateFacilities(os.path.join(ConfigService.getInstrumentDirectory(),"IDFs_for_UNIT_TESTING/UnitTestFacilities.xml"))
+ ConfigService.updateFacilities(os.path.join(ConfigService.getInstrumentDirectory(),"unit_testing/UnitTestFacilities.xml"))
ConfigService.setFacility("TEST")
self.assertEquals(config.getFacility().name(), "TEST")
self.assertRaises(RuntimeError, config.getFacility, "SNS")
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
index da74035faf3476dfb37c14d3f1d2dd3a6bbca338..e228f2005f677853487a6ce11b40a07b0f1ca6e6 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/LoadLiveDataTest.py
@@ -20,7 +20,7 @@ class LoadLiveDataTest(unittest.TestCase):
def setUp(self):
FrameworkManager.clearData()
- ConfigService.updateFacilities(os.path.join(ConfigService.getInstrumentDirectory(),"IDFs_for_UNIT_TESTING/UnitTestFacilities.xml"))
+ ConfigService.updateFacilities(os.path.join(ConfigService.getInstrumentDirectory(),"unit_testing/UnitTestFacilities.xml"))
ConfigService.setFacility("TEST")
pass
@@ -79,4 +79,3 @@ MyMethod(input, output)
if __name__ == '__main__':
unittest.main()
-
diff --git a/Framework/PythonInterface/test/python/plugins/algorithms/SaveReflectionsTest.py b/Framework/PythonInterface/test/python/plugins/algorithms/SaveReflectionsTest.py
index 81c329ee762dbee46e27968a8b8703daa3008adc..b314b28f726332e56c41de962b4b95831e2d51b9 100644
--- a/Framework/PythonInterface/test/python/plugins/algorithms/SaveReflectionsTest.py
+++ b/Framework/PythonInterface/test/python/plugins/algorithms/SaveReflectionsTest.py
@@ -26,7 +26,7 @@ class SaveReflectionsTest(unittest.TestCase):
def _create_peaks_workspace(self):
"""Create a dummy peaks workspace"""
- path = FileFinder.getFullPath("IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml")
+ path = FileFinder.getFullPath("unit_testing/MINITOPAZ_Definition.xml")
inst = LoadEmptyInstrument(Filename=path)
ws = CreatePeaksWorkspace(inst, 0)
DeleteWorkspace(inst)
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/ReflectometryHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/ReflectometryHelper.h
index 13012985003fad077fb1aaef0a141fc6c1adf6fa..2795169baac9a17fee05318e9d69321974695080 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/ReflectometryHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/ReflectometryHelper.h
@@ -19,7 +19,7 @@ using namespace API;
namespace TestHelpers {
// Create a workspace equipped with fake instrument from
-// IDFs_for_UNIT_TESTING/REFL_Definition.xml IDF.
+// unit_testing/REFL_Definition.xml IDF.
// @param nBins :: Number of bins in each spectrum.
// @param startX :: Start value of the x-axis in TOF
// @param endX :: End value of the x-axis in TOF
diff --git a/Framework/TestHelpers/src/MDEventsTestHelper.cpp b/Framework/TestHelpers/src/MDEventsTestHelper.cpp
index 95975833c4e70524eba3fdeaa6730b68f5b53682..adfac1f7de89da64242e8ab9529a719a4f31704a 100644
--- a/Framework/TestHelpers/src/MDEventsTestHelper.cpp
+++ b/Framework/TestHelpers/src/MDEventsTestHelper.cpp
@@ -76,7 +76,7 @@ createDiffractionEventWorkspace(int numEvents, int numPixels, int numBins) {
// --------- Load the instrument -----------
const std::string filename = FileFinder::Instance().getFullPath(
- "IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml");
+ "unit_testing/MINITOPAZ_Definition.xml");
InstrumentDefinitionParser parser(filename, "MINITOPAZ",
Strings::loadFile(filename));
auto instrument = parser.parseXML(nullptr);
diff --git a/Framework/TestHelpers/src/ReflectometryHelper.cpp b/Framework/TestHelpers/src/ReflectometryHelper.cpp
index 5b11dc6171e5d829e60d79332f7ff78e8494c83c..8e945a1b8fa41e9b43202fecac3573647e88b5b9 100644
--- a/Framework/TestHelpers/src/ReflectometryHelper.cpp
+++ b/Framework/TestHelpers/src/ReflectometryHelper.cpp
@@ -65,7 +65,7 @@ MatrixWorkspace_sptr createREFL_WS(size_t nBins, double startX, double endX,
LoadInstrument instrumentLoader;
instrumentLoader.initialize();
instrumentLoader.setPropertyValue(
- "Filename", "IDFs_for_UNIT_TESTING/REFL_Definition.xml");
+ "Filename", "unit_testing/REFL_Definition.xml");
instrumentLoader.setProperty("Workspace", workspace);
instrumentLoader.setProperty("RewriteSpectraMap", OptionalBool(true));
instrumentLoader.execute();
@@ -74,7 +74,7 @@ MatrixWorkspace_sptr createREFL_WS(size_t nBins, double startX, double endX,
LoadParameterFile paramLoader;
paramLoader.initialize();
paramLoader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/REFL_Parameters_" +
+ "unit_testing/REFL_Parameters_" +
paramsType + ".xml");
paramLoader.setProperty("Workspace", workspace);
paramLoader.execute();
diff --git a/Framework/TestHelpers/src/SANSInstrumentCreationHelper.cpp b/Framework/TestHelpers/src/SANSInstrumentCreationHelper.cpp
index d116235c73809486a620934d3f09f16189f3c0bd..08b9a3d9e1dab348d681084c82b3e18a9fe6d844 100644
--- a/Framework/TestHelpers/src/SANSInstrumentCreationHelper.cpp
+++ b/Framework/TestHelpers/src/SANSInstrumentCreationHelper.cpp
@@ -81,7 +81,7 @@ void SANSInstrumentCreationHelper::runLoadInstrument(
Mantid::DataHandling::LoadInstrument loadInst;
loadInst.initialize();
// Now execute the Child Algorithm. Catch and log any error, but don't stop.
- loadInst.setPropertyValue("Filename", "IDFs_for_UNIT_TESTING/" +
+ loadInst.setPropertyValue("Filename", "unit_testing/" +
instrumentID + "_Definition.xml");
loadInst.setProperty<MatrixWorkspace_sptr>("Workspace", workspace);
loadInst.setProperty("RewriteSpectraMap",
diff --git a/Testing/Data/UnitTest/LOKI_Definition.hdf5.md5 b/Testing/Data/UnitTest/LOKI_Definition.hdf5.md5
deleted file mode 100644
index 1e5b26bd5f1371a5558bf8bc3c9c9db5d2029535..0000000000000000000000000000000000000000
--- a/Testing/Data/UnitTest/LOKI_Definition.hdf5.md5
+++ /dev/null
@@ -1 +0,0 @@
-dfd4bddc159307410168cbd93a6577fd
diff --git a/Testing/Data/UnitTest/SANS2D_Definition_Tubes.hdf5.md5 b/Testing/Data/UnitTest/SANS2D_Definition_Tubes.hdf5.md5
deleted file mode 100644
index 0f9f0f82b02dfa25bd4405469b1853e93ffd0e2a..0000000000000000000000000000000000000000
--- a/Testing/Data/UnitTest/SANS2D_Definition_Tubes.hdf5.md5
+++ /dev/null
@@ -1 +0,0 @@
-ce50ca25229ebc503747ce0349f51aa3
diff --git a/Testing/Data/UnitTest/SMALLFAKE_example_geometry.hdf5.md5 b/Testing/Data/UnitTest/SMALLFAKE_example_geometry.hdf5.md5
deleted file mode 100644
index 5c9b5f40286cb560a4c9d81739b49c76d44d10e5..0000000000000000000000000000000000000000
--- a/Testing/Data/UnitTest/SMALLFAKE_example_geometry.hdf5.md5
+++ /dev/null
@@ -1 +0,0 @@
-707ce1af3a8eea681f419f5156ab18e1
diff --git a/Testing/Data/UnitTest/WISH_Definition_10Panels.hdf5.md5 b/Testing/Data/UnitTest/WISH_Definition_10Panels.hdf5.md5
deleted file mode 100644
index d378c24958e809795c6dd888bb2574e87c59f8ee..0000000000000000000000000000000000000000
--- a/Testing/Data/UnitTest/WISH_Definition_10Panels.hdf5.md5
+++ /dev/null
@@ -1 +0,0 @@
-13c1ad274bb998eabe69e1db6d057647
diff --git a/dev-docs/source/DataFilesForTesting.rst b/dev-docs/source/DataFilesForTesting.rst
index a7a0cd02cf91c1075a146f194e23b110a0e4f9fd..4b7fdb47027bfd2b1092d0e182fdbc719c4dcd03 100644
--- a/dev-docs/source/DataFilesForTesting.rst
+++ b/dev-docs/source/DataFilesForTesting.rst
@@ -22,7 +22,7 @@ harness and others load data from a file. Take the example of
workspace with 10 detectors using
``WorkspaceCreationHelper::create2DWorkspaceWithFullInstrument()``. In
the second test, testComplex, it reads a file
-``IDFs_for_UNIT_TESTING/MAPS_Definition_Reduced.xml``, which contains
+``unit_testing/MAPS_Definition_Reduced.xml``, which contains
the definition of a MAPS instrument with the number of detectors reduced
much to ensure it is read quickly but preserving the other properties of
this instrument. However, new tests should avoid even loading of this
@@ -103,7 +103,7 @@ There are two places files may be found:
- `.../Testing/Data/ <https://github.com/mantidproject/mantid/tree/master/Testing/Data>`__
for :ref:`unit test <RunningTheUnitTests>`, :ref:`doc test <DocumentationGuideForDevs>`, and :ref:`system test <SystemTests>` data
-- `.../instrument/IDFs_for_UNIT_TESTING <https://github.com/mantidproject/mantid/tree/master/instrument/IDFs_for_UNIT_TESTING>`__
+- `.../instrument/unit_testing <https://github.com/mantidproject/mantid/tree/master/instrument/unit_testing>`__
for test :ref:`IDF <InstrumentDefinitionFile>` files
diff --git a/docs/source/algorithms/LoadIsawDetCal-v1.rst b/docs/source/algorithms/LoadIsawDetCal-v1.rst
index 65adcc7bab0a3d41975c817824003a5745f25617..b685a6b115ea812a4594c68786056e41ddc4a944 100644
--- a/docs/source/algorithms/LoadIsawDetCal-v1.rst
+++ b/docs/source/algorithms/LoadIsawDetCal-v1.rst
@@ -24,7 +24,7 @@ Usage
f.write("5 1 256 256 50.1000 49.9000 0.2000 55.33 50.0000 16.7548 -16.7548 0.00011 -0.00002 1.00000 0.00000 1.00000 0.00000\n")
f.close()
- iw = LoadEmptyInstrument(Filename="IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml",)
+ iw = LoadEmptyInstrument(Filename="unit_testing/MINITOPAZ_Definition.xml",)
LoadIsawDetCal(InputWorkspace=iw,FileName=filename)
bank = iw.getInstrument().getComponentByName("bank1")
print("Position after LoadDetCal : {}".format(bank.getPos()))
diff --git a/docs/source/algorithms/NormaliseVanadium-v1.rst b/docs/source/algorithms/NormaliseVanadium-v1.rst
index c441ac08356614ef3a523a4e4de6dcd3e5896fa6..ce62421c7194611b61ab92a2ce015126f8d1fee4 100644
--- a/docs/source/algorithms/NormaliseVanadium-v1.rst
+++ b/docs/source/algorithms/NormaliseVanadium-v1.rst
@@ -21,7 +21,7 @@ Usage
vanadium = CreateWorkspace(DataX='0,0.5,1,1.5,2,2.5,3,3.5,4,4.5,5', DataY='10.574151,10.873,11.07348,11.22903,11.42286,11.47365,11.37375,11.112,10.512181,10.653397', UnitX='wavelength')
- LoadInstrument(Workspace=vanadium, Filename='IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml', RewriteSpectraMap=True)
+ LoadInstrument(Workspace=vanadium, Filename='unit_testing/MINITOPAZ_Definition.xml', RewriteSpectraMap=True)
norm_van = NormaliseVanadium(InputWorkspace=vanadium)
print("Wavelength = {} Y = {:.11f}".format(norm_van.readX(0)[2], norm_van.readY(0)[2]))
diff --git a/instrument/LOKI_Definition.hdf5 b/instrument/LOKI_Definition.hdf5
new file mode 100644
index 0000000000000000000000000000000000000000..ab1b44fd51166b9843c47227f2b27dfa316341d9
Binary files /dev/null and b/instrument/LOKI_Definition.hdf5 differ
diff --git a/instrument/SANS2D_Definition_Tubes.hdf5 b/instrument/SANS2D_Definition_Tubes.hdf5
new file mode 100644
index 0000000000000000000000000000000000000000..a9ff9627610026c19a695320dac56ad5b40be758
Binary files /dev/null and b/instrument/SANS2D_Definition_Tubes.hdf5 differ
diff --git a/instrument/WISH_Definition_10Panels.hdf5 b/instrument/WISH_Definition_10Panels.hdf5
new file mode 100644
index 0000000000000000000000000000000000000000..bd97f9b50ef670f3e95fbe7e4b0aee5e91e191bc
Binary files /dev/null and b/instrument/WISH_Definition_10Panels.hdf5 differ
diff --git a/instrument/IDFs_for_UNIT_TESTING/ARGUS_Definition_TEST1_ValidDateOverlap.xml b/instrument/unit_testing/ARGUS_Definition_TEST1_ValidDateOverlap.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/ARGUS_Definition_TEST1_ValidDateOverlap.xml
rename to instrument/unit_testing/ARGUS_Definition_TEST1_ValidDateOverlap.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/ARGUS_Definition_TEST2_ValidDateOverlap.xml b/instrument/unit_testing/ARGUS_Definition_TEST2_ValidDateOverlap.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/ARGUS_Definition_TEST2_ValidDateOverlap.xml
rename to instrument/unit_testing/ARGUS_Definition_TEST2_ValidDateOverlap.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/DUM_Definition.xml b/instrument/unit_testing/DUM_Definition.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/DUM_Definition.xml
rename to instrument/unit_testing/DUM_Definition.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/EMU_for_UNIT_TESTING.XML b/instrument/unit_testing/EMU_for_UNIT_TESTING.XML
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/EMU_for_UNIT_TESTING.XML
rename to instrument/unit_testing/EMU_for_UNIT_TESTING.XML
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Definition.xml b/instrument/unit_testing/HRPDTEST_Definition.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Definition.xml
rename to instrument/unit_testing/HRPDTEST_Definition.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Definition_Test6.xml b/instrument/unit_testing/HRPDTEST_Definition_Test6.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Definition_Test6.xml
rename to instrument/unit_testing/HRPDTEST_Definition_Test6.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Definition_Test7.xml b/instrument/unit_testing/HRPDTEST_Definition_Test7.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Definition_Test7.xml
rename to instrument/unit_testing/HRPDTEST_Definition_Test7.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Parameters.xml b/instrument/unit_testing/HRPDTEST_Parameters.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Parameters.xml
rename to instrument/unit_testing/HRPDTEST_Parameters.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Parameters_Test6.xml b/instrument/unit_testing/HRPDTEST_Parameters_Test6.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPDTEST_Parameters_Test6.xml
rename to instrument/unit_testing/HRPDTEST_Parameters_Test6.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPD_Definition.xml b/instrument/unit_testing/HRPD_Definition.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPD_Definition.xml
rename to instrument/unit_testing/HRPD_Definition.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPD_Definition_Test3.xml b/instrument/unit_testing/HRPD_Definition_Test3.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPD_Definition_Test3.xml
rename to instrument/unit_testing/HRPD_Definition_Test3.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPD_Definition_Test4.xml b/instrument/unit_testing/HRPD_Definition_Test4.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPD_Definition_Test4.xml
rename to instrument/unit_testing/HRPD_Definition_Test4.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPD_Parameters_Test4.xml b/instrument/unit_testing/HRPD_Parameters_Test4.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPD_Parameters_Test4.xml
rename to instrument/unit_testing/HRPD_Parameters_Test4.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPD_for_UNIT_TESTING.xml b/instrument/unit_testing/HRPD_for_UNIT_TESTING.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPD_for_UNIT_TESTING.xml
rename to instrument/unit_testing/HRPD_for_UNIT_TESTING.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/HRPD_for_UNIT_TESTING2.xml b/instrument/unit_testing/HRPD_for_UNIT_TESTING2.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/HRPD_for_UNIT_TESTING2.xml
rename to instrument/unit_testing/HRPD_for_UNIT_TESTING2.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_RECTANGULAR_UNIT_TESTING.xml b/instrument/unit_testing/IDF_for_RECTANGULAR_UNIT_TESTING.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_RECTANGULAR_UNIT_TESTING.xml
rename to instrument/unit_testing/IDF_for_RECTANGULAR_UNIT_TESTING.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml b/instrument/unit_testing/IDF_for_UNIT_TESTING.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING.xml
rename to instrument/unit_testing/IDF_for_UNIT_TESTING.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2.xml b/instrument/unit_testing/IDF_for_UNIT_TESTING2.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2.xml
rename to instrument/unit_testing/IDF_for_UNIT_TESTING2.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2_paramFile.xml b/instrument/unit_testing/IDF_for_UNIT_TESTING2_paramFile.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING2_paramFile.xml
rename to instrument/unit_testing/IDF_for_UNIT_TESTING2_paramFile.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING3.xml b/instrument/unit_testing/IDF_for_UNIT_TESTING3.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING3.xml
rename to instrument/unit_testing/IDF_for_UNIT_TESTING3.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING4.xml b/instrument/unit_testing/IDF_for_UNIT_TESTING4.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING4.xml
rename to instrument/unit_testing/IDF_for_UNIT_TESTING4.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING5.xml b/instrument/unit_testing/IDF_for_UNIT_TESTING5.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING5.xml
rename to instrument/unit_testing/IDF_for_UNIT_TESTING5.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING6.xml b/instrument/unit_testing/IDF_for_UNIT_TESTING6.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_UNIT_TESTING6.xml
rename to instrument/unit_testing/IDF_for_UNIT_TESTING6.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/IDF_for_locations_test.xml b/instrument/unit_testing/IDF_for_locations_test.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/IDF_for_locations_test.xml
rename to instrument/unit_testing/IDF_for_locations_test.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/INDIRECT_Definition.xml b/instrument/unit_testing/INDIRECT_Definition.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/INDIRECT_Definition.xml
rename to instrument/unit_testing/INDIRECT_Definition.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/MAPS_Definition_Reduced.xml b/instrument/unit_testing/MAPS_Definition_Reduced.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/MAPS_Definition_Reduced.xml
rename to instrument/unit_testing/MAPS_Definition_Reduced.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml b/instrument/unit_testing/MINITOPAZ_Definition.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/MINITOPAZ_Definition.xml
rename to instrument/unit_testing/MINITOPAZ_Definition.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping.xml b/instrument/unit_testing/MUSR_Detector_Grouping.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping.xml
rename to instrument/unit_testing/MUSR_Detector_Grouping.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping_dublicate.xml b/instrument/unit_testing/MUSR_Detector_Grouping_dublicate.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping_dublicate.xml
rename to instrument/unit_testing/MUSR_Detector_Grouping_dublicate.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping_dublicate2.xml b/instrument/unit_testing/MUSR_Detector_Grouping_dublicate2.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/MUSR_Detector_Grouping_dublicate2.xml
rename to instrument/unit_testing/MUSR_Detector_Grouping_dublicate2.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/REFL_Definition.xml b/instrument/unit_testing/REFL_Definition.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/REFL_Definition.xml
rename to instrument/unit_testing/REFL_Definition.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/REFL_Parameters.xml b/instrument/unit_testing/REFL_Parameters.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/REFL_Parameters.xml
rename to instrument/unit_testing/REFL_Parameters.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/REFL_Parameters_Flood.xml b/instrument/unit_testing/REFL_Parameters_Flood.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/REFL_Parameters_Flood.xml
rename to instrument/unit_testing/REFL_Parameters_Flood.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/REFL_Parameters_Fredrikze.xml b/instrument/unit_testing/REFL_Parameters_Fredrikze.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/REFL_Parameters_Fredrikze.xml
rename to instrument/unit_testing/REFL_Parameters_Fredrikze.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/REFL_Parameters_No_Flood.xml b/instrument/unit_testing/REFL_Parameters_No_Flood.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/REFL_Parameters_No_Flood.xml
rename to instrument/unit_testing/REFL_Parameters_No_Flood.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/REFL_Parameters_Wildes.xml b/instrument/unit_testing/REFL_Parameters_Wildes.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/REFL_Parameters_Wildes.xml
rename to instrument/unit_testing/REFL_Parameters_Wildes.xml
diff --git a/instrument/IDFs_for_UNIT_TESTING/SANSTEST_Definition.xml b/instrument/unit_testing/SANSTEST_Definition.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/SANSTEST_Definition.xml
rename to instrument/unit_testing/SANSTEST_Definition.xml
diff --git a/instrument/unit_testing/SMALLFAKE_example_geometry.hdf5 b/instrument/unit_testing/SMALLFAKE_example_geometry.hdf5
new file mode 100644
index 0000000000000000000000000000000000000000..ecfe1092a8e07aedee03c16f752fc69662b6b30f
Binary files /dev/null and b/instrument/unit_testing/SMALLFAKE_example_geometry.hdf5 differ
diff --git a/instrument/IDFs_for_UNIT_TESTING/UnitTestFacilities.xml b/instrument/unit_testing/UnitTestFacilities.xml
similarity index 100%
rename from instrument/IDFs_for_UNIT_TESTING/UnitTestFacilities.xml
rename to instrument/unit_testing/UnitTestFacilities.xml