From 9051692dba53dbb2c667ca0a7dad8506f64d9e52 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 13 Mar 2014 20:34:46 +0000 Subject: [PATCH] Mixin for tests --- tests/helpers/testmixin.py | 54 +++++++++++++++++++ .../openlp_core_ui/test_filerenamedialog.py | 10 ++-- .../openlp_core_ui/test_thememanager.py | 12 ++--- 3 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 tests/helpers/testmixin.py diff --git a/tests/helpers/testmixin.py b/tests/helpers/testmixin.py new file mode 100644 index 000000000..a087bd475 --- /dev/null +++ b/tests/helpers/testmixin.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 + +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2014 Raoul Snyman # +# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan # +# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # +# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # +# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # +# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # +# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # +# --------------------------------------------------------------------------- # +# 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 # +############################################################################### +""" +Mixin class with helpers +""" +import os +from tempfile import mkstemp + +from PyQt4 import QtCore, QtGui +from openlp.core.common import Settings + + +class TestMixin(object): + + def get_application(self): + old_app_instance = QtCore.QCoreApplication.instance() + if old_app_instance is None: + self.app = QtGui.QApplication([]) + else: + self.app = old_app_instance + + def build_settings(self): + Settings.setDefaultFormat(Settings.IniFormat) + fd, self.ini_file = mkstemp('.ini') + Settings().set_filename(self.ini_file) + + def destroy_settings(self): + os.unlink(Settings().fileName()) \ No newline at end of file diff --git a/tests/interfaces/openlp_core_ui/test_filerenamedialog.py b/tests/interfaces/openlp_core_ui/test_filerenamedialog.py index 8fac36213..3ddf48f28 100644 --- a/tests/interfaces/openlp_core_ui/test_filerenamedialog.py +++ b/tests/interfaces/openlp_core_ui/test_filerenamedialog.py @@ -8,20 +8,16 @@ from PyQt4 import QtCore, QtGui, QtTest from openlp.core.common import Registry from openlp.core.ui import filerenameform from tests.interfaces import MagicMock, patch +from tests.helpers.testmixin import TestMixin - -class TestStartFileRenameForm(TestCase): +class TestStartFileRenameForm(TestCase, TestMixin): def setUp(self): """ Create the UI """ Registry.create() - old_app_instance = QtCore.QCoreApplication.instance() - if old_app_instance is None: - self.app = QtGui.QApplication([]) - else: - self.app = old_app_instance + self.get_application() self.main_window = QtGui.QMainWindow() Registry().register('main_window', self.main_window) self.form = filerenameform.FileRenameForm() diff --git a/tests/interfaces/openlp_core_ui/test_thememanager.py b/tests/interfaces/openlp_core_ui/test_thememanager.py index 6bffcf4eb..a539d4e44 100644 --- a/tests/interfaces/openlp_core_ui/test_thememanager.py +++ b/tests/interfaces/openlp_core_ui/test_thememanager.py @@ -29,18 +29,17 @@ """ Interface tests to test the themeManager class and related methods. """ -import os from unittest import TestCase -from tempfile import mkstemp from PyQt4 import QtGui, QtCore from openlp.core.common import Registry, Settings from openlp.core.ui import ThemeManager from tests.functional import patch, MagicMock +from tests.helpers.testmixin import TestMixin -class TestThemeManager(TestCase): +class TestThemeManager(TestCase, TestMixin): """ Test the functions in the ThemeManager module """ @@ -48,9 +47,8 @@ class TestThemeManager(TestCase): """ Create the UI """ - Settings.setDefaultFormat(Settings.IniFormat) - fd, self.ini_file = mkstemp('.ini') - Settings().set_filename(self.ini_file) + self.build_settings() + self.get_application() old_app_instance = QtCore.QCoreApplication.instance() if old_app_instance is None: self.app = QtGui.QApplication([]) @@ -63,7 +61,7 @@ class TestThemeManager(TestCase): """ Delete all the C++ objects at the end so that we don't have a segfault """ - os.unlink(Settings().fileName()) + self.destroy_settings() def initialise_test(self): """