From 791fdba019ebeb792e1ecd8a492c2c26730dab8a Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Tue, 8 Apr 2014 17:15:46 +0200 Subject: [PATCH] Fix test --- .../openlp_core_ui/test_maindisplay.py | 37 +++----- .../openlp_core_ui/test_maindisplay.py.moved | 85 ------------------- 2 files changed, 14 insertions(+), 108 deletions(-) delete mode 100644 tests/functional/openlp_core_ui/test_maindisplay.py.moved diff --git a/tests/functional/openlp_core_ui/test_maindisplay.py b/tests/functional/openlp_core_ui/test_maindisplay.py index 48f05978c..fb6b1f0f3 100644 --- a/tests/functional/openlp_core_ui/test_maindisplay.py +++ b/tests/functional/openlp_core_ui/test_maindisplay.py @@ -88,31 +88,22 @@ class TestMainDisplay(TestCase): display = MagicMock() main_display = MainDisplay(display) - # WHEN: MainDisplay.set_transparency is called with a true value" + # WHEN: We enable transparency main_display.set_transparency(True) - # THEN: check MainDisplay.setAutoFillBackground, MainDisplay.setStyleSheet, MainDisplay.setAttribute, - assert main_display.StyleSheet == "QGraphicsView {background: transparent; border: 0px;}", \ - 'MainDisplay instance should be transparent' - assert main_display.getAutoFillBackground == False, \ - 'MainDisplay instance should be without background auto fill' - assert main_display.getAttribute(QtCore.Qt.WA_TranslucentBackground) == True, \ - 'MainDisplay hasnt translusent background' + # THEN: There should be a Stylesheet + self.assertEqual('QGraphicsView {background: transparent; border: 0px;}', main_display.styleSheet(), + 'MainDisplay instance should be transparent') + self.assertFalse(main_display.autoFillBackground(), + 'MainDisplay instance should be without background auto fill') + self.assertTrue(main_display.testAttribute(QtCore.Qt.WA_TranslucentBackground), + 'MainDisplay hasnt translucent background') - def set_transparency_disable_test(self): - """ - Test creating an instance of the MainDisplay class - """ - # GIVEN: get an instance of MainDisplay - display = MagicMock() - main_display = MainDisplay(display) - - # WHEN: MainDisplay.set_transparency is called with a False value" + # WHEN: We disable transparency main_display.set_transparency(False) - # THEN: check MainDisplay.setAutoFillBackground, MainDisplay.setStyleSheet, MainDisplay.setAttribute, - assert main_display.StyleSheet == "QGraphicsView {}", \ - 'MainDisplay instance should not be transparent' - assert main_display.getAutoFillBackground == True, 'MainDisplay instance should be with background auto fill' - assert main_display.getAttribute(QtCore.Qt.WA_TranslucentBackground) == True, \ - 'MainDisplay hasnt translusent background' + # THEN: The Stylesheet should be empty + self.assertEqual('QGraphicsView {}', main_display.styleSheet(), + 'MainDisplay instance should not be transparent') + self.assertFalse(main_display.testAttribute(QtCore.Qt.WA_TranslucentBackground), + 'MainDisplay hasnt translucent background') diff --git a/tests/functional/openlp_core_ui/test_maindisplay.py.moved b/tests/functional/openlp_core_ui/test_maindisplay.py.moved deleted file mode 100644 index 0a1f85d5f..000000000 --- a/tests/functional/openlp_core_ui/test_maindisplay.py.moved +++ /dev/null @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2013 Raoul Snyman # -# Portions copyright (c) 2008-2013 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, Dmitriy Marmyshev # -# --------------------------------------------------------------------------- # -# 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.maindisplay package. -""" -from unittest import TestCase - -from tests.functional import MagicMock -from PyQt4 import QtCore - -from openlp.core.ui.maindisplay import MainDisplay - - -class TestMainDisplay(TestCase): - """ - Test the functions in the :mod:`MainDisplay` module. - """ - #TODO: The following classes still need tests written for - # - Display - # - MainDisplay - # - AudioPlayer - - - def set_transparency_enable_test(self): - """ - Test creating an instance of the MainDisplay class - """ - # GIVEN: get an instance of MainDisplay - display = MagicMock() - main_display = MainDisplay(display) - - # WHEN: MainDisplay.set_transparency is called with a true value" - main_display.set_transparency(True) - - # THEN: check MainDisplay.setAutoFillBackground, MainDisplay.setStyleSheet, MainDisplay.setAttribute, - assert main_display.StyleSheet == "QGraphicsView {background: transparent; border: 0px;}", \ - 'MainDisplay instance should be transparent' - assert main_display.getAutoFillBackground == False, \ - 'MainDisplay instance should be without background auto fill' - assert main_display.getAttribute(QtCore.Qt.WA_TranslucentBackground) == True, \ - 'MainDisplay hasnt translusent background' - - def set_transparency_disable_test(self): - """ - Test creating an instance of the MainDisplay class - """ - # GIVEN: get an instance of MainDisplay - display = MagicMock() - main_display = MainDisplay(display) - - # WHEN: MainDispaly.set_transparency is called with a False value" - main_display.set_transparency(False) - - # THEN: check MainDisplay.setAutoFillBackground, MainDisplay.setStyleSheet, MainDisplay.setAttribute, - assert main_display.StyleSheet == "QGraphicsView {}", \ - 'MainDisplay instance should not be transparent' - assert main_display.getAutoFillBackground == True, 'MainDisplay instance should be with background auto fill' - assert main_display.getAttribute(QtCore.Qt.WA_TranslucentBackground) == True, \ - 'MainDisplay hasnt translusent background'