diff --git a/Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h b/Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h index da61313475c5..a66d942915db 100644 --- a/Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h +++ b/Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h @@ -37,7 +37,7 @@ class LoadIsawSpectrumTest : public CxxTest::TestSuite LoadIsawSpectrum alg; TS_ASSERT_THROWS_NOTHING( alg.initialize() ) TS_ASSERT( alg.isInitialized() ) - TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InstrumentFilename", "TOPAZ_Definition_2012-08-23.xml") ); + TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InstrumentFilename", "TOPAZ_Definition_2010.xml") ); TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("SpectraFile", "Spectrum_ISAW.dat") ); TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("OutputWorkspace", "LoadIsawSpectrumTest_ws") ); TS_ASSERT_THROWS_NOTHING( alg.execute(); ); diff --git a/Code/Mantid/scripts/test/DirectEnergyConversionTest.py b/Code/Mantid/scripts/test/DirectEnergyConversionTest.py index 90a68bff2992..1cba3c269816 100644 --- a/Code/Mantid/scripts/test/DirectEnergyConversionTest.py +++ b/Code/Mantid/scripts/test/DirectEnergyConversionTest.py @@ -59,17 +59,6 @@ def test_init_reducer(self): tReducer.initialise("MAP",True); self.assertEqual(tReducer.instr_name,"MAP") - #config.setFacility("SNS") - #config.setString('default.facility','SNS') - tReducer.instr_name = 'SEQ' - self.assertTrue(tReducer._idf_values_read) - self.assertEqual(tReducer.instr_name,"SEQ") - self.assertEqual(tReducer.facility,'SNS') - - tReducer.instr_name = 'MER' - self.assertEqual(tReducer.instr_name,"MER") - self.assertEqual(tReducer.facility,'ISIS') - self.assertRaises(KeyError,setattr,tReducer,'instr_name','NonExistingInstrument') @@ -381,4 +370,4 @@ def test_load_monitors_with_workspacer(self): if __name__=="__main__": - unittest.main() \ No newline at end of file + unittest.main()