From f8c29c1dfd495f12b2cf8a9a16a1d28ad3bcbb31 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 7 Feb 2010 19:51:38 +0100 Subject: [PATCH] Use self.playback in controller test --- tests/backends/__init__.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/backends/__init__.py b/tests/backends/__init__.py index f1df2815..6a427cab 100644 --- a/tests/backends/__init__.py +++ b/tests/backends/__init__.py @@ -16,6 +16,7 @@ class BaseCurrentPlaylistControllerTest(object): def setUp(self): self.backend = self.backend_class() self.controller = self.backend.current_playlist + self.playback = self.backend.playback def test_uri_set(self): self.assert_(len(self.uris) >= 3) @@ -38,28 +39,19 @@ class BaseCurrentPlaylistControllerTest(object): @populate_playlist def test_clear(self): self.controller.clear() - self.assertEqual(len(self.controller.playlist.tracks), 0) @populate_playlist def test_clear_when_playing(self): - playback = self.backend.playback - - playback.play() - - self.assertEqual(playback.state, playback.PLAYING) - + self.playback.play() + self.assertEqual(self.playback.state, self.playback.PLAYING) self.controller.clear() - - self.assertEqual(playback.state, playback.STOPPED) + self.assertEqual(self.playback.state, self.playback.STOPPED) def test_load(self): new_playlist = Playlist() - self.assertNotEqual(new_playlist, self.controller.playlist) - self.controller.load(new_playlist) - self.assertEqual(new_playlist, self.controller.playlist) class BasePlaybackControllerTest(object):