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

Restructured the tests a bit.

Browse Source
This commit is contained in:
Tomas Groth 2014-04-26 21:47:11 +02:00
parent 54ed6aeea0
commit 48fe8c5e37
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/functional/openlp_plugins/songs/test_ewimport.py
View File

@ -400,10 +400,11 @@ class TestEasyWorshipSongImport(TestCase):
# WHEN: Importing each file # WHEN: Importing each file
importer.import_source = os.path.join(TEST_PATH, 'Songs.DB') importer.import_source = os.path.join(TEST_PATH, 'Songs.DB')
import_result = importer.do_import()
# THEN: do_import should return none, the song data should be as expected, and finish should have been # THEN: do_import should return none, the song data should be as expected, and finish should have been
# called. # called.
self.assertIsNone(importer.do_import(), 'do_import should return None when it has completed') self.assertIsNone(import_result, 'do_import should return None when it has completed')
for song_data in SONG_TEST_DATA: for song_data in SONG_TEST_DATA:
title = song_data['title'] title = song_data['title']
author_calls = song_data['authors'] author_calls = song_data['authors']
@ -455,11 +456,12 @@ class TestEasyWorshipSongImport(TestCase):
# WHEN: Importing ews file # WHEN: Importing ews file
importer.import_source = os.path.join(TEST_PATH, 'test1.ews') importer.import_source = os.path.join(TEST_PATH, 'test1.ews')
import_result = importer.do_import()
# THEN: do_import should return none, the song data should be as expected, and finish should have been # THEN: do_import should return none, the song data should be as expected, and finish should have been
# called. # called.
title = EWS_SONG_TEST_DATA['title'] title = EWS_SONG_TEST_DATA['title']
self.assertIsNone(importer.do_import(), 'do_import should return None when it has completed') self.assertIsNone(import_result, 'do_import should return None when it has completed')
self.assertIn(title, importer._title_assignment_list, 'title for should be "%s"' % title) self.assertIn(title, importer._title_assignment_list, 'title for should be "%s"' % title)
mocked_add_author.assert_any_call(EWS_SONG_TEST_DATA['authors'][0]) mocked_add_author.assert_any_call(EWS_SONG_TEST_DATA['authors'][0])
for verse_text, verse_tag in EWS_SONG_TEST_DATA['verses']: for verse_text, verse_tag in EWS_SONG_TEST_DATA['verses']: