raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Samuel Mehrbrodt 2014-04-16 22:33:06 +02:00
parent be4a654298
commit 2c6da0603b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/songs/lib/openlyricsimport.py
View File

@ -71,7 +71,7 @@ class OpenLyricsImport(SongImport):
# special characters in the path (see lp:757673 and lp:744337). # special characters in the path (see lp:757673 and lp:744337).
parsed_file = etree.parse(open(file_path, 'r'), parser) parsed_file = etree.parse(open(file_path, 'r'), parser)
xml = etree.tostring(parsed_file).decode() xml = etree.tostring(parsed_file).decode()
return self.open_lyrics.xml_to_song(xml) self.open_lyrics.xml_to_song(xml)
except etree.XMLSyntaxError: except etree.XMLSyntaxError:
log.exception('XML syntax error in file %s' % file_path) log.exception('XML syntax error in file %s' % file_path)
self.log_error(file_path, SongStrings.XMLSyntaxError) self.log_error(file_path, SongStrings.XMLSyntaxError)

16
tests/functional/openlp_plugins/songs/test_openlyricsimport.py
View File

@ -73,24 +73,22 @@ class TestOpenLyricsImport(TestCase):
# THEN: The importer should be an instance of SongImport # THEN: The importer should be an instance of SongImport
self.assertIsInstance(importer, SongImport) self.assertIsInstance(importer, SongImport)
@patch('openlp.plugins.songs.lib.db.Song') def file_import_test(self):
@patch('openlp.plugins.songs.lib.songbeamerimport.SongImport')
def file_import_test(self, mock_songimport, mock_song):
""" """
Test the actual import of real song files and check that the imported data is correct. Test the actual import of real song files and check that the importer is called.
""" """
# GIVEN: Test files with a mocked out "manager" and a mocked out "import_wizard" # GIVEN: Test files with a mocked out "manager" and a mocked out "import_wizard"
for song_file in SONG_TEST_DATA: for song_file in SONG_TEST_DATA:
mocked_manager = MagicMock() mocked_manager = MagicMock()
mocked_import_wizard = MagicMock() mocked_import_wizard = MagicMock()
importer = OpenLyricsImport(mocked_manager, filenames=[]) importer = OpenLyricsImport(mocked_manager, filenames=[])
importer.import_wizard = mocked_import_wizard importer.import_wizard = mocked_import_wizard
importer.open_lyrics = MagicMock()
importer.open_lyrics.xml_to_song = MagicMock()
# WHEN: Importing each file # WHEN: Importing each file
importer.import_source = [os.path.join(TEST_PATH, song_file)] importer.import_source = [os.path.join(TEST_PATH, song_file)]
song = importer.do_import() importer.do_import()
# THEN: the song title should be as expected # THEN: The xml_to_song() method should have been called
self.assertEqual(song.title, SONG_TEST_DATA[song_file]['title'], self.assertTrue(importer.open_lyrics.xml_to_song.called)
'title for %s should be "%s"' % (song_file, SONG_TEST_DATA[song_file]['title']))