Re #5934. Move the TESTHISTOLISTENER instrument to the TEST facility.

This stops it appearing in the list of ISIS instruments in the
first-time setup dialog and elsewhere.

Code/Mantid/Framework/Kernel/test/MultiFileNameParserTest.h

@@ -14,6 +14,9 @@ using namespace Mantid::Kernel::MultiFileNameParsing;
 class MultiFileNameParserTest : public CxxTest::TestSuite
 {
 public:
+  static MultiFileNameParserTest *createSuite() { return new MultiFileNameParserTest(); }
+  static void destroySuite(MultiFileNameParserTest *suite) { delete suite; }
+
   typedef std::vector<std::vector<unsigned int> > ParsedRuns;
 
   /////////////////////////////////////////////////////////////////////////////
@@ -325,19 +328,6 @@ public:
     TS_ASSERT_EQUALS(filenames[2][0], "c:/TSC00004.raw");
   }
 
-  void test_instrument_with_multiple_padding()
-  {
-    Parser parser;
-    parser.parse("TESTHISTOLISTENER123,299-301");
-
-    std::vector<std::vector<std::string> > filenames = parser.fileNames();
-
-    TS_ASSERT_EQUALS(filenames[0][0], "TESTHISTOLISTENER00000123" );
-    TS_ASSERT_EQUALS(filenames[1][0], "TESTHISTOLISTENER00000299" );
-    TS_ASSERT_EQUALS(filenames[1][1], "TST00000000300" );
-    TS_ASSERT_EQUALS(filenames[1][2], "TST00000000301" );
-  }
-
   void test_complexFileNameString_SNS()
   {
     Parser parser;
@@ -371,6 +361,21 @@ public:
     TS_ASSERT_EQUALS(filenames[7][2], "CNCS_52.nxs");
   }
 
+  void test_instrument_with_multiple_padding()
+  {
+    Mantid::Kernel::ConfigService::Instance().setString("supported.facilities", "TEST");
+
+    Parser parser;
+    parser.parse("TESTHISTOLISTENER123,299-301");
+
+    std::vector<std::vector<std::string> > filenames = parser.fileNames();
+
+    TS_ASSERT_EQUALS(filenames[0][0], "TESTHISTOLISTENER00000123" );
+    TS_ASSERT_EQUALS(filenames[1][0], "TESTHISTOLISTENER00000299" );
+    TS_ASSERT_EQUALS(filenames[1][1], "TST00000000300" );
+    TS_ASSERT_EQUALS(filenames[1][2], "TST00000000301" );
+  }
+
 };
 
-#endif /* MANTID_KERNEL_MULTIFILENAMEPARSERTEST_H_ */
+#endif /* MANTID_KERNEL_MULTIFILENAMEPARSERTEST_H_ */
\ No newline at end of file

Code/Mantid/instrument/Facilities.xml

@@ -206,13 +206,6 @@
   
   <livedata listener="ISISHistoDataListener"/>
 
-  <instrument name="TESTHISTOLISTENER"> 
-    <zeropadding size="8"/>
-    <zeropadding size="11" startRunNumber="300" prefix="TST"/>
-    <technique>Test ISISHistoDataListener</technique>
-    <livedata address="127.0.0.1:6789" />
-  </instrument>
-   
 </facility>
 
 <facility name="HFIR" FileExtensions=".nxs,.dat,.xml">
@@ -488,6 +481,14 @@
       <technique>Test Neutron Diffraction</technique>
       <livedata address="127.0.0.1:0" />
    </instrument>
+
+  <instrument name="TESTHISTOLISTENER"> 
+    <zeropadding size="8"/>
+    <zeropadding size="11" startRunNumber="300" prefix="TST"/>
+    <technique>Test ISISHistoDataListener</technique>
+    <livedata listener="ISISHistoDataListener" address="127.0.0.1:6789" />
+  </instrument>
+
 </facility>
 
 </facilities>