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

[Dafydd Harries]

---
 tests/twisted/text/test-text-no-body.py |   54 +++++++-----------------------
 1 files changed, 13 insertions(+), 41 deletions(-)

diff --git a/tests/twisted/text/test-text-no-body.py b/tests/twisted/text/test-text-no-body.py
index 30686b5..9593872 100644
--- a/tests/twisted/text/test-text-no-body.py
+++ b/tests/twisted/text/test-text-no-body.py
@@ -4,28 +4,20 @@ Test that <message>s with a chat state notification but no body don't create a
 new text channel.
 """
 
-import dbus
-
 from twisted.words.xish import domish
 
-from gabbletest import go
-
-def expect_connected(event, data):
-    if event.type != 'dbus-signal':
-        return False
-
-    if event.signal != 'StatusChanged':
-        return False
+from gabbletest import exec_test
 
-    if event.args != [0, 1]:
-        return False
+def test(q, bus, conn, stream):
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
 
     # message without body
     m = domish.Element(('', 'message'))
     m['from'] = 'alice at foo.com'
     m['type'] = 'chat'
     m.addElement(('http://jabber.org/protocol/chatstates', 'composing'))
-    data['stream'].send(m)
+    stream.send(m)
 
     # message with body
     m = domish.Element(('', 'message'))
@@ -33,36 +25,16 @@ def expect_connected(event, data):
     m['type'] = 'chat'
     m.addElement(('http://jabber.org/protocol/chatstates', 'composing'))
     m.addElement('body', content='hello')
-    data['stream'].send(m)
-    return True
-
-def expect_new_channel(event, data):
-    if event.type != 'dbus-signal':
-        return False
-
-    if event.signal != 'NewChannel':
-        return False
+    stream.send(m)
 
-    if event.args[1] != u'org.freedesktop.Telepathy.Channel.Type.Text':
-        return False
-
-    jid = data['conn_iface'].InspectHandles(1, [event.args[3]])[0]
+    # first message should be from Bob, not Alice
+    event = q.expect('dbus-signal', signal='NewChannel')
+    assert event.args[1] == u'org.freedesktop.Telepathy.Channel.Type.Text'
+    jid = conn.InspectHandles(1, [event.args[3]])[0]
     assert jid == 'bob at foo.com'
-    data['conn_iface'].Disconnect()
-    return True
-
-def expect_disconnected(event, data):
-    if event.type != 'dbus-signal':
-        return False
-
-    if event.signal != 'StatusChanged':
-        return False
-
-    if event.args != [2, 1]:
-        return False
-
-    return True
+    conn.Disconnect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
 
 if __name__ == '__main__':
-    go()
+    exec_test(test)
 
-- 
1.5.6.5