[Telepathy-commits] [telepathy-salut/master] Add a test for the various alias sources

[Sjoerd Simons]

---
 tests/twisted/Makefile.am           |    3 +-
 tests/twisted/avahi/test-aliases.py |   63 +++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletions(-)
 create mode 100644 tests/twisted/avahi/test-aliases.py

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 2ffc068..fdad1e2 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -1,5 +1,6 @@
 TWISTED_TESTS = \
-	avahi/test-register.py
+	avahi/test-register.py \
+	avahi/test-aliases.py
 
 TESTS =
 
diff --git a/tests/twisted/avahi/test-aliases.py b/tests/twisted/avahi/test-aliases.py
new file mode 100644
index 0000000..79925cf
--- /dev/null
+++ b/tests/twisted/avahi/test-aliases.py
@@ -0,0 +1,63 @@
+from saluttest import exec_test
+from avahitest import AvahiAnnouncer
+from avahitest import get_host_name
+
+import time
+
+PUBLISHED_NAME="test-register"
+FIRST_NAME="lastname"
+LAST_NAME="lastname"
+
+HT_CONTACT = 1
+HT_CONTACT_LIST = 3
+
+def wait_for_aliases_changed(q, handle):
+    while True:
+        e = q.expect('dbus-signal', signal='AliasesChanged')
+        for x in e.args:
+            (h, a) = x[0]
+            if h == handle:
+                return a
+
+def test(q, bus, conn):
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L])
+    basic_txt = { "txtvers": "1", "status": "avail" }
+
+    contact_name = "aliastest@" + get_host_name()
+    announcer = AvahiAnnouncer(contact_name, "_presence._tcp", 1234, 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
+                break
+
+    alias = wait_for_aliases_changed(q, handle)
+    assert alias == contact_name, alias
+
+    for (alias, dict) in [
+      ("last", { "last": "last" }),
+      ("1st", { "1st": "1st"}),
+      ("1st last", { "1st": "1st", "last": "last" }),
+      ("nickname", { "1st": "1st", "last": "last", "nick": "nickname" }),
+      (contact_name, { }) ]:
+        txt = basic_txt.copy()
+        txt.update(dict)
+
+        announcer.set(txt)
+
+        a = wait_for_aliases_changed (q, handle)
+        assert a == alias, (a, alias, txt)
+
+if __name__ == '__main__':
+    exec_test(test)
-- 
1.5.6.3