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

tests: Update tests to not used deprecated kwargs

Browse Source
This commit is contained in:
Thomas Adamcik 2015-04-16 21:12:18 +02:00
parent ab761c4596
commit 81fd426caf
5 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/core/test_events.py
View File

@ -71,7 +71,7 @@ class BackendEventsTest(unittest.TestCase):
self.core.tracklist.add(uris=['dummy:a']).get()
send.reset_mock()
self.core.tracklist.remove(uri=['dummy:a']).get()
self.core.tracklist.remove({'uri': ['dummy:a']}).get()
self.assertEqual(send.call_args[0][0], 'tracklist_changed')

2
tests/core/test_playlists.py
View File

@ -240,7 +240,7 @@ class DeprecatedFilterPlaylistsTest(BasePlaylistsTest):
return super(DeprecatedFilterPlaylistsTest, self).run(result)
def test_filter_returns_matching_playlists(self):
result = self.core.playlists.filter(name='A')
result = self.core.playlists.filter({'name': 'A'})
self.assertEqual(2, len(result))

8
tests/core/test_tracklist.py
View File

@ -64,7 +64,7 @@ class TracklistTest(unittest.TestCase):
tl_tracks, self.core.tracklist.tl_tracks[-len(tl_tracks):])
def test_remove_removes_tl_tracks_matching_query(self):
tl_tracks = self.core.tracklist.remove(name=['foo'])
tl_tracks = self.core.tracklist.remove({'name': ['foo']})
self.assertEqual(2, len(tl_tracks))
self.assertListEqual(self.tl_tracks[:2], tl_tracks)
@ -82,7 +82,7 @@ class TracklistTest(unittest.TestCase):
self.assertListEqual(self.tl_tracks[2:], self.core.tracklist.tl_tracks)
def test_filter_returns_tl_tracks_matching_query(self):
tl_tracks = self.core.tracklist.filter(name=['foo'])
tl_tracks = self.core.tracklist.filter({'name': ['foo']})
self.assertEqual(2, len(tl_tracks))
self.assertListEqual(self.tl_tracks[:2], tl_tracks)
@ -95,10 +95,10 @@ class TracklistTest(unittest.TestCase):
def test_filter_fails_if_values_isnt_iterable(self):
with self.assertRaises(ValueError):
self.core.tracklist.filter(tlid=3)
self.core.tracklist.filter({'tlid': 3})
def test_filter_fails_if_values_is_a_string(self):
with self.assertRaises(ValueError):
self.core.tracklist.filter(uri='a')
self.core.tracklist.filter({'uri': 'a'})
# TODO Extract tracklist tests from the local backend tests

41
tests/local/test_tracklist.py
View File

@ -77,53 +77,54 @@ class LocalTracklistProviderTest(unittest.TestCase):
def test_filter_by_tlid(self):
tl_track = self.controller.tl_tracks[1]
self.assertEqual(
[tl_track], self.controller.filter(tlid=[tl_track.tlid]))
[tl_track], self.controller.filter({'tlid': [tl_track.tlid]}))
@populate_tracklist
def test_filter_by_uri(self):
tl_track = self.controller.tl_tracks[1]
self.assertEqual(
[tl_track], self.controller.filter(uri=[tl_track.track.uri]))
[tl_track], self.controller.filter({'uri': [tl_track.track.uri]}))
@populate_tracklist
def test_filter_by_uri_returns_nothing_for_invalid_uri(self):
self.assertEqual([], self.controller.filter(uri=['foobar']))
self.assertEqual([], self.controller.filter({'uri': ['foobar']}))
def test_filter_by_uri_returns_single_match(self):
track = Track(uri='a')
self.controller.add([Track(uri='z'), track, Track(uri='y')])
self.assertEqual(track, self.controller.filter(uri=['a'])[0].track)
t = Track(uri='a')
self.controller.add([Track(uri='z'), t, Track(uri='y')])
self.assertEqual(t, self.controller.filter({'uri': ['a']})[0].track)
def test_filter_by_uri_returns_multiple_matches(self):
track = Track(uri='a')
self.controller.add([Track(uri='z'), track, track])
tl_tracks = self.controller.filter(uri=['a'])
tl_tracks = self.controller.filter({'uri': ['a']})
self.assertEqual(track, tl_tracks[0].track)
self.assertEqual(track, tl_tracks[1].track)
def test_filter_by_uri_returns_nothing_if_no_match(self):
self.controller.playlist = Playlist(
tracks=[Track(uri='z'), Track(uri='y')])
self.assertEqual([], self.controller.filter(uri=['a']))
self.assertEqual([], self.controller.filter({'uri': ['a']}))
def test_filter_by_multiple_criteria_returns_elements_matching_all(self):
track1 = Track(uri='a', name='x')
track2 = Track(uri='b', name='x')
track3 = Track(uri='b', name='y')
self.controller.add([track1, track2, track3])
t1 = Track(uri='a', name='x')
t2 = Track(uri='b', name='x')
t3 = Track(uri='b', name='y')
self.controller.add([t1, t2, t3])
self.assertEqual(
track1, self.controller.filter(uri=['a'], name=['x'])[0].track)
t1, self.controller.filter({'uri': ['a'], 'name': ['x']})[0].track)
self.assertEqual(
track2, self.controller.filter(uri=['b'], name=['x'])[0].track)
t2, self.controller.filter({'uri': ['b'], 'name': ['x']})[0].track)
self.assertEqual(
track3, self.controller.filter(uri=['b'], name=['y'])[0].track)
t3, self.controller.filter({'uri': ['b'], 'name': ['y']})[0].track)
def test_filter_by_criteria_that_is_not_present_in_all_elements(self):
track1 = Track()
track2 = Track(uri='b')
track3 = Track()
self.controller.add([track1, track2, track3])
self.assertEqual(track2, self.controller.filter(uri=['b'])[0].track)
self.assertEqual(
track2, self.controller.filter({'uri': ['b']})[0].track)
@populate_tracklist
def test_clear(self):
@ -233,17 +234,17 @@ class LocalTracklistProviderTest(unittest.TestCase):
track1 = self.controller.tracks[1]
track2 = self.controller.tracks[2]
version = self.controller.version
self.controller.remove(uri=[track1.uri])
self.controller.remove({'uri': [track1.uri]})
self.assertLess(version, self.controller.version)
self.assertNotIn(track1, self.controller.tracks)
self.assertEqual(track2, self.controller.tracks[1])
@populate_tracklist
def test_removing_track_that_does_not_exist_does_nothing(self):
self.controller.remove(uri=['/nonexistant'])
self.controller.remove({'uri': ['/nonexistant']})
def test_removing_from_empty_playlist_does_nothing(self):
self.controller.remove(uri=['/nonexistant'])
self.controller.remove({'uri': ['/nonexistant']})
@populate_tracklist
def test_remove_lists(self):
@ -251,7 +252,7 @@ class LocalTracklistProviderTest(unittest.TestCase):
track1 = self.controller.tracks[1]
track2 = self.controller.tracks[2]
version = self.controller.version
self.controller.remove(uri=[track0.uri, track2.uri])
self.controller.remove({'uri': [track0.uri, track2.uri]})
self.assertLess(version, self.controller.version)
self.assertNotIn(track0, self.controller.tracks)
self.assertNotIn(track2, self.controller.tracks)

1
tests/m3u/test_playlists.py
View File

@ -275,6 +275,7 @@ class DeprecatedM3UPlaylistsProviderTest(M3UPlaylistsProviderTest):
def run(self, result=None):
with deprecation.ignore(ids=['core.playlists.filter',
'core.playlists.filter:kwargs_criteria',
'core.playlists.get_playlists']):
return super(DeprecatedM3UPlaylistsProviderTest, self).run(result)