From 2c11344434a8e5969867738d8d545d94f47e543c Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Wed, 25 Mar 2015 13:14:51 +0100 Subject: [PATCH] dummy: Make it obvious that method is test-only --- tests/dummy_backend.py | 2 +- tests/mpd/protocol/test_music_db.py | 8 +++--- tests/mpd/protocol/test_stored_playlists.py | 30 ++++++++++----------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/dummy_backend.py b/tests/dummy_backend.py index c3c88c87..61c26c5f 100644 --- a/tests/dummy_backend.py +++ b/tests/dummy_backend.py @@ -97,7 +97,7 @@ class DummyPlaylistsProvider(backend.PlaylistsProvider): super(DummyPlaylistsProvider, self).__init__(backend) self._playlists = [] - def set_playlists(self, playlists): + def set_dummy_playlists(self, playlists): """For tests using the dummy provider through an actor proxy.""" self._playlists = playlists diff --git a/tests/mpd/protocol/test_music_db.py b/tests/mpd/protocol/test_music_db.py index 37cbfce0..b9fbcdf6 100644 --- a/tests/mpd/protocol/test_music_db.py +++ b/tests/mpd/protocol/test_music_db.py @@ -277,7 +277,7 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase): def test_lsinfo_without_path_returns_same_as_for_root(self): last_modified = 1390942873222 - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='a', uri='dummy:/a', last_modified=last_modified)]) response1 = self.send_request('lsinfo') @@ -286,7 +286,7 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase): def test_lsinfo_with_empty_path_returns_same_as_for_root(self): last_modified = 1390942873222 - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='a', uri='dummy:/a', last_modified=last_modified)]) response1 = self.send_request('lsinfo ""') @@ -295,7 +295,7 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase): def test_lsinfo_for_root_includes_playlists(self): last_modified = 1390942873222 - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='a', uri='dummy:/a', last_modified=last_modified)]) self.send_request('lsinfo "/"') @@ -384,7 +384,7 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase): self.backend.library.dummy_browse_result = { 'dummy:/': [Ref.track(uri='dummy:/a', name='a'), Ref.directory(uri='dummy:/foo', name='foo')]} - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='a', uri='dummy:/a', last_modified=last_modified)]) response = self.send_request('lsinfo "/"') diff --git a/tests/mpd/protocol/test_stored_playlists.py b/tests/mpd/protocol/test_stored_playlists.py index 39d0d1b0..cca32b0d 100644 --- a/tests/mpd/protocol/test_stored_playlists.py +++ b/tests/mpd/protocol/test_stored_playlists.py @@ -7,7 +7,7 @@ from tests.mpd import protocol class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylist(self): - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist( name='name', uri='dummy:name', tracks=[Track(uri='dummy:a')])]) @@ -16,7 +16,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): self.assertInResponse('OK') def test_listplaylist_without_quotes(self): - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist( name='name', uri='dummy:name', tracks=[Track(uri='dummy:a')])]) @@ -31,14 +31,14 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylist_duplicate(self): playlist1 = Playlist(name='a', uri='dummy:a1', tracks=[Track(uri='b')]) playlist2 = Playlist(name='a', uri='dummy:a2', tracks=[Track(uri='c')]) - self.backend.playlists.set_playlists([playlist1, playlist2]) + self.backend.playlists.set_dummy_playlists([playlist1, playlist2]) self.send_request('listplaylist "a [2]"') self.assertInResponse('file: c') self.assertInResponse('OK') def test_listplaylistinfo(self): - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist( name='name', uri='dummy:name', tracks=[Track(uri='dummy:a')])]) @@ -49,7 +49,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): self.assertInResponse('OK') def test_listplaylistinfo_without_quotes(self): - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist( name='name', uri='dummy:name', tracks=[Track(uri='dummy:a')])]) @@ -67,7 +67,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylistinfo_duplicate(self): playlist1 = Playlist(name='a', uri='dummy:a1', tracks=[Track(uri='b')]) playlist2 = Playlist(name='a', uri='dummy:a2', tracks=[Track(uri='c')]) - self.backend.playlists.set_playlists([playlist1, playlist2]) + self.backend.playlists.set_dummy_playlists([playlist1, playlist2]) self.send_request('listplaylistinfo "a [2]"') self.assertInResponse('file: c') @@ -77,7 +77,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylists(self): last_modified = 1390942873222 - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='a', uri='dummy:a', last_modified=last_modified)]) self.send_request('listplaylists') @@ -89,7 +89,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylists_duplicate(self): playlist1 = Playlist(name='a', uri='dummy:a1') playlist2 = Playlist(name='a', uri='dummy:a2') - self.backend.playlists.set_playlists([playlist1, playlist2]) + self.backend.playlists.set_dummy_playlists([playlist1, playlist2]) self.send_request('listplaylists') self.assertInResponse('playlist: a') @@ -98,7 +98,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylists_ignores_playlists_without_name(self): last_modified = 1390942873222 - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='', uri='dummy:', last_modified=last_modified)]) self.send_request('listplaylists') @@ -106,7 +106,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): self.assertInResponse('OK') def test_listplaylists_replaces_newline_with_space(self): - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='a\n', uri='dummy:')]) self.send_request('listplaylists') self.assertInResponse('playlist: a ') @@ -114,7 +114,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): self.assertInResponse('OK') def test_listplaylists_replaces_carriage_return_with_space(self): - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='a\r', uri='dummy:')]) self.send_request('listplaylists') self.assertInResponse('playlist: a ') @@ -122,7 +122,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): self.assertInResponse('OK') def test_listplaylists_replaces_forward_slash_with_pipe(self): - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='a/b', uri='dummy:')]) self.send_request('listplaylists') self.assertInResponse('playlist: a|b') @@ -132,7 +132,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_load_appends_to_tracklist(self): self.core.tracklist.add([Track(uri='a'), Track(uri='b')]) self.assertEqual(len(self.core.tracklist.tracks.get()), 2) - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='A-list', uri='dummy:A-list', tracks=[ Track(uri='c'), Track(uri='d'), Track(uri='e')])]) @@ -150,7 +150,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_load_with_range_loads_part_of_playlist(self): self.core.tracklist.add([Track(uri='a'), Track(uri='b')]) self.assertEqual(len(self.core.tracklist.tracks.get()), 2) - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='A-list', uri='dummy:A-list', tracks=[ Track(uri='c'), Track(uri='d'), Track(uri='e')])]) @@ -166,7 +166,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_load_with_range_without_end_loads_rest_of_playlist(self): self.core.tracklist.add([Track(uri='a'), Track(uri='b')]) self.assertEqual(len(self.core.tracklist.tracks.get()), 2) - self.backend.playlists.set_playlists([ + self.backend.playlists.set_dummy_playlists([ Playlist(name='A-list', uri='dummy:A-list', tracks=[ Track(uri='c'), Track(uri='d'), Track(uri='e')])])