From 872d5b9d26dbf753e4ef4a41c01e318d274ba552 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Wed, 18 Feb 2015 14:04:29 -0800 Subject: [PATCH 1/2] Fix duplicate test names --- .../functional/openlp_plugins/songs/test_songselect.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/functional/openlp_plugins/songs/test_songselect.py b/tests/functional/openlp_plugins/songs/test_songselect.py index 700933465..92e652149 100644 --- a/tests/functional/openlp_plugins/songs/test_songselect.py +++ b/tests/functional/openlp_plugins/songs/test_songselect.py @@ -491,7 +491,6 @@ class TestSongSelectFileImport(TestCase, TestMixin): def songselect_import_usr_file_test(self): """ Verify import SongSelect USR file parses file properly - :return: """ # GIVEN: Text file to import and mocks copyright = '2011 OpenLP Programmer One (Admin. by OpenLP One) | ' \ @@ -510,14 +509,13 @@ class TestSongSelectFileImport(TestCase, TestMixin): self.assertEquals(song_import.title, self.title, 'Song title should match') self.assertEquals(song_import.ccli_number, self.ccli_number, 'CCLI Song Number should match') self.assertEquals(song_import.authors, self.authors, 'Author(s) should match') - self.assertEquals(song_import.copyright, self.copyright_usr, 'Copyright should match') + self.assertEquals(song_import.copyright, copyright, 'Copyright should match') self.assertEquals(song_import.topics, self.topics, 'Theme(s) should match') - self.assertEquals(song_import.verses, self.verses, 'Verses should match with test verses') + self.assertEquals(song_import.verses, verses, 'Verses should match with test verses') - def songselect_import_usr_file_test(self): + def songselect_import_usr_file_2_test(self): """ - Verify import SongSelect USR file parses file properly - :return: + Verify import SongSelect TEXT file parses file properly """ # GIVEN: Text file to import and mocks copyright = '© 2011 OpenLP Programmer One (Admin. by OpenLP One)' From e0c44c4b9fc7b49624801042ddbefa70fae5d825 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Wed, 18 Feb 2015 14:39:02 -0800 Subject: [PATCH 2/2] Rename test to match file import type --- tests/functional/openlp_plugins/songs/test_songselect.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/functional/openlp_plugins/songs/test_songselect.py b/tests/functional/openlp_plugins/songs/test_songselect.py index 92e652149..0357f4477 100644 --- a/tests/functional/openlp_plugins/songs/test_songselect.py +++ b/tests/functional/openlp_plugins/songs/test_songselect.py @@ -471,7 +471,6 @@ class TestSongSelectFileImport(TestCase, TestMixin): def setUp(self): """ Initial setups - :return: """ Registry.create() test_song_name = 'TestSong' @@ -484,7 +483,6 @@ class TestSongSelectFileImport(TestCase, TestMixin): def tearDown(self): """ Test cleanups - :return: """ pass @@ -513,7 +511,7 @@ class TestSongSelectFileImport(TestCase, TestMixin): self.assertEquals(song_import.topics, self.topics, 'Theme(s) should match') self.assertEquals(song_import.verses, verses, 'Verses should match with test verses') - def songselect_import_usr_file_2_test(self): + def songselect_import_text_file_test(self): """ Verify import SongSelect TEXT file parses file properly """