From 135664da4d0e443d213196ff00719cdcef0f5f11 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sat, 6 Feb 2010 02:35:57 +0100 Subject: [PATCH 1/4] Add logging of which backend is loaded --- mopidy/__main__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 181bef96..0d02b416 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -10,6 +10,8 @@ from mopidy import config from mopidy.exceptions import ConfigError from mopidy.mpd.server import MpdServer +logger = logging.getLogger('mopidy') + def main(): _setup_logging(2) backend = _get_backend(config.BACKEND) @@ -31,6 +33,7 @@ def _setup_logging(verbosity_level): def _get_backend(name): module_name = name[:name.rindex('.')] class_name = name[name.rindex('.') + 1:] + logger.info('Loading: %s from %s', class_name, module_name) module = __import__(module_name, globals(), locals(), [class_name], -1) class_object = getattr(module, class_name) instance = class_object() From 2950984b5a3df200c4971c747f1bcf230805740b Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 7 Feb 2010 04:20:43 +0100 Subject: [PATCH 2/4] Add basic BaseCurrentPlaylistControllerTest --- tests/backends/__init__.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 tests/backends/__init__.py diff --git a/tests/backends/__init__.py b/tests/backends/__init__.py new file mode 100644 index 00000000..9fd8b229 --- /dev/null +++ b/tests/backends/__init__.py @@ -0,0 +1,24 @@ +from mopidy.models import Track + +class BaseCurrentPlaylistControllerTest(object): + uris = [] + backend_class = None + + def setUp(self): + self.backend = self.backend_class() + + def test_add(self): + playlist = self.backend.current_playlist + + for uri in self.uris: + playlist.add(uri) + self.assertEqual(uri, playlist.tracks[-1].uri) + + def test_add_at_position(self): + playlist = self.backend.current_playlist + + for uri in self.uris: + playlist.add(uri, 0) + self.assertEqual(uri, playlist.tracks[0].uri) + + # FIXME test other placements From 3f0d2028c37edfb73046514395ee001133679780 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 7 Feb 2010 04:32:30 +0100 Subject: [PATCH 3/4] Add basic BasePlaybackControllerTest --- tests/backends/__init__.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/backends/__init__.py b/tests/backends/__init__.py index 9fd8b229..a3898324 100644 --- a/tests/backends/__init__.py +++ b/tests/backends/__init__.py @@ -22,3 +22,18 @@ class BaseCurrentPlaylistControllerTest(object): self.assertEqual(uri, playlist.tracks[0].uri) # FIXME test other placements + +class BasePlaybackControllerTest(object): + backend_class = None + + def setUp(self): + self.backend = self.backend_class() + + def test_play(self): + playback = self.backend.playback + + self.assertEqual(playback.state, playback.STOPPED) + + playback.play() + + self.assertEqual(playback.state, playback.PLAYING) From 8fb7a364d195632b2951244ace90b86e539e4485 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 7 Feb 2010 04:34:18 +0100 Subject: [PATCH 4/4] Add test for next --- tests/backends/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/backends/__init__.py b/tests/backends/__init__.py index a3898324..cec58c73 100644 --- a/tests/backends/__init__.py +++ b/tests/backends/__init__.py @@ -37,3 +37,12 @@ class BasePlaybackControllerTest(object): playback.play() self.assertEqual(playback.state, playback.PLAYING) + + def test_next(self): + playback = self.backend.playback + + current_song = playback.playlist_position + + playback.next() + + self.assertEqual(playback.playlist_position, current_song+1)