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

Fix the unit test framework

This commit is contained in:
Tim Bentley 2013-02-17 07:54:43 +00:00
parent e921e63e35
commit 62b1653c46
10 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/functional/__init__.py
View File

@ -7,7 +7,3 @@ sip.setapi(u'QTime', 2)
sip.setapi(u'QUrl', 2)
sip.setapi(u'QVariant', 2)
from PyQt4 import QtGui
# Only one QApplication can be created. Use QtGui.QApplication.instance() when you need to "create" a QApplication.
application = QtGui.QApplication([])

2
tests/functional/openlp_core_lib/test_image_manager.py
View File

@ -20,7 +20,7 @@ class TestImageManager(TestCase):
Create the UI
"""
Registry.create()
self.app = QtGui.QApplication.instance()
self.app = QtGui.QApplication([])
ScreenList.create(self.app.desktop())
self.image_manager = ImageManager()

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

@ -11,7 +11,6 @@ from openlp.core.lib import Registry
TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'..', u'..', u'resources'))
class TestRegistry(TestCase):
def registry_service_test(self):

11
tests/functional/openlp_core_lib/test_screen.py
View File

@ -7,7 +7,7 @@ from unittest import TestCase
from mock import MagicMock
from PyQt4 import QtGui, QtCore
from openlp.core.lib import ScreenList
from openlp.core.lib import Registry, ScreenList
SCREEN = {
@ -23,18 +23,22 @@ class TestScreenList(TestCase):
"""
Set up the components need for all tests.
"""
self.application = QtGui.QApplication.instance()
Registry.create()
self.application = QtGui.QApplication([])
self.application.setOrganizationName(u'OpenLP-tests')
self.application.setOrganizationDomain(u'openlp.org')
self.screens = ScreenList.create(self.application.desktop())
def tearDown(self):
"""
Delete QApplication.
"""
del self.screens
del self.application
def add_desktop_test(self):
"""
Test the ScreenList class' screen_count_changed method to check if new monitors are detected by OpenLP.
Test the ScreenList class' - screen_count_changed method to check if new monitors are detected by OpenLP.
"""
# GIVEN: The screen list.
old_screens = copy.deepcopy(self.screens.screen_list)
@ -52,4 +56,3 @@ class TestScreenList(TestCase):
# THEN: The screens should be identically.
assert SCREEN == new_screens.pop(), u'The new screen should be identically to the screen defined above.'

4
tests/interfaces/__init__.py
View File

@ -7,7 +7,3 @@ sip.setapi(u'QTime', 2)
sip.setapi(u'QUrl', 2)
sip.setapi(u'QVariant', 2)
from PyQt4 import QtGui
# Only one QApplication can be created. Use QtGui.QApplication.instance() when you need to "create" a QApplication.
application = QtGui.QApplication([])

5
tests/interfaces/openlp_core_lib/test_pluginmanager.py
View File

@ -6,7 +6,7 @@ import sys
from tempfile import mkstemp
from unittest import TestCase
from mock import MagicMock, patch
from mock import MagicMock
from PyQt4 import QtGui
from openlp.core.lib.pluginmanager import PluginManager
@ -26,7 +26,7 @@ class TestPluginManager(TestCase):
Settings().set_filename(self.ini_file)
Registry.create()
Registry().register(u'service_list', MagicMock())
self.app = QtGui.QApplication.instance()
self.app = QtGui.QApplication([])
self.main_window = QtGui.QMainWindow()
Registry().register(u'main_window', self.main_window)
self.plugins_dir = os.path.abspath(os.path.join(os.path.basename(__file__), u'..', u'openlp', u'plugins'))
@ -34,6 +34,7 @@ class TestPluginManager(TestCase):
def tearDown(self):
os.unlink(self.ini_file)
del self.app
del self.main_window
def find_plugins_test(self):
"""

6
tests/interfaces/openlp_core_ui/test_filerenamedialog.py
View File

@ -14,8 +14,8 @@ class TestStartFileRenameForm(TestCase):
"""
Create the UI
"""
registry = Registry.create()
self.app = QtGui.QApplication.instance()
Registry.create()
self.app = QtGui.QApplication([])
self.main_window = QtGui.QMainWindow()
Registry().register(u'main_window', self.main_window)
self.form = filerenameform.FileRenameForm()
@ -78,6 +78,6 @@ class TestStartFileRenameForm(TestCase):
# WHEN: 'Typing' a string containing invalid file characters.
QtTest.QTest.keyClicks(self.form.fileNameEdit, u'I/n\\v?a*l|i<d> \F[i\l]e" :N+a%me')
# THEN: The text in the QLineEdit should be the same as the input string with the invalid chatacters filtered
# THEN: The text in the QLineEdit should be the same as the input string with the invalid characters filtered
# out.
self.assertEqual(self.form.fileNameEdit.text(), u'Invalid File Name')

2
tests/interfaces/openlp_core_ui/test_servicemanager.py
View File

@ -18,7 +18,7 @@ class TestStartNoteDialog(TestCase):
Create the UI
"""
Registry.create()
self.app = QtGui.QApplication.instance()
self.app = QtGui.QApplication([])
ScreenList.create(self.app.desktop())
Registry().register(u'application', MagicMock())
self.main_window = MainWindow()

2
tests/interfaces/openlp_core_ui/test_servicenotedialog.py
View File

@ -17,7 +17,7 @@ class TestStartNoteDialog(TestCase):
Create the UI
"""
Registry.create()
self.app = QtGui.QApplication.instance()
self.app = QtGui.QApplication([])
self.main_window = QtGui.QMainWindow()
Registry().register(u'main_window', self.main_window)
self.form = servicenoteform.ServiceNoteForm()

2
tests/interfaces/openlp_core_ui/test_starttimedialog.py
View File

@ -17,7 +17,7 @@ class TestStartTimeDialog(TestCase):
Create the UI
"""
Registry.create()
self.app = QtGui.QApplication.instance()
self.app = QtGui.QApplication([])
self.main_window = QtGui.QMainWindow()
Registry().register(u'main_window', self.main_window)
self.form = starttimeform.StartTimeForm()