From ee8c2ca58911e92f0dfd867fe5be8a112793d21e Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 20 Nov 2012 09:24:37 +0100 Subject: [PATCH] tests: Rename populate_playlist() to populate_tracklist() --- tests/backends/base/__init__.py | 2 +- tests/backends/base/playback.py | 212 +++++++++++++++---------------- tests/backends/base/tracklist.py | 50 ++++---- 3 files changed, 132 insertions(+), 132 deletions(-) diff --git a/tests/backends/base/__init__.py b/tests/backends/base/__init__.py index ec3ec1df..c415ef23 100644 --- a/tests/backends/base/__init__.py +++ b/tests/backends/base/__init__.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -def populate_playlist(func): +def populate_tracklist(func): def wrapper(self): for track in self.tracks: self.core.tracklist.add(track) diff --git a/tests/backends/base/playback.py b/tests/backends/base/playback.py index 21e377d9..94fc7759 100644 --- a/tests/backends/base/playback.py +++ b/tests/backends/base/playback.py @@ -9,7 +9,7 @@ from mopidy.core import PlaybackState from mopidy.models import Track from tests import unittest -from tests.backends.base import populate_playlist +from tests.backends.base import populate_tracklist # TODO Test 'playlist repeat', e.g. repeat=1,single=0 @@ -40,35 +40,35 @@ class PlaybackControllerTest(object): def test_play_with_empty_playlist_return_value(self): self.assertEqual(self.playback.play(), None) - @populate_playlist + @populate_tracklist def test_play_state(self): self.assertEqual(self.playback.state, PlaybackState.STOPPED) self.playback.play() self.assertEqual(self.playback.state, PlaybackState.PLAYING) - @populate_playlist + @populate_tracklist def test_play_return_value(self): self.assertEqual(self.playback.play(), None) - @populate_playlist + @populate_tracklist def test_play_track_state(self): self.assertEqual(self.playback.state, PlaybackState.STOPPED) self.playback.play(self.tracklist.tl_tracks[-1]) self.assertEqual(self.playback.state, PlaybackState.PLAYING) - @populate_playlist + @populate_tracklist def test_play_track_return_value(self): self.assertEqual(self.playback.play( self.tracklist.tl_tracks[-1]), None) - @populate_playlist + @populate_tracklist def test_play_when_playing(self): self.playback.play() track = self.playback.current_track self.playback.play() self.assertEqual(track, self.playback.current_track) - @populate_playlist + @populate_tracklist def test_play_when_paused(self): self.playback.play() track = self.playback.current_track @@ -77,7 +77,7 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.PLAYING) self.assertEqual(track, self.playback.current_track) - @populate_playlist + @populate_tracklist def test_play_when_pause_after_next(self): self.playback.play() self.playback.next() @@ -88,17 +88,17 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.PLAYING) self.assertEqual(track, self.playback.current_track) - @populate_playlist + @populate_tracklist def test_play_sets_current_track(self): self.playback.play() self.assertEqual(self.playback.current_track, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_play_track_sets_current_track(self): self.playback.play(self.tracklist.tl_tracks[-1]) self.assertEqual(self.playback.current_track, self.tracks[-1]) - @populate_playlist + @populate_tracklist def test_play_skips_to_next_track_on_failure(self): # If backend's play() returns False, it is a failure. self.backend.playback.play = lambda track: track != self.tracks[0] @@ -106,7 +106,7 @@ class PlaybackControllerTest(object): self.assertNotEqual(self.playback.current_track, self.tracks[0]) self.assertEqual(self.playback.current_track, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_current_track_after_completed_playlist(self): self.playback.play(self.tracklist.tl_tracks[-1]) self.playback.on_end_of_track() @@ -118,14 +118,14 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.STOPPED) self.assertEqual(self.playback.current_track, None) - @populate_playlist + @populate_tracklist def test_previous(self): self.playback.play() self.playback.next() self.playback.previous() self.assertEqual(self.playback.current_track, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_previous_more(self): self.playback.play() # At track 0 self.playback.next() # At track 1 @@ -133,13 +133,13 @@ class PlaybackControllerTest(object): self.playback.previous() # At track 1 self.assertEqual(self.playback.current_track, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_previous_return_value(self): self.playback.play() self.playback.next() self.assertEqual(self.playback.previous(), None) - @populate_playlist + @populate_tracklist def test_previous_does_not_trigger_playback(self): self.playback.play() self.playback.next() @@ -147,7 +147,7 @@ class PlaybackControllerTest(object): self.playback.previous() self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_previous_at_start_of_playlist(self): self.playback.previous() self.assertEqual(self.playback.state, PlaybackState.STOPPED) @@ -158,7 +158,7 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.STOPPED) self.assertEqual(self.playback.current_track, None) - @populate_playlist + @populate_tracklist def test_previous_skips_to_previous_track_on_failure(self): # If backend's play() returns False, it is a failure. self.backend.playback.play = lambda track: track != self.tracks[1] @@ -168,7 +168,7 @@ class PlaybackControllerTest(object): self.assertNotEqual(self.playback.current_track, self.tracks[1]) self.assertEqual(self.playback.current_track, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_next(self): self.playback.play() @@ -181,17 +181,17 @@ class PlaybackControllerTest(object): self.playback.tracklist_position, old_position + 1) self.assertNotEqual(self.playback.current_track.uri, old_uri) - @populate_playlist + @populate_tracklist def test_next_return_value(self): self.playback.play() self.assertEqual(self.playback.next(), None) - @populate_playlist + @populate_tracklist def test_next_does_not_trigger_playback(self): self.playback.next() self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_next_at_end_of_playlist(self): self.playback.play() @@ -204,7 +204,7 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_next_until_end_of_playlist_and_play_from_start(self): self.playback.play() @@ -222,7 +222,7 @@ class PlaybackControllerTest(object): self.playback.next() self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_next_skips_to_next_track_on_failure(self): # If backend's play() returns False, it is a failure. self.backend.playback.play = lambda track: track != self.tracks[1] @@ -232,16 +232,16 @@ class PlaybackControllerTest(object): self.assertNotEqual(self.playback.current_track, self.tracks[1]) self.assertEqual(self.playback.current_track, self.tracks[2]) - @populate_playlist + @populate_tracklist def test_next_track_before_play(self): self.assertEqual(self.playback.track_at_next, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_next_track_during_play(self): self.playback.play() self.assertEqual(self.playback.track_at_next, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_next_track_after_previous(self): self.playback.play() self.playback.next() @@ -251,14 +251,14 @@ class PlaybackControllerTest(object): def test_next_track_empty_playlist(self): self.assertEqual(self.playback.track_at_next, None) - @populate_playlist + @populate_tracklist def test_next_track_at_end_of_playlist(self): self.playback.play() for _ in self.tracklist.tl_tracks[1:]: self.playback.next() self.assertEqual(self.playback.track_at_next, None) - @populate_playlist + @populate_tracklist def test_next_track_at_end_of_playlist_with_repeat(self): self.playback.repeat = True self.playback.play() @@ -266,20 +266,20 @@ class PlaybackControllerTest(object): self.playback.next() self.assertEqual(self.playback.track_at_next, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_next_track_with_random(self): random.seed(1) self.playback.random = True self.assertEqual(self.playback.track_at_next, self.tracks[2]) - @populate_playlist + @populate_tracklist def test_next_with_consume(self): self.playback.consume = True self.playback.play() self.playback.next() self.assertIn(self.tracks[0], self.tracklist.tracks) - @populate_playlist + @populate_tracklist def test_next_with_single_and_repeat(self): self.playback.single = True self.playback.repeat = True @@ -287,7 +287,7 @@ class PlaybackControllerTest(object): self.playback.next() self.assertEqual(self.playback.current_track, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_next_with_random(self): # FIXME feels very fragile random.seed(1) @@ -296,7 +296,7 @@ class PlaybackControllerTest(object): self.playback.next() self.assertEqual(self.playback.current_track, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_next_track_with_random_after_append_playlist(self): random.seed(1) self.playback.random = True @@ -304,7 +304,7 @@ class PlaybackControllerTest(object): self.tracklist.append(self.tracks[:1]) self.assertEqual(self.playback.track_at_next, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_end_of_track(self): self.playback.play() @@ -317,17 +317,17 @@ class PlaybackControllerTest(object): self.playback.tracklist_position, old_position + 1) self.assertNotEqual(self.playback.current_track.uri, old_uri) - @populate_playlist + @populate_tracklist def test_end_of_track_return_value(self): self.playback.play() self.assertEqual(self.playback.on_end_of_track(), None) - @populate_playlist + @populate_tracklist def test_end_of_track_does_not_trigger_playback(self): self.playback.on_end_of_track() self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_end_of_track_at_end_of_playlist(self): self.playback.play() @@ -340,7 +340,7 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_end_of_track_until_end_of_playlist_and_play_from_start(self): self.playback.play() @@ -358,7 +358,7 @@ class PlaybackControllerTest(object): self.playback.on_end_of_track() self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_end_of_track_skips_to_next_track_on_failure(self): # If backend's play() returns False, it is a failure. self.backend.playback.play = lambda track: track != self.tracks[1] @@ -368,16 +368,16 @@ class PlaybackControllerTest(object): self.assertNotEqual(self.playback.current_track, self.tracks[1]) self.assertEqual(self.playback.current_track, self.tracks[2]) - @populate_playlist + @populate_tracklist def test_end_of_track_track_before_play(self): self.assertEqual(self.playback.track_at_next, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_end_of_track_track_during_play(self): self.playback.play() self.assertEqual(self.playback.track_at_next, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_end_of_track_track_after_previous(self): self.playback.play() self.playback.on_end_of_track() @@ -387,14 +387,14 @@ class PlaybackControllerTest(object): def test_end_of_track_track_empty_playlist(self): self.assertEqual(self.playback.track_at_next, None) - @populate_playlist + @populate_tracklist def test_end_of_track_track_at_end_of_playlist(self): self.playback.play() for _ in self.tracklist.tl_tracks[1:]: self.playback.on_end_of_track() self.assertEqual(self.playback.track_at_next, None) - @populate_playlist + @populate_tracklist def test_end_of_track_track_at_end_of_playlist_with_repeat(self): self.playback.repeat = True self.playback.play() @@ -402,20 +402,20 @@ class PlaybackControllerTest(object): self.playback.on_end_of_track() self.assertEqual(self.playback.track_at_next, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_end_of_track_track_with_random(self): random.seed(1) self.playback.random = True self.assertEqual(self.playback.track_at_next, self.tracks[2]) - @populate_playlist + @populate_tracklist def test_end_of_track_with_consume(self): self.playback.consume = True self.playback.play() self.playback.on_end_of_track() self.assertNotIn(self.tracks[0], self.tracklist.tracks) - @populate_playlist + @populate_tracklist def test_end_of_track_with_random(self): # FIXME feels very fragile random.seed(1) @@ -424,7 +424,7 @@ class PlaybackControllerTest(object): self.playback.on_end_of_track() self.assertEqual(self.playback.current_track, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_end_of_track_track_with_random_after_append_playlist(self): random.seed(1) self.playback.random = True @@ -432,22 +432,22 @@ class PlaybackControllerTest(object): self.tracklist.append(self.tracks[:1]) self.assertEqual(self.playback.track_at_next, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_previous_track_before_play(self): self.assertEqual(self.playback.track_at_previous, None) - @populate_playlist + @populate_tracklist def test_previous_track_after_play(self): self.playback.play() self.assertEqual(self.playback.track_at_previous, None) - @populate_playlist + @populate_tracklist def test_previous_track_after_next(self): self.playback.play() self.playback.next() self.assertEqual(self.playback.track_at_previous, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_previous_track_after_previous(self): self.playback.play() # At track 0 self.playback.next() # At track 1 @@ -458,7 +458,7 @@ class PlaybackControllerTest(object): def test_previous_track_empty_playlist(self): self.assertEqual(self.playback.track_at_previous, None) - @populate_playlist + @populate_tracklist def test_previous_track_with_consume(self): self.playback.consume = True for _ in self.tracks: @@ -466,7 +466,7 @@ class PlaybackControllerTest(object): self.assertEqual( self.playback.track_at_previous, self.playback.current_track) - @populate_playlist + @populate_tracklist def test_previous_track_with_random(self): self.playback.random = True for _ in self.tracks: @@ -474,37 +474,37 @@ class PlaybackControllerTest(object): self.assertEqual( self.playback.track_at_previous, self.playback.current_track) - @populate_playlist + @populate_tracklist def test_initial_current_track(self): self.assertEqual(self.playback.current_track, None) - @populate_playlist + @populate_tracklist def test_current_track_during_play(self): self.playback.play() self.assertEqual(self.playback.current_track, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_current_track_after_next(self): self.playback.play() self.playback.next() self.assertEqual(self.playback.current_track, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_initial_tracklist_position(self): self.assertEqual(self.playback.tracklist_position, None) - @populate_playlist + @populate_tracklist def test_tracklist_position_during_play(self): self.playback.play() self.assertEqual(self.playback.tracklist_position, 0) - @populate_playlist + @populate_tracklist def test_tracklist_position_after_next(self): self.playback.play() self.playback.next() self.assertEqual(self.playback.tracklist_position, 1) - @populate_playlist + @populate_tracklist def test_tracklist_position_at_end_of_playlist(self): self.playback.play(self.tracklist.tl_tracks[-1]) self.playback.on_end_of_track() @@ -524,7 +524,7 @@ class PlaybackControllerTest(object): self.assert_(wrapper.called) @unittest.SkipTest # Blocks for 10ms - @populate_playlist + @populate_tracklist def test_end_of_track_callback_gets_called(self): self.playback.play() result = self.playback.seek(self.tracks[0].length - 10) @@ -532,7 +532,7 @@ class PlaybackControllerTest(object): message = self.core_queue.get(True, 1) self.assertEqual('end_of_track', message['command']) - @populate_playlist + @populate_tracklist def test_on_tracklist_change_when_playing(self): self.playback.play() current_track = self.playback.current_track @@ -540,13 +540,13 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.PLAYING) self.assertEqual(self.playback.current_track, current_track) - @populate_playlist + @populate_tracklist def test_on_tracklist_change_when_stopped(self): self.tracklist.append([self.tracks[2]]) self.assertEqual(self.playback.state, PlaybackState.STOPPED) self.assertEqual(self.playback.current_track, None) - @populate_playlist + @populate_tracklist def test_on_tracklist_change_when_paused(self): self.playback.play() self.playback.pause() @@ -555,55 +555,55 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.PAUSED) self.assertEqual(self.playback.current_track, current_track) - @populate_playlist + @populate_tracklist def test_pause_when_stopped(self): self.playback.pause() self.assertEqual(self.playback.state, PlaybackState.PAUSED) - @populate_playlist + @populate_tracklist def test_pause_when_playing(self): self.playback.play() self.playback.pause() self.assertEqual(self.playback.state, PlaybackState.PAUSED) - @populate_playlist + @populate_tracklist def test_pause_when_paused(self): self.playback.play() self.playback.pause() self.playback.pause() self.assertEqual(self.playback.state, PlaybackState.PAUSED) - @populate_playlist + @populate_tracklist def test_pause_return_value(self): self.playback.play() self.assertEqual(self.playback.pause(), None) - @populate_playlist + @populate_tracklist def test_resume_when_stopped(self): self.playback.resume() self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_resume_when_playing(self): self.playback.play() self.playback.resume() self.assertEqual(self.playback.state, PlaybackState.PLAYING) - @populate_playlist + @populate_tracklist def test_resume_when_paused(self): self.playback.play() self.playback.pause() self.playback.resume() self.assertEqual(self.playback.state, PlaybackState.PLAYING) - @populate_playlist + @populate_tracklist def test_resume_return_value(self): self.playback.play() self.playback.pause() self.assertEqual(self.playback.resume(), None) @unittest.SkipTest # Uses sleep and might not work with LocalBackend - @populate_playlist + @populate_tracklist def test_resume_continues_from_right_position(self): self.playback.play() time.sleep(0.2) @@ -611,12 +611,12 @@ class PlaybackControllerTest(object): self.playback.resume() self.assertNotEqual(self.playback.time_position, 0) - @populate_playlist + @populate_tracklist def test_seek_when_stopped(self): result = self.playback.seek(1000) self.assert_(result, 'Seek return value was %s' % result) - @populate_playlist + @populate_tracklist def test_seek_when_stopped_updates_position(self): self.playback.seek(1000) position = self.playback.time_position @@ -629,18 +629,18 @@ class PlaybackControllerTest(object): self.playback.seek(0) self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_seek_when_stopped_triggers_play(self): self.playback.seek(0) self.assertEqual(self.playback.state, PlaybackState.PLAYING) - @populate_playlist + @populate_tracklist def test_seek_when_playing(self): self.playback.play() result = self.playback.seek(self.tracks[0].length - 1000) self.assert_(result, 'Seek return value was %s' % result) - @populate_playlist + @populate_tracklist def test_seek_when_playing_updates_position(self): length = self.tracklist.tracks[0].length self.playback.play() @@ -648,14 +648,14 @@ class PlaybackControllerTest(object): position = self.playback.time_position self.assertGreaterEqual(position, length - 1010) - @populate_playlist + @populate_tracklist def test_seek_when_paused(self): self.playback.play() self.playback.pause() result = self.playback.seek(self.tracks[0].length - 1000) self.assert_(result, 'Seek return value was %s' % result) - @populate_playlist + @populate_tracklist def test_seek_when_paused_updates_position(self): length = self.tracklist.tracks[0].length self.playback.play() @@ -664,7 +664,7 @@ class PlaybackControllerTest(object): position = self.playback.time_position self.assertGreaterEqual(position, length - 1010) - @populate_playlist + @populate_tracklist def test_seek_when_paused_triggers_play(self): self.playback.play() self.playback.pause() @@ -672,34 +672,34 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.PLAYING) @unittest.SkipTest - @populate_playlist + @populate_tracklist def test_seek_beyond_end_of_song(self): # FIXME need to decide return value self.playback.play() result = self.playback.seek(self.tracks[0].length * 100) self.assert_(not result, 'Seek return value was %s' % result) - @populate_playlist + @populate_tracklist def test_seek_beyond_end_of_song_jumps_to_next_song(self): self.playback.play() self.playback.seek(self.tracks[0].length * 100) self.assertEqual(self.playback.current_track, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_seek_beyond_end_of_song_for_last_track(self): self.playback.play(self.tracklist.tl_tracks[-1]) self.playback.seek(self.tracklist.tracks[-1].length * 100) self.assertEqual(self.playback.state, PlaybackState.STOPPED) @unittest.SkipTest - @populate_playlist + @populate_tracklist def test_seek_beyond_start_of_song(self): # FIXME need to decide return value self.playback.play() result = self.playback.seek(-1000) self.assert_(not result, 'Seek return value was %s' % result) - @populate_playlist + @populate_tracklist def test_seek_beyond_start_of_song_update_postion(self): self.playback.play() self.playback.seek(-1000) @@ -707,18 +707,18 @@ class PlaybackControllerTest(object): self.assertGreaterEqual(position, 0) self.assertEqual(self.playback.state, PlaybackState.PLAYING) - @populate_playlist + @populate_tracklist def test_stop_when_stopped(self): self.playback.stop() self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_stop_when_playing(self): self.playback.play() self.playback.stop() self.assertEqual(self.playback.state, PlaybackState.STOPPED) - @populate_playlist + @populate_tracklist def test_stop_when_paused(self): self.playback.play() self.playback.pause() @@ -736,7 +736,7 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.time_position, 0) - @populate_playlist + @populate_tracklist def test_time_position_when_stopped_with_playlist(self): future = mock.Mock() future.get = mock.Mock(return_value=0) @@ -745,7 +745,7 @@ class PlaybackControllerTest(object): self.assertEqual(self.playback.time_position, 0) @unittest.SkipTest # Uses sleep and does might not work with LocalBackend - @populate_playlist + @populate_tracklist def test_time_position_when_playing(self): self.playback.play() first = self.playback.time_position @@ -754,7 +754,7 @@ class PlaybackControllerTest(object): self.assertGreater(second, first) @unittest.SkipTest # Uses sleep - @populate_playlist + @populate_tracklist def test_time_position_when_paused(self): self.playback.play() time.sleep(0.2) @@ -764,13 +764,13 @@ class PlaybackControllerTest(object): second = self.playback.time_position self.assertEqual(first, second) - @populate_playlist + @populate_tracklist def test_play_with_consume(self): self.playback.consume = True self.playback.play() self.assertEqual(self.playback.current_track, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_playlist_is_empty_after_all_tracks_are_played_with_consume(self): self.playback.consume = True self.playback.play() @@ -778,14 +778,14 @@ class PlaybackControllerTest(object): self.playback.on_end_of_track() self.assertEqual(len(self.tracklist.tracks), 0) - @populate_playlist + @populate_tracklist def test_play_with_random(self): random.seed(1) self.playback.random = True self.playback.play() self.assertEqual(self.playback.current_track, self.tracks[2]) - @populate_playlist + @populate_tracklist def test_previous_with_random(self): random.seed(1) self.playback.random = True @@ -795,13 +795,13 @@ class PlaybackControllerTest(object): self.playback.previous() self.assertEqual(self.playback.current_track, current_track) - @populate_playlist + @populate_tracklist def test_end_of_song_starts_next_track(self): self.playback.play() self.playback.on_end_of_track() self.assertEqual(self.playback.current_track, self.tracks[1]) - @populate_playlist + @populate_tracklist def test_end_of_song_with_single_and_repeat_starts_same(self): self.playback.single = True self.playback.repeat = True @@ -809,7 +809,7 @@ class PlaybackControllerTest(object): self.playback.on_end_of_track() self.assertEqual(self.playback.current_track, self.tracks[0]) - @populate_playlist + @populate_tracklist def test_end_of_playlist_stops(self): self.playback.play(self.tracklist.tl_tracks[-1]) self.playback.on_end_of_track() @@ -824,7 +824,7 @@ class PlaybackControllerTest(object): def test_consume_off_by_default(self): self.assertEqual(self.playback.consume, False) - @populate_playlist + @populate_tracklist def test_random_until_end_of_playlist(self): self.playback.random = True self.playback.play() @@ -832,7 +832,7 @@ class PlaybackControllerTest(object): self.playback.next() self.assertEqual(self.playback.track_at_next, None) - @populate_playlist + @populate_tracklist def test_random_until_end_of_playlist_and_play_from_start(self): self.playback.repeat = True for _ in self.tracks: @@ -842,7 +842,7 @@ class PlaybackControllerTest(object): self.playback.play() self.assertEqual(self.playback.state, PlaybackState.PLAYING) - @populate_playlist + @populate_tracklist def test_random_until_end_of_playlist_with_repeat(self): self.playback.repeat = True self.playback.random = True @@ -851,7 +851,7 @@ class PlaybackControllerTest(object): self.playback.next() self.assertNotEqual(self.playback.track_at_next, None) - @populate_playlist + @populate_tracklist def test_played_track_during_random_not_played_again(self): self.playback.random = True self.playback.play() @@ -861,7 +861,7 @@ class PlaybackControllerTest(object): played.append(self.playback.current_track) self.playback.next() - @populate_playlist + @populate_tracklist def test_playing_track_that_isnt_in_playlist(self): test = lambda: self.playback.play((17, Track())) self.assertRaises(AssertionError, test) diff --git a/tests/backends/base/tracklist.py b/tests/backends/base/tracklist.py index a5fbbcb5..52ddfa46 100644 --- a/tests/backends/base/tracklist.py +++ b/tests/backends/base/tracklist.py @@ -9,7 +9,7 @@ from mopidy import audio, core from mopidy.core import PlaybackState from mopidy.models import TlTrack, Playlist, Track -from tests.backends.base import populate_playlist +from tests.backends.base import populate_tracklist class TracklistControllerTest(object): @@ -48,25 +48,25 @@ class TracklistControllerTest(object): self.assertEqual(tl_track, self.controller.tl_tracks[0]) self.assertEqual(track, tl_track.track) - @populate_playlist + @populate_tracklist def test_add_at_position_outside_of_playlist(self): test = lambda: self.controller.add( self.tracks[0], len(self.tracks) + 2) self.assertRaises(AssertionError, test) - @populate_playlist + @populate_tracklist def test_filter_by_tlid(self): tl_track = self.controller.tl_tracks[1] self.assertEqual( [tl_track], self.controller.filter(tlid=tl_track.tlid)) - @populate_playlist + @populate_tracklist def test_filter_by_uri(self): tl_track = self.controller.tl_tracks[1] self.assertEqual( [tl_track], self.controller.filter(uri=tl_track.track.uri)) - @populate_playlist + @populate_tracklist def test_filter_by_uri_returns_nothing_for_invalid_uri(self): self.assertEqual([], self.controller.filter(uri='foobar')) @@ -106,7 +106,7 @@ class TracklistControllerTest(object): self.controller.append([track1, track2, track3]) self.assertEqual(track2, self.controller.filter(uri='b')[0].track) - @populate_playlist + @populate_tracklist def test_clear(self): self.controller.clear() self.assertEqual(len(self.controller.tracks), 0) @@ -115,7 +115,7 @@ class TracklistControllerTest(object): self.controller.clear() self.assertEqual(len(self.controller.tracks), 0) - @populate_playlist + @populate_tracklist def test_clear_when_playing(self): self.playback.play() self.assertEqual(self.playback.state, PlaybackState.PLAYING) @@ -137,7 +137,7 @@ class TracklistControllerTest(object): self.controller.append([]) self.assertEqual(self.controller.version, version) - @populate_playlist + @populate_tracklist def test_append_preserves_playing_state(self): self.playback.play() track = self.playback.current_track @@ -145,13 +145,13 @@ class TracklistControllerTest(object): self.assertEqual(self.playback.state, PlaybackState.PLAYING) self.assertEqual(self.playback.current_track, track) - @populate_playlist + @populate_tracklist def test_append_preserves_stopped_state(self): self.controller.append(self.controller.tracks[1:2]) self.assertEqual(self.playback.state, PlaybackState.STOPPED) self.assertEqual(self.playback.current_track, None) - @populate_playlist + @populate_tracklist def test_append_returns_the_tl_tracks_that_was_added(self): tl_tracks = self.controller.append(self.controller.tracks[1:2]) self.assertEqual(tl_tracks[0].track, self.controller.tracks[1]) @@ -166,14 +166,14 @@ class TracklistControllerTest(object): test = lambda: self.controller.index(TlTrack(0, Track())) self.assertRaises(ValueError, test) - @populate_playlist + @populate_tracklist def test_move_single(self): self.controller.move(0, 0, 2) tracks = self.controller.tracks self.assertEqual(tracks[2], self.tracks[0]) - @populate_playlist + @populate_tracklist def test_move_group(self): self.controller.move(0, 2, 1) @@ -181,25 +181,25 @@ class TracklistControllerTest(object): self.assertEqual(tracks[1], self.tracks[0]) self.assertEqual(tracks[2], self.tracks[1]) - @populate_playlist + @populate_tracklist def test_moving_track_outside_of_playlist(self): tracks = len(self.controller.tracks) test = lambda: self.controller.move(0, 0, tracks + 5) self.assertRaises(AssertionError, test) - @populate_playlist + @populate_tracklist def test_move_group_outside_of_playlist(self): tracks = len(self.controller.tracks) test = lambda: self.controller.move(0, 2, tracks + 5) self.assertRaises(AssertionError, test) - @populate_playlist + @populate_tracklist def test_move_group_out_of_range(self): tracks = len(self.controller.tracks) test = lambda: self.controller.move(tracks + 2, tracks + 3, 0) self.assertRaises(AssertionError, test) - @populate_playlist + @populate_tracklist def test_move_group_invalid_group(self): test = lambda: self.controller.move(2, 1, 0) self.assertRaises(AssertionError, test) @@ -209,7 +209,7 @@ class TracklistControllerTest(object): tracks2 = self.controller.tracks self.assertNotEqual(id(tracks1), id(tracks2)) - @populate_playlist + @populate_tracklist def test_remove(self): track1 = self.controller.tracks[1] track2 = self.controller.tracks[2] @@ -219,14 +219,14 @@ class TracklistControllerTest(object): self.assertNotIn(track1, self.controller.tracks) self.assertEqual(track2, self.controller.tracks[1]) - @populate_playlist + @populate_tracklist def test_removing_track_that_does_not_exist_does_nothing(self): self.controller.remove(uri='/nonexistant') def test_removing_from_empty_playlist_does_nothing(self): self.controller.remove(uri='/nonexistant') - @populate_playlist + @populate_tracklist def test_shuffle(self): random.seed(1) self.controller.shuffle() @@ -236,7 +236,7 @@ class TracklistControllerTest(object): self.assertNotEqual(self.tracks, shuffled_tracks) self.assertEqual(set(self.tracks), set(shuffled_tracks)) - @populate_playlist + @populate_tracklist def test_shuffle_subset(self): random.seed(1) self.controller.shuffle(1, 3) @@ -247,18 +247,18 @@ class TracklistControllerTest(object): self.assertEqual(self.tracks[0], shuffled_tracks[0]) self.assertEqual(set(self.tracks), set(shuffled_tracks)) - @populate_playlist + @populate_tracklist def test_shuffle_invalid_subset(self): test = lambda: self.controller.shuffle(3, 1) self.assertRaises(AssertionError, test) - @populate_playlist + @populate_tracklist def test_shuffle_superset(self): tracks = len(self.controller.tracks) test = lambda: self.controller.shuffle(1, tracks + 5) self.assertRaises(AssertionError, test) - @populate_playlist + @populate_tracklist def test_shuffle_open_subset(self): random.seed(1) self.controller.shuffle(1) @@ -269,14 +269,14 @@ class TracklistControllerTest(object): self.assertEqual(self.tracks[0], shuffled_tracks[0]) self.assertEqual(set(self.tracks), set(shuffled_tracks)) - @populate_playlist + @populate_tracklist def test_slice_returns_a_subset_of_tracks(self): track_slice = self.controller.slice(1, 3) self.assertEqual(2, len(track_slice)) self.assertEqual(self.tracks[1], track_slice[0].track) self.assertEqual(self.tracks[2], track_slice[1].track) - @populate_playlist + @populate_tracklist def test_slice_returns_empty_list_if_indexes_outside_tracks_list(self): self.assertEqual(0, len(self.controller.slice(7, 8))) self.assertEqual(0, len(self.controller.slice(-1, 1)))