Update listener method names to match interface

This commit is contained in:
Stein Magnus Jodal 2011-07-27 00:47:34 +02:00
parent c7c9f6b718
commit 1399bb61dc
2 changed files with 16 additions and 16 deletions

View File

@ -107,8 +107,8 @@ class MprisFrontend(ThreadingActor, BackendListener):
except ImportError as e:
logger.debug(u'Startup notification was not sent (%s)', e)
def paused_playing(self, track, time_position):
logger.debug(u'Received paused playing event')
def track_playback_paused(self, track, time_position):
logger.debug(u'Received track playback paused event')
if self.mpris_object is None:
return
self.mpris_object.PropertiesChanged(PLAYER_IFACE, {
@ -116,8 +116,8 @@ class MprisFrontend(ThreadingActor, BackendListener):
self.mpris_object.Get(PLAYER_IFACE, 'PlaybackStatus'),
}, [])
def resumed_playing(self, track, time_position):
logger.debug(u'Received resumed playing event')
def track_playback_resumed(self, track, time_position):
logger.debug(u'Received track playback resumed event')
if self.mpris_object is None:
return
self.mpris_object.PropertiesChanged(PLAYER_IFACE, {
@ -125,8 +125,8 @@ class MprisFrontend(ThreadingActor, BackendListener):
self.mpris_object.Get(PLAYER_IFACE, 'PlaybackStatus'),
}, [])
def started_playing(self, track):
logger.debug(u'Received started playing event')
def track_playback_started(self, track):
logger.debug(u'Received track playback started event')
if self.mpris_object is None:
return
self.mpris_object.PropertiesChanged(PLAYER_IFACE, {
@ -135,8 +135,8 @@ class MprisFrontend(ThreadingActor, BackendListener):
self.mpris_object.Get(PLAYER_IFACE, 'PlaybackStatus'),
}, [])
def stopped_playing(self, track, time_position):
logger.debug(u'Received stopped playing event')
def track_playback_ended(self, track, time_position):
logger.debug(u'Received track playback ended event')
if self.mpris_object is None:
return
self.mpris_object.PropertiesChanged(PLAYER_IFACE, {

View File

@ -10,27 +10,27 @@ class BackendEventsTest(unittest.TestCase):
self.mpris_object = mock.Mock(spec=MprisObject)
self.mpris_frontend.mpris_object = self.mpris_object
def test_paused_playing_event_changes_playback_status(self):
def test_track_playback_paused_event_changes_playback_status(self):
self.mpris_object.Get.return_value = 'Paused'
self.mpris_frontend.paused_playing(Track(), 0)
self.mpris_frontend.track_playback_paused(Track(), 0)
self.assertListEqual(self.mpris_object.Get.call_args_list, [
((PLAYER_IFACE, 'PlaybackStatus'), {}),
])
self.mpris_object.PropertiesChanged.assert_called_with(
PLAYER_IFACE, {'PlaybackStatus': 'Paused'}, [])
def test_resumed_playing_event_changes_playback_status(self):
def test_track_playback_resumed_event_changes_playback_status(self):
self.mpris_object.Get.return_value = 'Playing'
self.mpris_frontend.resumed_playing(Track(), 0)
self.mpris_frontend.track_playback_resumed(Track(), 0)
self.assertListEqual(self.mpris_object.Get.call_args_list, [
((PLAYER_IFACE, 'PlaybackStatus'), {}),
])
self.mpris_object.PropertiesChanged.assert_called_with(
PLAYER_IFACE, {'PlaybackStatus': 'Playing'}, [])
def test_started_playing_event_changes_playback_status_and_metadata(self):
def test_track_playback_started_event_changes_playback_status_and_metadata(self):
self.mpris_object.Get.return_value = '...'
self.mpris_frontend.started_playing(Track())
self.mpris_frontend.track_playback_started(Track())
self.assertListEqual(self.mpris_object.Get.call_args_list, [
((PLAYER_IFACE, 'Metadata'), {}),
((PLAYER_IFACE, 'PlaybackStatus'), {}),
@ -38,9 +38,9 @@ class BackendEventsTest(unittest.TestCase):
self.mpris_object.PropertiesChanged.assert_called_with(
PLAYER_IFACE, {'Metadata': '...', 'PlaybackStatus': '...'}, [])
def test_stopped_playing_event_changes_playback_status_and_metadata(self):
def test_track_playback_ended_event_changes_playback_status_and_metadata(self):
self.mpris_object.Get.return_value = '...'
self.mpris_frontend.stopped_playing(Track(), 0)
self.mpris_frontend.track_playback_ended(Track(), 0)
self.assertListEqual(self.mpris_object.Get.call_args_list, [
((PLAYER_IFACE, 'Metadata'), {}),
((PLAYER_IFACE, 'PlaybackStatus'), {}),