diff --git a/tests/frontends/mpris/player_interface_test.py b/tests/frontends/mpris/player_interface_test.py index 11823a98..e59886ac 100644 --- a/tests/frontends/mpris/player_interface_test.py +++ b/tests/frontends/mpris/player_interface_test.py @@ -17,57 +17,57 @@ class PlayerInterfaceTest(unittest.TestCase): mpris.ActorRegistry = mock.Mock(spec=ActorRegistry) mpris.MprisObject._connect_to_dbus = mock.Mock() self.backend = DummyBackend.start().proxy() - self.mpris_object = mpris.MprisObject() - self.mpris_object._backend = self.backend + self.mpris = mpris.MprisObject() + self.mpris._backend = self.backend def tearDown(self): self.backend.stop() def test_get_playback_status_is_playing_when_playing(self): self.backend.playback.state = PLAYING - result = self.mpris_object.Get(mpris.PLAYER_IFACE, 'PlaybackStatus') + result = self.mpris.Get(mpris.PLAYER_IFACE, 'PlaybackStatus') self.assertEqual('Playing', result) def test_get_playback_status_is_paused_when_paused(self): self.backend.playback.state = PAUSED - result = self.mpris_object.Get(mpris.PLAYER_IFACE, 'PlaybackStatus') + result = self.mpris.Get(mpris.PLAYER_IFACE, 'PlaybackStatus') self.assertEqual('Paused', result) def test_get_playback_status_is_stopped_when_stopped(self): self.backend.playback.state = STOPPED - result = self.mpris_object.Get(mpris.PLAYER_IFACE, 'PlaybackStatus') + result = self.mpris.Get(mpris.PLAYER_IFACE, 'PlaybackStatus') self.assertEqual('Stopped', result) def test_get_loop_status_is_none_when_not_looping(self): self.backend.playback.repeat = False self.backend.playback.single = False - result = self.mpris_object.Get(mpris.PLAYER_IFACE, 'LoopStatus') + result = self.mpris.Get(mpris.PLAYER_IFACE, 'LoopStatus') self.assertEqual('None', result) def test_get_loop_status_is_track_when_looping_a_single_track(self): self.backend.playback.repeat = True self.backend.playback.single = True - result = self.mpris_object.Get(mpris.PLAYER_IFACE, 'LoopStatus') + result = self.mpris.Get(mpris.PLAYER_IFACE, 'LoopStatus') self.assertEqual('Track', result) def test_get_loop_status_is_playlist_when_looping_the_current_playlist(self): self.backend.playback.repeat = True self.backend.playback.single = False - result = self.mpris_object.Get(mpris.PLAYER_IFACE, 'LoopStatus') + result = self.mpris.Get(mpris.PLAYER_IFACE, 'LoopStatus') self.assertEqual('Playlist', result) def test_set_loop_status_to_none_unsets_repeat_and_single(self): - self.mpris_object.Set(mpris.PLAYER_IFACE, 'LoopStatus', 'None') + self.mpris.Set(mpris.PLAYER_IFACE, 'LoopStatus', 'None') self.assertEquals(self.backend.playback.repeat.get(), False) self.assertEquals(self.backend.playback.single.get(), False) def test_set_loop_status_to_track_sets_repeat_and_single(self): - self.mpris_object.Set(mpris.PLAYER_IFACE, 'LoopStatus', 'Track') + self.mpris.Set(mpris.PLAYER_IFACE, 'LoopStatus', 'Track') self.assertEquals(self.backend.playback.repeat.get(), True) self.assertEquals(self.backend.playback.single.get(), True) def test_set_loop_status_to_playlists_sets_repeat_and_not_single(self): - self.mpris_object.Set(mpris.PLAYER_IFACE, 'LoopStatus', 'Playlist') + self.mpris.Set(mpris.PLAYER_IFACE, 'LoopStatus', 'Playlist') self.assertEquals(self.backend.playback.repeat.get(), True) self.assertEquals(self.backend.playback.single.get(), False) @@ -76,7 +76,7 @@ class PlayerInterfaceTest(unittest.TestCase): self.backend.playback.play() self.assertEquals(self.backend.playback.current_track.get().uri, 'a') self.assertEquals(self.backend.playback.state.get(), PLAYING) - self.mpris_object.Next() + self.mpris.Next() self.assertEquals(self.backend.playback.current_track.get().uri, 'b') self.assertEquals(self.backend.playback.state.get(), PLAYING) @@ -84,7 +84,7 @@ class PlayerInterfaceTest(unittest.TestCase): self.backend.current_playlist.append([Track(uri='a'), Track(uri='b')]) self.backend.playback.play() self.assertEquals(self.backend.playback.state.get(), PLAYING) - self.mpris_object.Pause() + self.mpris.Pause() self.assertEquals(self.backend.playback.state.get(), PAUSED) def test_previous_when_playing_should_skip_to_prev_track_and_keep_playing(self): @@ -93,7 +93,7 @@ class PlayerInterfaceTest(unittest.TestCase): self.backend.playback.next() self.assertEquals(self.backend.playback.current_track.get().uri, 'b') self.assertEquals(self.backend.playback.state.get(), PLAYING) - self.mpris_object.Previous() + self.mpris.Previous() self.assertEquals(self.backend.playback.current_track.get().uri, 'a') self.assertEquals(self.backend.playback.state.get(), PLAYING) @@ -101,5 +101,5 @@ class PlayerInterfaceTest(unittest.TestCase): self.backend.current_playlist.append([Track(uri='a'), Track(uri='b')]) self.backend.playback.play() self.assertEquals(self.backend.playback.state.get(), PLAYING) - self.mpris_object.Stop() + self.mpris.Stop() self.assertEquals(self.backend.playback.state.get(), STOPPED) diff --git a/tests/frontends/mpris/root_interface_test.py b/tests/frontends/mpris/root_interface_test.py index 74ac2cf2..f088d4dd 100644 --- a/tests/frontends/mpris/root_interface_test.py +++ b/tests/frontends/mpris/root_interface_test.py @@ -9,42 +9,42 @@ class RootInterfaceTest(unittest.TestCase): def setUp(self): mpris.ActorRegistry = mock.Mock(spec=ActorRegistry) mpris.MprisObject._connect_to_dbus = mock.Mock() - self.mpris_object = mpris.MprisObject() + self.mpris = mpris.MprisObject() def test_constructor_connects_to_dbus(self): - self.assert_(self.mpris_object._connect_to_dbus.called) + self.assert_(self.mpris._connect_to_dbus.called) def test_can_raise_returns_false(self): - result = self.mpris_object.Get(mpris.ROOT_IFACE, 'CanRaise') + result = self.mpris.Get(mpris.ROOT_IFACE, 'CanRaise') self.assertFalse(result) def test_raise_does_nothing(self): - self.mpris_object.Raise() + self.mpris.Raise() def test_can_quit_returns_true(self): - result = self.mpris_object.Get(mpris.ROOT_IFACE, 'CanQuit') + result = self.mpris.Get(mpris.ROOT_IFACE, 'CanQuit') self.assertTrue(result) def test_quit_should_stop_all_actors(self): - self.mpris_object.Quit() + self.mpris.Quit() self.assert_(mpris.ActorRegistry.stop_all.called) def test_has_track_list_returns_false(self): - result = self.mpris_object.Get(mpris.ROOT_IFACE, 'HasTrackList') + result = self.mpris.Get(mpris.ROOT_IFACE, 'HasTrackList') self.assertFalse(result) def test_identify_is_mopidy(self): - result = self.mpris_object.Get(mpris.ROOT_IFACE, 'Identity') + result = self.mpris.Get(mpris.ROOT_IFACE, 'Identity') self.assertEquals('Mopidy', result) def test_desktop_entry_is_mopidy(self): - result = self.mpris_object.Get(mpris.ROOT_IFACE, 'DesktopEntry') + result = self.mpris.Get(mpris.ROOT_IFACE, 'DesktopEntry') self.assertEquals('mopidy', result) def test_supported_uri_schemes_is_empty(self): - result = self.mpris_object.Get(mpris.ROOT_IFACE, 'SupportedUriSchemes') + result = self.mpris.Get(mpris.ROOT_IFACE, 'SupportedUriSchemes') self.assertEquals(0, len(result)) def test_supported_mime_types_is_empty(self): - result = self.mpris_object.Get(mpris.ROOT_IFACE, 'SupportedMimeTypes') + result = self.mpris.Get(mpris.ROOT_IFACE, 'SupportedMimeTypes') self.assertEquals(0, len(result))