summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-10 19:30:02 (GMT)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-11 21:55:05 (GMT)
commit102af3144c6bb66a49021acfa2b1e99e872df82a (patch)
treee2a210bf38d71e27010d3e7c5bac8c0f1366e275
parenta1ef146939a5e66bea10cbd0044a04e324b43d32 (diff)
downloadtelepathy-gabble-102af3144c6bb66a49021acfa2b1e99e872df82a.tar.gz
telepathy-gabble-102af3144c6bb66a49021acfa2b1e99e872df82a.tar.xz
use properties instead of Group getters
-rw-r--r--tests/twisted/muc/test-muc-invitation.py10
-rw-r--r--tests/twisted/muc/test-muc-ownership.py9
2 files changed, 10 insertions, 9 deletions
diff --git a/tests/twisted/muc/test-muc-invitation.py b/tests/twisted/muc/test-muc-invitation.py
index ea7419a..6cc8efc 100644
--- a/tests/twisted/muc/test-muc-invitation.py
+++ b/tests/twisted/muc/test-muc-invitation.py
@@ -29,22 +29,22 @@ def test(q, bus, conn, stream):
text_chan = wrap_channel(bus.get_object(conn.bus_name, path), 'Text')
- members = text_chan.Group.GetMembers()
- local_pending = text_chan.Group.GetLocalPendingMembers()
- remote_pending = text_chan.Group.GetRemotePendingMembers()
+ members = text_chan.Properties.Get(cs.CHANNEL_IFACE_GROUP, 'Members')
+ local_pending = text_chan.Properties.Get(cs.CHANNEL_IFACE_GROUP, 'LocalPendingMembers')
+ remote_pending = text_chan.Properties.Get(cs.CHANNEL_IFACE_GROUP, 'RemotePendingMembers')
assert len(members) == 1
assert conn.inspect_contact_sync(members[0]) == 'bob@localhost'
bob_handle = members[0]
assert len(local_pending) == 1
# FIXME: the username-part-is-nickname assumption
- assert conn.inspect_contact_sync(local_pending[0]) == \
+ assert conn.inspect_contact_sync(local_pending[0][0]) == \
'chat@conf.localhost/test'
assert len(remote_pending) == 0
room_self_handle = text_chan.Properties.Get(cs.CHANNEL_IFACE_GROUP,
"SelfHandle")
- assert room_self_handle == local_pending[0]
+ assert room_self_handle == local_pending[0][0]
channel_props = text_chan.Properties.GetAll(cs.CHANNEL)
assert channel_props['TargetID'] == 'chat@conf.localhost', channel_props
diff --git a/tests/twisted/muc/test-muc-ownership.py b/tests/twisted/muc/test-muc-ownership.py
index d5d97b9..7de9e9b 100644
--- a/tests/twisted/muc/test-muc-ownership.py
+++ b/tests/twisted/muc/test-muc-ownership.py
@@ -1,7 +1,7 @@
"""
Test support for the HANDLE_OWNERS_NOT_AVAILABLE group flag, and calling
-GetHandleOwners on MUC members.
+HandleOwners on MUC members.
By default, MUC channels should have the flag set. The flag should be unset
when presence is received that includes the MUC JID's owner JID.
@@ -83,9 +83,10 @@ def test(q, bus, conn, stream):
chan = wrap_channel(bus.get_object(conn.bus_name, event.value[0]), 'Text')
- # Exercise GetHandleOwners
- assertEquals([che_owner, chris_owner],
- chan.Group.GetHandleOwners([che, chris]))
+ # Exercise HandleOwners
+ owners = chan.Properties.Get(cs.CHANNEL_IFACE_GROUP, 'HandleOwners')
+ assertEquals(che_owner, owners[che])
+ assertEquals(chris_owner, owners[chris])
# Exercise D-Bus properties
all = chan.Properties.GetAll(cs.CHANNEL_IFACE_GROUP)