Added One More Test re #5635 re #6281

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
mantidproject · Dec 13, 2012 · 97a44fc · 97a44fc
1 parent b3918a6
commit 97a44fc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/test/LoadInstrumentTest.h b/Code/Mantid/Framework/DataHandling/test/LoadInstrumentTest.h
@@ -473,6 +473,13 @@ class LoadInstrumentTest : public CxxTest::TestSuite
     doTestParameterFileSelection("IDFs_for_UNIT_TESTING/HRPDTEST_Definition_Test6.xml","IDFs_for_UNIT_TESTING/HRPDTEST_Parameters_Test6.xml","V"); 
   }
 
+  void testExecHRP7()
+  {
+    // Test Parameter file outside instrument folder is used by an IDF file in same instrument folder and
+    // with an extension of its name after the 'Definition' not present in a parameter file.
+    doTestParameterFileSelection("IDFs_for_UNIT_TESTING/HRPDTEST_Definition_Test7.xml","HRPDTEST_Parameters.xml","U"); 
+  }
+
   void testNeutronicPositions()
   {
     // Make sure the IDS is empty

diff --git a/Code/Mantid/instrument/IDFs_for_UNIT_TESTING/HRPD_Definition.xml b/Code/Mantid/instrument/IDFs_for_UNIT_TESTING/HRPD_Definition.xml
@@ -2,8 +2,8 @@
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
 <instrument name="HRPD" valid-from   ="1900-03-31 23:59:59"
-                        valid-to     ="2100-01-31 23:59:59"
-		        last-modified="2012-12-10 00:00:00">
+                        valid-to     ="1910-01-31 23:59:59"
+		        last-modified="2012-12-12 00:00:00">
 
 <defaults>
   <length unit="meter" />

diff --git a/Code/Mantid/instrument/IDFs_for_UNIT_TESTING/HRPD_Definition_Test3.xml b/Code/Mantid/instrument/IDFs_for_UNIT_TESTING/HRPD_Definition_Test3.xml
@@ -2,8 +2,8 @@
 <!-- For help on the notation used to specify an Instrument Definition File 
      see http://www.mantidproject.org/IDF -->
 <instrument name="HRPD" valid-from   ="1900-05-31 23:59:59"
-                        valid-to     ="2100-01-31 23:59:59"
-		        last-modified="2012-12-10 00:00:00">
+                        valid-to     ="1910-01-31 23:59:59"
+		        last-modified="2012-12-12 00:00:00">
 
 <defaults>
   <length unit="meter" />