telepathy-mission-control: Test that an account storage backend can alter AutomaticPresence

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 0fda3bd4b8217460a3c755e8eae8c48ad6478958
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=0fda3bd4b8217460a3c755e8eae8c48ad6478958

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Sep 12 12:26:16 2012 +0100

Test that an account storage backend can alter AutomaticPresence

AutomaticPresenceType etc. don't work, but AutomaticPresence does.

---

 .../account-manager/backend-makes-changes.py       |   47 +++++++-------------
 1 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/tests/twisted/account-manager/backend-makes-changes.py b/tests/twisted/account-manager/backend-makes-changes.py
index 71472b5..89eb4c1 100644
--- a/tests/twisted/account-manager/backend-makes-changes.py
+++ b/tests/twisted/account-manager/backend-makes-changes.py
@@ -184,48 +184,33 @@ def test(q, bus, mc, fake_accounts_service=None, **kwargs):
             account.Properties.Get(cs.ACCOUNT, 'Supersedes'))
 
     fake_accounts_service.update_attributes(account_tail,
-        {'AutomaticPresenceType': cs.PRESENCE_TYPE_HIDDEN,
-            'AutomaticPresenceStatus': 'hidden',
-            'AutomaticPresenceMessage': 'in a haystack or something'})
+        {'AutomaticPresence': (dbus.UInt32(cs.PRESENCE_TYPE_HIDDEN), 'hidden',
+            'in a haystack or something')})
     q.expect_many(
             EventPattern('dbus-signal',
                 path=cs.TEST_DBUS_ACCOUNT_SERVICE_PATH,
                 signal='AttributesChanged',
                 args=[account_tail,
-                    {'AutomaticPresenceType': cs.PRESENCE_TYPE_HIDDEN,
-                        'AutomaticPresenceStatus': 'hidden',
-                        'AutomaticPresenceMessage':
-                            'in a haystack or something'},
-                    {'AutomaticPresenceType': 0,
-                        'AutomaticPresenceStatus': 0,
-                        'AutomaticPresenceMessage': 0},
+                    {'AutomaticPresence': (cs.PRESENCE_TYPE_HIDDEN,
+                        'hidden',
+                        'in a haystack or something')},
+                    {'AutomaticPresence': 0},
                     []]),
-            # FIXME: signal not actually emitted: the three parts don't get
-            # combined correctly
-            #EventPattern('dbus-signal',
-            #    path=account_path,
-            #    signal='AccountPropertyChanged',
-            #    interface=cs.ACCOUNT,
-            #    args=[{'AutomaticPresence':
-            #        (cs.PRESENCE_TYPE_HIDDEN, 'hidden',
-            #            'in a haystack or something')}]),
             EventPattern('dbus-signal',
-                path=cs.TEST_DBUS_ACCOUNT_PLUGIN_PATH,
-                signal='AttributeChanged',
-                args=[account_path, 'AutomaticPresenceType']),
-            EventPattern('dbus-signal',
-                path=cs.TEST_DBUS_ACCOUNT_PLUGIN_PATH,
-                signal='AttributeChanged',
-                args=[account_path, 'AutomaticPresenceStatus']),
+                path=account_path,
+                signal='AccountPropertyChanged',
+                interface=cs.ACCOUNT,
+                args=[{'AutomaticPresence':
+                    (cs.PRESENCE_TYPE_HIDDEN, 'hidden',
+                        'in a haystack or something')}]),
             EventPattern('dbus-signal',
                 path=cs.TEST_DBUS_ACCOUNT_PLUGIN_PATH,
                 signal='AttributeChanged',
-                args=[account_path, 'AutomaticPresenceMessage']),
+                args=[account_path, 'AutomaticPresence']),
             )
-    # FIXME: doesn't work
-    #assertEquals((cs.PRESENCE_TYPE_HIDDEN, 'hidden',
-    #    'in a haystack or something'),
-    #        account.Properties.Get(cs.ACCOUNT, 'AutomaticPresence'))
+    assertEquals((cs.PRESENCE_TYPE_HIDDEN, 'hidden',
+        'in a haystack or something'),
+            account.Properties.Get(cs.ACCOUNT, 'AutomaticPresence'))
 
     fake_accounts_service.update_attributes(account_tail, {
         'DisplayName': 'Ezio\'s IM account'})