Missed a py2 file

This commit is contained in:
Philip Ridout 2013-09-07 17:02:28 +00:00
parent dc9d3cd74e
commit bc30365e0e
1 changed files with 113 additions and 113 deletions

View File

@ -12,7 +12,7 @@ class SongImportTestHelper(TestCase):
"""
def __init__(self, *args, **kwargs):
self.importer_module = __import__(
u'openlp.plugins.songs.lib.%s' % self.importer_module_name, fromlist=[self.importer_class_name])
'openlp.plugins.songs.lib.%s' % self.importer_module_name, fromlist=[self.importer_class_name])
self.importer_class = getattr(self.importer_module, self.importer_class_name)
TestCase.__init__(self, *args, **kwargs)
@ -21,14 +21,14 @@ class SongImportTestHelper(TestCase):
Patch and set up the mocks required.
"""
self.add_copyright_patcher = patch(
u'openlp.plugins.songs.lib.%s.%s.addCopyright' % (self.importer_module_name, self.importer_class_name))
'openlp.plugins.songs.lib.%s.%s.addCopyright' % (self.importer_module_name, self.importer_class_name))
self.add_verse_patcher = patch(
u'openlp.plugins.songs.lib.%s.%s.addVerse' % (self.importer_module_name, self.importer_class_name))
'openlp.plugins.songs.lib.%s.%s.addVerse' % (self.importer_module_name, self.importer_class_name))
self.finish_patcher = patch(
u'openlp.plugins.songs.lib.%s.%s.finish' % (self.importer_module_name, self.importer_class_name))
'openlp.plugins.songs.lib.%s.%s.finish' % (self.importer_module_name, self.importer_class_name))
self.parse_author_patcher = patch(
u'openlp.plugins.songs.lib.%s.%s.parse_author' % (self.importer_module_name, self.importer_class_name))
self.song_import_patcher = patch(u'openlp.plugins.songs.lib.%s.SongImport' % self.importer_module_name)
'openlp.plugins.songs.lib.%s.%s.parse_author' % (self.importer_module_name, self.importer_class_name))
self.song_import_patcher = patch('openlp.plugins.songs.lib.%s.SongImport' % self.importer_module_name)
self.mocked_add_copyright = self.add_copyright_patcher.start()
self.mocked_add_verse = self.add_verse_patcher.start()
self.mocked_finish = self.finish_patcher.start()
@ -66,48 +66,48 @@ class SongImportTestHelper(TestCase):
# WHEN: Importing the source file
importer.import_source = [source_file_name]
add_verse_calls = self.get_data(result_data, u'verses')
author_calls = self.get_data(result_data, u'authors')
ccli_number = self.get_data(result_data, u'ccli_number')
comments = self.get_data(result_data, u'comments')
song_book_name = self.get_data(result_data, u'song_book_name')
song_copyright = self.get_data(result_data, u'copyright')
song_number = self.get_data(result_data, u'song_number')
title = self.get_data(result_data, u'title')
topics = self.get_data(result_data, u'topics')
verse_order_list = self.get_data(result_data, u'verse_order_list')
add_verse_calls = self.get_data(result_data, 'verses')
author_calls = self.get_data(result_data, 'authors')
ccli_number = self.get_data(result_data, 'ccli_number')
comments = self.get_data(result_data, 'comments')
song_book_name = self.get_data(result_data, 'song_book_name')
song_copyright = self.get_data(result_data, 'copyright')
song_number = self.get_data(result_data, 'song_number')
title = self.get_data(result_data, 'title')
topics = self.get_data(result_data, 'topics')
verse_order_list = self.get_data(result_data, 'verse_order_list')
# THEN: doImport should return none, the song data should be as expected, and finish should have been
# called.
self.assertIsNone(importer.doImport(), u'doImport should return None when it has completed')
self.assertEquals(importer.title, title, u'title for %s should be "%s"' % (source_file_name, title))
self.assertIsNone(importer.doImport(), 'doImport should return None when it has completed')
self.assertEquals(importer.title, title, 'title for %s should be "%s"' % (source_file_name, title))
for author in author_calls:
self.mocked_parse_author.assert_any_call(author)
if song_copyright:
self.mocked_add_copyright.assert_called_with(song_copyright)
if ccli_number:
self.assertEquals(importer.ccliNumber, ccli_number, u'ccliNumber for %s should be %s'
self.assertEquals(importer.ccliNumber, ccli_number, 'ccliNumber for %s should be %s'
% (source_file_name, ccli_number))
for verse_text, verse_tag in add_verse_calls:
self.mocked_add_verse.assert_any_call(verse_text, verse_tag)
if topics:
self.assertEquals(importer.topics, topics, u'topics for %s should be %s' % (source_file_name, topics))
self.assertEquals(importer.topics, topics, 'topics for %s should be %s' % (source_file_name, topics))
if comments:
self.assertEquals(importer.comments, comments, u'comments for %s should be "%s"'
self.assertEquals(importer.comments, comments, 'comments for %s should be "%s"'
% (source_file_name, comments))
if song_book_name:
self.assertEquals(importer.songBookName, song_book_name, u'songBookName for %s should be "%s"'
self.assertEquals(importer.songBookName, song_book_name, 'songBookName for %s should be "%s"'
% (source_file_name, song_book_name))
if song_number:
self.assertEquals(importer.songNumber, song_number, u'songNumber for %s should be %s'
self.assertEquals(importer.songNumber, song_number, 'songNumber for %s should be %s'
% (source_file_name, song_number))
if verse_order_list:
self.assertEquals(importer.verseOrderList, [], u'verseOrderList for %s should be %s'
self.assertEquals(importer.verseOrderList, [], 'verseOrderList for %s should be %s'
% (source_file_name, verse_order_list))
self.mocked_finish.assert_called_with()
def get_data(self, data, key):
if key in data:
return data[key]
return u''
return ''