From ad55a8d2541b483b910d86513fffd294d5371907 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 30 May 2017 22:06:27 +0200 Subject: [PATCH] Fix issue where enable-chord settings was not setup correctly for tests. --- .../openlp_plugins/songs/test_editverseform.py | 8 +++++++- .../openlp_plugins/songs/forms/test_editsongform.py | 9 ++++++++- .../openlp_plugins/songs/forms/test_editverseform.py | 9 ++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tests/functional/openlp_plugins/songs/test_editverseform.py b/tests/functional/openlp_plugins/songs/test_editverseform.py index 0cb08e827..3e97abbb7 100644 --- a/tests/functional/openlp_plugins/songs/test_editverseform.py +++ b/tests/functional/openlp_plugins/songs/test_editverseform.py @@ -27,10 +27,15 @@ from unittest.mock import MagicMock from PyQt5 import QtCore +from openlp.core.common import Settings from openlp.plugins.songs.forms.editverseform import EditVerseForm from tests.helpers.testmixin import TestMixin +__default_settings__ = { + 'songs/enable chords': True, +} + class TestEditVerseForm(TestCase, TestMixin): """ @@ -40,9 +45,10 @@ class TestEditVerseForm(TestCase, TestMixin): """ Set up the components need for all tests. """ - self.edit_verse_form = EditVerseForm(None) self.setup_application() self.build_settings() + Settings().extend_default_settings(__default_settings__) + self.edit_verse_form = EditVerseForm(None) QtCore.QLocale.setDefault(QtCore.QLocale('en_GB')) def tearDown(self): diff --git a/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py index b82bb29ae..e7d8308fa 100644 --- a/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py +++ b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py @@ -27,12 +27,16 @@ from unittest.mock import MagicMock from PyQt5 import QtWidgets -from openlp.core.common import Registry +from openlp.core.common import Registry, Settings from openlp.core.common.uistrings import UiStrings from openlp.plugins.songs.forms.editsongform import EditSongForm from tests.helpers.testmixin import TestMixin +__default_settings__ = { + 'songs/enable chords': True, +} + class TestEditSongForm(TestCase, TestMixin): """ @@ -48,12 +52,15 @@ class TestEditSongForm(TestCase, TestMixin): self.main_window = QtWidgets.QMainWindow() Registry().register('main_window', self.main_window) Registry().register('theme_manager', MagicMock()) + self.build_settings() + Settings().extend_default_settings(__default_settings__) self.form = EditSongForm(MagicMock(), self.main_window, MagicMock()) def tearDown(self): """ Delete all the C++ objects at the end so that we don't have a segfault """ + self.destroy_settings() del self.form del self.main_window diff --git a/tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py b/tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py index a28be8df2..78c5c3016 100644 --- a/tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py +++ b/tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py @@ -26,10 +26,14 @@ from unittest import TestCase from PyQt5 import QtCore, QtTest, QtWidgets -from openlp.core.common import Registry +from openlp.core.common import Registry, Settings from openlp.plugins.songs.forms.editverseform import EditVerseForm from tests.helpers.testmixin import TestMixin +__default_settings__ = { + 'songs/enable chords': True, +} + class TestEditVerseForm(TestCase, TestMixin): """ @@ -44,12 +48,15 @@ class TestEditVerseForm(TestCase, TestMixin): self.setup_application() self.main_window = QtWidgets.QMainWindow() Registry().register('main_window', self.main_window) + self.build_settings() + Settings().extend_default_settings(__default_settings__) self.form = EditVerseForm() def tearDown(self): """ Delete all the C++ objects at the end so that we don't have a segfault """ + self.destroy_settings() del self.form del self.main_window