[Telepathy-commits] [telepathy-gabble/master] port test-register.py to new test API

[Dafydd Harries]

20080503001123-c9803-7bd054a19b4327ca70de447356a5cd7a23f689e5.gz
---
 tests/twisted/test-register.py |   44 ++++++++++++---------------------------
 1 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/tests/twisted/test-register.py b/tests/twisted/test-register.py
index 2e2012d..a9f525c 100644
--- a/tests/twisted/test-register.py
+++ b/tests/twisted/test-register.py
@@ -3,47 +3,31 @@
 Test registration.
 """
 
-from gabbletest import go
-from servicetest import match
+from gabbletest import exec_test, make_result_iq, acknowledge_iq
 
 from twisted.words.xish import xpath
-from twisted.words.protocols.jabber.client import IQ
 
- at match('dbus-signal', signal='StatusChanged', args=[1, 1])
-def expect_connecting(event, data):
-    return True
+def test(q, bus, conn, stream):
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[1, 1])
 
- at match('stream-iq', query_ns='jabber:iq:register')
-def expect_register_iq1(event, data):
-    iq = event.stanza
-    result = IQ(data['stream'], "result")
-    result["id"] = iq["id"]
-    query = result.addElement('query')
-    query["xmlns"] = "jabber:iq:register"
+    event = q.expect('stream-iq', query_ns='jabber:iq:register')
+    result = make_result_iq(stream, event.stanza)
+    query = result.firstChildElement()
     query.addElement('username')
     query.addElement('password')
-    data['stream'].send(result)
-    return True
+    stream.send(result)
 
- at match('stream-iq')
-def expect_register_iq2(event, data):
+    event = q.expect('stream-iq')
     iq = event.stanza
     assert xpath.queryForString('/iq/query/username', iq) == 'test'
     assert xpath.queryForString('/iq/query/password', iq) == 'pass'
+    acknowledge_iq(stream, iq)
 
-    iq["type"] = "result"
-    data['stream'].send(iq)
-    return True
-
- at match('dbus-signal', signal='StatusChanged', args=[0, 1])
-def expect_connected(event, data):
-    data['conn_iface'].Disconnect()
-    return True
-
- at match('dbus-signal', signal='StatusChanged', args=[2, 1])
-def expect_disconnected(event, data):
-    return True
+    q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
+    conn.Disconnect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
 
 if __name__ == '__main__':
-    go({'register': True})
+    exec_test(test, {'register': True})
 
-- 
1.5.6.3