From 7043a20530ba9ccf08ae60c41bac6a6942ef27ae Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Sat, 2 Dec 2017 22:10:22 +0000 Subject: [PATCH] Few test fixes --- .../openlp_core/lib/test_exceptions.py | 45 +++++++++++++++++++ .../openlp_core/lib/test_mediamanageritem.py | 18 ++++---- 2 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 tests/functional/openlp_core/lib/test_exceptions.py diff --git a/tests/functional/openlp_core/lib/test_exceptions.py b/tests/functional/openlp_core/lib/test_exceptions.py new file mode 100644 index 000000000..bf5efa949 --- /dev/null +++ b/tests/functional/openlp_core/lib/test_exceptions.py @@ -0,0 +1,45 @@ +# -*- 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.exceptions package. +""" +from unittest import TestCase + +from openlp.core.lib.exceptions import ValidationError + + +class TestValidationError(TestCase): + """ + Test the ValidationError Class + """ + def test_validation_error(self): + """ + Test the creation of a ValidationError + """ + # GIVEN: The ValidationError class + + # WHEN: Creating an instance of ValidationError + error = ValidationError('Test ValidationError') + + # THEN: Then calling str on the error should return the correct text and it should be an instance of `Exception` + assert str(error) == 'Test ValidationError' + assert isinstance(error, Exception) diff --git a/tests/functional/openlp_core/lib/test_mediamanageritem.py b/tests/functional/openlp_core/lib/test_mediamanageritem.py index fba8ce36b..a6152cbdf 100644 --- a/tests/functional/openlp_core/lib/test_mediamanageritem.py +++ b/tests/functional/openlp_core/lib/test_mediamanageritem.py @@ -42,8 +42,8 @@ class TestMediaManagerItem(TestCase, TestMixin): self.mocked_setup = self.setup_patcher.start() self.addCleanup(self.setup_patcher.stop) - @patch(u'openlp.core.lib.mediamanageritem.Settings') - @patch(u'openlp.core.lib.mediamanageritem.MediaManagerItem.on_preview_click') + @patch('openlp.core.lib.mediamanageritem.Settings') + @patch('openlp.core.lib.mediamanageritem.MediaManagerItem.on_preview_click') def test_on_double_clicked(self, mocked_on_preview_click, MockedSettings): """ Test that when an item is double-clicked then the item is previewed @@ -75,8 +75,8 @@ class TestMediaManagerItem(TestCase, TestMixin): self.assertTrue(mmi.has_delete_icon, 'By default a delete icon should be present') self.assertFalse(mmi.add_to_service_item, 'There should be no add_to_service icon by default') - @patch(u'openlp.core.lib.mediamanageritem.Settings') - @patch(u'openlp.core.lib.mediamanageritem.MediaManagerItem.on_live_click') + @patch('openlp.core.lib.mediamanageritem.Settings') + @patch('openlp.core.lib.mediamanageritem.MediaManagerItem.on_live_click') def test_on_double_clicked_go_live(self, mocked_on_live_click, MockedSettings): """ Test that when "Double-click to go live" is enabled that the item goes live @@ -93,9 +93,9 @@ class TestMediaManagerItem(TestCase, TestMixin): # THEN: on_live_click() should have been called mocked_on_live_click.assert_called_with() - @patch(u'openlp.core.lib.mediamanageritem.Settings') - @patch(u'openlp.core.lib.mediamanageritem.MediaManagerItem.on_live_click') - @patch(u'openlp.core.lib.mediamanageritem.MediaManagerItem.on_preview_click') + @patch('openlp.core.lib.mediamanageritem.Settings') + @patch('openlp.core.lib.mediamanageritem.MediaManagerItem.on_live_click') + @patch('openlp.core.lib.mediamanageritem.MediaManagerItem.on_preview_click') def test_on_double_clicked_single_click_preview(self, mocked_on_preview_click, mocked_on_live_click, MockedSettings): """ @@ -111,5 +111,5 @@ class TestMediaManagerItem(TestCase, TestMixin): mmi.on_double_clicked() # THEN: on_live_click() should have been called - self.assertEqual(0, mocked_on_live_click.call_count, u'on_live_click() should not have been called') - self.assertEqual(0, mocked_on_preview_click.call_count, u'on_preview_click() should not have been called') + self.assertEqual(0, mocked_on_live_click.call_count, 'on_live_click() should not have been called') + self.assertEqual(0, mocked_on_preview_click.call_count, 'on_preview_click() should not have been called')