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

tests: Don't use indexes into TlTracks

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-11-16 14:57:25 +01:00
parent 533b46987d
commit cfac728def
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/backends/base/tracklist.py
View File

@ -88,7 +88,7 @@ class TracklistControllerTest(object):
def test_get_by_uri_returns_unique_match(self):
track = Track(uri='a')
self.controller.append([Track(uri='z'), track, Track(uri='y')])
self.assertEqual(track, self.controller.get(uri='a')[1])
self.assertEqual(track, self.controller.get(uri='a').track)
def test_get_by_uri_raises_error_if_multiple_matches(self):
track = Track(uri='a')
@ -113,16 +113,16 @@ class TracklistControllerTest(object):
track2 = Track(uri='b', name='x')
track3 = Track(uri='b', name='y')
self.controller.append([track1, track2, track3])
self.assertEqual(track1, self.controller.get(uri='a', name='x')[1])
self.assertEqual(track2, self.controller.get(uri='b', name='x')[1])
self.assertEqual(track3, self.controller.get(uri='b', name='y')[1])
self.assertEqual(track1, self.controller.get(uri='a', name='x').track)
self.assertEqual(track2, self.controller.get(uri='b', name='x').track)
self.assertEqual(track3, self.controller.get(uri='b', name='y').track)
def test_get_by_criteria_that_is_not_present_in_all_elements(self):
track1 = Track()
track2 = Track(uri='b')
track3 = Track()
self.controller.append([track1, track2, track3])
self.assertEqual(track2, self.controller.get(uri='b')[1])
self.assertEqual(track2, self.controller.get(uri='b').track)
def test_append_appends_to_the_tracklist(self):
self.controller.append([Track(uri='a'), Track(uri='b')])
@ -156,7 +156,7 @@ class TracklistControllerTest(object):
@populate_playlist
def test_append_returns_the_tl_tracks_that_was_added(self):
tl_tracks = self.controller.append(self.controller.tracks[1:2])
self.assertEqual(tl_tracks[0][1], self.controller.tracks[1])
self.assertEqual(tl_tracks[0].track, self.controller.tracks[1])
def test_index_returns_index_of_track(self):
tl_tracks = self.controller.append(self.tracks)

12
tests/frontends/mpd/protocol/current_playlist_test.py
View File

@ -41,7 +41,7 @@ class CurrentPlaylistHandlerTest(protocol.BaseTestCase):
self.assertEqual(len(self.core.tracklist.tracks.get()), 6)
self.assertEqual(self.core.tracklist.tracks.get()[5], needle)
self.assertInResponse(
'Id: %d' % self.core.tracklist.tl_tracks.get()[5][0])
'Id: %d' % self.core.tracklist.tl_tracks.get()[5].tlid)
self.assertInResponse('OK')
def test_addid_with_empty_uri_acks(self):
@ -60,7 +60,7 @@ class CurrentPlaylistHandlerTest(protocol.BaseTestCase):
self.assertEqual(len(self.core.tracklist.tracks.get()), 6)
self.assertEqual(self.core.tracklist.tracks.get()[3], needle)
self.assertInResponse(
'Id: %d' % self.core.tracklist.tl_tracks.get()[3][0])
'Id: %d' % self.core.tracklist.tl_tracks.get()[3].tlid)
self.assertInResponse('OK')
def test_addid_with_songpos_out_of_bounds_should_ack(self):
@ -94,7 +94,7 @@ class CurrentPlaylistHandlerTest(protocol.BaseTestCase):
self.assertEqual(len(self.core.tracklist.tracks.get()), 5)
self.sendRequest(
'delete "%d"' % self.core.tracklist.tl_tracks.get()[2][0])
'delete "%d"' % self.core.tracklist.tl_tracks.get()[2].tlid)
self.assertEqual(len(self.core.tracklist.tracks.get()), 4)
self.assertInResponse('OK')
@ -424,11 +424,11 @@ class CurrentPlaylistHandlerTest(protocol.BaseTestCase):
self.sendRequest('plchangesposid "0"')
tl_tracks = self.core.tracklist.tl_tracks.get()
self.assertInResponse('cpos: 0')
self.assertInResponse('Id: %d' % tl_tracks[0][0])
self.assertInResponse('Id: %d' % tl_tracks[0].tlid)
self.assertInResponse('cpos: 2')
self.assertInResponse('Id: %d' % tl_tracks[1][0])
self.assertInResponse('Id: %d' % tl_tracks[1].tlid)
self.assertInResponse('cpos: 2')
self.assertInResponse('Id: %d' % tl_tracks[2][0])
self.assertInResponse('Id: %d' % tl_tracks[2].tlid)
self.assertInResponse('OK')
def test_shuffle_without_range(self):