openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

implemented fix suggestions

This commit is contained in:
Johannes Thomas Meyer 2017-06-05 23:41:29 +02:00
parent 12b540064d
commit 0850351237
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openlp/plugins/songs/lib/mediaitem.py
View File

@ -231,13 +231,14 @@ class SongMediaItem(MediaManagerItem):
def search_entire(self, search_keywords):
search_string = '%{text}%'.format(text=clean_string(search_keywords))
return (self.plugin.manager.session.query(Song)
.join(SongBookEntry, isouter=True)
.join(Book, isouter=True)
.filter(or_(Book.name.like(search_string), SongBookEntry.entry.like(search_string),
Song.search_title.like(search_string), Song.search_lyrics.like(search_string),
Song.comments.like(search_string), Song.alternate_title.like(search_string)))
.all())
return self.plugin.manager.session.query(Song) \
.join(SongBookEntry, isouter=True) \
.join(Book, isouter=True) \
.filter(or_(Book.name.like(search_string), SongBookEntry.entry.like(search_string),
# hint: search_title contains alternate title
Song.search_title.like(search_string), Song.search_lyrics.like(search_string),
Song.comments.like(search_string))) \
.all()
def on_song_list_load(self):
"""

35
tests/functional/openlp_plugins/songs/test_mediaitem.py
View File

@ -46,9 +46,10 @@ class TestMediaItem(TestCase, TestMixin):
Registry.create()
Registry().register('service_list', MagicMock())
Registry().register('main_window', MagicMock())
self.mocked_plugin = MagicMock()
with patch('openlp.core.lib.mediamanageritem.MediaManagerItem._setup'), \
patch('openlp.plugins.songs.forms.editsongform.EditSongForm.__init__'):
self.media_item = SongMediaItem(None, MagicMock())
self.media_item = SongMediaItem(None, self.mocked_plugin)
self.media_item.save_auto_select_id = MagicMock()
self.media_item.list_view = MagicMock()
self.media_item.list_view.save_auto_select_id = MagicMock()
@ -558,3 +559,35 @@ class TestMediaItem(TestCase, TestMixin):
# THEN: The correct formatted results are returned
self.assertEqual(search_results, [[123, 'My Song', 'My alternative']])
@patch('openlp.plugins.songs.lib.mediaitem.Book')
@patch('openlp.plugins.songs.lib.mediaitem.SongBookEntry')
@patch('openlp.plugins.songs.lib.mediaitem.Song')
@patch('openlp.plugins.songs.lib.mediaitem.or_')
def test_entire_song_search(self, mocked_or, MockedSong, MockedSongBookEntry, MockedBook):
"""
Test that searching the entire song does the right queries
"""
# GIVEN: A song media item, a keyword and some mocks
keyword = 'Jesus'
mocked_song = MagicMock()
mocked_or.side_effect = lambda a, b, c, d, e: ' '.join([a, b, c, d, e])
MockedSong.search_title.like.side_effect = lambda a: a
MockedSong.search_lyrics.like.side_effect = lambda a: a
MockedSong.comments.like.side_effect = lambda a: a
MockedSongBookEntry.entry.like.side_effect = lambda a: a
MockedBook.name.like.side_effect = lambda a: a
# WHEN: search_entire_song() is called with the keyword
self.media_item.search_entire(keyword)
# THEN: The correct calls were made
MockedSong.search_title.like.assert_called_once_with('%jesus%')
MockedSong.search_lyrics.like.assert_called_once_with('%jesus%')
MockedSong.comments.like.assert_called_once_with('%jesus%')
MockedSongBookEntry.entry.like.assert_called_once_with('%jesus%')
MockedBook.name.like.assert_called_once_with('%jesus%')
mocked_or.assert_called_once_with('%jesus%', '%jesus%', '%jesus%', '%jesus%', '%jesus%')
self.mocked_plugin.manager.session.query.assert_called_once_with(MockedSong)
self.assertEqual(self.mocked_plugin.manager.session.query.mock_calls[4][0], '().join().join().filter().all')