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

tests: Fixing self confusion mistake

Browse Source 
docs: Documenting tracklist's new filter() feature
This commit is contained in:
Javier Domingo Cansino 2013-11-07 09:46:34 +01:00
parent 8b5f30e5ff
commit 6721a59b26
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mopidy/core/tracklist.py
View File

@ -298,18 +298,34 @@ class TracklistController(object):
filter({'tlid': 7})
filter(tlid=7)
# Returns tracks with TLIDs 1, 2, 3 and 4
filter({'tlid': [1, 2, 3, 4]})
filter(tlid=[1, 2, 3, 4])
# Returns track with ID 1
filter({'id': 1})
filter(id=1)
# Returns track with IDs 1 5 and 7
filter({'id': [1, 5, 7]})
filter(id=[1, 5, 7])
# Returns track with URI 'xyz'
filter({'uri': 'xyz'})
filter(uri='xyz')
# Returns track with URIs 'xyz' and 'abc'
filter({'uri': ['xyz', 'abc']})
filter(uri=['xyz', 'abc'])
# Returns track with ID 1 and URI 'xyz'
filter({'id': 1, 'uri': 'xyz'})
filter(id=1, uri='xyz')
# Returns track with IDs (1, 3 or 6) and URIs ('xyz' or 'abc')
filter({'id': [1, 3, 6], 'uri': ['xyz', 'abc']})
filter(id=[1, 3, 6], uri=['xyz', 'abc'])
:param criteria: on or more criteria to match by
:type criteria: dict
:rtype: list of :class:`mopidy.models.TlTrack`

10
tests/backends/local/tracklist_test.py
View File

@ -241,15 +241,15 @@ class LocalTracklistProviderTest(unittest.TestCase):
@populate_tracklist
def test_remove_lists(self):
track0 = self.controller.tracks[0]
track1 = self.controller.tracks[1]
track2 = self.controller.tracks[2]
track3 = self.controller.tracks[3]
version = self.controller.version
self.controller.remove(uri=[track1.uri, track3.uri])
self.controller.remove(uri=[track0.uri, track2.uri])
self.assertLess(version, self.controller.version)
self.assertNotIn(track1, self.controller.tracks)
self.assertNotIn(track3, self.controller.tracks)
self.assertEqual(track2, self.controller.tracks[1])
self.assertNotIn(track0, self.controller.tracks)
self.assertNotIn(track2, self.controller.tracks)
self.assertEqual(track1, self.controller.tracks[0])
@populate_tracklist
def test_shuffle(self):