re #7403 expose new methods to python and add test

Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp

@@ -1,6 +1,7 @@
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/FacilityInfo.h"
 #include "MantidPythonInterface/kernel/Converters/PySequenceToVector.h"
+#include "MantidPythonInterface/kernel/StlExportDefinitions.h"
 #include <boost/python/class.hpp>
 #include <boost/python/def.hpp>
 #include <boost/python/reference_existing_object.hpp>
@@ -37,6 +38,10 @@ namespace
 
 void export_ConfigService()
 {
+  using Mantid::PythonInterface::std_vector_exporter;
+
+  std_vector_exporter<FacilityInfo*>::wrap("std_vector_facilityinfo");
+
   class_<ConfigServiceImpl, boost::noncopyable>("ConfigServiceImpl", no_init)
     .def("reset", &ConfigServiceImpl::reset,
          "Clears all user settings and removes the user properties file")
@@ -48,6 +53,10 @@ void export_ConfigService()
     .def("getInstrumentDirectory", &ConfigServiceImpl::getInstrumentDirectory,
          "Returns the directory used for the instrument definitions")
 
+    .def("getFacilityNames", &ConfigServiceImpl::getFacilityNames, "Returns the default facility")
+
+    .def("getFacilities", &ConfigServiceImpl::getFacilities, "Returns the default facility")
+
     .def("getFacility", (const FacilityInfo&(ConfigServiceImpl::*)() const)&ConfigServiceImpl::getFacility,
         return_value_policy<reference_existing_object>(), "Returns the default facility")
 

Code/Mantid/Framework/PythonInterface/test/python/mantid/kernel/ConfigServiceTest.py

@@ -28,7 +28,20 @@ def test_getFacility_With_Name_Returns_A_FacilityInfo_Object(self):
         facility = config.getFacility("ISIS")
         self.assertTrue(isinstance(facility, FacilityInfo))
         self.assertRaises(RuntimeError, config.getFacility, "MadeUpFacility")
-
+
+    def test_getFacilities_Returns_A_FacilityInfo_List(self):
+        facilities = config.getFacilities()
+        self.assertTrue(isinstance(facilities[0], FacilityInfo))
+
+    def test_getFacilities_and_Facility_Names_are_in_sync_and_non_empty(self):
+        facilities = config.getFacilities()
+        names = config.getFacilityNames()
+
+        self.assertTrue(len(names)>0)
+        self.assertEquals(len(names),len(facilities))
+        for i in range(len(names)):
+            self.assertEquals(names[i],facilities[i].name())
+
     def test_getInstrumentReturns_A_InstrumentInfo_Object(self):
         self.assertTrue(isinstance(config.getInstrument("WISH"), InstrumentInfo))
         self.assertRaises(RuntimeError, config.getInstrument, "MadeUpInstrument")