From 8b29170c9b14a9fb2414578669e0d8a10a0794aa Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 24 Dec 2009 03:40:33 +0100 Subject: [PATCH] Unbreak tests. Update some message formats to match Sonata. --- mopidy/backends/{backend.py => base.py} | 0 mopidy/backends/dummy.py | 4 ++ mopidy/backends/dummy_backend.py | 4 -- .../{spotify_backend.py => spotify.py} | 8 +-- mopidy/handler.py | 14 ++--- mopidy/settings.py | 4 +- tests/handlertest.py | 52 ++++++++++--------- 7 files changed, 45 insertions(+), 41 deletions(-) rename mopidy/backends/{backend.py => base.py} (100%) create mode 100644 mopidy/backends/dummy.py delete mode 100644 mopidy/backends/dummy_backend.py rename mopidy/backends/{spotify_backend.py => spotify.py} (68%) diff --git a/mopidy/backends/backend.py b/mopidy/backends/base.py similarity index 100% rename from mopidy/backends/backend.py rename to mopidy/backends/base.py diff --git a/mopidy/backends/dummy.py b/mopidy/backends/dummy.py new file mode 100644 index 00000000..b8713c81 --- /dev/null +++ b/mopidy/backends/dummy.py @@ -0,0 +1,4 @@ +from mopidy.backends.base import BaseBackend + +class DummyBackend(BaseBackend): + pass diff --git a/mopidy/backends/dummy_backend.py b/mopidy/backends/dummy_backend.py deleted file mode 100644 index dabdae79..00000000 --- a/mopidy/backends/dummy_backend.py +++ /dev/null @@ -1,4 +0,0 @@ -from mopidy.backends.backend import BaseBackend - -class DummyBackend(BaseBackend): - pass diff --git a/mopidy/backends/spotify_backend.py b/mopidy/backends/spotify.py similarity index 68% rename from mopidy/backends/spotify_backend.py rename to mopidy/backends/spotify.py index 83b2081f..a5e88624 100644 --- a/mopidy/backends/spotify_backend.py +++ b/mopidy/backends/spotify.py @@ -1,17 +1,19 @@ import spytify from mopidy import settings -from mopidy.backends.backend import BaseBackend +from mopidy.backends.base import BaseBackend class SpotifyBackend(BaseBackend): def __init__(self, *args, **kwargs): super(SpotifyBackend, self).__init__(*args, **kwargs) - self.spotify = spytify.Spytify(settings.SPOTIFY_USERNAME, settings.SPOTIFY_PASSWORD) + self.spotify = spytify.Spytify( + settings.SPOTIFY_USERNAME.encode('utf-8'), + settings.SPOTIFY_PASSWORD.encode('utf-8')) def list_playlists(self): playlists = u'' for playlist in self.spotify.stored_playlists: - playlists += u'playlist: %s\n' % playlist.name + playlists += u'playlist: %s\n' % playlist.name.decode('utf-8') return playlists def load(self, name): diff --git a/mopidy/handler.py b/mopidy/handler.py index 8c19911e..66f601a9 100644 --- a/mopidy/handler.py +++ b/mopidy/handler.py @@ -3,7 +3,7 @@ import re import sys from mopidy import settings -from mopidy.backends.spotify_backend import SpotifyBackend +from mopidy.backends.spotify import SpotifyBackend logger = logging.getLogger('handler') @@ -58,7 +58,7 @@ class MpdHandler(object): def _close(self): self.session.do_close() - @register(r'^consume (?P[01])$') + @register(r'^consume "(?P[01])"$') def _consume(self, state): state = int(state) if state: @@ -66,7 +66,7 @@ class MpdHandler(object): else: pass # TODO - @register(r'^crossfade (?P\d+)$') + @register(r'^crossfade "(?P\d+)"$') def _crossfade(self, seconds): seconds = int(seconds) pass # TODO @@ -202,7 +202,7 @@ class MpdHandler(object): def _rename(self, old_name, new_name): pass # TODO - @register(r'^random (?P[01])$') + @register(r'^random "(?P[01])"$') def _random(self, state): state = int(state) if state: @@ -210,7 +210,7 @@ class MpdHandler(object): else: pass # TODO - @register(r'^repeat (?P[01])$') + @register(r'^repeat "(?P[01])"$') def _repeat(self, state): state = int(state) if state: @@ -242,7 +242,7 @@ class MpdHandler(object): def _seekid(self, songid, seconds): pass # TODO - @register(r'^setvol (?P-*\d+)$') + @register(r'^setvol "(?P-*\d+)"$') def _setvol(self, volume): volume = int(volume) if volume < 0: @@ -255,7 +255,7 @@ class MpdHandler(object): def _shuffle(self, start=None, end=None): pass # TODO - @register(r'^single (?P[01])$') + @register(r'^single "(?P[01])"$') def _single(self, state): state = int(state) if state: diff --git a/mopidy/settings.py b/mopidy/settings.py index ea888864..22a51a40 100644 --- a/mopidy/settings.py +++ b/mopidy/settings.py @@ -4,8 +4,8 @@ MPD_LINE_TERMINATOR = u'\n' MPD_SERVER_HOSTNAME = u'localhost' MPD_SERVER_PORT = 6600 -SPOTIFY_USERNAME = '' -SPOTIFY_PASSWORD = '' +SPOTIFY_USERNAME = u'' +SPOTIFY_PASSWORD = u'' try: from mopidy.local_settings import * diff --git a/tests/handlertest.py b/tests/handlertest.py index 4154fc62..229dc1aa 100644 --- a/tests/handlertest.py +++ b/tests/handlertest.py @@ -1,10 +1,11 @@ import unittest from mopidy import handler +from mopidy.backends.dummy import DummyBackend class RequestHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) def test_register_same_pattern_twice_fails(self): func = lambda: None @@ -33,7 +34,7 @@ class RequestHandlerTest(unittest.TestCase): class StatusHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) def test_clearerror(self): result = self.h.handle_request(u'clearerror') @@ -92,62 +93,62 @@ class StatusHandlerTest(unittest.TestCase): class PlaybackOptionsHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) def test_consume_off(self): - result = self.h.handle_request(u'consume 0') + result = self.h.handle_request(u'consume "0"') self.assert_(result is None) def test_consume_on(self): - result = self.h.handle_request(u'consume 1') + result = self.h.handle_request(u'consume "1"') self.assert_(result is None) def test_crossfade(self): - result = self.h.handle_request(u'crossfade 10') + result = self.h.handle_request(u'crossfade "10"') self.assert_(result is None) def test_random_off(self): - result = self.h.handle_request(u'random 0') + result = self.h.handle_request(u'random "0"') self.assert_(result is None) def test_random_on(self): - result = self.h.handle_request(u'random 1') + result = self.h.handle_request(u'random "1"') self.assert_(result is None) def test_repeat_off(self): - result = self.h.handle_request(u'repeat 0') + result = self.h.handle_request(u'repeat "0"') self.assert_(result is None) def test_repeat_on(self): - result = self.h.handle_request(u'repeat 1') + result = self.h.handle_request(u'repeat "1"') self.assert_(result is None) def test_setvol_below_min(self): - result = self.h.handle_request(u'setvol -10') + result = self.h.handle_request(u'setvol "-10"') self.assert_(result is None) def test_setvol_min(self): - result = self.h.handle_request(u'setvol 0') + result = self.h.handle_request(u'setvol "0"') self.assert_(result is None) def test_setvol_middle(self): - result = self.h.handle_request(u'setvol 50') + result = self.h.handle_request(u'setvol "50"') self.assert_(result is None) def test_setvol_max(self): - result = self.h.handle_request(u'setvol 100') + result = self.h.handle_request(u'setvol "100"') self.assert_(result is None) def test_setvol_above_max(self): - result = self.h.handle_request(u'setvol 110') + result = self.h.handle_request(u'setvol "110"') self.assert_(result is None) def test_single_off(self): - result = self.h.handle_request(u'single 0') + result = self.h.handle_request(u'single "0"') self.assert_(result is None) def test_single_on(self): - result = self.h.handle_request(u'single 1') + result = self.h.handle_request(u'single "1"') self.assert_(result is None) def test_replay_gain_mode_off(self): @@ -188,7 +189,7 @@ class PlaybackOptionsHandlerTest(unittest.TestCase): class PlaybackControlHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) def test_next(self): result = self.h.handle_request(u'next') @@ -229,7 +230,7 @@ class PlaybackControlHandlerTest(unittest.TestCase): class CurrentPlaylistHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) def test_add(self): result = self.h.handle_request(u'add "file:///dev/urandom"') @@ -347,7 +348,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase): class StoredPlaylistsHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) def test_listplaylist(self): result = self.h.handle_request(u'listplaylist name') @@ -397,7 +398,7 @@ class StoredPlaylistsHandlerTest(unittest.TestCase): class MusicDatabaseHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) pass # TODO @@ -413,7 +414,7 @@ class MusicDatabaseHandlerTest(unittest.TestCase): class StickersHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) pass # TODO @@ -428,7 +429,8 @@ class DummySession(object): class ConnectionHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler(session=DummySession()) + self.h = handler.MpdHandler(session=DummySession(), + backend=DummyBackend) def test_close(self): result = self.h.handle_request(u'close') @@ -452,13 +454,13 @@ class ConnectionHandlerTest(unittest.TestCase): class AudioOutputHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) pass # TODO class ReflectionHandlerTest(unittest.TestCase): def setUp(self): - self.h = handler.MpdHandler() + self.h = handler.MpdHandler(backend=DummyBackend) pass # TODO