[Telepathy-commits] [telepathy-gabble/master] test-caps-tubes: use ns.py
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Tue Jan 27 04:00:58 PST 2009
---
tests/twisted/test-caps-tubes.py | 109 ++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 58 deletions(-)
diff --git a/tests/twisted/test-caps-tubes.py b/tests/twisted/test-caps-tubes.py
index 2ed1fe0..a2677d8 100644
--- a/tests/twisted/test-caps-tubes.py
+++ b/tests/twisted/test-caps-tubes.py
@@ -42,8 +42,7 @@ from constants import *
from caps_helper import compute_caps_hash
from config import PACKAGE_STRING
-
-ns_tubes = 'http://telepathy.freedesktop.org/xmpp/tubes'
+import ns
text_fixed_properties = dbus.Dictionary({
TARGET_HANDLE_TYPE: HT_CONTACT,
@@ -95,7 +94,7 @@ def make_presence(from_jid, type, status):
return presence
def presence_add_caps(presence, ver, client, hash=None):
- c = presence.addElement(('http://jabber.org/protocol/caps', 'c'))
+ c = presence.addElement((ns.CAPS, 'c'))
c['node'] = client
c['ver'] = ver
if hash is not None:
@@ -125,15 +124,14 @@ def receive_presence_and_ask_caps(q, stream):
id='disco1'
to='gabble at jabber.org/resource'
type='get'>
- <query xmlns='http://jabber.org/protocol/disco#info'
+ <query xmlns='""" + ns.DISCO_INFO + """'
node='""" + node + '#' + ver + """'/>
</iq>
"""
stream.send(request)
# receive caps
- event = q.expect('stream-iq',
- query_ns='http://jabber.org/protocol/disco#info')
+ event = q.expect('stream-iq', query_ns=ns.DISCO_INFO)
caps_str = str(xpath.queryForNodes('/iq/query/feature', event.stanza))
features = []
@@ -165,15 +163,14 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
# send presence with no tube cap
presence = make_presence(contact, None, 'hello')
- c = presence.addElement(('http://jabber.org/protocol/caps', 'c'))
+ c = presence.addElement((ns.CAPS, 'c'))
c['node'] = client
c['ver'] = 'JpaYgiKL0y4fUOCTwN3WLGpaftM='
c['hash'] = 'sha-1'
stream.send(presence)
# Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact,
- query_ns='http://jabber.org/protocol/disco#info')
+ event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
assert query_node.attributes['node'] == \
client + '#' + c['ver']
@@ -184,11 +181,11 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
query['node'] = client + '#' + c['ver']
feature = query.addElement('feature')
- feature['var'] = 'http://jabber.org/protocol/jingle'
+ feature['var'] = ns.JINGLE
feature = query.addElement('feature')
- feature['var'] = 'http://jabber.org/protocol/jingle/description/audio'
+ feature['var'] = ns.JINGLE_AUDIO
feature = query.addElement('feature')
- feature['var'] = 'http://www.google.com/transport/p2p'
+ feature['var'] = ns.GOOGLE_P2P
stream.send(result)
# no change in ContactCapabilities, so no signal ContactCapabilitiesChanged
@@ -211,15 +208,14 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
# send presence with 1 stream tube cap
presence = make_presence(contact, None, 'hello')
- c = presence.addElement(('http://jabber.org/protocol/caps', 'c'))
+ c = presence.addElement((ns.CAPS, 'c'))
c['node'] = client
c['ver'] = 'f5oUAlH0fcR8btEo5K0P135QReo='
c['hash'] = 'sha-1'
stream.send(presence)
# Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact,
- query_ns='http://jabber.org/protocol/disco#info')
+ event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
assert query_node.attributes['node'] == \
client + '#' + c['ver']
@@ -229,7 +225,7 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
query = result.firstChildElement()
query['node'] = client + '#' + c['ver']
feature = query.addElement('feature')
- feature['var'] = ns_tubes + '/stream#daap'
+ feature['var'] = ns.TUBES + '/stream#daap'
stream.send(result)
# daap capabilities
@@ -254,15 +250,14 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
# send presence with 1 D-Bus tube cap
presence = make_presence(contact, None, 'hello')
- c = presence.addElement(('http://jabber.org/protocol/caps', 'c'))
+ c = presence.addElement((ns.CAPS, 'c'))
c['node'] = client
c['ver'] = '4Ps2iaOc+lsFwfbasCdsBjLOQ5s='
c['hash'] = 'sha-1'
stream.send(presence)
# Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact,
- query_ns='http://jabber.org/protocol/disco#info')
+ event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
assert query_node.attributes['node'] == \
client + '#' + c['ver']
@@ -272,7 +267,7 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
query = result.firstChildElement()
query['node'] = client + '#' + c['ver']
feature = query.addElement('feature')
- feature['var'] = ns_tubes + '/dbus#com.example.Xiangqi'
+ feature['var'] = ns.TUBES + '/dbus#com.example.Xiangqi'
stream.send(result)
# xiangqi capabilities
@@ -297,15 +292,14 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
# send presence with both D-Bus and stream tube caps
presence = make_presence(contact, None, 'hello')
- c = presence.addElement(('http://jabber.org/protocol/caps', 'c'))
+ c = presence.addElement((ns.CAPS, 'c'))
c['node'] = client
c['ver'] = 'ALCBfacl4M/FKWckV1OCHfj+lt0='
c['hash'] = 'sha-1'
stream.send(presence)
# Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact,
- query_ns='http://jabber.org/protocol/disco#info')
+ event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
assert query_node.attributes['node'] == \
client + '#' + c['ver']
@@ -315,9 +309,9 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
query = result.firstChildElement()
query['node'] = client + '#' + c['ver']
feature = query.addElement('feature')
- feature['var'] = ns_tubes + '/dbus#com.example.Xiangqi'
+ feature['var'] = ns.TUBES + '/dbus#com.example.Xiangqi'
feature = query.addElement('feature')
- feature['var'] = ns_tubes + '/stream#daap'
+ feature['var'] = ns.TUBES + '/stream#daap'
stream.send(result)
# daap + xiangqi capabilities
@@ -343,15 +337,14 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
# send presence with 4 tube caps
presence = make_presence(contact, None, 'hello')
- c = presence.addElement(('http://jabber.org/protocol/caps', 'c'))
+ c = presence.addElement((ns.CAPS, 'c'))
c['node'] = client
c['ver'] = 'ObSHJf9W0fUDuSjmB6gmthptw+s='
c['hash'] = 'sha-1'
stream.send(presence)
# Gabble looks up our capabilities
- event = q.expect('stream-iq', to=contact,
- query_ns='http://jabber.org/protocol/disco#info')
+ event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
assert query_node.attributes['node'] == \
client + '#' + c['ver']
@@ -361,13 +354,13 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
query = result.firstChildElement()
query['node'] = client + '#' + c['ver']
feature = query.addElement('feature')
- feature['var'] = ns_tubes + '/dbus#com.example.Xiangqi'
+ feature['var'] = ns.TUBES + '/dbus#com.example.Xiangqi'
feature = query.addElement('feature')
- feature['var'] = ns_tubes + '/dbus#com.example.Go'
+ feature['var'] = ns.TUBES + '/dbus#com.example.Go'
feature = query.addElement('feature')
- feature['var'] = ns_tubes + '/stream#daap'
+ feature['var'] = ns.TUBES + '/stream#daap'
feature = query.addElement('feature')
- feature['var'] = ns_tubes + '/stream#http'
+ feature['var'] = ns.TUBES + '/stream#http'
stream.send(result)
# http + daap + xiangqi + go capabilities
@@ -395,7 +388,7 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
# send presence with both D-Bus and stream tube caps
presence = make_presence(contact, None, 'hello')
- c = presence.addElement(('http://jabber.org/protocol/caps', 'c'))
+ c = presence.addElement((ns.CAPS, 'c'))
c['node'] = client
c['ver'] = 'ALCBfacl4M/FKWckV1OCHfj+lt0='
c['hash'] = 'sha-1'
@@ -477,12 +470,12 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
# Expect Gabble to reply with the correct caps
event, caps_str, signaled_caps = receive_presence_and_ask_caps(q, stream)
- assert caps_contain(event, ns_tubes) == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#daap') == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#http') == False, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Go') \
+ assert caps_contain(event, ns.TUBES) == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#daap') == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#http') == False, caps_str
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Go') \
== False, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Xiangqi') \
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Xiangqi') \
== False, caps_str
assert signaled_caps == daap_caps
@@ -501,12 +494,12 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
# Expect Gabble to reply with the correct caps
event, caps_str, signaled_caps = receive_presence_and_ask_caps(q, stream)
- assert caps_contain(event, ns_tubes) == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#daap') == False, caps_str
- assert caps_contain(event, ns_tubes + '/stream#http') == False, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Go') \
+ assert caps_contain(event, ns.TUBES) == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#daap') == False, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#http') == False, caps_str
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Go') \
== False, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Xiangqi') \
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Xiangqi') \
== True, caps_str
assert signaled_caps == xiangqi_caps
@@ -525,12 +518,12 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
# Expect Gabble to reply with the correct caps
event, caps_str, signaled_caps = receive_presence_and_ask_caps(q, stream)
- assert caps_contain(event, ns_tubes) == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#daap') == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#http') == False, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Go') \
+ assert caps_contain(event, ns.TUBES) == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#daap') == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#http') == False, caps_str
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Go') \
== False, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Xiangqi') \
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Xiangqi') \
== True, caps_str
assert signaled_caps == daap_xiangqi_caps
@@ -550,12 +543,12 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
# Expect Gabble to reply with the correct caps
event, caps_str, signaled_caps = receive_presence_and_ask_caps(q, stream)
- assert caps_contain(event, ns_tubes) == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#daap') == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#http') == True, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Go') \
+ assert caps_contain(event, ns.TUBES) == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#daap') == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#http') == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Go') \
== True, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Xiangqi') \
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Xiangqi') \
== True, caps_str
assert signaled_caps == all_tubes_caps
@@ -574,12 +567,12 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
# Expect Gabble to reply with the correct caps
event, caps_str, signaled_caps = receive_presence_and_ask_caps(q, stream)
- assert caps_contain(event, ns_tubes) == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#daap') == True, caps_str
- assert caps_contain(event, ns_tubes + '/stream#http') == False, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Go') \
+ assert caps_contain(event, ns.TUBES) == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#daap') == True, caps_str
+ assert caps_contain(event, ns.TUBES + '/stream#http') == False, caps_str
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Go') \
== False, caps_str
- assert caps_contain(event, ns_tubes + '/dbus#com.example.Xiangqi') \
+ assert caps_contain(event, ns.TUBES + '/dbus#com.example.Xiangqi') \
== True, caps_str
assert signaled_caps == daap_xiangqi_caps
--
1.5.6.5
More information about the Telepathy-commits
mailing list