trunk

openlp/plugins/bibles/forms/bibleimportform.py

@@ -135,6 +135,7 @@ class BibleImportForm(OpenLPWizard):
         Add the bible import specific wizard pages.
         """
         # Select Page
+        self.spacers = []
         self.select_page = QtWidgets.QWizardPage()
         self.select_page.setObjectName('SelectPage')
         self.select_page_layout = QtWidgets.QVBoxLayout(self.select_page)
@@ -147,8 +148,8 @@ class BibleImportForm(OpenLPWizard):
         self.format_combo_box.addItems(['', '', '', '', '', '', ''])
         self.format_combo_box.setObjectName('FormatComboBox')
         self.format_layout.addRow(self.format_label, self.format_combo_box)
-        self.spacer = QtWidgets.QSpacerItem(10, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
+        self.spacers.append(QtWidgets.QSpacerItem(10, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum))
-        self.format_layout.setItem(1, QtWidgets.QFormLayout.LabelRole, self.spacer)
+        self.format_layout.setItem(1, QtWidgets.QFormLayout.LabelRole, self.spacers[-1])
         self.select_page_layout.addLayout(self.format_layout)
         self.select_stack = QtWidgets.QStackedLayout()
         self.select_stack.setObjectName('SelectStack')
@@ -170,7 +171,8 @@ class BibleImportForm(OpenLPWizard):
         self.osis_browse_button.setObjectName('OsisBrowseButton')
         self.osis_file_layout.addWidget(self.osis_browse_button)
         self.osis_layout.addRow(self.osis_file_label, self.osis_file_layout)
-        self.osis_layout.setItem(1, QtWidgets.QFormLayout.LabelRole, self.spacer)
+        self.spacers.append(QtWidgets.QSpacerItem(10, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum))
+        self.osis_layout.setItem(1, QtWidgets.QFormLayout.LabelRole, self.spacers[-1])
         self.select_stack.addWidget(self.osis_widget)
         self.csv_widget = QtWidgets.QWidget(self.select_page)
         self.csv_widget.setObjectName('CsvWidget')
@@ -203,7 +205,8 @@ class BibleImportForm(OpenLPWizard):
         self.csv_verses_button.setObjectName('CsvVersesButton')
         self.csv_verses_layout.addWidget(self.csv_verses_button)
         self.csv_layout.addRow(self.csv_verses_label, self.csv_verses_layout)
-        self.csv_layout.setItem(3, QtWidgets.QFormLayout.LabelRole, self.spacer)
+        self.spacers.append(QtWidgets.QSpacerItem(10, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum))
+        self.csv_layout.setItem(2, QtWidgets.QFormLayout.LabelRole, self.spacers[-1])
         self.select_stack.addWidget(self.csv_widget)
         self.open_song_widget = QtWidgets.QWidget(self.select_page)
         self.open_song_widget.setObjectName('OpenSongWidget')
@@ -223,7 +226,8 @@ class BibleImportForm(OpenLPWizard):
         self.open_song_browse_button.setObjectName('OpenSongBrowseButton')
         self.open_song_file_layout.addWidget(self.open_song_browse_button)
         self.open_song_layout.addRow(self.open_song_file_label, self.open_song_file_layout)
-        self.open_song_layout.setItem(1, QtWidgets.QFormLayout.LabelRole, self.spacer)
+        self.spacers.append(QtWidgets.QSpacerItem(10, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum))
+        self.open_song_layout.setItem(1, QtWidgets.QFormLayout.LabelRole, self.spacers[-1])
         self.select_stack.addWidget(self.open_song_widget)
         self.web_tab_widget = QtWidgets.QTabWidget(self.select_page)
         self.web_tab_widget.setObjectName('WebTabWidget')
@@ -300,7 +304,8 @@ class BibleImportForm(OpenLPWizard):
         self.zefania_browse_button.setObjectName('ZefaniaBrowseButton')
         self.zefania_file_layout.addWidget(self.zefania_browse_button)
         self.zefania_layout.addRow(self.zefania_file_label, self.zefania_file_layout)
-        self.zefania_layout.setItem(5, QtWidgets.QFormLayout.LabelRole, self.spacer)
+        self.spacers.append(QtWidgets.QSpacerItem(10, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum))
+        self.zefania_layout.setItem(1, QtWidgets.QFormLayout.LabelRole, self.spacers[-1])
         self.select_stack.addWidget(self.zefania_widget)
         self.sword_widget = QtWidgets.QWidget(self.select_page)
         self.sword_widget.setObjectName('SwordWidget')
@@ -381,7 +386,8 @@ class BibleImportForm(OpenLPWizard):
         self.wordproject_browse_button.setObjectName('WordProjectBrowseButton')
         self.wordproject_file_layout.addWidget(self.wordproject_browse_button)
         self.wordproject_layout.addRow(self.wordproject_file_label, self.wordproject_file_layout)
-        self.wordproject_layout.setItem(5, QtWidgets.QFormLayout.LabelRole, self.spacer)
+        self.spacers.append(QtWidgets.QSpacerItem(10, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum))
+        self.wordproject_layout.setItem(1, QtWidgets.QFormLayout.LabelRole, self.spacers[-1])
         self.select_stack.addWidget(self.wordproject_widget)
         self.select_page_layout.addLayout(self.select_stack)
         self.addPage(self.select_page)
@@ -499,7 +505,8 @@ class BibleImportForm(OpenLPWizard):
                           self.csv_verses_label.minimumSizeHint().width(),
                           self.open_song_file_label.minimumSizeHint().width(),
                           self.zefania_file_label.minimumSizeHint().width())
-        self.spacer.changeSize(label_width, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        for spacer in self.spacers:
+            spacer.changeSize(label_width, 0, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
 
     def validateCurrentPage(self):
         """

scripts/appveyor-webhook.py

@@ -35,8 +35,9 @@ import sys
 import time
 from subprocess import Popen, PIPE
 
-appveyor_build_url = 'https://ci.appveyor.com/project/TomasGroth/openlp/build'
+appveyor_build_url = 'https://ci.appveyor.com/project/OpenLP/{project}/build'
-appveyor_api_url = 'https://ci.appveyor.com/api/projects/TomasGroth/openlp'
+appveyor_api_url = 'https://ci.appveyor.com/api/projects/OpenLP/{project}'
+appveyor_log_url = 'https://ci.appveyor.com/api/buildjobs/{buildid}/log'
 
 webhook_element = \
     {
@@ -84,7 +85,7 @@ def get_version():
     return version_string, version
 
 
-def get_yml(branch):
+def get_yml(branch, build_type):
     """
     Returns the content of appveyor.yml and inserts the branch to be build
     """
@@ -92,7 +93,7 @@ def get_yml(branch):
     yml_text = f.read()
     f.close()
     yml_text = yml_text.replace('BRANCHNAME', branch)
-    if 'openlp-core/openlp/trunk' in branch:
+    if build_type in ['openlp', 'trunk']:
         yml_text = yml_text.replace('BUILD_DOCS', '$TRUE')
     else:
         yml_text = yml_text.replace('BUILD_DOCS', '$FALSE')
@@ -115,23 +116,28 @@ def hook(webhook_url, yml):
         print(responce.read().decode('utf-8'))
 
 
-def get_appveyor_build_url(branch):
+def get_appveyor_build_url(build_type):
     """
     Get the url of the build.
     """
-    responce = urllib.request.urlopen(appveyor_api_url)
+    responce = urllib.request.urlopen(appveyor_api_url.format(project=build_type))
     json_str = responce.read().decode('utf-8')
     build_json = json.loads(json_str)
-    build_url = '%s/%s' % (appveyor_build_url, build_json['build']['version'])
+    build_url = '%s/%s' % (appveyor_build_url.format(project=build_type), build_json['build']['version'])
-    print('Check this URL for build status: %s' % build_url)
+    print(build_url.format(project=build_type))
+    print(appveyor_log_url.format(buildid=build_json['build']['jobs'][0]['jobId']))
 
 
-if len(sys.argv) != 3:
+if len(sys.argv) != 4:
-    print('Usage: %s <webhook-url> <branch>' % sys.argv[0])
+    print('Invalid number of arguments\nUsage: %s <webhook-url> <branch> <dev|trunk|openlp>' % sys.argv[0])
 else:
     webhook_url = sys.argv[1]
     branch = sys.argv[2]
-    hook(webhook_url, get_yml(branch))
+    build_type = sys.argv[3]
+    if build_type not in ['dev', 'trunk', 'openlp']:
+        print('Invalid build type\nUsage: %s <webhook-url> <branch> <dev|trunk|openlp>' % sys.argv[0])
+        exit()
+    hook(webhook_url, get_yml(branch, build_type))
     # Wait 5 seconds to make sure the hook has been triggered
     time.sleep(5)
-    get_appveyor_build_url(branch)
+    get_appveyor_build_url(build_type)

scripts/appveyor.yml

@@ -19,14 +19,14 @@ install:
   - "%PYTHON%\\python.exe -m pip install https://get.openlp.org/win-sdk/lxml-3.6.4-cp34-cp34m-win32.whl"
   - "%PYTHON%\\python.exe -m pip install https://get.openlp.org/win-sdk/PyICU-1.9.5-cp34-cp34m-win32.whl"
   # Download and install PyQt5
-  - curl -L -O http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-5.5.1/PyQt5-5.5.1-gpl-Py3.4-Qt5.5.1-x32.exe
+  - appveyor DownloadFile http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-5.5.1/PyQt5-5.5.1-gpl-Py3.4-Qt5.5.1-x32.exe
   - PyQt5-5.5.1-gpl-Py3.4-Qt5.5.1-x32.exe /S
   # Download and unpack mupdf
-  - curl -O http://mupdf.com/downloads/archive/mupdf-1.9a-windows.zip
+  - appveyor DownloadFile http://mupdf.com/downloads/archive/mupdf-1.9a-windows.zip
   - 7z x mupdf-1.9a-windows.zip
   - cp mupdf-1.9a-windows/mupdf.exe openlp-branch/mupdf.exe
   # Download and unpack mediainfo
-  - curl -O https://mediaarea.net/download/binary/mediainfo/0.7.90/MediaInfo_CLI_0.7.90_Windows_i386.zip
+  - appveyor DownloadFile https://mediaarea.net/download/binary/mediainfo/0.7.90/MediaInfo_CLI_0.7.90_Windows_i386.zip
   - mkdir MediaInfo
   - 7z x -oMediaInfo MediaInfo_CLI_0.7.90_Windows_i386.zip
   - cp MediaInfo\\MediaInfo.exe openlp-branch\\MediaInfo.exe
@@ -43,15 +43,15 @@ test_script:
 after_test:
   # This is where we create a package using PyInstaller
   # First get PyInstaller
-  - curl -L -O https://github.com/pyinstaller/pyinstaller/releases/download/v3.2/PyInstaller-3.2.zip
+  - appveyor DownloadFile  https://github.com/pyinstaller/pyinstaller/releases/download/v3.2/PyInstaller-3.2.zip
   - 7z x PyInstaller-3.2.zip
   # Install PyInstaller dependencies
   - "%PYTHON%\\python.exe -m pip install future pefile"
   # Download and install Inno Setup - used for packaging
-  - curl -L -O http://www.jrsoftware.org/download.php/is-unicode.exe
+  - appveyor DownloadFile http://www.jrsoftware.org/download.php/is-unicode.exe
   - is-unicode.exe /VERYSILENT /SUPPRESSMSGBOXES /SP-
   # Download and unpack portable-bundle
-  - curl -O https://get.openlp.org/win-sdk/portable-setup.7z
+  - appveyor DownloadFile https://get.openlp.org/win-sdk/portable-setup.7z
   - 7z x portable-setup.7z
   # Disabled portable installers - can't figure out how to make them silent
   # - curl -L -O http://downloads.sourceforge.net/project/portableapps/PortableApps.com%20Installer/PortableApps.comInstaller_3.4.4.paf.exe
@@ -61,7 +61,7 @@ after_test:
   # - curl -L -O http://downloads.sourceforge.net/project/portableapps/NSIS%20Portable/NSISPortable_3.0_English.paf.exe
   # - NSISPortable_3.0_English.paf.exe /S
   # Get the packaging code
-  - curl -L http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -o packaging.tar.gz
+  - appveyor DownloadFile http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -FileName packaging.tar.gz
   - 7z e packaging.tar.gz
   - 7z x packaging.tar
   - mv ~openlp-core/openlp/packaging packaging
@@ -74,7 +74,7 @@ after_test:
         7z x documentation.tar
         mv ~openlp-core/openlp/documentation documentation
         cd packaging
-        &"$env:PYTHON\python.exe" builders/windows-builder.py --skip-update --skip-translations -c windows/config-appveyor.ini -b ../openlp-branch -d ../documentation --portable
+        &"$env:PYTHON\python.exe" builders/windows-builder.py --skip-update -c windows/config-appveyor.ini -b ../openlp-branch -d ../documentation --portable
       } else {
         cd packaging
         &"$env:PYTHON\python.exe" builders/windows-builder.py --skip-update --skip-translations -c windows/config-appveyor.ini -b ../openlp-branch --portable

scripts/jenkins_script.py

@@ -59,14 +59,13 @@ class OpenLPJobs(object):
     Branch_Pull = 'Branch-01-Pull'
     Branch_Functional = 'Branch-02-Functional-Tests'
     Branch_Interface = 'Branch-03-Interface-Tests'
-    Branch_Windows_Functional = 'Branch-04a-Windows_Functional_Tests'
+    Branch_PEP = 'Branch-04a-Code_Analysis'
-    Branch_Windows_Interface = 'Branch-04b-Windows_Interface_Tests'
+    Branch_Coverage = 'Branch-04b-Test_Coverage'
-    Branch_PEP = 'Branch-05a-Code_Analysis'
+    Branch_Pylint = 'Branch-04c-Code_Analysis2'
-    Branch_Coverage = 'Branch-05b-Test_Coverage'
+    Branch_AppVeyor = 'Branch-05-AppVeyor-Tests'
-    Branch_Pylint = 'Branch-05c-Code_Analysis2'
 
-    Jobs = [Branch_Pull, Branch_Functional, Branch_Interface, Branch_Windows_Functional, Branch_Windows_Interface,
+    Jobs = [Branch_Pull, Branch_Functional, Branch_Interface, Branch_PEP, Branch_Coverage, Branch_Pylint,
-            Branch_PEP, Branch_Coverage, Branch_Pylint]
+            Branch_AppVeyor]
 
 
 class Colour(object):

tests/functional/__init__.py

@@ -25,13 +25,8 @@ Base directory for tests
 import sys
 from PyQt5 import QtWidgets
 
-if sys.version_info[1] >= 3:
-    from unittest.mock import ANY, MagicMock, patch, mock_open, call, PropertyMock
-else:
-    from mock import ANY, MagicMock, patch, mock_open, call, PropertyMock
-
 # Only one QApplication can be created. Use QtWidgets.QApplication.instance() when you need to "create" a  QApplication.
 application = QtWidgets.QApplication([])
 application.setApplicationName('OpenLP')
 
-__all__ = ['ANY', 'MagicMock', 'patch', 'mock_open', 'call', 'application', 'PropertyMock']
+__all__ = ['application']

tests/functional/openlp_core_common/test_actions.py

@@ -23,12 +23,13 @@
 Package to test the openlp.core.common.actions package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock
 
 from PyQt5 import QtGui, QtCore, QtWidgets
 
 from openlp.core.common import Settings
 from openlp.core.common.actions import CategoryActionList, ActionList
-from tests.functional import MagicMock
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_common/test_applocation.py

@@ -25,9 +25,9 @@ Functional tests to test the AppLocation class and related methods.
 import copy
 import os
 from unittest import TestCase
+from unittest.mock import patch
 
 from openlp.core.common import AppLocation, get_frozen_path
-from tests.functional import patch
 
 FILE_LIST = ['file1', 'file2', 'file3.txt', 'file4.txt', 'file5.mp3', 'file6.mp3']
 

tests/functional/openlp_core_common/test_common.py

@@ -22,12 +22,11 @@
 """
 Functional tests to test the AppLocation class and related methods.
 """
-
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.common import check_directory_exists, de_hump, trace_error_handler, translate, is_win, is_macosx, \
     is_linux, clean_button_text
-from tests.functional import MagicMock, patch
 
 
 class TestCommonFunctions(TestCase):

tests/functional/openlp_core_common/test_httputils.py

@@ -26,10 +26,10 @@ import os
 import tempfile
 import socket
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.common.httputils import get_user_agent, get_web_page, get_url_file_size, url_get_file
 
-from tests.functional import MagicMock, patch
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_common/test_init.py

@@ -25,10 +25,11 @@ Functional tests to test the AppLocation class and related methods.
 import os
 from io import BytesIO
 from unittest import TestCase
+from unittest.mock import MagicMock, PropertyMock, call, patch
 
 from openlp.core.common import add_actions, clean_filename, delete_file, get_file_encoding, get_filesystem_encoding,  \
     get_uno_command, get_uno_instance, split_filename
-from tests.functional import MagicMock, PropertyMock, call, patch
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_common/test_languagemanager.py

@@ -23,8 +23,8 @@
 Functional tests to test the AppLocation class and related methods.
 """
 from unittest import TestCase
+from unittest.mock import patch
 
-from tests.functional import patch
 from openlp.core.common.languagemanager import get_locale_key, get_natural_key
 
 

tests/functional/openlp_core_common/test_registry.py

@@ -24,9 +24,9 @@ Package to test the openlp.core.lib package.
 """
 import os
 from unittest import TestCase
+from unittest.mock import MagicMock
 
 from openlp.core.common import Registry
-from tests.functional import MagicMock
 
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '../', '..', 'resources'))
 

tests/functional/openlp_core_common/test_registryproperties.py

@@ -23,11 +23,10 @@
 Test the registry properties
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.common import Registry, RegistryProperties
 
-from tests.functional import MagicMock, patch
-
 
 class TestRegistryProperties(TestCase, RegistryProperties):
     """

tests/functional/openlp_core_common/test_settings.py

@@ -23,10 +23,11 @@
 Package to test the openlp.core.lib.settings package.
 """
 from unittest import TestCase
+from unittest.mock import patch
 
 from openlp.core.common import Settings
 from openlp.core.common.settings import recent_files_conv
-from tests.functional import patch
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_common/test_versionchecker.py

@@ -23,10 +23,11 @@
 Package to test the openlp.core.common.versionchecker package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.common.settings import Settings
 from openlp.core.common.versionchecker import VersionThread
-from tests.functional import MagicMock, patch
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_lib/test_db.py

@@ -24,13 +24,13 @@ Package to test the openlp.core.lib package.
 """
 import os
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 
 from sqlalchemy.pool import NullPool
 from sqlalchemy.orm.scoping import ScopedSession
 from sqlalchemy import MetaData
 
 from openlp.core.lib.db import init_db, get_upgrade_op, delete_database
-from tests.functional import patch, MagicMock
 
 
 class TestDB(TestCase):

tests/functional/openlp_core_lib/test_file_dialog.py

@@ -1,11 +1,31 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
 """
 Package to test the openlp.core.lib.filedialog package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, call, patch
 
-from openlp.core.common import UiStrings
 from openlp.core.lib.filedialog import FileDialog
-from tests.functional import MagicMock, call, patch
 
 
 class TestFileDialog(TestCase):

tests/functional/openlp_core_lib/test_formattingtags.py

@@ -24,10 +24,9 @@ Package to test the openlp.core.lib.formattingtags package.
 """
 import copy
 from unittest import TestCase
+from unittest.mock import patch
 
 from openlp.core.lib import FormattingTags
-from tests.functional import patch
-
 
 TAG = {
     'end tag': '{/aa}',

tests/functional/openlp_core_lib/test_htmlbuilder.py

@@ -1,8 +1,8 @@
 """
 Package to test the openlp.core.lib.htmlbuilder module.
 """
-
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtCore, QtWebKit
 
@@ -10,7 +10,7 @@ from openlp.core.common import Settings
 from openlp.core.lib.htmlbuilder import build_html, build_background_css, build_lyrics_css, build_lyrics_outline_css, \
     build_lyrics_format_css, build_footer_css, webkit_version, build_chords_css
 from openlp.core.lib.theme import HorizontalType, VerticalType
-from tests.functional import MagicMock, patch
+
 from tests.helpers.testmixin import TestMixin
 
 HTML = """

tests/functional/openlp_core_lib/test_image_manager.py

@@ -25,14 +25,15 @@ Package to test the openlp.core.ui package.
 import os
 import time
 from threading import Lock
-
 from unittest import TestCase
+from unittest.mock import patch
+
 from PyQt5 import QtGui
 
 from openlp.core.common import Registry
 from openlp.core.lib import ImageManager, ScreenList
 from openlp.core.lib.imagemanager import Priority
-from tests.functional import patch
+
 from tests.helpers.testmixin import TestMixin
 
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'resources'))

tests/functional/openlp_core_lib/test_lib.py

@@ -23,9 +23,9 @@
 Package to test the openlp.core.lib package.
 """
 import os
-
-from unittest import TestCase
 from datetime import datetime, timedelta
+from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtCore, QtGui
 
@@ -33,7 +33,6 @@ from openlp.core.lib import FormattingTags, expand_chords_for_printing
 from openlp.core.lib import build_icon, check_item_selected, clean_tags, create_thumb, create_separated_list, \
     expand_tags, get_text_file_string, image_to_byte, resize_image, str_to_bool, validate_thumb, expand_chords, \
     compare_chord_lyric, find_formatting_tags
-from tests.functional import MagicMock, patch
 
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'resources'))
 

tests/functional/openlp_core_lib/test_mediamanageritem.py

@@ -23,10 +23,10 @@
 Package to test the openlp.core.lib.mediamanageritem package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.lib import MediaManagerItem
 
-from tests.functional import MagicMock, patch
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_lib/test_pluginmanager.py

@@ -23,11 +23,11 @@
 Package to test the openlp.core.lib.pluginmanager package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock
 
 from openlp.core.common import Registry, Settings
 from openlp.core.lib.pluginmanager import PluginManager
 from openlp.core.lib import PluginStatus
-from tests.functional import MagicMock
 
 
 class TestPluginManager(TestCase):

tests/functional/openlp_core_lib/test_projector_pjlink1.py

@@ -22,14 +22,12 @@
 """
 Package to test the openlp.core.lib.projector.pjlink1 package.
 """
-
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 
 from openlp.core.lib.projector.pjlink1 import PJLink1
-from openlp.core.lib.projector.constants import E_PARAMETER, ERROR_STRING, S_OFF, S_STANDBY, S_WARMUP, S_ON, \
+from openlp.core.lib.projector.constants import E_PARAMETER, ERROR_STRING, S_OFF, S_STANDBY, S_ON, PJLINK_POWR_STATUS
-    S_COOLDOWN, PJLINK_POWR_STATUS
 
-from tests.functional import patch, MagicMock
 from tests.resources.projector.data import TEST_PIN, TEST_SALT, TEST_CONNECT_AUTHENTICATE, TEST_HASH
 
 pjlink_test = PJLink1(name='test', ip='127.0.0.1', pin=TEST_PIN, no_poll=True)

tests/functional/openlp_core_lib/test_projectordb.py

@@ -27,11 +27,11 @@ PREREQUISITE: add_record() and get_all() functions validated.
 """
 import os
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.lib.projector.db import Manufacturer, Model, Projector, ProjectorDB, ProjectorSource, Source
 from openlp.core.lib.projector.constants import PJLINK_PORT
 
-from tests.functional import MagicMock, patch
 from tests.resources.projector.data import TEST_DB, TEST1_DATA, TEST2_DATA, TEST3_DATA
 
 

tests/functional/openlp_core_lib/test_renderer.py

@@ -23,6 +23,7 @@
 Package to test the openlp.core.ui.renderer package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtCore
 
@@ -31,7 +32,6 @@ from openlp.core.lib import Renderer, ScreenList, ServiceItem, FormattingTags
 from openlp.core.lib.renderer import words_split, get_start_tags
 from openlp.core.lib.theme import ThemeXML
 
-from tests.functional import MagicMock, patch
 
 SCREEN = {
     'primary': False,

tests/functional/openlp_core_lib/test_screen.py

@@ -23,12 +23,12 @@
 Package to test the openlp.core.lib.screenlist package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock
 
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common import Registry
 from openlp.core.lib import ScreenList
-from tests.functional import MagicMock
 
 SCREEN = {
     'primary': False,

tests/functional/openlp_core_lib/test_serviceitem.py

@@ -24,13 +24,13 @@ Package to test the openlp.core.lib package.
 """
 import os
 from unittest import TestCase
-
+from unittest.mock import MagicMock, patch
-from tests.functional import MagicMock, patch
-from tests.utils import assert_length, convert_file_service_item
 
 from openlp.core.common import Registry, md5_hash
 from openlp.core.lib import ItemCapabilities, ServiceItem, ServiceItemType, FormattingTags
 
+from tests.utils import assert_length, convert_file_service_item
+
 VERSE = 'The Lord said to {r}Noah{/r}: \n'\
         'There\'s gonna be a {su}floody{/su}, {sb}floody{/sb}\n'\
         'The Lord said to {g}Noah{/g}:\n'\

tests/functional/openlp_core_lib/test_ui.py

@@ -22,14 +22,15 @@
 """
 Package to test the openlp.core.lib.ui package.
 """
-from PyQt5 import QtCore, QtGui, QtWidgets
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+from PyQt5 import QtCore, QtGui, QtWidgets
 
 from openlp.core.common import UiStrings, translate
 from openlp.core.lib.ui import add_welcome_page, create_button_box, create_horizontal_adjusting_combo_box, \
     create_button, create_action, create_valign_selection_widgets, find_and_set_in_combo_box, create_widget_action, \
     set_case_insensitive_completer
-from tests.functional import MagicMock, patch
 
 
 class TestUi(TestCase):

tests/functional/openlp_core_ui/test_aboutform.py

@@ -24,10 +24,10 @@ Package to test the openlp.core.ui.firsttimeform package.
 """
 import datetime
 from unittest import TestCase
+from unittest.mock import patch
 
 from openlp.core.ui.aboutform import AboutForm
 
-from tests.functional import patch
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_ui/test_exceptionform.py

@@ -26,15 +26,13 @@ Package to test the openlp.core.ui.exeptionform package.
 import os
 import tempfile
 from unittest import TestCase
-from unittest.mock import mock_open
+from unittest.mock import mock_open, patch
 
 from openlp.core.common import Registry
-
-from tests.functional import patch
-from tests.helpers.testmixin import TestMixin
-
 from openlp.core.ui import exceptionform
 
+from tests.helpers.testmixin import TestMixin
+
 exceptionform.WEBKIT_VERSION = 'Webkit Test'
 exceptionform.MIGRATE_VERSION = 'Migrate Test'
 exceptionform.CHARDET_VERSION = 'CHARDET Test'

tests/functional/openlp_core_ui/test_first_time.py

@@ -22,17 +22,16 @@
 """
 Package to test the openlp.core.utils.__init__ package.
 """
-
-from unittest import TestCase
 import urllib.request
 import urllib.error
 import urllib.parse
-
+from unittest import TestCase
-from tests.functional import patch
+from unittest.mock import patch
-from tests.helpers.testmixin import TestMixin
 
 from openlp.core.common.httputils import CONNECTION_RETRIES, get_web_page
 
+from tests.helpers.testmixin import TestMixin
+
 
 class TestFirstTimeWizard(TestMixin, TestCase):
     """

tests/functional/openlp_core_ui/test_firsttimeform.py

@@ -26,11 +26,11 @@ import os
 import tempfile
 import urllib
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.common import Registry
 from openlp.core.ui.firsttimeform import FirstTimeForm
 
-from tests.functional import MagicMock, patch
 from tests.helpers.testmixin import TestMixin
 
 FAKE_CONFIG = b"""

tests/functional/openlp_core_ui/test_formattingtagsform.py

@@ -23,8 +23,7 @@
 Package to test the openlp.core.ui.formattingtagsform package.
 """
 from unittest import TestCase
-
+from unittest.mock import MagicMock, patch, call
-from tests.functional import MagicMock, patch, call
 
 from openlp.core.ui.formattingtagform import FormattingTagForm
 

tests/functional/openlp_core_ui/test_maindisplay.py

@@ -23,6 +23,7 @@
 Package to test the openlp.core.ui.slidecontroller package.
 """
 from unittest import TestCase, skipUnless
+from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtCore
 
@@ -33,11 +34,9 @@ from openlp.core.ui.media import MediaController
 from openlp.core.ui.maindisplay import TRANSPARENT_STYLESHEET, OPAQUE_STYLESHEET
 
 from tests.helpers.testmixin import TestMixin
-from tests.functional import MagicMock, patch
 
 if is_macosx():
     from ctypes import pythonapi, c_void_p, c_char_p, py_object
-
     from sip import voidptr
     from objc import objc_object
     from AppKit import NSMainMenuWindowLevel, NSWindowCollectionBehaviorManaged

tests/functional/openlp_core_ui/test_mainwindow.py

@@ -23,8 +23,8 @@
 Package to test openlp.core.ui.mainwindow package.
 """
 import os
-
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtWidgets
 
@@ -32,7 +32,6 @@ from openlp.core.ui.mainwindow import MainWindow
 from openlp.core.lib.ui import UiStrings
 from openlp.core.common.registry import Registry
 
-from tests.functional import MagicMock, patch
 from tests.helpers.testmixin import TestMixin
 from tests.utils.constants import TEST_RESOURCES_PATH
 

tests/functional/openlp_core_ui/test_media.py

@@ -22,12 +22,13 @@
 """
 Package to test the openlp.core.ui package.
 """
-from PyQt5 import QtCore
 from unittest import TestCase
+from unittest.mock import patch
+
+from PyQt5 import QtCore
 
 from openlp.core.ui.media import get_media_players, parse_optical_path
 
-from tests.functional import MagicMock, patch
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_ui/test_servicemanager.py

@@ -24,15 +24,14 @@ Package to test the openlp.core.ui.slidecontroller package.
 """
 import os
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 import PyQt5
 
 from openlp.core.common import Registry, ThemeLevel
-from openlp.core.ui.lib.toolbar import OpenLPToolbar
 from openlp.core.lib import ServiceItem, ServiceItemType, ItemCapabilities
 from openlp.core.ui import ServiceManager
-
+from openlp.core.ui.lib.toolbar import OpenLPToolbar
-from tests.functional import MagicMock, patch
 
 
 class TestServiceManager(TestCase):

tests/functional/openlp_core_ui/test_settingsform.py

@@ -22,14 +22,14 @@
 """
 Package to test the openlp.core.ui.settingsform package.
 """
-from PyQt5 import QtWidgets
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+from PyQt5 import QtWidgets
 
 from openlp.core.common import Registry
 from openlp.core.ui.settingsform import SettingsForm
 
-from tests.functional import MagicMock, patch
-
 
 class TestSettingsForm(TestCase):
 

tests/functional/openlp_core_ui/test_shortcutlistdialog.py

@@ -22,12 +22,12 @@
 """
 Package to test the openlp.core.ui.shortcutlistdialog package.
 """
-from PyQt5 import QtCore, QtGui, QtWidgets
+from unittest.mock import MagicMock
+
+from PyQt5 import QtCore
 
 from openlp.core.ui.shortcutlistdialog import CaptureShortcutButton, ShortcutTreeWidget
 
-from tests.interfaces import MagicMock, patch
-
 
 def test_key_press_event():
     """

tests/functional/openlp_core_ui/test_slidecontroller.py

@@ -22,16 +22,16 @@
 """
 Package to test the openlp.core.ui.slidecontroller package.
 """
+from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
 from PyQt5 import QtCore, QtGui
 
-from unittest import TestCase
 from openlp.core import Registry
 from openlp.core.lib import ImageSource, ServiceItemAction
 from openlp.core.ui import SlideController, LiveController, PreviewController
 from openlp.core.ui.slidecontroller import InfoLabel, WIDE_MENU, NON_TEXT_MENU
 
-from tests.functional import MagicMock, patch
-
 
 class TestSlideController(TestCase):
 

tests/functional/openlp_core_ui/test_themeform.py

@@ -22,13 +22,11 @@
 """
 Package to test the openlp.core.ui.themeform package.
 """
-
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.ui import ThemeForm
 
-from tests.functional import MagicMock, patch
-
 
 class TestThemeManager(TestCase):
     """

tests/functional/openlp_core_ui/test_thememanager.py

@@ -24,18 +24,16 @@ Package to test the openlp.core.ui.thememanager package.
 """
 import os
 import shutil
-
-from unittest import TestCase
 from tempfile import mkdtemp
+from unittest import TestCase
+from unittest.mock import ANY, MagicMock, patch
 
 from PyQt5 import QtWidgets
-from tempfile import mkdtemp
 
 from openlp.core.ui import ThemeManager
 from openlp.core.common import Registry
 
 from tests.utils.constants import TEST_RESOURCES_PATH
-from tests.functional import ANY, MagicMock, patch
 
 
 class TestThemeManager(TestCase):

tests/functional/openlp_core_ui/test_themetab.py

@@ -23,13 +23,13 @@
 Package to test the openlp.core.ui.ThemeTab package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock
 
 from openlp.core.common import Registry
 from openlp.core.ui.themestab import ThemesTab
 from openlp.core.ui.settingsform import SettingsForm
 
 from tests.helpers.testmixin import TestMixin
-from tests.functional import MagicMock
 
 
 class TestThemeTab(TestCase, TestMixin):

tests/functional/openlp_core_ui_lib/test_color_button.py

@@ -23,9 +23,9 @@
 This module contains tests for the openlp.core.lib.filedialog module
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, call, patch
 
 from openlp.core.ui.lib.colorbutton import ColorButton
-from tests.functional import MagicMock, call, patch
 
 
 class TestColorDialog(TestCase):

tests/functional/openlp_core_ui_lib/test_listpreviewwidget.py

@@ -23,6 +23,7 @@
 Package to test the openlp.core.ui.lib.listpreviewwidget package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch, call
 
 from PyQt5 import QtGui
 
@@ -30,8 +31,6 @@ from openlp.core.common import Settings
 from openlp.core.ui.lib.listpreviewwidget import ListPreviewWidget
 from openlp.core.lib import ImageSource, ServiceItem
 
-from tests.functional import MagicMock, patch, call
-
 
 class TestListPreviewWidget(TestCase):
 

tests/functional/openlp_core_ui_media/test_mediacontroller.py

@@ -23,12 +23,12 @@
 Package to test the openlp.core.ui.media package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core.ui.media.mediacontroller import MediaController
 from openlp.core.ui.media.mediaplayer import MediaPlayer
 from openlp.core.common import Registry
 
-from tests.functional import MagicMock, patch
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_core_ui_media/test_systemplayer.py

@@ -23,6 +23,7 @@
 Package to test the openlp.core.ui.media.systemplayer package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, call, patch
 
 from PyQt5 import QtCore, QtMultimedia
 
@@ -30,8 +31,6 @@ from openlp.core.common import Registry
 from openlp.core.ui.media import MediaState
 from openlp.core.ui.media.systemplayer import SystemPlayer, CheckMediaWorker, ADDITIONAL_EXT
 
-from tests.functional import MagicMock, call, patch
-
 
 class TestSystemPlayer(TestCase):
     """

tests/functional/openlp_core_ui_media/test_vlcplayer.py

@@ -26,12 +26,12 @@ import os
 import sys
 from datetime import datetime, timedelta
 from unittest import TestCase, skip
+from unittest.mock import MagicMock, patch, call
 
 from openlp.core.common import Registry
 from openlp.core.ui.media import MediaState, MediaType
 from openlp.core.ui.media.vlcplayer import AUDIO_EXT, VIDEO_EXT, VlcPlayer, get_vlc
 
-from tests.functional import MagicMock, patch, call
 from tests.helpers import MockDateTime
 from tests.helpers.testmixin import TestMixin
 

tests/functional/openlp_core_ui_media/test_webkitplayer.py

@@ -23,7 +23,7 @@
 Package to test the openlp.core.ui.media.webkitplayer package.
 """
 from unittest import TestCase
-from tests.functional import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from openlp.core.ui.media.webkitplayer import WebkitPlayer
 

tests/functional/openlp_plugins/alerts/test_manager.py

@@ -22,12 +22,11 @@
 """
 This module contains tests for the CSV Bible importer.
 """
-
 import os
 import json
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
-from tests.functional import MagicMock, patch
 from openlp.core.common.registry import Registry
 from openlp.plugins.alerts.lib.alertsmanager import AlertsManager
 

tests/functional/openlp_plugins/bibles/test_bibleimport.py

@@ -22,18 +22,17 @@
 """
 This module contains tests for the bibleimport module.
 """
-
 from io import BytesIO
-from lxml import etree, objectify
-
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+from lxml import etree, objectify
 from PyQt5.QtWidgets import QDialog
 
 from openlp.core.common.languages import Language
 from openlp.core.lib.exceptions import ValidationError
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 from openlp.plugins.bibles.lib.db import BibleDB
-from tests.functional import MagicMock, patch
 
 
 class TestBibleImport(TestCase):

tests/functional/openlp_plugins/bibles/test_bibleserver.py

@@ -23,9 +23,10 @@
 This module contains tests for the http module of the Bibles plugin.
 """
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
+
 from bs4 import BeautifulSoup
 
-from tests.functional import patch, MagicMock
 from openlp.plugins.bibles.lib.importers.http import BSExtract
 
 # TODO: Items left to test

tests/functional/openlp_plugins/bibles/test_csvimport.py

@@ -22,14 +22,13 @@
 """
 This module contains tests for the CSV Bible importer.
 """
-
 import csv
 import json
 import os
 from collections import namedtuple
 from unittest import TestCase
+from unittest.mock import ANY, MagicMock, PropertyMock, call, patch
 
-from tests.functional import ANY, MagicMock, PropertyMock, call, patch
 from openlp.core.lib.exceptions import ValidationError
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 from openlp.plugins.bibles.lib.importers.csvbible import Book, CSVBible, Verse

tests/functional/openlp_plugins/bibles/test_lib.py

@@ -23,10 +23,11 @@
 This module contains tests for the lib submodule of the Bibles plugin.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.plugins.bibles import lib
 from openlp.plugins.bibles.lib import SearchResults, get_reference_match
-from tests.functional import MagicMock, patch
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_plugins/bibles/test_opensongimport.py

@@ -22,19 +22,19 @@
 """
 This module contains tests for the OpenSong Bible importer.
 """
-
 import json
 import os
 from unittest import TestCase
+from unittest.mock import MagicMock, patch, call
 
 from lxml import objectify
 
-from tests.functional import MagicMock, patch, call
-from tests.helpers.testmixin import TestMixin
 from openlp.core.common import Registry
 from openlp.plugins.bibles.lib.importers.opensong import OpenSongBible, get_text, parse_chapter_number
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 
+from tests.helpers.testmixin import TestMixin
+
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                          '..', '..', '..', 'resources', 'bibles'))
 

tests/functional/openlp_plugins/bibles/test_osisimport.py

@@ -22,12 +22,11 @@
 """
 This module contains tests for the OSIS Bible importer.
 """
-
 import os
 import json
 from unittest import TestCase
+from unittest.mock import MagicMock, call, patch
 
-from tests.functional import MagicMock, call, patch
 from openlp.plugins.bibles.lib.bibleimport import BibleImport
 from openlp.plugins.bibles.lib.db import BibleDB
 from openlp.plugins.bibles.lib.importers.osis import OSISBible

tests/functional/openlp_plugins/bibles/test_swordimport.py

@@ -26,13 +26,14 @@ This module contains tests for the SWORD Bible importer.
 import os
 import json
 from unittest import TestCase, skipUnless
+from unittest.mock import MagicMock, patch
 
-from tests.functional import MagicMock, patch
 try:
     from openlp.plugins.bibles.lib.importers.sword import SwordBible
     HAS_PYSWORD = True
 except ImportError:
     HAS_PYSWORD = False
+
 from openlp.plugins.bibles.lib.db import BibleDB
 
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),

tests/functional/openlp_plugins/bibles/test_wordprojectimport.py

@@ -22,15 +22,12 @@
 """
 This module contains tests for the WordProject Bible importer.
 """
-
 import os
-import json
 from unittest import TestCase
+from unittest.mock import MagicMock, patch, call
 
 from openlp.plugins.bibles.lib.importers.wordproject import WordProjectBible
-from openlp.plugins.bibles.lib.db import BibleDB
 
-from tests.functional import MagicMock, patch, call
 
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                          '..', '..', '..', 'resources', 'bibles'))

tests/functional/openlp_plugins/bibles/test_zefaniaimport.py

@@ -22,12 +22,11 @@
 """
 This module contains tests for the Zefania Bible importer.
 """
-
 import os
 import json
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
-from tests.functional import MagicMock, patch
 from openlp.plugins.bibles.lib.importers.zefania import ZefaniaBible
 from openlp.plugins.bibles.lib.db import BibleDB
 

tests/functional/openlp_plugins/custom/test_mediaitem.py

@@ -1,15 +1,36 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
 """
 This module contains tests for the lib submodule of the Songs plugin.
 """
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 
 from PyQt5 import QtCore
 
-from openlp.core.common import Registry, Settings
+from openlp.core.common import Registry
 from openlp.core.lib import ServiceItem, PluginStatus
 from openlp.plugins.custom.lib import CustomMediaItem
-from openlp.plugins.custom.lib.db import CustomSlide
+
-from tests.functional import patch, MagicMock
 from tests.helpers.testmixin import TestMixin
 
 FOOTER = ['Arky Arky (Unknown)', 'Public Domain', 'CCLI 123456']

tests/functional/openlp_plugins/images/test_imagetab.py

@@ -23,15 +23,15 @@
 This module contains tests for the lib submodule of the Images plugin.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
 from PyQt5 import QtWidgets
 
-from openlp.core.common import Settings
+from openlp.core.common import Registry, Settings
-
-from openlp.core.common import Registry
 from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups
 from openlp.plugins.images.lib.mediaitem import ImageMediaItem
 from openlp.plugins.images.lib import ImageTab
-from tests.functional import MagicMock, patch
+
 from tests.helpers.testmixin import TestMixin
 
 __default_settings__ = {

tests/functional/openlp_plugins/images/test_lib.py

@@ -23,13 +23,13 @@
 This module contains tests for the lib submodule of the Images plugin.
 """
 from unittest import TestCase
+from unittest.mock import ANY, MagicMock, patch
 
 from PyQt5 import QtCore, QtWidgets
 
 from openlp.core.common import Registry
 from openlp.plugins.images.lib.db import ImageFilenames, ImageGroups
 from openlp.plugins.images.lib.mediaitem import ImageMediaItem
-from tests.functional import ANY, MagicMock, patch
 
 
 class TestImageMediaItem(TestCase):

tests/functional/openlp_plugins/media/test_mediaitem.py

@@ -23,15 +23,13 @@
 Test the media plugin
 """
 from unittest import TestCase
-
+from unittest.mock import MagicMock, patch
-from openlp.core import Registry, Settings
-from openlp.plugins.media.mediaplugin import MediaPlugin
-from openlp.plugins.media.lib.mediaitem import MediaMediaItem
-from openlp.core.ui.media.mediacontroller import MediaController
 
 from PyQt5 import QtCore
 
-from tests.functional import MagicMock, patch
+from openlp.core import Settings
+from openlp.plugins.media.lib.mediaitem import MediaMediaItem
+
 from tests.helpers.testmixin import TestMixin
 
 __default_settings__ = {

tests/functional/openlp_plugins/media/test_mediaplugin.py

@@ -23,11 +23,11 @@
 Test the media plugin
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from openlp.core import Registry
 from openlp.plugins.media.mediaplugin import MediaPlugin, process_check_binary
 
-from tests.functional import MagicMock, patch
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_plugins/presentations/test_impresscontroller.py

@@ -23,19 +23,19 @@
 Functional tests to test the Impress class and related methods.
 """
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 import os
 import shutil
 from tempfile import mkdtemp
 
-from tests.functional import patch, MagicMock
-from tests.utils.constants import TEST_RESOURCES_PATH
-from tests.helpers.testmixin import TestMixin
-
 from openlp.core.common import Settings
 from openlp.plugins.presentations.lib.impresscontroller import \
     ImpressController, ImpressDocument, TextType
 from openlp.plugins.presentations.presentationplugin import __default_settings__
 
+from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.helpers.testmixin import TestMixin
+
 
 class TestImpressController(TestCase, TestMixin):
     """

tests/functional/openlp_plugins/presentations/test_mediaitem.py

@@ -23,10 +23,11 @@
 This module contains tests for the lib submodule of the Presentations plugin.
 """
 from unittest import TestCase
+from unittest.mock import patch, MagicMock, call
 
 from openlp.core.common import Registry
 from openlp.plugins.presentations.lib.mediaitem import PresentationMediaItem
-from tests.functional import patch, MagicMock, call
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_plugins/presentations/test_messagelistener.py

@@ -23,11 +23,12 @@
 This module contains tests for the lib submodule of the Presentations plugin.
 """
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 
 from openlp.core.common import Registry
 from openlp.plugins.presentations.lib.mediaitem import MessageListener, PresentationMediaItem
 from openlp.plugins.presentations.lib.messagelistener import Controller
-from tests.functional import patch, MagicMock
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_plugins/presentations/test_pdfcontroller.py

@@ -24,14 +24,16 @@ This module contains tests for the PdfController
 """
 import os
 import shutil
-from unittest import TestCase, SkipTest
 from tempfile import mkdtemp
+from unittest import TestCase, SkipTest
+from unittest.mock import MagicMock, patch
+
 from PyQt5 import QtCore, QtGui
 
 from openlp.plugins.presentations.lib.pdfcontroller import PdfController, PdfDocument
-from tests.functional import MagicMock, patch
 from openlp.core.common import Settings
 from openlp.core.lib import ScreenList
+
 from tests.utils.constants import TEST_RESOURCES_PATH
 from tests.helpers.testmixin import TestMixin
 

tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py

@@ -25,16 +25,16 @@ Functional tests to test the PowerPointController class and related methods.
 import os
 import shutil
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 from tempfile import mkdtemp
 
-from tests.functional import patch, MagicMock
-from tests.helpers.testmixin import TestMixin
-from tests.utils.constants import TEST_RESOURCES_PATH
-
 from openlp.plugins.presentations.lib.powerpointcontroller import PowerpointController, PowerpointDocument,\
     _get_text_from_shapes
 from openlp.core.common import is_win, Settings
 
+from tests.helpers.testmixin import TestMixin
+from tests.utils.constants import TEST_RESOURCES_PATH
+
 if is_win():
     import pywintypes
 

tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py

@@ -24,17 +24,16 @@ This module contains tests for the pptviewcontroller module of the Presentations
 """
 import os
 import shutil
-
 from tempfile import mkdtemp
 from unittest import TestCase
-
+from unittest.mock import MagicMock, patch
-from tests.functional import MagicMock, patch
-from tests.helpers.testmixin import TestMixin
-from tests.utils.constants import TEST_RESOURCES_PATH
 
 from openlp.plugins.presentations.lib.pptviewcontroller import PptviewDocument, PptviewController
 from openlp.core.common import is_win
 
+from tests.helpers.testmixin import TestMixin
+from tests.utils.constants import TEST_RESOURCES_PATH
+
 if is_win():
     from ctypes import cdll
 

tests/functional/openlp_plugins/presentations/test_presentationcontroller.py

@@ -23,10 +23,11 @@
 Functional tests to test the PresentationController and PresentationDocument
 classes and related methods.
 """
-from unittest import TestCase
 import os
+from unittest import TestCase
+from unittest.mock import MagicMock, mock_open, patch
+
 from openlp.plugins.presentations.lib.presentationcontroller import PresentationController, PresentationDocument
-from tests.functional import MagicMock, mock_open, patch
 
 FOLDER_TO_PATCH = 'openlp.plugins.presentations.lib.presentationcontroller.PresentationDocument.get_thumbnail_folder'
 

tests/functional/openlp_plugins/remotes/test_remotetab.py

@@ -25,13 +25,13 @@ This module contains tests for the lib submodule of the Remotes plugin.
 import os
 import re
 from unittest import TestCase
+from unittest.mock import patch
 
 from PyQt5 import QtWidgets
 
-
 from openlp.core.common import Settings
 from openlp.plugins.remotes.lib.remotetab import RemoteTab
-from tests.functional import patch
+
 from tests.helpers.testmixin import TestMixin
 
 __default_settings__ = {

tests/functional/openlp_plugins/songs/test_chordproimport.py

@@ -25,7 +25,7 @@ This module contains tests for the OpenSong song importer.
 import os
 
 from tests.helpers.songfileimport import SongImportTestHelper
-from tests.functional import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 TEST_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'chordprosongs'))

tests/functional/openlp_plugins/songs/test_editsongform.py

@@ -23,6 +23,7 @@
 This module contains tests for the lib submodule of the Songs plugin.
 """
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 
 from PyQt5 import QtCore
 
@@ -30,7 +31,7 @@ from openlp.core.common import Registry, Settings
 from openlp.core.lib import ServiceItem
 from openlp.plugins.songs.forms.editsongform import EditSongForm
 from openlp.plugins.songs.lib.db import AuthorType
-from tests.functional import patch, MagicMock
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_plugins/songs/test_editverseform.py

@@ -23,14 +23,12 @@
 This module contains tests for the editverseform of the Songs plugin.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock
 
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore
 
-from openlp.core.common import Registry, Settings
-from openlp.core.lib import ServiceItem
 from openlp.plugins.songs.forms.editverseform import EditVerseForm
-from openlp.plugins.songs.lib.db import AuthorType
+
-from tests.functional import patch, MagicMock
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_plugins/songs/test_ewimport.py

@@ -22,11 +22,9 @@
 """
 This module contains tests for the EasyWorship song importer.
 """
-
 import os
 from unittest import TestCase
-
+from unittest.mock import MagicMock, patch
-from tests.functional import MagicMock, patch
 
 from openlp.core.common import Registry
 from openlp.plugins.songs.lib.importers.easyworship import EasyWorshipSongImport, FieldDescEntry, FieldType

tests/functional/openlp_plugins/songs/test_foilpresenterimport.py

@@ -22,10 +22,9 @@
 """
 This module contains tests for the SongShow Plus song importer.
 """
-
 import os
 from unittest import TestCase
-from tests.functional import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 from openlp.plugins.songs.lib.importers.foilpresenter import FoilPresenter
 

tests/functional/openlp_plugins/songs/test_lib.py

@@ -23,10 +23,10 @@
 This module contains tests for the lib submodule of the Songs plugin.
 """
 from unittest import TestCase
+from unittest.mock import patch, MagicMock, PropertyMock
 
 from openlp.plugins.songs.lib import VerseType, clean_string, clean_title, strip_rtf, transpose_chord, transpose_lyrics
 from openlp.plugins.songs.lib.songcompare import songs_probably_equal, _remove_typos, _op_length
-from tests.functional import patch, MagicMock, PropertyMock
 
 
 class TestLib(TestCase):

tests/functional/openlp_plugins/songs/test_lyriximport.py

@@ -21,14 +21,10 @@
 """
 This module contains tests for the LyriX song importer.
 """
-
 import os
-from unittest import TestCase
+from unittest.mock import patch
 
 from tests.helpers.songfileimport import SongImportTestHelper
-from openlp.plugins.songs.lib.importers.opensong import OpenSongImport
-from openlp.core.common import Registry
-from tests.functional import patch, MagicMock
 
 TEST_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'lyrixsongs'))

tests/functional/openlp_plugins/songs/test_mediaitem.py

@@ -23,15 +23,15 @@
 This module contains tests for the lib submodule of the Songs plugin.
 """
 from unittest import TestCase
-from unittest.mock import call
+from unittest.mock import MagicMock, patch, call
 
 from PyQt5 import QtCore
 
 from openlp.core.common import Registry, Settings
 from openlp.core.lib import ServiceItem
-from openlp.plugins.songs.lib.mediaitem import SongMediaItem
 from openlp.plugins.songs.lib.db import AuthorType, Song
-from tests.functional import patch, MagicMock
+from openlp.plugins.songs.lib.mediaitem import SongMediaItem
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_plugins/songs/test_mediashout.py

@@ -22,8 +22,9 @@
 """
 Test the MediaShout importer
 """
-from unittest import TestCase, skipUnless
 from collections import namedtuple
+from unittest import TestCase, skipUnless
+from unittest.mock import MagicMock, patch, call
 
 from openlp.core.common import Registry
 try:
@@ -32,8 +33,6 @@ try:
 except ImportError:
     CAN_RUN_TESTS = False
 
-from tests.functional import MagicMock, patch, call
-
 
 @skipUnless(CAN_RUN_TESTS, 'Not Windows, skipping test')
 class TestMediaShoutImport(TestCase):

tests/functional/openlp_plugins/songs/test_openlpimporter.py

@@ -23,10 +23,10 @@
 This module contains tests for the OpenLP song importer.
 """
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 
-from openlp.plugins.songs.lib.importers.openlp import OpenLPSongImport
 from openlp.core.common import Registry
-from tests.functional import patch, MagicMock
+from openlp.plugins.songs.lib.importers.openlp import OpenLPSongImport
 
 
 class TestOpenLPImport(TestCase):

tests/functional/openlp_plugins/songs/test_openlyricsexport.py

@@ -22,17 +22,17 @@
 """
 This module contains tests for the OpenLyrics song importer.
 """
-
 import os
 import shutil
-from unittest import TestCase
 from tempfile import mkdtemp
+from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
-from tests.functional import MagicMock, patch
-from tests.helpers.testmixin import TestMixin
 from openlp.plugins.songs.lib.openlyricsexport import OpenLyricsExport
 from openlp.core.common import Registry
 
+from tests.helpers.testmixin import TestMixin
+
 
 class TestOpenLyricsExport(TestCase, TestMixin):
     """

tests/functional/openlp_plugins/songs/test_openlyricsimport.py

@@ -22,19 +22,19 @@
 """
 This module contains tests for the OpenLyrics song importer.
 """
-
 import os
 import json
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
 from lxml import etree, objectify
 
-from tests.functional import MagicMock, patch
-from tests.helpers.testmixin import TestMixin
 from openlp.plugins.songs.lib.importers.openlyrics import OpenLyricsImport
 from openlp.plugins.songs.lib.importers.songimport import SongImport
 from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics
 from openlp.core.common import Registry, Settings
 
+from tests.helpers.testmixin import TestMixin
 
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                          '..', '..', '..', 'resources', 'openlyricssongs'))

tests/functional/openlp_plugins/songs/test_openoffice.py

@@ -23,6 +23,7 @@
 This module contains tests for the OpenOffice/LibreOffice importer.
 """
 from unittest import TestCase, SkipTest
+from unittest.mock import MagicMock, patch
 
 from openlp.core.common import Registry
 try:
@@ -30,7 +31,6 @@ try:
 except ImportError:
     raise SkipTest('Could not import OpenOfficeImport probably due to unavailability of uno')
 
-from tests.functional import MagicMock, patch
 from tests.helpers.testmixin import TestMixin
 
 

tests/functional/openlp_plugins/songs/test_opensongimport.py

@@ -24,12 +24,12 @@ This module contains tests for the OpenSong song importer.
 """
 import os
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 
-from openlp.plugins.songs.lib.importers.opensong import OpenSongImport
 from openlp.core.common import Registry
+from openlp.plugins.songs.lib.importers.opensong import OpenSongImport
 
 from tests.helpers.songfileimport import SongImportTestHelper
-from tests.functional import patch, MagicMock
 
 TEST_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'opensongsongs'))

tests/functional/openlp_plugins/songs/test_opsproimport.py

@@ -25,6 +25,7 @@ This module contains tests for the WorshipCenter Pro song importer.
 import os
 import json
 from unittest import TestCase, skipUnless
+from unittest.mock import patch, MagicMock
 
 try:
     from openlp.core.common import Registry
@@ -33,8 +34,6 @@ try:
 except ImportError:
     CAN_RUN_TESTS = False
 
-from tests.functional import patch, MagicMock
-
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'opsprosongs'))
 
 

tests/functional/openlp_plugins/songs/test_songbeamerimport.py

@@ -22,15 +22,15 @@
 """
 This module contains tests for the Songbeamer song importer.
 """
-
 import os
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
-from tests.helpers.songfileimport import SongImportTestHelper
-from tests.functional import MagicMock, patch
 from openlp.plugins.songs.lib.importers.songbeamer import SongBeamerImport, SongBeamerTypes
 from openlp.core.common import Registry
 
+from tests.helpers.songfileimport import SongImportTestHelper
+
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                          '..', '..', '..', 'resources', 'songbeamersongs'))
 

tests/functional/openlp_plugins/songs/test_songshowplusimport.py

@@ -22,14 +22,14 @@
 """
 This module contains tests for the SongShow Plus song importer.
 """
-
 import os
 from unittest import TestCase
+from unittest.mock import patch, MagicMock
 
-from tests.helpers.songfileimport import SongImportTestHelper
 from openlp.plugins.songs.lib import VerseType
 from openlp.plugins.songs.lib.importers.songshowplus import SongShowPlusImport
-from tests.functional import patch, MagicMock
+
+from tests.helpers.songfileimport import SongImportTestHelper
 
 TEST_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'songshowplussongs'))

tests/functional/openlp_plugins/songs/test_sundayplusimport.py

@@ -19,13 +19,12 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 """
-This module contains tests for the VideoPsalm song importer.
+This module contains tests for the SundayPlus song importer.
 """
-
 import os
+from unittest.mock import patch
 
 from tests.helpers.songfileimport import SongImportTestHelper
-from tests.functional import patch
 
 TEST_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'sundayplussongs'))

tests/functional/openlp_plugins/songs/test_videopsalm.py

@@ -25,7 +25,7 @@ This module contains tests for the VideoPsalm song importer.
 import os
 
 from tests.helpers.songfileimport import SongImportTestHelper
-from tests.functional import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 TEST_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'videopsalmsongs'))

tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py

@@ -23,6 +23,7 @@
 This module contains tests for the WorshipCenter Pro song importer.
 """
 from unittest import TestCase, skipUnless
+from unittest.mock import patch, MagicMock
 
 try:
     import pyodbc
@@ -33,9 +34,6 @@ except ImportError:
     CAN_RUN_TESTS = False
 
 
-from tests.functional import patch, MagicMock
-
-
 class TestRecord(object):
     """
     Microsoft Access Driver is not available on non Microsoft Systems for this reason the :class:`TestRecord` is used

tests/functional/openlp_plugins/songs/test_zionworximport.py

@@ -23,15 +23,15 @@
 This module contains tests for the ZionWorx song importer.
 """
 import os
-
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
-from tests.functional import MagicMock, patch
-from tests.helpers.songfileimport import SongImportTestHelper
 from openlp.plugins.songs.lib.importers.zionworx import ZionWorxImport
 from openlp.plugins.songs.lib.importers.songimport import SongImport
 from openlp.core.common import Registry
 
+from tests.helpers.songfileimport import SongImportTestHelper
+
 TEST_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'zionworxsongs'))
 

tests/functional/test_init.py

@@ -24,6 +24,7 @@ Package to test the openlp.core.__init__ package.
 """
 import os
 from unittest import TestCase
+from unittest.mock import MagicMock, patch, call
 
 from PyQt5 import QtCore, QtWidgets
 
@@ -31,7 +32,6 @@ from openlp.core import OpenLP, parse_options
 from openlp.core.common import Settings
 
 from tests.helpers.testmixin import TestMixin
-from tests.functional import MagicMock, patch, call
 
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'resources'))
 

tests/helpers/songfileimport.py

@@ -26,11 +26,10 @@ song files from third party applications.
 import json
 import logging
 from unittest import TestCase
+from unittest.mock import MagicMock, patch, call
 
-from openlp.plugins.songs.lib.importers.opensong import OpenSongImport
 from openlp.core.common import Registry
-
+from openlp.plugins.songs.lib.importers.opensong import OpenSongImport
-from tests.functional import patch, MagicMock, call
 
 log = logging.getLogger(__name__)
 

tests/interfaces/__init__.py

@@ -19,9 +19,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
-import sys
+"""
-
+Interface tests
-if sys.version_info[1] >= 3:
+"""
-    from unittest.mock import patch, MagicMock
-else:
-    from mock import patch, MagicMock

tests/interfaces/openlp_core_lib/test_pluginmanager.py

@@ -27,12 +27,13 @@ import shutil
 import gc
 from tempfile import mkdtemp
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtWidgets
 
 from openlp.core.common import Registry, Settings
 from openlp.core.lib.pluginmanager import PluginManager
-from tests.interfaces import MagicMock, patch
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/interfaces/openlp_core_ui/test_filerenamedialog.py

@@ -23,12 +23,13 @@
     Package to test the openlp.core.ui package.
 """
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtTest, QtWidgets
 
 from openlp.core.common import Registry
 from openlp.core.ui import filerenameform
-from tests.interfaces import MagicMock, patch
+
 from tests.helpers.testmixin import TestMixin
 
 

tests/interfaces/openlp_core_ui/test_mainwindow.py

@@ -23,11 +23,11 @@
 Package to test the openlp.core.ui.mainwindow package.
 """
 from unittest import TestCase
-
+from unittest.mock import MagicMock, patch
 
 from openlp.core.common import Registry
 from openlp.core.ui.mainwindow import MainWindow
-from tests.interfaces import MagicMock, patch
+
 from tests.helpers.testmixin import TestMixin