[Telepathy-commits] [telepathy-gabble/master] ImChannel: Test sending and receiving using Messages interface

[Will Thompson]

---
 tests/twisted/text/test-text.py |  111 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 103 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/text/test-text.py b/tests/twisted/text/test-text.py
index 21109fe..3c09b01 100644
--- a/tests/twisted/text/test-text.py
+++ b/tests/twisted/text/test-text.py
@@ -8,6 +8,7 @@ import dbus
 from twisted.words.xish import domish
 
 from gabbletest import exec_test
+from servicetest import EventPattern
 
 def test(q, bus, conn, stream):
     conn.Connect()
@@ -25,7 +26,8 @@ def test(q, bus, conn, stream):
     assert event.args[1] == u'org.freedesktop.Telepathy.Channel.Type.Text'
     # check that handle type == contact handle
     assert event.args[2] == 1
-    jid = conn.InspectHandles(1, [event.args[3]])[0]
+    foo_at_bar_dot_com_handle = event.args[3]
+    jid = conn.InspectHandles(1, [foo_at_bar_dot_com_handle])[0]
     assert jid == 'foo at bar.com'
     assert event.args[4] == False   # suppress handler
 
@@ -43,6 +45,9 @@ def test(q, bus, conn, stream):
     assert 'org.freedesktop.Telepathy.Channel.Interface.ChatState' in \
             channel_props.get('Interfaces', ()), \
             channel_props.get('Interfaces')
+    assert 'org.freedesktop.Telepathy.Channel.Interface.Messages.DRAFT' in \
+            channel_props.get('Interfaces', ()), \
+            channel_props.get('Interfaces')
     assert channel_props['TargetID'] == jid,\
             (channel_props['TargetID'], jid)
     assert channel_props['Requested'] == False
@@ -51,27 +56,117 @@ def test(q, bus, conn, stream):
     assert channel_props['InitiatorID'] == jid,\
             (channel_props['InitiatorID'], jid)
 
-    event = q.expect('dbus-signal', signal='Received')
+    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 event.args[3] == 0
+    assert received.args[3] == 0
     # flags: none
-    assert event.args[4] == 0
+    assert received.args[4] == 0
     # body
-    assert event.args[5] == 'hello'
+    assert received.args[5] == 'hello'
+
+
+    # Check that C.I.Messages.MessageReceived looks right.
+    message = message_received.args[0]
+
+    # message should have two parts: the header and one content part
+    assert len(message) == 2, message
+    header, body = message
+
+    assert header['message-sender'] == foo_at_bar_dot_com_handle, header
+    # the spec says that message-type "SHOULD be omitted for normal chat
+    # messages."
+    assert 'message-type' not in header, header
+
+    assert body['type'] == 'text/plain', body
+    assert body['content'] == 'hello', body
+
+    # Remove the message from the pending message queue, and check that
+    # PendingMessagesRemoved fires.
+    message_id = header['pending-message-id']
+
+    dbus.Interface(text_chan,
+        u'org.freedesktop.Telepathy.Channel.Type.Text'
+        ).AcknowledgePendingMessages([message_id])
+
+    removed = q.expect('dbus-signal', signal='PendingMessagesRemoved')
+
+    removed_ids = removed.args[0]
+    assert len(removed_ids) == 1, removed_ids
+    assert removed_ids[0] == message_id, (removed_ids, message_id)
+
+    # Send a Notice using the Messages API
+    greeting = [
+        dbus.Dictionary({ 'message-type': 2, # Notice
+                        }, signature='sv'),
+        { 'type': 'text/plain',
+          'content': u"what up",
+        }
+    ]
 
     dbus.Interface(text_chan,
+        u'org.freedesktop.Telepathy.Channel.Interface.Messages.DRAFT'
+        ).SendMessage(greeting, dbus.UInt32(0))
+
+    stream_message, sent, message_sent = q.expect_many(
+        EventPattern('stream-message'),
+        EventPattern('dbus-signal', signal='Sent'),
+        EventPattern('dbus-signal', signal='MessageSent'),
+        )
+
+    elem = stream_message.stanza
+    assert elem.name == 'message'
+    assert elem['type'] == 'normal'
+    body = list(stream_message.stanza.elements())[0]
+    assert body.name == 'body'
+    assert body.children[0] == u'what up'
+
+    sent_message = message_sent.args[0]
+    assert len(sent_message) == 2, sent_message
+    header = sent_message[0]
+    assert header['message-type'] == 2, header # Notice
+    body = sent_message[1]
+    assert body['type'] == 'text/plain', body
+    assert body['content'] == u'what up', body
+
+    assert sent.args[1] == 2, sent.args # Notice
+    assert sent.args[2] == u'what up', sent.args
+
+
+    # Send a message using Channel.Type.Text API
+    dbus.Interface(text_chan,
         u'org.freedesktop.Telepathy.Channel.Type.Text').Send(0, 'goodbye')
 
-    event = q.expect('stream-message')
+    stream_message, sent, message_sent = q.expect_many(
+        EventPattern('stream-message'),
+        EventPattern('dbus-signal', signal='Sent'),
+        EventPattern('dbus-signal', signal='MessageSent'),
+        )
 
-    elem = event.stanza
+    elem = stream_message.stanza
     assert elem.name == 'message'
     assert elem['type'] == 'chat'
-    body = list(event.stanza.elements())[0]
+    body = list(stream_message.stanza.elements())[0]
     assert body.name == 'body'
     assert body.children[0] == u'goodbye'
 
+    sent_message = message_sent.args[0]
+    assert len(sent_message) == 2, sent_message
+    header = sent_message[0]
+    # if it would be Normal, message-type SHOULD be omitted
+    assert 'message-type' not in header, header
+    body = sent_message[1]
+    assert body['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])
 
-- 
1.5.6.5