diff --git a/tests/functional/openlp_core_ui/test_thememanager.py b/tests/functional/openlp_core_ui/test_thememanager.py index 264a9f3ce..b0196d048 100644 --- a/tests/functional/openlp_core_ui/test_thememanager.py +++ b/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): diff --git a/tests/functional/openlp_plugins/bibles/test_csvimport.py b/tests/functional/openlp_plugins/bibles/test_csvimport.py index 446ac433a..63d3d5282 100644 --- a/tests/functional/openlp_plugins/bibles/test_csvimport.py +++ b/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 diff --git a/tests/functional/openlp_plugins/images/test_lib.py b/tests/functional/openlp_plugins/images/test_lib.py index 3f0c4e621..f00463d67 100644 --- a/tests/functional/openlp_plugins/images/test_lib.py +++ b/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):