From 457c39fc78de912e7cdbd8a15f5c8d5b9fdc28c0 Mon Sep 17 00:00:00 2001 From: Lasse Bigum Date: Tue, 22 Oct 2013 23:40:38 +0200 Subject: [PATCH] Remove duplicate test group, merge it into existing --- tests/backends/local/library_test.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/tests/backends/local/library_test.py b/tests/backends/local/library_test.py index 7077e65c..9c3bc13c 100644 --- a/tests/backends/local/library_test.py +++ b/tests/backends/local/library_test.py @@ -108,22 +108,6 @@ class LocalLibraryProviderTest(unittest.TestCase): result = self.library.find_exact(uri=track_2_uri) self.assertEqual(list(result[0].tracks), self.tracks[1:2]) - def test_find_exact_any(self): - result = self.library.find_exact(any=['track1']) - self.assertEqual(list(result[0].tracks), self.tracks[:1]) - - result = self.library.find_exact(any=['track2']) - self.assertEqual(list(result[0].tracks), self.tracks[1:2]) - - result = self.library.find_exact(any=['2002']) - self.assertEqual(list(result[0].tracks), self.tracks[1:2]) - - result = self.library.find_exact(any=['album1']) - self.assertEqual(list(result[0].tracks), self.tracks[:1]) - - result = self.library.find_exact(any=['artist2']) - self.assertEqual(list(result[0].tracks), self.tracks[1:2]) - def test_find_exact_track(self): result = self.library.find_exact(track=['track1']) self.assertEqual(list(result[0].tracks), self.tracks[:1]) @@ -180,10 +164,16 @@ class LocalLibraryProviderTest(unittest.TestCase): result = self.library.find_exact(any=['artist1']) self.assertEqual(list(result[0].tracks), self.tracks[:1]) + result = self.library.find_exact(any=['artist2']) + self.assertEqual(list(result[0].tracks), self.tracks[1:2]) + # Matches on track result = self.library.find_exact(any=['track1']) self.assertEqual(list(result[0].tracks), self.tracks[:1]) + result = self.library.find_exact(any=['track2']) + self.assertEqual(list(result[0].tracks), self.tracks[1:2]) + # Matches on track album result = self.library.find_exact(any=['album1']) self.assertEqual(list(result[0].tracks), self.tracks[:1]) @@ -192,6 +182,10 @@ class LocalLibraryProviderTest(unittest.TestCase): result = self.library.find_exact(any=['artist3']) self.assertEqual(list(result[0].tracks), self.tracks[2:3]) + # Matches on track year + result = self.library.find_exact(any=['2002']) + self.assertEqual(list(result[0].tracks), self.tracks[1:2]) + # Matches on URI result = self.library.find_exact(any=['local:track:path1']) self.assertEqual(list(result[0].tracks), self.tracks[:1])