forked from openlp/openlp
- fixed customs regression
- moved tests bzr-revno: 2221
This commit is contained in:
commit
1ee71bfb72
@ -158,7 +158,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
|
|||||||
"""
|
"""
|
||||||
Add a new blank slide.
|
Add a new blank slide.
|
||||||
"""
|
"""
|
||||||
self.edit_slide_form.setText(u'')
|
self.edit_slide_form.set_text(u'')
|
||||||
if self.edit_slide_form.exec_():
|
if self.edit_slide_form.exec_():
|
||||||
self.slide_list_view.addItems(self.edit_slide_form.get_text())
|
self.slide_list_view.addItems(self.edit_slide_form.get_text())
|
||||||
|
|
||||||
@ -166,7 +166,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
|
|||||||
"""
|
"""
|
||||||
Edit the currently selected slide.
|
Edit the currently selected slide.
|
||||||
"""
|
"""
|
||||||
self.edit_slide_form.setText(self.slide_list_view.currentItem().text())
|
self.edit_slide_form.set_text(self.slide_list_view.currentItem().text())
|
||||||
if self.edit_slide_form.exec_():
|
if self.edit_slide_form.exec_():
|
||||||
self.update_slide_list(self.edit_slide_form.get_text())
|
self.update_slide_list(self.edit_slide_form.get_text())
|
||||||
|
|
||||||
@ -180,7 +180,7 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
|
|||||||
slide_text += item.text()
|
slide_text += item.text()
|
||||||
if row != self.slide_list_view.count() - 1:
|
if row != self.slide_list_view.count() - 1:
|
||||||
slide_text += u'\n[===]\n'
|
slide_text += u'\n[===]\n'
|
||||||
self.edit_slide_form.setText(slide_text)
|
self.edit_slide_form.set_text(slide_text)
|
||||||
if self.edit_slide_form.exec_():
|
if self.edit_slide_form.exec_():
|
||||||
self.update_slide_list(self.edit_slide_form.get_text(), True)
|
self.update_slide_list(self.edit_slide_form.get_text(), True)
|
||||||
|
|
||||||
|
BIN
tests/interfaces/openlp_plugins/__init__.pyc
Normal file
BIN
tests/interfaces/openlp_plugins/__init__.pyc
Normal file
Binary file not shown.
@ -4,7 +4,7 @@ Module to test the custom edit form.
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from mock import MagicMock, patch
|
from mock import MagicMock, patch
|
||||||
|
|
||||||
from PyQt4 import QtGui
|
from PyQt4 import QtGui, QtTest, QtCore
|
||||||
|
|
||||||
from openlp.core.lib import Registry
|
from openlp.core.lib import Registry
|
||||||
# Import needed due to import problems.
|
# Import needed due to import problems.
|
||||||
@ -38,7 +38,7 @@ class TestCustomFrom(TestCase):
|
|||||||
|
|
||||||
def load_custom_test(self):
|
def load_custom_test(self):
|
||||||
"""
|
"""
|
||||||
Test the EditCustomForm defaults are correct
|
Test the load_custom() method.
|
||||||
"""
|
"""
|
||||||
# GIVEN: A mocked QDialog.exec_() method
|
# GIVEN: A mocked QDialog.exec_() method
|
||||||
with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
|
with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
|
||||||
@ -50,3 +50,15 @@ class TestCustomFrom(TestCase):
|
|||||||
self.assertEqual(self.form.title_edit.text(), u'', u'The title edit should be empty')
|
self.assertEqual(self.form.title_edit.text(), u'', u'The title edit should be empty')
|
||||||
self.assertEqual(self.form.credit_edit.text(), u'', u'The credit edit should be empty')
|
self.assertEqual(self.form.credit_edit.text(), u'', u'The credit edit should be empty')
|
||||||
|
|
||||||
|
|
||||||
|
def on_add_button_clicked_test(self):
|
||||||
|
"""
|
||||||
|
Test the on_add_button_clicked_test method / add_button button.
|
||||||
|
"""
|
||||||
|
# GIVEN: A mocked QDialog.exec_() method
|
||||||
|
with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
|
||||||
|
# WHEN: Show the dialog and add a new slide.
|
||||||
|
self.form.exec_()
|
||||||
|
QtTest.QTest.mouseClick(self.form.add_button, QtCore.Qt.LeftButton)
|
||||||
|
#THEN: One slide should be added.
|
||||||
|
assert self.form.slide_list_view.count() == 1, u'There should be one slide added.'
|
0
tests/interfaces/openlp_plugins/songs/__init__.py
Normal file
0
tests/interfaces/openlp_plugins/songs/__init__.py
Normal file
Loading…
Reference in New Issue
Block a user