1 files changed, 9 insertions, 29 deletions

diff --git a/tests/twisted/text/test-text.py b/tests/twisted/text/test-text.py
index 91ebb6a..b1916ed 100644
--- a/tests/twisted/text/test-text.py
+++ b/tests/twisted/text/test-text.py
@@ -47,21 +47,8 @@ def test(q, bus, conn, stream):
     assert channel_props['InitiatorID'] == jid,\
             (channel_props['InitiatorID'], jid)
 
-    received, message_received = q.expect_many(
-        EventPattern('dbus-signal', signal='Received'),
-        EventPattern('dbus-signal', signal='MessageReceived'),
-        )
-
-    # Check that C.T.Text.Received looks right
-    # message type: normal
-    assert received.args[3] == 0
-    # flags: none
-    assert received.args[4] == 0
-    # body
-    assert received.args[5] == 'hello'
+    message_received = q.expect('dbus-signal', signal='MessageReceived')
 
-
-    # Check that C.I.Messages.MessageReceived looks right.
     message = message_received.args[0]
 
     # message should have two parts: the header and one content part
@@ -92,7 +79,7 @@ def test(q, bus, conn, stream):
     # Send an action using the Messages API
     # In Gabble, this is a Notice, but we don't support those.
     greeting = [
-        dbus.Dictionary({ 'message-type': 1, # Action
+        dbus.Dictionary({ 'message-type': cs.MT_ACTION,
                         }, signature='sv'),
         { 'content-type': 'text/plain',
           'content': u"waves",
@@ -102,9 +89,8 @@ def test(q, bus, conn, stream):
     dbus.Interface(text_chan, cs.CHANNEL_IFACE_MESSAGES
         ).SendMessage(greeting, dbus.UInt32(0))
 
-    stream_message, sent, message_sent = q.expect_many(
+    stream_message, message_sent = q.expect_many(
         EventPattern('stream-message'),
-        EventPattern('dbus-signal', signal='Sent'),
         EventPattern('dbus-signal', signal='MessageSent'),
         )
 
@@ -128,16 +114,14 @@ def test(q, bus, conn, stream):
     assert body['content-type'] == 'text/plain', body
     assert body['content'] == u'waves', body
 
-    assert sent.args[1] == 1, sent.args # Action
-    assert sent.args[2] == u'waves', sent.args
-
-
-    # Send a message using Channel.Type.Text API
-    dbus.Interface(text_chan, cs.CHANNEL_TYPE_TEXT).Send(0, 'goodbye')
+    dbus.Interface(text_chan, cs.CHANNEL_IFACE_MESSAGES
+            ).SendMessage([{}, {
+        'content-type': 'text/plain',
+        'content': 'goodbye',
+        }], 0)
 
-    stream_message, sent, message_sent = q.expect_many(
+    stream_message, message_sent = q.expect_many(
         EventPattern('stream-message'),
-        EventPattern('dbus-signal', signal='Sent'),
         EventPattern('dbus-signal', signal='MessageSent'),
         )
 
@@ -163,10 +147,6 @@ def test(q, bus, conn, stream):
     assert body['content-type'] == 'text/plain', body
     assert body['content'] == u'goodbye', body
 
-    assert sent.args[1] == 0, sent.args # message type normal
-    assert sent.args[2] == u'goodbye', sent.args
-
-
     conn.Disconnect()
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])