From c5f6c4c2a64a18099376bc508d0b7343ecfcb85d Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 25 Dec 2009 17:20:42 +0100 Subject: [PATCH] Add test for 'lsinfo' command --- mopidy/handler.py | 4 +--- tests/handlertest.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/mopidy/handler.py b/mopidy/handler.py index 3aef0667..7726f43e 100644 --- a/mopidy/handler.py +++ b/mopidy/handler.py @@ -136,9 +136,7 @@ class MpdHandler(object): @register(r'^lsinfo( "(?P[^"]*)")*$') def _lsinfo(self, uri): - if uri == u'/': - return self._listplaylists() - elif uri is None: + if uri == u'/' or uri is None: return self._listplaylists() pass # TODO diff --git a/tests/handlertest.py b/tests/handlertest.py index 2810ce7a..548dffde 100644 --- a/tests/handlertest.py +++ b/tests/handlertest.py @@ -443,15 +443,20 @@ class MusicDatabaseHandlerTest(unittest.TestCase): result = self.h.handle_request(u'listallinfo "file:///dev/urandom"') self.assert_(result is None) + def test_lsinfo_without_path_returns_same_as_listplaylists(self): + lsinfo_result = self.h.handle_request(u'lsinfo') + listplaylists_result = self.h.handle_request(u'listplaylists') + self.assertEquals(lsinfo_result, listplaylists_result) + + def test_lsinfo_with_path(self): + result = self.h.handle_request(u'lsinfo ""') + self.assert_(result is None) + def test_lsinfo_for_root_returns_same_as_listplaylists(self): lsinfo_result = self.h.handle_request(u'lsinfo "/"') listplaylists_result = self.h.handle_request(u'listplaylists') self.assertEquals(lsinfo_result, listplaylists_result) - def test_lsinfo(self): - result = self.h.handle_request(u'lsinfo ""') - self.assert_(result is None) - def test_search_album(self): result = self.h.handle_request(u'search album analbum') self.assert_(result is None)