openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1296104 into lp:openlp.

Requested reviews:
  Samuel Mehrbrodt (sam92)
  Raoul Snyman (raoul-snyman)
  Tim Bentley (trb143)
Related bugs:
  Bug #1296104 in OpenLP: "Renderer broken when two option breaks next to each other"
  https://bugs.launchpad.net/openlp/+bug/1296104

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1296104/+merge/217576

Hello,

- fixed Renderer broken when two option breaks next to each other (bug #1296104)

lp:~googol/openlp/bug-1296104 (revision 2372)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/409/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/365/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/310/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/271/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/187/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/62/

-- 
https://code.launchpad.net/~googol/openlp/bug-1296104/+merge/217576
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2014-03-16 21:25:23 +0000
+++ openlp/core/lib/renderer.py	2014-04-29 11:17:14 +0000
@@ -248,6 +248,9 @@
         elif item.is_capable(ItemCapabilities.CanSoftBreak):
             pages = []
             if '[---]' in text:
+                # Remove two or more option slide breaks next to each other (causing infinite loop).
+                while '\n[---]\n[---]\n' in text:
+                    text = text.replace('\n[---]\n[---]\n', '\n[---]\n')
                 while True:
                     slides = text.split('\n[---]\n', 2)
                     # If there are (at least) two occurrences of [---] we use the first two slides (and neglect the last
@@ -392,7 +395,7 @@
         off when displayed.
 
         :param lines: The text to be fitted on the slide split into lines.
-        :param line_end: The text added after each line. Either ``u' '`` or ``u'<br>``.
+        :param line_end: The text added after each line. Either ``' '`` or ``'<br>``.
         """
         formatted = []
         previous_html = ''
@@ -416,7 +419,7 @@
         processed word by word. This is sometimes need for **bible** verses.
 
         :param lines: The text to be fitted on the slide split into lines.
-        :param line_end: The text added after each line. Either ``u' '`` or ``u'<br>``. This is needed for **bibles**.
+        :param line_end: The text added after each line. Either ``' '`` or ``'<br>``. This is needed for **bibles**.
         """
         formatted = []
         previous_html = ''
@@ -453,7 +456,7 @@
         """
         Tests the given text for not closed formatting tags and returns a tuple consisting of three unicode strings::
 
-            (u'{st}{r}Text text text{/r}{/st}', u'{st}{r}', u'<strong><span style="-webkit-text-fill-color:red">')
+            ('{st}{r}Text text text{/r}{/st}', '{st}{r}', '<strong><span style="-webkit-text-fill-color:red">')
 
         The first unicode string is the text, with correct closing tags. The second unicode string are OpenLP's opening
         formatting tags and the third unicode string the html opening formatting tags.
@@ -500,8 +503,8 @@
         The text contains html.
         :param raw_list: The elements which do not fit on a slide and needs to be processed using the binary chop.
         The elements can contain formatting tags.
-        :param separator: The separator for the elements. For lines this is ``u'<br>'`` and for words this is ``u' '``.
-        :param line_end: The text added after each "element line". Either ``u' '`` or ``u'<br>``. This is needed for
+        :param separator: The separator for the elements. For lines this is ``'<br>'`` and for words this is ``' '``.
+        :param line_end: The text added after each "element line". Either ``' '`` or ``'<br>``. This is needed for
          bibles.
         """
         smallest_index = 0

=== added file 'tests/interfaces/openlp_core_ui/test_shortcutlistform.py'
--- tests/interfaces/openlp_core_ui/test_shortcutlistform.py	1970-01-01 00:00:00 +0000
+++ tests/interfaces/openlp_core_ui/test_shortcutlistform.py	2014-04-29 11:17:14 +0000
@@ -0,0 +1,78 @@
+# -*- 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                          #
+###############################################################################
+"""
+Package to test the openlp.core.ui.shortcutform package.
+"""
+from unittest import TestCase
+
+from PyQt4 import QtCore, QtGui, QtTest
+
+from openlp.core.common import Registry
+from openlp.core.ui.shortcutlistform import ShortcutListForm
+from tests.interfaces import patch
+from tests.helpers.testmixin import TestMixin
+
+
+class TestShortcutform(TestCase, TestMixin):
+
+    def setUp(self):
+        """
+        Create the UI
+        """
+        Registry.create()
+        self.get_application()
+        self.main_window = QtGui.QMainWindow()
+        Registry().register('main_window', self.main_window)
+        self.form = ShortcutListForm()
+
+    def tearDown(self):
+        """
+        Delete all the C++ objects at the end so that we don't have a segfault
+        """
+        del self.form
+        del self.main_window
+
+    def adjust_button_test(self):
+        """
+        Test the _adjust_button() method
+        """
+        # GIVEN: A button.
+        button = QtGui.QPushButton()
+        checked = True
+        enabled = True
+        text = "new!"
+
+        # WHEN: Call the method.
+        with patch('PyQt4.QtGui.QPushButton.setChecked') as mocked_check_method:
+            self.form._adjust_button(button, checked, enabled, text)
+
+            # THEN: The button should be changed.
+            self.assertEqual(button.text(), text, "The text should match.")
+            mocked_check_method.assert_called_once_with(True)
+            self.assertEqual(button.isEnabled(), enabled, "The button should be disabled.")
\ No newline at end of file