From 3b15acdc7cf49341da8b41ea36b1c02c3433f801 Mon Sep 17 00:00:00 2001
From: Stuart Campbell <campbellsi@ornl.gov>
Date: Wed, 29 Dec 2010 23:08:34 +0000
Subject: [PATCH] Fixing paths in algorithms tests. refs #1881
---
Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h | 2 +-
.../Framework/Algorithms/test/CalculateTransmissionTest.h | 2 +-
Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h | 4 ++--
.../Framework/Algorithms/test/CreateCalFileByNamesTest.h | 2 +-
.../Mantid/Framework/Algorithms/test/CreateDummyCalFileTest.h | 2 +-
.../Algorithms/test/DetectorEfficiencyVariationTest.h | 2 +-
.../Algorithms/test/DiffractionEventReadDetCalTest.h | 2 +-
Code/Mantid/Framework/Algorithms/test/He3TubeEfficiencyTest.h | 4 ++--
.../Mantid/Framework/Algorithms/test/MedianDetectorTestTest.h | 2 +-
Code/Mantid/Framework/Algorithms/test/SolidAngleTest.h | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h b/Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h
index 24c6f0058a9..b3b4db9377a 100644
--- a/Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/AlignDetectorsTest.h
@@ -98,7 +98,7 @@ public:
loader.setProperty("PulseidFilename", pulsefile);
loader.setPropertyValue("MappingFilename", "CNCS_TS_2008_08_18.dat");
loader.setPropertyValue("OutputWorkspace", inputWS);
-// loader.setPropertyValue("InstrumentFilename", "../../../../Test/Instrument/CNCS_Definition.xml");
+// loader.setPropertyValue("InstrumentFilename", "../../../Instrument/CNCS_Definition.xml");
loader.execute();
TS_ASSERT (loader.isExecuted() );
}
diff --git a/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h b/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h
index c3ce67db8c3..3a0600c23b1 100644
--- a/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h
@@ -29,7 +29,7 @@ public:
Mantid::DataHandling::LoadInstrument inst;
inst.initialize();
inst.setPropertyValue("Workspace",inputWS);
- inst.setPropertyValue("Filename","../../../../Test/Instrument/LOQ_trans_Definition.xml");
+ inst.setPropertyValue("Filename","../../../Instrument/LOQ_trans_Definition.xml");
inst.execute();
Mantid::Algorithms::ConvertUnits convert;
diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h
index 9e78f54be51..b85172e30a8 100644
--- a/Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ConvertUnitsTest.h
@@ -63,7 +63,7 @@ public:
Mantid::DataHandling::LoadInstrument loader;
loader.initialize();
// Path to test input file assumes Test directory checked out from SVN
- std::string inputFile = "../../../../Test/Instrument/HET_Definition.xml";
+ std::string inputFile = "../../../Instrument/HET_Definition.xml";
loader.setPropertyValue("Filename", inputFile);
loader.setPropertyValue("Workspace", this->inputSpace);
loader.execute();
@@ -245,7 +245,7 @@ public:
loader.setProperty("PulseidFilename", pulsefile);
loader.setPropertyValue("MappingFilename", "CNCS_TS_2008_08_18.dat");
loader.setPropertyValue("OutputWorkspace", this->inputSpace);
-// loader.setPropertyValue("InstrumentFilename", "../../../../Test/Instrument/CNCS_Definition.xml");
+// loader.setPropertyValue("InstrumentFilename", "../../../Instrument/CNCS_Definition.xml");
loader.execute();
TS_ASSERT (loader.isExecuted() );
}
diff --git a/Code/Mantid/Framework/Algorithms/test/CreateCalFileByNamesTest.h b/Code/Mantid/Framework/Algorithms/test/CreateCalFileByNamesTest.h
index 9eec2e42783..cdcd0aedf66 100644
--- a/Code/Mantid/Framework/Algorithms/test/CreateCalFileByNamesTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CreateCalFileByNamesTest.h
@@ -38,7 +38,7 @@ public:
loaderCAL.initialize();
loaderCAL.isInitialized();
- loaderCAL.setPropertyValue("Filename", "../../../../Test/Instrument/INES_Definition.xml");
+ loaderCAL.setPropertyValue("Filename", "../../../Instrument/INES_Definition.xml");
inputFile = loaderCAL.getPropertyValue("Filename");
wsName = "LoadEmptyInstrumentTestCAL";
loaderCAL.setPropertyValue("OutputWorkspace", wsName);
diff --git a/Code/Mantid/Framework/Algorithms/test/CreateDummyCalFileTest.h b/Code/Mantid/Framework/Algorithms/test/CreateDummyCalFileTest.h
index d1fd89ba229..71f1c505f54 100644
--- a/Code/Mantid/Framework/Algorithms/test/CreateDummyCalFileTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CreateDummyCalFileTest.h
@@ -38,7 +38,7 @@ public:
loaderCAL.initialize();
loaderCAL.isInitialized();
- loaderCAL.setPropertyValue("Filename", "../../../../Test/Instrument/INES_Definition.xml");
+ loaderCAL.setPropertyValue("Filename", "../../../Instrument/INES_Definition.xml");
inputFile = loaderCAL.getPropertyValue("Filename");
wsName = "LoadEmptyInstrumentTestCAL";
loaderCAL.setPropertyValue("OutputWorkspace", wsName);
diff --git a/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyVariationTest.h b/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyVariationTest.h
index 6dcde05c775..5d47ff86ebe 100644
--- a/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyVariationTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyVariationTest.h
@@ -151,7 +151,7 @@ public:
Mantid::DataHandling::LoadInstrument loader;
loader.initialize();
// Path to test input file assumes Test directory checked out from SVN
- std::string inputFile = "../../../../Test/Instrument/INES_Definition.xml";
+ std::string inputFile = "../../../Instrument/INES_Definition.xml";
loader.setPropertyValue("Filename", inputFile);
loader.setPropertyValue("Workspace", m_WB1Name);
loader.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/DiffractionEventReadDetCalTest.h b/Code/Mantid/Framework/Algorithms/test/DiffractionEventReadDetCalTest.h
index 7baa2a20c3a..fd6f98d7ead 100644
--- a/Code/Mantid/Framework/Algorithms/test/DiffractionEventReadDetCalTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/DiffractionEventReadDetCalTest.h
@@ -39,7 +39,7 @@ public:
loaderCAL.initialize();
loaderCAL.isInitialized();
- loaderCAL.setPropertyValue("Filename", "../../../../Test/Instrument/SNAP_Definition.xml");
+ loaderCAL.setPropertyValue("Filename", "../../../Instrument/SNAP_Definition.xml");
inputFile = loaderCAL.getPropertyValue("Filename");
wsName = "LoadEmptyInstrumentTestCAL";
loaderCAL.setPropertyValue("OutputWorkspace", wsName);
diff --git a/Code/Mantid/Framework/Algorithms/test/He3TubeEfficiencyTest.h b/Code/Mantid/Framework/Algorithms/test/He3TubeEfficiencyTest.h
index fe56b1d70fc..7561a766785 100644
--- a/Code/Mantid/Framework/Algorithms/test/He3TubeEfficiencyTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/He3TubeEfficiencyTest.h
@@ -156,7 +156,7 @@ private:
LoadInstrument loader;
loader.initialize();
loader.setPropertyValue("Filename",
- "../../../../Test/Instrument/IDFs_for_UNIT_TESTING/DUM_Definition.xml");
+ "../../../Instrument/IDFs_for_UNIT_TESTING/DUM_Definition.xml");
loader.setPropertyValue("Workspace", inputWS);
loader.execute();
}
@@ -171,7 +171,7 @@ private:
LoadInstrument loader;
loader.initialize();
loader.setPropertyValue("Filename",
- "../../../../Test/Instrument/IDFs_for_UNIT_TESTING/DUM_Definition.xml");
+ "../../../Instrument/IDFs_for_UNIT_TESTING/DUM_Definition.xml");
loader.setPropertyValue("Workspace", inputEvWS);
loader.execute();
}
diff --git a/Code/Mantid/Framework/Algorithms/test/MedianDetectorTestTest.h b/Code/Mantid/Framework/Algorithms/test/MedianDetectorTestTest.h
index 77a4af31876..c2448638e4d 100644
--- a/Code/Mantid/Framework/Algorithms/test/MedianDetectorTestTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MedianDetectorTestTest.h
@@ -153,7 +153,7 @@ public:
Mantid::DataHandling::LoadInstrument loader;
loader.initialize();
// Path to test input file assumes Test directory checked out from SVN
- std::string inputFile = "../../../../Test/Instrument/INES_Definition.xml";
+ std::string inputFile = "../../../Instrument/INES_Definition.xml";
loader.setPropertyValue("Filename", inputFile);
loader.setPropertyValue("Workspace", m_IWSName);
loader.execute();
diff --git a/Code/Mantid/Framework/Algorithms/test/SolidAngleTest.h b/Code/Mantid/Framework/Algorithms/test/SolidAngleTest.h
index c1706e08dfd..b382a18a4f7 100644
--- a/Code/Mantid/Framework/Algorithms/test/SolidAngleTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/SolidAngleTest.h
@@ -58,7 +58,7 @@ public:
Mantid::DataHandling::LoadInstrument loader;
loader.initialize();
// Path to test input file assumes Test directory checked out from SVN
- std::string inputFile = "../../../../Test/Instrument/INES_Definition.xml";
+ std::string inputFile = "../../../Instrument/INES_Definition.xml";
loader.setPropertyValue("Filename", inputFile);
loader.setPropertyValue("Workspace", inputSpace);
loader.execute();
--
GitLab