diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 9ad8809b7..24d0d3024 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -701,7 +701,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
for index in range(self.verse_list_widget.rowCount()):
verse = self.verse_list_widget.item(index, 0)
verse = verse.data(QtCore.Qt.UserRole)
- print(verse)
if verse not in verses_in_order:
verses_not_used.append(verse)
# Set the label text.
diff --git a/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py
index 9e560c5e6..013e91bc1 100644
--- a/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py
+++ b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py
@@ -64,8 +64,7 @@ class TestEditSongForm(TestCase):
# WHEN: Call the method.
self.form.on_verse_order_text_changed(given_verse_order)
- # THEN: The warning lable should be hidden.
- print self.form.warning_label.text()
+ # THEN: No text should be shown.
assert self.form.warning_label.text() == u'', u'There should be no warning.'
def verse_order_incomplete_warning_test(self):
@@ -86,8 +85,8 @@ class TestEditSongForm(TestCase):
# WHEN: Call the method.
self.form.on_verse_order_text_changed(given_verse_order)
- # THEN: The warning lable should be hidden.
- assert self.form.warning_label.text() == u'Warning: Not all of the verses are in use.', \
+ # THEN: The verse-order-incomplete text should be shown.
+ assert self.form.warning_label.text() == self.form.not_all_verses_used_warning, \
u'The verse-order-incomplete warning should be shown.'
def bug_1170435_test(self):
@@ -101,11 +100,11 @@ class TestEditSongForm(TestCase):
mocked_verse = MagicMock()
mocked_verse.data = MagicMock(return_value=u'V1')
self.form.verse_list_widget.item = MagicMock(return_value=mocked_verse)
- self.form._extract_verse_order = MagicMock(return_value=[given_verse_order])
+ self.form._extract_verse_order = MagicMock(return_value=[])
self.form.verse_order_edit.text = MagicMock(return_value=given_verse_order)
# WHEN: Call the method.
self.form.on_verse_order_text_changed(given_verse_order)
- # THEN: The warning lable should be hidden.
- assert self.form.warning_label.text() == u'Warning: You have not entered a verse order.', \
+ # THEN: The no-verse-order message should be shown.
+ assert self.form.warning_label.text() == self.form.no_verse_order_entered_warning, \
u'The no-verse-order message should be shown.'