diff --git a/tests/backends/base.py b/tests/backends/base.py index 43e6dcd5..1274e6c5 100644 --- a/tests/backends/base.py +++ b/tests/backends/base.py @@ -7,9 +7,9 @@ import time from mopidy import settings from mopidy.mixers.dummy import DummyMixer -from mopidy.models import Playlist, Track +from mopidy.models import Playlist, Track, Album, Artist -from tests import SkipTest +from tests import SkipTest, data_folder __all__ = ['BaseCurrentPlaylistControllerTest', 'BasePlaybackControllerTest', @@ -979,11 +979,17 @@ class BaseStoredPlaylistsControllerTest(object): class BaseLibraryControllerTest(object): tracks = [] + artists = [Artist(name='artist1'), Artist(name='artist2')] + albums = [Album(name='album1', artists=artists[:1]), + Album(name='album2', artists=artists[1:])] + tracks = [Track(name='track1', length=4000, artists=artists[:1], album=albums[0], uri='file://' + data_folder('uri1')), + Track(name='track2', length=4000, artists=artists[1:], album=albums[1], uri='file://' + data_folder('uri2'))] + # FIXME add tracks with partial info + def setUp(self): self.backend = self.backend_class(mixer=DummyMixer()) self.library = self.backend.library - - assert len(self.tracks) == 3, 'Need three tracks to run tests.' + self.library.refresh() # FIXME init should call refresh instead def tearDown(self): self.backend.destroy() @@ -998,10 +1004,12 @@ class BaseLibraryControllerTest(object): raise SkipTest def test_lookup(self): - raise SkipTest + track = self.library.lookup(self.tracks[0].uri) + self.assertEqual(track, self.tracks[0]) def test_lookup_unknown_track(self): - raise SkipTest + test = lambda: self.library.lookup('fake uri') + self.assertRaises(LookupError, test) def test_find_exact_no_hits(self): raise SkipTest diff --git a/tests/backends/gstreamer_test.py b/tests/backends/gstreamer_test.py index 0f62006b..48679cd8 100644 --- a/tests/backends/gstreamer_test.py +++ b/tests/backends/gstreamer_test.py @@ -126,15 +126,17 @@ class GStreamerBackendLibraryControllerTest(BaseLibraryControllerTest, unittest.TestCase): backend_class = GStreamerBackend - tracks = [Track(), Track(), Track()] def setUp(self): self.original_tag_cache = settings.TAG_CACHE - settings.TAG_CACHE = '' + self.original_music_folder = settings.MUSIC_FOLDER + settings.TAG_CACHE = data_folder('library_tag_cache') + settings.MUSIC_FOLDER = data_folder('') super(GStreamerBackendLibraryControllerTest, self).setUp() def tearDown(self): settings.TAG_CACHE = self.original_tag_cache + settings.MUSIC_FOLDER= self.original_music_folder super(GStreamerBackendLibraryControllerTest, self).tearDown() if __name__ == '__main__':