From 6d22c4fd5970430f96e937432862b0cf23d18004 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Mon, 23 Mar 2015 00:48:48 +0100 Subject: [PATCH] core: Remove set_current_tl_track --- mopidy/core/playback.py | 15 +++++++-------- tests/core/test_playback.py | 17 ++++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index e97d5c5e..8d9b7777 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -41,15 +41,14 @@ class PlaybackController(object): """ return self._current_tl_track - def set_current_tl_track(self, value): + def _set_current_tl_track(self, value): """Set the currently playing or selected track. *Internal:* This is only for use by Mopidy's test suite. """ self._current_tl_track = value - current_tl_track = deprecated_property( - get_current_tl_track, set_current_tl_track) + current_tl_track = deprecated_property(get_current_tl_track) """ .. deprecated:: 1.0 Use :meth:`get_current_tl_track` instead. @@ -195,7 +194,7 @@ class PlaybackController(object): """ old_state = self.get_state() self.stop() - self.set_current_tl_track(tl_track) + self._set_current_tl_track(tl_track) if old_state == PlaybackState.PLAYING: self._play(on_error_step=on_error_step) elif old_state == PlaybackState.PAUSED: @@ -218,7 +217,7 @@ class PlaybackController(object): self._change_track(next_tl_track) else: self.stop() - self.set_current_tl_track(None) + self._set_current_tl_track(None) self.core.tracklist._mark_played(original_tl_track) @@ -231,7 +230,7 @@ class PlaybackController(object): tracklist = self.core.tracklist.get_tl_tracks() if self.get_current_tl_track() not in tracklist: self.stop() - self.set_current_tl_track(None) + self._set_current_tl_track(None) def _on_stream_changed(self, uri): self._stream_title = None @@ -253,7 +252,7 @@ class PlaybackController(object): self._change_track(next_tl_track) else: self.stop() - self.set_current_tl_track(None) + self._set_current_tl_track(None) self.core.tracklist._mark_played(original_tl_track) @@ -302,7 +301,7 @@ class PlaybackController(object): if self.get_state() == PlaybackState.PLAYING: self.stop() - self.set_current_tl_track(tl_track) + self._set_current_tl_track(tl_track) self.set_state(PlaybackState.PLAYING) backend = self._get_backend() success = False diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py index 972b6dea..7c4db0d6 100644 --- a/tests/core/test_playback.py +++ b/tests/core/test_playback.py @@ -53,8 +53,11 @@ class CorePlaybackTest(unittest.TestCase): def trigger_end_of_track(self): self.core.playback._on_end_of_track() + def set_current_tl_track(self, tl_track): + self.core.playback._set_current_tl_track(tl_track) + def test_get_current_tl_track_none(self): - self.core.playback.set_current_tl_track(None) + self.set_current_tl_track(None) self.assertEqual( self.core.playback.get_current_tl_track(), None) @@ -217,7 +220,7 @@ class CorePlaybackTest(unittest.TestCase): self.playback2.pause.assert_called_once_with() def test_pause_changes_state_even_if_track_is_unplayable(self): - self.core.playback.current_tl_track = self.unplayable_tl_track + self.set_current_tl_track(self.unplayable_tl_track) self.core.playback.pause() self.assertEqual(self.core.playback.state, core.PlaybackState.PAUSED) @@ -260,7 +263,7 @@ class CorePlaybackTest(unittest.TestCase): self.playback2.resume.assert_called_once_with() def test_resume_does_nothing_if_track_is_unplayable(self): - self.core.playback.current_tl_track = self.unplayable_tl_track + self.set_current_tl_track(self.unplayable_tl_track) self.core.playback.state = core.PlaybackState.PAUSED self.core.playback.resume() @@ -303,7 +306,7 @@ class CorePlaybackTest(unittest.TestCase): self.playback2.stop.assert_called_once_with() def test_stop_changes_state_even_if_track_is_unplayable(self): - self.core.playback.current_tl_track = self.unplayable_tl_track + self.set_current_tl_track(self.unplayable_tl_track) self.core.playback.state = core.PlaybackState.PAUSED self.core.playback.stop() @@ -498,7 +501,7 @@ class CorePlaybackTest(unittest.TestCase): self.playback2.seek.assert_called_once_with(10000) def test_seek_fails_for_unplayable_track(self): - self.core.playback.current_tl_track = self.unplayable_tl_track + self.set_current_tl_track(self.unplayable_tl_track) self.core.playback.state = core.PlaybackState.PLAYING success = self.core.playback.seek(1000) @@ -507,7 +510,7 @@ class CorePlaybackTest(unittest.TestCase): self.assertFalse(self.playback2.seek.called) def test_seek_fails_for_track_without_duration(self): - self.core.playback.current_tl_track = self.duration_less_tl_track + self.set_current_tl_track(self.duration_less_tl_track) self.core.playback.state = core.PlaybackState.PLAYING success = self.core.playback.seek(1000) @@ -557,7 +560,7 @@ class CorePlaybackTest(unittest.TestCase): self.playback2.get_time_position.assert_called_once_with() def test_time_position_returns_0_if_track_is_unplayable(self): - self.core.playback.current_tl_track = self.unplayable_tl_track + self.set_current_tl_track(self.unplayable_tl_track) result = self.core.playback.time_position