andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Match assertIn behaviour and rename helper to assertInResponse

Browse Source
This commit is contained in:
Thomas Adamcik 2011-07-20 16:14:43 +02:00
parent da9b6470ba
commit 3d1c47586e
2 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/frontends/mpd/protocol/__init__.py
View File

@ -36,8 +36,6 @@ class BaseTestCase(unittest.TestCase):
self.connection.response = []
self.session.on_line_received(request)
def assertResponse(self, value, index=None):
if index is not None:
self.assertEqual(value, self.connection.response[index])
else:
self.assert_(value in self.connection.response)
def assertInResponse(self, value):
self.assert_(value in self.connection.response, u'Did not find %s '
'in %s' % (repr(value), repr(self.connection.response)))

116
tests/frontends/mpd/protocol/playback_test.py
View File

@ -13,138 +13,138 @@ class PlaybackOptionsHandlerTest(protocol.BaseTestCase):
def test_consume_off(self):
self.sendRequest(u'consume "0"')
self.assertFalse(self.backend.playback.consume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_consume_off_without_quotes(self):
self.sendRequest(u'consume 0')
self.assertFalse(self.backend.playback.consume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_consume_on(self):
self.sendRequest(u'consume "1"')
self.assertTrue(self.backend.playback.consume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_consume_on_without_quotes(self):
self.sendRequest(u'consume 1')
self.assertTrue(self.backend.playback.consume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_crossfade(self):
self.sendRequest(u'crossfade "10"')
self.assertResponse(u'ACK [0@0] {} Not implemented')
self.assertInResponse(u'ACK [0@0] {} Not implemented')
def test_random_off(self):
self.sendRequest(u'random "0"')
self.assertFalse(self.backend.playback.random.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_random_off_without_quotes(self):
self.sendRequest(u'random 0')
self.assertFalse(self.backend.playback.random.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_random_on(self):
self.sendRequest(u'random "1"')
self.assertTrue(self.backend.playback.random.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_random_on_without_quotes(self):
self.sendRequest(u'random 1')
self.assertTrue(self.backend.playback.random.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_repeat_off(self):
self.sendRequest(u'repeat "0"')
self.assertFalse(self.backend.playback.repeat.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_repeat_off_without_quotes(self):
self.sendRequest(u'repeat 0')
self.assertFalse(self.backend.playback.repeat.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_repeat_on(self):
self.sendRequest(u'repeat "1"')
self.assertTrue(self.backend.playback.repeat.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_repeat_on_without_quotes(self):
self.sendRequest(u'repeat 1')
self.assertTrue(self.backend.playback.repeat.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_setvol_below_min(self):
self.sendRequest(u'setvol "-10"')
self.assertEqual(0, self.mixer.volume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_setvol_min(self):
self.sendRequest(u'setvol "0"')
self.assertEqual(0, self.mixer.volume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_setvol_middle(self):
self.sendRequest(u'setvol "50"')
self.assertEqual(50, self.mixer.volume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_setvol_max(self):
self.sendRequest(u'setvol "100"')
self.assertEqual(100, self.mixer.volume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_setvol_above_max(self):
self.sendRequest(u'setvol "110"')
self.assertEqual(100, self.mixer.volume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_setvol_plus_is_ignored(self):
self.sendRequest(u'setvol "+10"')
self.assertEqual(10, self.mixer.volume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_setvol_without_quotes(self):
self.sendRequest(u'setvol 50')
self.assertEqual(50, self.mixer.volume.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_single_off(self):
self.sendRequest(u'single "0"')
self.assertFalse(self.backend.playback.single.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_single_off_without_quotes(self):
self.sendRequest(u'single 0')
self.assertFalse(self.backend.playback.single.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_single_on(self):
self.sendRequest(u'single "1"')
self.assertTrue(self.backend.playback.single.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_single_on_without_quotes(self):
self.sendRequest(u'single 1')
self.assertTrue(self.backend.playback.single.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_replay_gain_mode_off(self):
self.sendRequest(u'replay_gain_mode "off"')
self.assertResponse(u'ACK [0@0] {} Not implemented')
self.assertInResponse(u'ACK [0@0] {} Not implemented')
def test_replay_gain_mode_track(self):
self.sendRequest(u'replay_gain_mode "track"')
self.assertResponse(u'ACK [0@0] {} Not implemented')
self.assertInResponse(u'ACK [0@0] {} Not implemented')
def test_replay_gain_mode_album(self):
self.sendRequest(u'replay_gain_mode "album"')
self.assertResponse(u'ACK [0@0] {} Not implemented')
self.assertInResponse(u'ACK [0@0] {} Not implemented')
def test_replay_gain_status_default(self):
self.sendRequest(u'replay_gain_status')
self.assertResponse(u'OK')
self.assertResponse(u'off')
self.assertInResponse(u'OK')
self.assertInResponse(u'off')
def test_replay_gain_status_off(self):
raise SkipTest # TODO
@ -159,7 +159,7 @@ class PlaybackOptionsHandlerTest(protocol.BaseTestCase):
class PlaybackControlHandlerTest(protocol.BaseTestCase):
def test_next(self):
self.sendRequest(u'next')
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_pause_off(self):
self.backend.current_playlist.append([Track()])
@ -168,7 +168,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'pause "1"')
self.sendRequest(u'pause "0"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_pause_on(self):
self.backend.current_playlist.append([Track()])
@ -176,22 +176,22 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'play "0"')
self.sendRequest(u'pause "1"')
self.assertEqual(PAUSED, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_pause_toggle(self):
self.backend.current_playlist.append([Track()])
self.sendRequest(u'play "0"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
self.sendRequest(u'pause')
self.assertEqual(PAUSED, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
self.sendRequest(u'pause')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_play_without_pos(self):
self.backend.current_playlist.append([Track()])
@ -199,28 +199,28 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'play')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_play_with_pos(self):
self.backend.current_playlist.append([Track()])
self.sendRequest(u'play "0"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_play_with_pos_without_quotes(self):
self.backend.current_playlist.append([Track()])
self.sendRequest(u'play 0')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_play_with_pos_out_of_bounds(self):
self.backend.current_playlist.append([])
self.sendRequest(u'play "0"')
self.assertEqual(STOPPED, self.backend.playback.state.get())
self.assertResponse(u'ACK [2@0] {play} Bad song index', index=0)
self.assertInResponse(u'ACK [2@0] {play} Bad song index')
def test_play_minus_one_plays_first_in_playlist_if_no_current_track(self):
self.assertEqual(self.backend.playback.current_track.get(), None)
@ -229,7 +229,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'play "-1"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertEqual('a', self.backend.playback.current_track.get().uri)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_play_minus_one_plays_current_track_if_current_track_is_set(self):
self.backend.current_playlist.append([Track(uri='a'), Track(uri='b')])
@ -242,7 +242,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'play "-1"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertEqual('b', self.backend.playback.current_track.get().uri)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_play_minus_one_on_empty_playlist_does_not_ack(self):
self.backend.current_playlist.clear()
@ -250,7 +250,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'play "-1"')
self.assertEqual(STOPPED, self.backend.playback.state.get())
self.assertEqual(None, self.backend.playback.current_track.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_play_minus_is_ignored_if_playing(self):
self.backend.current_playlist.append([Track(length=40000)])
@ -261,7 +261,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'play "-1"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assert_(self.backend.playback.time_position.get() >= 30000)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_play_minus_one_resumes_if_paused(self):
self.backend.current_playlist.append([Track(length=40000)])
@ -274,14 +274,14 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'play "-1"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assert_(self.backend.playback.time_position.get() >= 30000)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_playid(self):
self.backend.current_playlist.append([Track()])
self.sendRequest(u'playid "0"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_playid_minus_one_plays_first_in_playlist_if_no_current_track(self):
self.assertEqual(self.backend.playback.current_track.get(), None)
@ -290,7 +290,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'playid "-1"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertEqual('a', self.backend.playback.current_track.get().uri)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_playid_minus_one_plays_current_track_if_current_track_is_set(self):
self.backend.current_playlist.append([Track(uri='a'), Track(uri='b')])
@ -303,7 +303,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'playid "-1"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assertEqual('b', self.backend.playback.current_track.get().uri)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_playid_minus_one_on_empty_playlist_does_not_ack(self):
self.backend.current_playlist.clear()
@ -311,7 +311,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'playid "-1"')
self.assertEqual(STOPPED, self.backend.playback.state.get())
self.assertEqual(None, self.backend.playback.current_track.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_playid_minus_is_ignored_if_playing(self):
self.backend.current_playlist.append([Track(length=40000)])
@ -322,7 +322,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'playid "-1"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assert_(self.backend.playback.time_position.get() >= 30000)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_playid_minus_one_resumes_if_paused(self):
self.backend.current_playlist.append([Track(length=40000)])
@ -335,17 +335,17 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'playid "-1"')
self.assertEqual(PLAYING, self.backend.playback.state.get())
self.assert_(self.backend.playback.time_position.get() >= 30000)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_playid_which_does_not_exist(self):
self.backend.current_playlist.append([Track()])
self.sendRequest(u'playid "12345"')
self.assertResponse(u'ACK [50@0] {playid} No such song', index=0)
self.assertInResponse(u'ACK [50@0] {playid} No such song')
def test_previous(self):
self.sendRequest(u'previous')
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_seek(self):
self.backend.current_playlist.append([Track(length=40000)])
@ -353,7 +353,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'seek "0"')
self.sendRequest(u'seek "0" "30"')
self.assert_(self.backend.playback.time_position >= 30000)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_seek_with_songpos(self):
seek_track = Track(uri='2', length=40000)
@ -362,7 +362,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'seek "1" "30"')
self.assertEqual(self.backend.playback.current_track.get(), seek_track)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_seek_without_quotes(self):
self.backend.current_playlist.append([Track(length=40000)])
@ -370,13 +370,13 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'seek 0')
self.sendRequest(u'seek 0 30')
self.assert_(self.backend.playback.time_position.get() >= 30000)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_seekid(self):
self.backend.current_playlist.append([Track(length=40000)])
self.sendRequest(u'seekid "0" "30"')
self.assert_(self.backend.playback.time_position.get() >= 30000)
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_seekid_with_cpid(self):
seek_track = Track(uri='2', length=40000)
@ -386,9 +386,9 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.sendRequest(u'seekid "1" "30"')
self.assertEqual(1, self.backend.playback.current_cpid.get())
self.assertEqual(seek_track, self.backend.playback.current_track.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')
def test_stop(self):
self.sendRequest(u'stop')
self.assertEqual(STOPPED, self.backend.playback.state.get())
self.assertResponse(u'OK')
self.assertInResponse(u'OK')