Skip to content

Commit

Permalink
Re #8107. Expose updateFacilities to python.
Browse files Browse the repository at this point in the history
Also modify setFacility - why was it pointing to setString???
  • Loading branch information
RussellTaylor committed Oct 10, 2013
1 parent bc72701 commit 1232c78
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ void export_ConfigService()
(arg("facilityName")), return_value_policy<reference_existing_object>(),
"Returns the named facility. Raises an RuntimeError if it does not exist")

.def("setFacility", &ConfigServiceImpl::setString, (arg("facilityName")), "Sets the current facility to the given name")
.def("setFacility", &ConfigServiceImpl::setFacility, "Sets the current facility to the given name")

.def("updateFacilities", &ConfigServiceImpl::updateFacilities, "Loads facility information from a provided file")

.def("getInstrument", &ConfigServiceImpl::getInstrument,
getInstrument_Overload("Returns the named instrument. If name = \"\" then the default.instrument is returned",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ def test_getFacilities_and_Facility_Names_are_in_sync_and_non_empty(self):
for i in range(len(names)):
self.assertEquals(names[i],facilities[i].name())

def test_update_and_set_facility(self):
self.assertFalse("TEST" in config.getFacilityNames())
ConfigService.updateFacilities(os.path.join(ConfigService.getInstrumentDirectory(),"IDFs_for_UNIT_TESTING/UnitTestFacilities.xml"))
ConfigService.setFacility("TEST")
self.assertEquals(config.getFacility().name(), "TEST")
self.assertRaises(RuntimeError, config.getFacility, "SNS")

def test_getInstrumentReturns_A_InstrumentInfo_Object(self):
self.assertTrue(isinstance(config.getInstrument("WISH"), InstrumentInfo))
self.assertRaises(RuntimeError, config.getInstrument, "MadeUpInstrument")
Expand Down

0 comments on commit 1232c78

Please sign in to comment.