From c5a4bb0e229a070192d40d068b426aa8e9e7eddb Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 27 Dec 2011 22:22:30 +0100 Subject: [PATCH] Rename tracks_len to length, and add test --- mopidy/backends/base/current_playlist.py | 4 ++-- mopidy/frontends/mpd/protocol/status.py | 4 ++-- tests/backends/base/current_playlist.py | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mopidy/backends/base/current_playlist.py b/mopidy/backends/base/current_playlist.py index 1134984b..966456a4 100644 --- a/mopidy/backends/base/current_playlist.py +++ b/mopidy/backends/base/current_playlist.py @@ -40,9 +40,9 @@ class CurrentPlaylistController(object): return [ct[1] for ct in self._cp_tracks] @property - def tracks_len(self): + def length(self): """ - Length of current playlist + Length of the current playlist. """ return len(self._cp_tracks) diff --git a/mopidy/frontends/mpd/protocol/status.py b/mopidy/frontends/mpd/protocol/status.py index b0bc7ad7..f4d66c56 100644 --- a/mopidy/frontends/mpd/protocol/status.py +++ b/mopidy/frontends/mpd/protocol/status.py @@ -166,7 +166,7 @@ def status(context): decimal places for millisecond precision. """ futures = { - 'current_playlist.tracks_len': context.backend.current_playlist.tracks_len, + 'current_playlist.length': context.backend.current_playlist.length, 'current_playlist.version': context.backend.current_playlist.version, 'mixer.volume': context.mixer.volume, 'playback.consume': context.backend.playback.consume, @@ -213,7 +213,7 @@ def _status_consume(futures): return 0 def _status_playlist_length(futures): - return futures['current_playlist.tracks_len'].get() + return futures['current_playlist.length'].get() def _status_playlist_version(futures): return futures['current_playlist.version'].get() diff --git a/tests/backends/base/current_playlist.py b/tests/backends/base/current_playlist.py index c81f4a0d..6d4854a7 100644 --- a/tests/backends/base/current_playlist.py +++ b/tests/backends/base/current_playlist.py @@ -18,6 +18,13 @@ class CurrentPlaylistControllerTest(object): assert len(self.tracks) == 3, 'Need three tracks to run tests.' + def test_length(self): + self.assertEqual(0, len(self.controller.cp_tracks)) + self.assertEqual(0, self.controller.length) + self.controller.append(self.tracks) + self.assertEqual(3, len(self.controller.cp_tracks)) + self.assertEqual(3, self.controller.length) + def test_add(self): for track in self.tracks: cp_track = self.controller.add(track)