[telepathy-mission-control/master] capabilities/draft-1.py: new regression test for the version of ContactCapabilities in telepathy-spec 0.17.26

[Simon McVittie]

---
 test/twisted/Makefile.am             |    1 +
 test/twisted/capabilities/draft-1.py |   81 ++++++++++++++++++++++++++++++++++
 test/twisted/constants.py            |    3 +-
 3 files changed, 84 insertions(+), 1 deletions(-)
 create mode 100644 test/twisted/capabilities/draft-1.py

diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am
index 99a6b6b..02f2a12 100644
--- a/test/twisted/Makefile.am
+++ b/test/twisted/Makefile.am
@@ -19,6 +19,7 @@ TWISTED_BASIC_TESTS = \
 	account-requests/cancel.py \
 	account-requests/create-text.py \
 	account-requests/delete-account-during-request.py \
+	capabilities/draft-1.py \
 	capabilities/legacy-caps.py \
 	dispatcher/approver-fails.py \
 	dispatcher/already-has-channel.py \
diff --git a/test/twisted/capabilities/draft-1.py b/test/twisted/capabilities/draft-1.py
new file mode 100644
index 0000000..d4b61e0
--- /dev/null
+++ b/test/twisted/capabilities/draft-1.py
@@ -0,0 +1,81 @@
+# Copyright (C) 2009 Nokia Corporation
+# Copyright (C) 2009 Collabora Ltd.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+import dbus
+
+"""Regression test for pushing clients' capabilities into a CM with
+draft 1 of ContactCapabilities.
+"""
+
+import dbus
+import dbus.service
+
+from servicetest import EventPattern, tp_name_prefix, tp_path_prefix, \
+        call_async
+from mctest import exec_test, SimulatedConnection, SimulatedClient, \
+        create_fakecm_account, enable_fakecm_account, SimulatedChannel, \
+        expect_client_setup
+import constants as cs
+
+def test(q, bus, mc):
+    # Two clients want to handle channels: MediaCall is running, and AbiWord
+    # is activatable.
+
+    # this must match the .client file
+    abi_fixed_properties = dbus.Dictionary({
+        cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_STREAM_TUBE,
+        cs.CHANNEL_TYPE_STREAM_TUBE + '.Service': 'x-abiword',
+        }, signature='sv')
+
+    media_fixed_properties = dbus.Dictionary({
+        cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_STREAMED_MEDIA,
+        }, signature='sv')
+    media_call = SimulatedClient(q, bus, 'MediaCall',
+            observe=[], approve=[],
+            handle=[media_fixed_properties], bypass_approval=False)
+
+    # wait for MC to download the properties
+    expect_client_setup(q, [media_call])
+
+    def check_correct_caps(e):
+        # Because MC has no idea how to map Client capabilities into legacy
+        # capabilities, it assumes that every client has all the flags in
+        # the world. In this example we have (only) a StreamedMedia client
+        # and a stream-tube client, so that's what MC will tell us.
+        aasv = e.args[0]
+
+        assert media_fixed_properties in aasv
+        assert abi_fixed_properties in aasv
+        assert len(aasv) == 2
+
+        return True
+
+    params = dbus.Dictionary({"account": "someguy at example.com",
+        "password": "secrecy"}, signature='sv')
+    cm_name_ref, account = create_fakecm_account(q, bus, mc, params)
+    conn = enable_fakecm_account(q, bus, mc, account, params,
+            extra_interfaces=[cs.CONN_IFACE_CONTACT_CAPS_DRAFT1],
+            expect_after_connect=[
+                EventPattern('dbus-method-call', handled=False,
+                    interface=cs.CONN_IFACE_CONTACT_CAPS_DRAFT1,
+                    method='SetSelfCapabilities',
+                    predicate=check_correct_caps),
+                ])
+
+if __name__ == '__main__':
+    exec_test(test, {})
diff --git a/test/twisted/constants.py b/test/twisted/constants.py
index d666c51..68880c9 100644
--- a/test/twisted/constants.py
+++ b/test/twisted/constants.py
@@ -59,7 +59,8 @@ CONN_IFACE_ALIASING = CONN + '.Interface.Aliasing'
 CONN_IFACE_AVATARS = CONN + '.Interface.Avatars'
 CONN_IFACE_CAPS = CONN + '.Interface.Capabilities'
 CONN_IFACE_CONTACTS = CONN + '.Interface.Contacts'
-CONN_IFACE_CONTACT_CAPA = CONN + '.Interface.ContactCapabilities.DRAFT'
+CONN_IFACE_CONTACT_CAPS_DRAFT1 = CONN + '.Interface.ContactCapabilities.DRAFT'
+CONN_IFACE_CONTACT_CAPS_DRAFT2 = CONN + '.Interface.ContactCapabilities.DRAFT2'
 CONN_IFACE_REQUESTS = CONN + '.Interface.Requests'
 CONN_IFACE_SIMPLE_PRESENCE = CONN + '.Interface.SimplePresence'
 
-- 
1.5.6.5