diff --git a/tests/functional/openlp_core_lib/test_image_manager.py b/tests/functional/openlp_core_lib/test_image_manager.py index 3ee4abd90..a8fcdfa59 100644 --- a/tests/functional/openlp_core_lib/test_image_manager.py +++ b/tests/functional/openlp_core_lib/test_image_manager.py @@ -3,12 +3,13 @@ """ import os - from unittest import TestCase -from openlp.core.lib import Registry, ImageManager, ScreenList from PyQt4 import QtGui +from openlp.core.lib import Registry, ImageManager, ScreenList + + TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'..', u'..', u'resources')) diff --git a/tests/functional/openlp_core_lib/test_registry.py b/tests/functional/openlp_core_lib/test_registry.py index a2fe60627..7bb7c84cf 100644 --- a/tests/functional/openlp_core_lib/test_registry.py +++ b/tests/functional/openlp_core_lib/test_registry.py @@ -2,13 +2,14 @@ Package to test the openlp.core.lib package. """ import os - from unittest import TestCase from mock import MagicMock + from openlp.core.lib import Registry TESTPATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'..', u'..', u'resources')) + class TestRegistry(TestCase): def registry_service_test(self): diff --git a/tests/functional/openlp_core_lib/test_serviceitem.py b/tests/functional/openlp_core_lib/test_serviceitem.py index a50752cce..05952471d 100644 --- a/tests/functional/openlp_core_lib/test_serviceitem.py +++ b/tests/functional/openlp_core_lib/test_serviceitem.py @@ -3,10 +3,9 @@ """ import os import cPickle - from unittest import TestCase - from mock import MagicMock + from openlp.core.lib import ServiceItem, Registry diff --git a/tests/interfaces/openlp_core_ui/test_servicemanager.py b/tests/interfaces/openlp_core_ui/test_servicemanager.py index b894db470..8ecf3271d 100644 --- a/tests/interfaces/openlp_core_ui/test_servicemanager.py +++ b/tests/interfaces/openlp_core_ui/test_servicemanager.py @@ -1,12 +1,14 @@ """ Package to test the openlp.core.lib package. """ -from unittest import TestCase +from unittest import TestCase from mock import MagicMock + +from PyQt4 import QtGui + from openlp.core.lib import Registry, ScreenList from openlp.core.ui.mainwindow import MainWindow -from PyQt4 import QtGui class TestStartNoteDialog(TestCase): diff --git a/tests/interfaces/openlp_core_ui/test_servicenotedialog.py b/tests/interfaces/openlp_core_ui/test_servicenotedialog.py index f3694fdea..1cf3fef38 100644 --- a/tests/interfaces/openlp_core_ui/test_servicenotedialog.py +++ b/tests/interfaces/openlp_core_ui/test_servicenotedialog.py @@ -2,11 +2,13 @@ Package to test the openlp.core.ui package. """ from unittest import TestCase - from mock import patch + +from PyQt4 import QtCore, QtGui, QtTest + from openlp.core.lib import Registry from openlp.core.ui import servicenoteform -from PyQt4 import QtCore, QtGui, QtTest + class TestStartNoteDialog(TestCase): diff --git a/tests/interfaces/openlp_core_ui/test_starttimedialog.py b/tests/interfaces/openlp_core_ui/test_starttimedialog.py index a9b33a30c..888402235 100644 --- a/tests/interfaces/openlp_core_ui/test_starttimedialog.py +++ b/tests/interfaces/openlp_core_ui/test_starttimedialog.py @@ -2,11 +2,13 @@ Package to test the openlp.core.ui package. """ from unittest import TestCase - from mock import MagicMock, patch + +from PyQt4 import QtCore, QtGui, QtTest + from openlp.core.lib import Registry from openlp.core.ui import starttimeform -from PyQt4 import QtCore, QtGui, QtTest + class TestStartTimeDialog(TestCase):