made get_data private

This commit is contained in:
Philip Ridout 2013-10-14 23:05:17 +01:00
parent 24f80e10ab
commit a8e1d5005c

View File

@ -95,16 +95,16 @@ class SongImportTestHelper(TestCase):
# WHEN: Importing the source file # WHEN: Importing the source file
importer.import_source = [source_file_name] importer.import_source = [source_file_name]
add_verse_calls = self.get_data(result_data, 'verses') add_verse_calls = self._get_data(result_data, 'verses')
author_calls = self.get_data(result_data, 'authors') author_calls = self._get_data(result_data, 'authors')
ccli_number = self.get_data(result_data, 'ccli_number') ccli_number = self._get_data(result_data, 'ccli_number')
comments = self.get_data(result_data, 'comments') comments = self._get_data(result_data, 'comments')
song_book_name = self.get_data(result_data, 'song_book_name') song_book_name = self._get_data(result_data, 'song_book_name')
song_copyright = self.get_data(result_data, 'copyright') song_copyright = self._get_data(result_data, 'copyright')
song_number = self.get_data(result_data, 'song_number') song_number = self._get_data(result_data, 'song_number')
title = self.get_data(result_data, 'title') title = self._get_data(result_data, 'title')
topics = self.get_data(result_data, 'topics') topics = self._get_data(result_data, 'topics')
verse_order_list = self.get_data(result_data, 'verse_order_list') 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 # THEN: doImport should return none, the song data should be as expected, and finish should have been
# called. # called.
@ -135,7 +135,7 @@ class SongImportTestHelper(TestCase):
% (source_file_name, verse_order_list)) % (source_file_name, verse_order_list))
self.mocked_finish.assert_called_with() self.mocked_finish.assert_called_with()
def get_data(self, data, key): def _get_data(self, data, key):
if key in data: if key in data:
return data[key] return data[key]
return '' return ''