Fixes to tests

This commit is contained in:
Tim Bentley 2013-10-14 06:01:01 +01:00
parent b794623e7f
commit 4f3291b2ee
2 changed files with 4 additions and 4 deletions

View File

@ -46,7 +46,7 @@ class TestAppLocation(TestCase):
"""
Test the AppLocation.get_data_path() method
"""
with patch('openlp.core.common.Settings') as mocked_class, \
with patch('openlp.core.common.applocation.Settings') as mocked_class, \
patch('openlp.core.common.AppLocation.get_directory') as mocked_get_directory, \
patch('openlp.core.common.applocation.check_directory_exists') as mocked_check_directory_exists, \
patch('openlp.core.common.applocation.os') as mocked_os:
@ -71,7 +71,7 @@ class TestAppLocation(TestCase):
"""
Test the AppLocation.get_data_path() method when a custom location is set in the settings
"""
with patch('openlp.core.common.Settings') as mocked_class,\
with patch('openlp.core.common.applocation.Settings') as mocked_class,\
patch('openlp.core.common.applocation.os') as mocked_os:
# GIVEN: A mocked out Settings class which returns a custom data location
mocked_settings = mocked_class.return_value
@ -200,4 +200,4 @@ class TestAppLocation(TestCase):
frozen_path = get_frozen_path('frozen', 'not frozen')
# THEN: The frozen parameter is returned
self.assertEqual('frozen', frozen_path, 'Should return "frozen"')
self.assertEqual('frozen', frozen_path, 'Should return "frozen"')

View File

@ -62,4 +62,4 @@ class TestTheme(TestCase):
# THEN: We should get some default behaviours
self.assertTrue(default_theme.background_border_color == '#000000', 'The theme should have a black border')
self.assertTrue(default_theme.background_type == 'solid', 'There theme should have a solid backgrounds')
self.assertTrue(default_theme.background_type == 'solid', 'There theme should have a solid backgrounds')