raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fix up testing bugs

Browse Source
This commit is contained in:
Tim Bentley 2013-01-24 20:04:18 +00:00
parent 1e3590a152
commit 0e6b7c705d
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/registry.py
View File

@ -64,7 +64,7 @@ class Registry(object):
return self.service_list[key] return self.service_list[key]
else: else:
log.error(u'Service %s not found in list' % key) log.error(u'Service %s not found in list' % key)
return None raise KeyError(u'Service %s not found in list' % key)
def register(self, key, reference): def register(self, key, reference):
""" """
@ -72,6 +72,6 @@ class Registry(object):
""" """
if key in self.service_list: if key in self.service_list:
log.error(u'Duplicate service exception %s' % key) log.error(u'Duplicate service exception %s' % key)
raise Exception(u'Duplicate service exception %s' % key) raise KeyError(u'Duplicate service exception %s' % key)
else: else:
self.service_list[key] = reference self.service_list[key] = reference

17
tests/functional/openlp_core_lib/test_registry.py
View File

@ -9,7 +9,7 @@ from openlp.core.lib import Registry
TESTPATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'..', u'..', u'resources')) TESTPATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'..', u'..', u'resources'))
class TestServiceItem(TestCase): class TestRegistry(TestCase):
def registry_basic_test(self): def registry_basic_test(self):
""" """
@ -25,17 +25,14 @@ class TestServiceItem(TestCase):
# THEN: we should be able retrieve the saved object # THEN: we should be able retrieve the saved object
assert Registry().get(u'test1') == mock_1, u'The saved service can be retrieved and matches' assert Registry().get(u'test1') == mock_1, u'The saved service can be retrieved and matches'
# WHEN: I add a service it should save it a second time # WHEN: I add a service for the second time I am mad.
# THEN I will get an exception # THEN I will get an exception
try: with self.assertRaises(KeyError) as context:
Registry().register(u'test1', mock_1) Registry().register(u'test1', mock_1)
except Exception, e: self.assertEqual(context.exception[0], u'Duplicate service exception test1')
pass
# WHEN I try to get back a non existent service # WHEN I try to get back a non existent service
# THEN I will get an exception # THEN I will get an exception
try: with self.assertRaises(KeyError) as context:
assert Registry().get(u'test2') == mock_1, u'This should not be fired' temp = Registry().get(u'test2')
except Exception, e: self.assertEqual(context.exception[0], u'Service test2 not found in list')
pass