Use PersonaStore.always_writeable_properties.

This removes references to the deprecated
PersonaStore.can_alias_personas and PersonaStore.can_group_personas

Closes: bgo#659737 - tests fail due to usage of deprecated methods

diff --git a/NEWS b/NEWS
index 72c5117..6d37e1b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Overview of changes from libfolks 0.6.3 to libfolks 0.6.4
 Bugs fixed:
 * Bug 658631 — Deprecate PersonaStore.can-[alias|group]-personas
 * Bug 658002 — defective typelib
+* Bug 659737 — tests fail due to usage of deprecated methods
 
 API changes:
 * Deprecate Folks.PersonaStore.can_[alias, group]_personas.

diff --git a/tests/eds/persona-store-tests.vala b/tests/eds/persona-store-tests.vala
index 1ecb092..05d7f7a 100644 (file)
--- a/tests/eds/persona-store-tests.vala
+++ b/tests/eds/persona-store-tests.vala
@@ -122,17 +122,11 @@ public class PersonaStoreTests : Folks.TestCase
                 store.notify["can-remove-personas"].connect (
                     this._can_remove_personas_cb);
 
-              if (store.can_alias_personas != MaybeBool.UNSET)
-                this._can_alias_personas_cb (store, null);
-              else
-                store.notify["can-alias-personas"].connect (
-                    this._can_alias_personas_cb);
+              if ("alias" in store.always_writeable_properties)
+                this._check_can_alias_personas (store, null);
 
-              if (store.can_group_personas != MaybeBool.UNSET)
-                this._can_group_personas_cb (store, null);
-              else
-                store.notify["can-group-personas"].connect (
-                    this._can_group_personas_cb);
+              if ("groups" in store.always_writeable_properties)
+                this._check_can_group_personas (store, null);
             }
           catch (GLib.Error e)
             {
@@ -170,31 +164,23 @@ public class PersonaStoreTests : Folks.TestCase
         }
     }
 
-  private void _can_alias_personas_cb (GLib.Object s, ParamSpec? p)
+  private void _check_can_alias_personas (GLib.Object s, ParamSpec? p)
     {
       assert (s is Edsf.PersonaStore);
       var store = (Edsf.PersonaStore) s;
 
-      if (store.can_alias_personas != MaybeBool.UNSET)
+      if ("alias" in store.always_writeable_properties)
         {
-          assert (store.can_alias_personas == MaybeBool.FALSE);
-
-          store.notify["can-alias-personas"].disconnect (
-              this._can_alias_personas_cb);
         }
     }
 
-  private void _can_group_personas_cb (GLib.Object s, ParamSpec? p)
+  private void _check_can_group_personas (GLib.Object s, ParamSpec? p)
     {
       assert (s is Edsf.PersonaStore);
       var store = (Edsf.PersonaStore) s;
 
-      if (store.can_group_personas != MaybeBool.UNSET)
+      if ("groups" in store.always_writeable_properties)
         {
-          assert (store.can_group_personas == MaybeBool.TRUE);
-
-          store.notify["can-group-personas"].disconnect (
-              this._can_group_personas_cb);
         }
     }
 }

diff --git a/tests/telepathy/persona-store-capabilities.vala b/tests/telepathy/persona-store-capabilities.vala
index eb31eb3..09a226b 100644 (file)
--- a/tests/telepathy/persona-store-capabilities.vala
+++ b/tests/telepathy/persona-store-capabilities.vala
@@ -116,17 +116,11 @@ public class PersonaStoreCapabilitiesTests : Folks.TestCase
                 store.notify["can-remove-personas"].connect (
                     this.can_remove_personas_cb);
 
-              if (store.can_alias_personas != MaybeBool.UNSET)
-                can_alias_personas_cb (store, null);
-              else
-                store.notify["can-alias-personas"].connect (
-                    this.can_alias_personas_cb);
+              if ("alias" in store.always_writeable_properties)
+                check_can_alias_personas (store, null);
 
-              if (store.can_group_personas != MaybeBool.UNSET)
-                can_group_personas_cb (store, null);
-              else
-                store.notify["can-group-personas"].connect (
-                    this.can_group_personas_cb);
+              if ("groups" in store.always_writeable_properties)
+                check_can_group_personas_cb (store, null);
             }
           catch (GLib.Error e)
             {
@@ -168,36 +162,22 @@ public class PersonaStoreCapabilitiesTests : Folks.TestCase
         }
     }
 
-  private void can_alias_personas_cb (GLib.Object s, ParamSpec? p)
+  private void check_can_alias_personas (GLib.Object s, ParamSpec? p)
     {
       assert (s is Tpf.PersonaStore);
       var store = (Tpf.PersonaStore) s;
 
-      if (store.can_alias_personas != MaybeBool.UNSET)
-        {
-          assert (store.can_alias_personas == MaybeBool.TRUE);
-
-          this.group_flags_received.add ("can-alias-personas");
-
-          store.notify["can-alias-personas"].disconnect (
-              this.can_alias_personas_cb);
-        }
+      if ("alias" in store.always_writeable_properties)
+        this.group_flags_received.add ("can-alias-personas");
     }
 
-  private void can_group_personas_cb (GLib.Object s, ParamSpec? p)
+  private void check_can_group_personas_cb (GLib.Object s, ParamSpec? p)
     {
       assert (s is Tpf.PersonaStore);
       var store = (Tpf.PersonaStore) s;
 
-      if (store.can_group_personas != MaybeBool.UNSET)
-        {
-          assert (store.can_group_personas == MaybeBool.TRUE);
-
-          this.group_flags_received.add ("can-group-personas");
-
-          store.notify["can-group-personas"].disconnect (
-              this.can_group_personas_cb);
-        }
+      if ("groups" in store.always_writeable_properties)
+        this.group_flags_received.add ("can-group-personas");
     }
 }