[Telepathy-commits] [telepathy-gabble/master] Add a test-case for Destroyable.Destroy()

[Simon McVittie]

---
 tests/twisted/Makefile.am     |    1 +
 tests/twisted/text/destroy.py |  139 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+), 0 deletions(-)
 create mode 100644 tests/twisted/text/destroy.py

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index c5aa679..dc97295 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -30,6 +30,7 @@ TWISTED_TESTS = \
 	roster/test-save-alias-to-roster.py \
 	text/initiate.py \
 	text/initiate-requestotron.py \
+	text/destroy.py \
 	text/ensure.py \
 	text/respawn.py \
 	text/test-text-delayed.py \
diff --git a/tests/twisted/text/destroy.py b/tests/twisted/text/destroy.py
new file mode 100644
index 0000000..16e17eb
--- /dev/null
+++ b/tests/twisted/text/destroy.py
@@ -0,0 +1,139 @@
+"""
+Test text channel not being recreated because although there were still
+pending messages, we destroyed it with extreme prejudice.
+"""
+
+import dbus
+
+from twisted.words.xish import domish
+
+from gabbletest import exec_test
+from servicetest import call_async, EventPattern, tp_path_prefix
+
+def test(q, bus, conn, stream):
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
+
+    self_handle = conn.GetSelfHandle()
+
+    jid = 'foo at bar.com'
+    call_async(q, conn, 'RequestHandles', 1, [jid])
+
+    event = q.expect('dbus-return', method='RequestHandles')
+    foo_handle = event.value[0][0]
+
+    call_async(q, conn, 'RequestChannel',
+        'org.freedesktop.Telepathy.Channel.Type.Text', 1, foo_handle, True)
+
+    ret, old_sig, new_sig = q.expect_many(
+        EventPattern('dbus-return', method='RequestChannel'),
+        EventPattern('dbus-signal', signal='NewChannel'),
+        EventPattern('dbus-signal', signal='NewChannels'),
+        )
+
+    text_chan = bus.get_object(conn.bus_name, ret.value[0])
+    chan_iface = dbus.Interface(text_chan,
+            'org.freedesktop.Telepathy.Channel')
+    text_iface = dbus.Interface(text_chan,
+            'org.freedesktop.Telepathy.Channel.Type.Text')
+    destroyable_iface = dbus.Interface(text_chan,
+            'org.freedesktop.Telepathy.Channel.Interface.Destroyable.DRAFT')
+
+    assert old_sig.args[0] == ret.value[0]
+    assert old_sig.args[1] == u'org.freedesktop.Telepathy.Channel.Type.Text'
+    # check that handle type == contact handle
+    assert old_sig.args[2] == 1
+    assert old_sig.args[3] == foo_handle
+    assert old_sig.args[4] == True      # suppress handler
+
+    assert len(new_sig.args) == 1
+    assert len(new_sig.args[0]) == 1        # one channel
+    assert len(new_sig.args[0][0]) == 2     # two struct members
+    assert new_sig.args[0][0][0] == ret.value[0]
+    emitted_props = new_sig.args[0][0][1]
+    assert emitted_props['org.freedesktop.Telepathy.Channel.ChannelType'] ==\
+            'org.freedesktop.Telepathy.Channel.Type.Text'
+    assert emitted_props['org.freedesktop.Telepathy.Channel.'
+            'TargetHandleType'] == 1
+    assert emitted_props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
+            foo_handle
+    assert emitted_props['org.freedesktop.Telepathy.Channel.TargetID'] == jid
+    assert emitted_props['org.freedesktop.Telepathy.Channel.'
+            'Requested'] == True
+    assert emitted_props['org.freedesktop.Telepathy.Channel.'
+            'InitiatorHandle'] == self_handle
+    assert emitted_props['org.freedesktop.Telepathy.Channel.'
+            'InitiatorID'] == 'test at localhost'
+
+    channel_props = text_chan.GetAll(
+            'org.freedesktop.Telepathy.Channel',
+            dbus_interface='org.freedesktop.DBus.Properties')
+    assert channel_props['TargetID'] == jid,\
+            (channel_props['TargetID'], jid)
+    assert channel_props['Requested'] == True
+    assert channel_props['InitiatorHandle'] == self_handle,\
+            (channel_props['InitiatorHandle'], self_handle)
+    assert channel_props['InitiatorID'] == 'test at localhost',\
+            channel_props['InitiatorID']
+
+    text_iface.Send(0, 'hey')
+
+    event = q.expect('stream-message')
+
+    elem = event.stanza
+    assert elem.name == 'message'
+    assert elem['type'] == 'chat'
+    body = list(event.stanza.elements())[0]
+    assert body.name == 'body'
+    assert body.children[0] == u'hey'
+
+    # <message type="chat"><body>hello</body</message>
+    m = domish.Element(('', 'message'))
+    m['from'] = 'foo at bar.com/Pidgin'
+    m['type'] = 'chat'
+    m.addElement('body', content='hello')
+    stream.send(m)
+
+    event = q.expect('dbus-signal', signal='Received')
+
+    hello_message_id = event.args[0]
+    hello_message_time = event.args[1]
+    assert event.args[2] == foo_handle
+    # message type: normal
+    assert event.args[3] == 0
+    # flags: none
+    assert event.args[4] == 0
+    # body
+    assert event.args[5] == 'hello'
+
+    messages = text_chan.ListPendingMessages(False,
+            dbus_interface='org.freedesktop.Telepathy.Channel.Type.Text')
+    assert messages == \
+            [(hello_message_id, hello_message_time, foo_handle,
+                0, 0, 'hello')], messages
+
+    # destroy the channel without acking the message; it does not come back
+
+    call_async(q, destroyable_iface, 'Destroy')
+
+    event = q.expect('dbus-signal', signal='Closed')
+    assert tp_path_prefix + event.path == text_chan.object_path,\
+            (tp_path_prefix + event.path, text_chan.object_path)
+
+    event = q.expect('dbus-return', method='Destroy')
+
+    # assert that it stays dead
+
+    try:
+        chan_iface.GetChannelType()
+    except dbus.DBusException:
+        pass
+    else:
+        raise AssertionError("Why won't it die?")
+
+    conn.Disconnect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
+
+if __name__ == '__main__':
+    exec_test(test)
+
-- 
1.5.6.5