Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-04-26 20:52:13 (GMT)
committer Dan Williams <dcbw@redhat.com>2007-04-26 20:52:13 (GMT)
commitf18df46c624055838352616ae9bb7f4c3827796a (patch)
treed4c079d0324053d5d716bff12bd401ede66ccfa6 /tests
parent511c666a4a602bcf4e962593a9874a37a845a3af (diff)
Add bits to support current activity and add/remove buddy to activity
Diffstat (limited to 'tests')
-rwxr-xr-xtests/presence/mockps.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/tests/presence/mockps.py b/tests/presence/mockps.py
index 011c381..3468515 100755
--- a/tests/presence/mockps.py
+++ b/tests/presence/mockps.py
@@ -161,6 +161,10 @@ class TestBuddy(dbus.service.Object):
def get_activities(self):
return self._activities.values()
+ def set_current_activity(self, actid):
+ self._curact = actid
+ self.PropertyChanged({_PROP_CURACT: actid})
+
@dbus.service.signal(_BUDDY_INTERFACE, signature="ay")
def IconChanged(self, icon_data):
pass
@@ -185,8 +189,8 @@ class TestBuddy(dbus.service.Object):
@dbus.service.method(_BUDDY_INTERFACE, in_signature="", out_signature="ao")
def GetJoinedActivities(self):
acts = []
- for key in self._activities.keys():
- acts.append(dbus.ObjectPath(key))
+ for activity in self._activities.values():
+ acts.append(dbus.ObjectPath(activity._object_path))
return acts
@dbus.service.method(_BUDDY_INTERFACE, in_signature="", out_signature="a{sv}")
@@ -356,7 +360,7 @@ class TestPresenceService(dbus.service.Object):
self.BuddyDisappeared(buddy._object_path)
del self._buddies[pubkey]
- @dbus.service.method(_PRESENCE_TEST_INTERFACE, in_signature="oo")
+ @dbus.service.method(_PRESENCE_TEST_INTERFACE, in_signature="ays")
def AddBuddyToActivity(self, pubkey, actid):
pubkey = ''.join([chr(item) for item in pubkey])
if not self._buddies.has_key(pubkey):
@@ -369,7 +373,7 @@ class TestPresenceService(dbus.service.Object):
activity.add_buddy(buddy)
buddy.add_activity(activity)
- @dbus.service.method(_PRESENCE_TEST_INTERFACE, in_signature="oo")
+ @dbus.service.method(_PRESENCE_TEST_INTERFACE, in_signature="ays")
def RemoveBuddyFromActivity(self, pubkey, actid):
pubkey = ''.join([chr(item) for item in pubkey])
if not self._buddies.has_key(pubkey):
@@ -398,6 +402,14 @@ class TestPresenceService(dbus.service.Object):
self.ActivityDisappeared(act._object_path)
del self._activities[actid]
+ @dbus.service.method(_PRESENCE_TEST_INTERFACE, in_signature="ays")
+ def SetBuddyCurrentActivity(self, pubkey, actid):
+ pubkey = ''.join([chr(item) for item in pubkey])
+ if not self._buddies.has_key(pubkey):
+ raise NotFoundError("Buddy unknown")
+ buddy = self._buddies[pubkey]
+ buddy.set_current_activity(actid)
+
def main():
import logging
logging.basicConfig(level=logging.DEBUG)