[Telepathy-commits] [telepathy-salut/master] Add a test for iChat type chat notifications

[Sjoerd Simons]

---
 tests/twisted/Makefile.am                   |    3 +-
 tests/twisted/avahi/test-ichat-composing.py |   88 +++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletions(-)
 create mode 100644 tests/twisted/avahi/test-ichat-composing.py

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 355cb2a..a983970 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -5,7 +5,8 @@ TWISTED_BASIC_TESTS =
 TWISTED_AVAHI_TESTS = \
 	avahi/test-register.py \
 	avahi/test-aliases.py \
-	avahi/test-text-channel.py
+	avahi/test-text-channel.py \
+	avahi/test-ichat-composing.py
 
 TWISTED_AVAHI_OLPC_TESTS = \
 	avahi/test-olpc-activity-announcements.py
diff --git a/tests/twisted/avahi/test-ichat-composing.py b/tests/twisted/avahi/test-ichat-composing.py
new file mode 100644
index 0000000..a8c5f25
--- /dev/null
+++ b/tests/twisted/avahi/test-ichat-composing.py
@@ -0,0 +1,88 @@
+from saluttest import exec_test
+from avahitest import AvahiAnnouncer, AvahiListener
+from avahitest import get_host_name
+import avahi
+
+from xmppstream import setup_stream_listener, connect_to_stream
+from servicetest import make_channel_proxy
+
+from twisted.words.xish import xpath, domish
+
+
+import time
+import dbus
+
+CHANNEL_TYPE_TEXT = "org.freedesktop.Telepathy.Channel.Type.Text"
+HT_CONTACT = 1
+HT_CONTACT_LIST = 3
+OUTGOING_MESSAGE = "This is a message"
+
+def test(q, bus, conn):
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L])
+    basic_txt = { "txtvers": "1", "status": "avail" }
+
+    contact_name = "test-text-channel@" + get_host_name()
+    listener, port = setup_stream_listener(q, contact_name)
+
+    announcer = AvahiAnnouncer(contact_name, "_presence._tcp", port, basic_txt)
+
+    publish_handle = conn.RequestHandles(HT_CONTACT_LIST, ["publish"])[0]
+    publish = conn.RequestChannel(
+        "org.freedesktop.Telepathy.Channel.Type.ContactList",
+        HT_CONTACT_LIST, publish_handle, False)
+
+    handle = 0
+    # Wait until the record shows up in publish
+    while handle == 0:
+        e = q.expect('dbus-signal', signal='MembersChanged', path=publish)
+        for h in e.args[1]:
+            name = conn.InspectHandles(HT_CONTACT, [h])[0]
+            if name == contact_name:
+                handle = h
+
+    self_handle = conn.GetSelfHandle()
+    self_handle_name =  conn.InspectHandles(HT_CONTACT, [self_handle])[0]
+
+    AvahiListener(q).listen_for_service("_presence._tcp")
+    e = q.expect('service-added', name = self_handle_name,
+        protocol = avahi.PROTO_INET)
+    service = e.service
+    service.resolve()
+
+
+    e = q.expect('service-resolved', service = service)
+
+    xmpp_connection = connect_to_stream(q, contact_name,
+        self_handle_name, str(e.pt), e.port)
+
+    e = q.expect('connection-result')
+    assert e.succeeded, e.reason
+
+    e = q.expect('stream-opened', connection = xmpp_connection)
+
+    # connected to salut, now send a messages as composing part 
+    # here be sillyness
+    parts = OUTGOING_MESSAGE.split(" ")
+    print parts
+
+    for x in xrange(1,len(parts)):
+        print ' '.join(parts[:x])
+        message = domish.Element(('', 'message'))
+        message.addElement('body', content=' '.join(parts[:x]))
+        event = message.addElement('x', 'jabber:x:event')
+        event.addElement('composing')
+        event.addElement('id')
+        xmpp_connection.send(message)
+
+    message = domish.Element(('', 'message'))
+    message.addElement('body', content=OUTGOING_MESSAGE)
+    xmpp_connection.send(message)
+
+    e = q.expect('dbus-signal', signal='Received')
+    e = q.expect('dbus-signal', signal='Received')
+    assert e.args[2] == handle
+    assert e.args[5] == OUTGOING_MESSAGE
+
+if __name__ == '__main__':
+    exec_test(test)
-- 
1.5.6.5