From 6721a59b266b9f3209e792910255ba3565c07469 Mon Sep 17 00:00:00 2001 From: Javier Domingo Cansino Date: Thu, 7 Nov 2013 09:46:34 +0100 Subject: [PATCH] tests: Fixing self confusion mistake docs: Documenting tracklist's new filter() feature --- mopidy/core/tracklist.py | 16 ++++++++++++++++ tests/backends/local/tracklist_test.py | 10 +++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index 002b0d0d..5c2d91e0 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -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` diff --git a/tests/backends/local/tracklist_test.py b/tests/backends/local/tracklist_test.py index 21c06673..90eadeb9 100644 --- a/tests/backends/local/tracklist_test.py +++ b/tests/backends/local/tracklist_test.py @@ -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):