GNOME.org
 

[folks] tests fixed to match last vala release.

commit 316c0be531bd9cd53e5459ec014b9c25501768fd
Author: Erick PÃrez Castellanos <erick red gmail com>
Date:   Thu Aug 9 14:57:15 2012 -0400

    tests fixed to match last vala release.
    
    Vala change:
    1. Warn when accessing static members with an instance reference.
    2. Deprecate implicit .begin for async methods.
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=681420

 tests/eds/add-contacts-stress-test.vala         |    6 +++---
 tests/eds/add-persona.vala                      |   18 ++++++++++--------
 tests/eds/avatar-details.vala                   |    6 +++---
 tests/eds/email-details.vala                    |    4 ++--
 tests/eds/im-details.vala                       |    2 +-
 tests/eds/individual-retrieval.vala             |    2 +-
 tests/eds/link-personas-diff-stores.vala        |    4 ++--
 tests/eds/link-personas.vala                    |    8 ++++----
 tests/eds/name-details.vala                     |    2 +-
 tests/eds/persona-store-tests.vala              |    2 +-
 tests/eds/phone-details.vala                    |    6 +++---
 tests/eds/postal-address-details.vala           |   10 +++++-----
 tests/eds/remove-persona.vala                   |    6 +++---
 tests/eds/removing-contacts.vala                |    4 ++--
 tests/eds/set-avatar.vala                       |    4 ++--
 tests/eds/set-birthday.vala                     |    2 +-
 tests/eds/set-emails.vala                       |    6 +++---
 tests/eds/set-gender.vala                       |    2 +-
 tests/eds/set-im-addresses.vala                 |    2 +-
 tests/eds/set-is-favourite.vala                 |    2 +-
 tests/eds/set-names.vala                        |    2 +-
 tests/eds/set-notes.vala                        |    2 +-
 tests/eds/set-phones.vala                       |    9 +++++----
 tests/eds/set-postal-addresses.vala             |   10 +++++-----
 tests/eds/set-properties-race.vala              |   10 +++++-----
 tests/eds/set-roles.vala                        |    2 +-
 tests/eds/set-structured-name.vala              |    2 +-
 tests/eds/set-urls.vala                         |    8 +++++---
 tests/eds/updating-contacts.vala                |    4 ++--
 tests/key-file/individual-retrieval.vala        |    4 ++--
 tests/lib/test-case.vala                        |    2 +-
 tests/telepathy/individual-properties.vala      |   10 +++++-----
 tests/telepathy/persona-store-capabilities.vala |    2 +-
 33 files changed, 85 insertions(+), 80 deletions(-)
---
diff --git a/tests/eds/add-contacts-stress-test.vala b/tests/eds/add-contacts-stress-test.vala
index d41d14a..d354cf7 100644
--- a/tests/eds/add-contacts-stress-test.vala
+++ b/tests/eds/add-contacts-stress-test.vala
@@ -69,7 +69,7 @@ public class AddContactsStressTestTests : Folks.TestCase
 
       this._start_time = new DateTime.now_utc ();
 
-      this._test_add_persona_async ();
+      this._test_add_persona_async.begin ();
 
       this._main_loop.run ();
 
@@ -77,7 +77,7 @@ public class AddContactsStressTestTests : Folks.TestCase
       var difference = now.difference (this._start_time);
 
       var diff = difference / TimeSpan.SECOND;
-      GLib.stdout.printf ("(Elapsed time: %" + diff.FORMAT + " secs) ", diff);
+      GLib.stdout.printf ("(Elapsed time: %" + int64.FORMAT + " secs) ", diff);
 
       int found = 0;
       foreach (var k in this._contacts_found.get_values ())
@@ -183,7 +183,7 @@ public class AddContactsStressTestTests : Folks.TestCase
               this._added_contacts == false)
             {
               this._added_contacts = true;
-              this._add_contacts ();
+              this._add_contacts.begin ();
             }
         }
     }
diff --git a/tests/eds/add-persona.vala b/tests/eds/add-persona.vala
index b6b8c08..ef8791f 100644
--- a/tests/eds/add-persona.vala
+++ b/tests/eds/add-persona.vala
@@ -92,8 +92,8 @@ public class AddPersonaTests : Folks.TestCase
           this._extension, this._street, this._locality, this._region,
           this._postal_code, this._country, null, null);
       this._address = new PostalAddressFieldDetails (pa);
-      this._address.add_parameter (this._address.PARAM_TYPE,
-          this._address.PARAM_TYPE_HOME);
+      this._address.add_parameter (AbstractFieldDetails.PARAM_TYPE,
+          AbstractFieldDetails.PARAM_TYPE_HOME);
 
       this._properties_found = new HashTable<string, bool>
           (str_hash, str_equal);
@@ -111,7 +111,7 @@ public class AddPersonaTests : Folks.TestCase
       this._properties_found.insert ("role-1", false);
       this._properties_found.insert ("is-favourite", false);
 
-      this._test_add_persona_async ();
+      this._test_add_persona_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
@@ -172,7 +172,8 @@ public class AddPersonaTests : Folks.TestCase
           (GLib.HashFunc) EmailFieldDetails.hash,
           (GLib.EqualFunc) EmailFieldDetails.equal);
       var email_1 = new EmailFieldDetails (this._email_1);
-      email_1.set_parameter (email_1.PARAM_TYPE, email_1.PARAM_TYPE_HOME);
+      email_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
+          AbstractFieldDetails.PARAM_TYPE_HOME);
       emails.add (email_1);
       v2.set_object (emails);
       details.insert (
@@ -220,7 +221,8 @@ public class AddPersonaTests : Folks.TestCase
           this._extension, this._street, this._locality, this._region,
           this._postal_code, this._country, null, null);
       var pa_fd_a = new PostalAddressFieldDetails (pa_a);
-      pa_fd_a.add_parameter (pa_fd_a.PARAM_TYPE, pa_fd_a.PARAM_TYPE_HOME);
+      pa_fd_a.add_parameter (AbstractFieldDetails.PARAM_TYPE,
+          AbstractFieldDetails.PARAM_TYPE_HOME);
       pa_fds.add (pa_fd_a);
       v6.set_object (pa_fds);
       details.insert (
@@ -347,7 +349,7 @@ public class AddPersonaTests : Folks.TestCase
           i.notify["roles"].connect (this._notify_cb);
           i.notify["is-favourite"].connect (this._notify_cb);
 
-          this._check_properties (i);
+          this._check_properties.begin (i);
         }
 
       return retval;
@@ -356,7 +358,7 @@ public class AddPersonaTests : Folks.TestCase
   private void _notify_cb (Object individual_obj, ParamSpec ps)
     {
       Folks.Individual i = (Folks.Individual) individual_obj;
-      this._check_properties (i);
+      this._check_properties.begin (i);
     }
 
   private void _notify_pstore_cb (Object _pstore, ParamSpec ps)
@@ -372,7 +374,7 @@ public class AddPersonaTests : Folks.TestCase
               this._added_persona == false)
             {
               this._added_persona = true;
-              this._add_persona ();
+              this._add_persona.begin ();
             }
         }
     }
diff --git a/tests/eds/avatar-details.vala b/tests/eds/avatar-details.vala
index 979f2c9..d37a203 100644
--- a/tests/eds/avatar-details.vala
+++ b/tests/eds/avatar-details.vala
@@ -71,7 +71,7 @@ public class AvatarDetailsTests : Folks.TestCase
       this._c1.set ("avatar",(owned) v);
       this._eds_backend.add_contact (this._c1);
 
-      this._test_avatar_async ();
+      this._test_avatar_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
@@ -126,7 +126,7 @@ public class AvatarDetailsTests : Folks.TestCase
           if (i.full_name == "bernie h. innocenti")
             {
               i.notify["avatar"].connect (this._notify_cb);
-              this._check_avatar (i.avatar);
+              this._check_avatar.begin (i.avatar);
             }
         }
    }
@@ -134,7 +134,7 @@ public class AvatarDetailsTests : Folks.TestCase
   private void _notify_cb (Object individual_obj, ParamSpec ps)
     {
       Folks.Individual i = (Folks.Individual) individual_obj;
-      this._check_avatar (i.avatar);
+      this._check_avatar.begin (i.avatar);
     }
 
   private async void _check_avatar (LoadableIcon? avatar)
diff --git a/tests/eds/email-details.vala b/tests/eds/email-details.vala
index 10dd688..3b3828e 100644
--- a/tests/eds/email-details.vala
+++ b/tests/eds/email-details.vala
@@ -101,7 +101,7 @@ public class EmailDetailsTests : Folks.TestCase
       this._c3.set (Edsf.Persona.email_fields[1], (owned) v);
       this._eds_backend.add_contact (this._c3);
 
-      this._test_email_details_async ();
+      this._test_email_details_async.begin ();
 
       Timeout.add_seconds (5, () =>
           {
@@ -190,7 +190,7 @@ public class EmailDetailsTests : Folks.TestCase
                   }
               }
               assert (found);
-              foreach (var v in e.get_parameter_values (e.PARAM_TYPE))
+              foreach (var v in e.get_parameter_values (AbstractFieldDetails.PARAM_TYPE))
                 {
                   this._email_types.add (v);
                 }
diff --git a/tests/eds/im-details.vala b/tests/eds/im-details.vala
index d16c72f..abdd73e 100644
--- a/tests/eds/im-details.vala
+++ b/tests/eds/im-details.vala
@@ -79,7 +79,7 @@ public class ImDetailsTests : Folks.TestCase
       this._found_addr_1 = false;
       this._found_addr_2 = false;
 
-      this._test_im_details_interface_async ();
+      this._test_im_details_interface_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
diff --git a/tests/eds/individual-retrieval.vala b/tests/eds/individual-retrieval.vala
index b3d8e4e..d9fdbc2 100644
--- a/tests/eds/individual-retrieval.vala
+++ b/tests/eds/individual-retrieval.vala
@@ -78,7 +78,7 @@ public class IndividualRetrievalTests : Folks.TestCase
       c2.set(Edsf.Persona.email_fields[0], (owned) v);
       this._eds_backend.add_contact (c2);
 
-      this._test_singleton_individuals_async ();
+      this._test_singleton_individuals_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
diff --git a/tests/eds/link-personas-diff-stores.vala b/tests/eds/link-personas-diff-stores.vala
index 202795b..01cdf6b 100644
--- a/tests/eds/link-personas-diff-stores.vala
+++ b/tests/eds/link-personas-diff-stores.vala
@@ -80,7 +80,7 @@ public class LinkPersonasDiffStoresTests : Folks.TestCase
       this._persona_iid_2 = "";
       this._linked_individual_found = false;
 
-      this._test_linking_personas_async ();
+      this._test_linking_personas_async.begin ();
 
       var timer_id = Timeout.add_seconds (8, () =>
         {
@@ -123,7 +123,7 @@ public class LinkPersonasDiffStoresTests : Folks.TestCase
               assert (pstore2 != null);
               assert (pstore2.is_prepared == true);
 
-              this._add_personas (pstore, pstore2);
+              this._add_personas.begin (pstore, pstore2);
             });
         }
       catch (GLib.Error e)
diff --git a/tests/eds/link-personas.vala b/tests/eds/link-personas.vala
index 745de8a..b0d1e42 100644
--- a/tests/eds/link-personas.vala
+++ b/tests/eds/link-personas.vala
@@ -131,7 +131,7 @@ public class LinkPersonasTests : Folks.TestCase
           this._linking_props.set ("prop2", this._auto_linkable_email);
         }
 
-      this._test_linking_personas_async ();
+      this._test_linking_personas_async.begin ();
 
       var timer_id = Timeout.add_seconds (8, () =>
         {
@@ -179,7 +179,7 @@ public class LinkPersonasTests : Folks.TestCase
   private void _notify_pstore_cb (Object _pstore, ParamSpec ps)
     {
       var pstore = (PersonaStore) _pstore;
-      this._add_personas (pstore, pstore);
+      this._add_personas.begin (pstore, pstore);
     }
 
   private PersonaStore? _get_store (BackendStore store, string store_id)
@@ -323,9 +323,9 @@ public class LinkPersonasTests : Folks.TestCase
             }
 
           if (this._linking_method == LinkingMethod.EMAIL_AS_IM_ADDRESS)
-            this._check_auto_linked_personas (i);
+            this._check_auto_linked_personas.begin (i);
           else
-            this._check_personas (i);
+            this._check_personas.begin (i);
         }
     }
 
diff --git a/tests/eds/name-details.vala b/tests/eds/name-details.vala
index 9c481d7..047e8d1 100644
--- a/tests/eds/name-details.vala
+++ b/tests/eds/name-details.vala
@@ -98,7 +98,7 @@ public class NameDetailsTests : Folks.TestCase
       this._c2.set ("contact_name_given", (owned) v);
       this._eds_backend.add_contact (this._c2);
 
-      this._test_names_async ();
+      this._test_names_async.begin ();
 
       Timeout.add_seconds (5, () =>
           {
diff --git a/tests/eds/persona-store-tests.vala b/tests/eds/persona-store-tests.vala
index 0e81af5..517198c 100644
--- a/tests/eds/persona-store-tests.vala
+++ b/tests/eds/persona-store-tests.vala
@@ -92,7 +92,7 @@ public class PersonaStoreTests : Folks.TestCase
               }
           });
 
-      backend_store.load_backends ();
+      backend_store.load_backends.begin ();
 
       Timeout.add_seconds (3, () =>
         {
diff --git a/tests/eds/phone-details.vala b/tests/eds/phone-details.vala
index 047ed00..d14e8c7 100644
--- a/tests/eds/phone-details.vala
+++ b/tests/eds/phone-details.vala
@@ -94,7 +94,7 @@ public class PhoneDetailsTests : Folks.TestCase
       this._c2.set ("home_phone", (owned) v);
       this._eds_backend.add_contact (this._c2);
 
-      this._test_phone_numbers_async ();
+      this._test_phone_numbers_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
@@ -168,7 +168,7 @@ public class PhoneDetailsTests : Folks.TestCase
             {
               this._phones_count++;
               foreach (var t in phone_fd.get_parameter_values (
-                  phone_fd.PARAM_TYPE))
+                  AbstractFieldDetails.PARAM_TYPE))
                 {
                   string? v = null;
 
@@ -176,7 +176,7 @@ public class PhoneDetailsTests : Folks.TestCase
                     {
                       v = "car_phone";
                     }
-                  else if (t == phone_fd.PARAM_TYPE_HOME)
+                  else if (t == AbstractFieldDetails.PARAM_TYPE_HOME)
                     {
                       v = "home_phone";
                     }
diff --git a/tests/eds/postal-address-details.vala b/tests/eds/postal-address-details.vala
index bffe3f1..7921387 100644
--- a/tests/eds/postal-address-details.vala
+++ b/tests/eds/postal-address-details.vala
@@ -77,8 +77,8 @@ public class PostalAddressDetailsTests : Folks.TestCase
            this._country,
            null, "eds_id");
       this._postal_address = new PostalAddressFieldDetails (pa);
-      this._postal_address.add_parameter (this._postal_address.PARAM_TYPE,
-          this._postal_address.PARAM_TYPE_HOME);
+      this._postal_address.add_parameter (AbstractFieldDetails.PARAM_TYPE,
+          AbstractFieldDetails.PARAM_TYPE_HOME);
 
       v = Value (typeof (string));
       v.set_string (this._fullname);
@@ -93,8 +93,8 @@ public class PostalAddressDetailsTests : Folks.TestCase
            this._country,
            null, "eds_id");
       var pa_fd_copy = new PostalAddressFieldDetails (pa_copy);
-      pa_fd_copy.add_parameter (pa_fd_copy.PARAM_TYPE,
-          this._postal_address.PARAM_TYPE_HOME);
+      pa_fd_copy.add_parameter (AbstractFieldDetails.PARAM_TYPE,
+          AbstractFieldDetails.PARAM_TYPE_HOME);
       v = Value (typeof (PostalAddressFieldDetails));
       v.set_object (pa_fd_copy);
       /* corresponds to address of type "home" */
@@ -104,7 +104,7 @@ public class PostalAddressDetailsTests : Folks.TestCase
 
       this._found_postal_address = false;
 
-      this._test_postal_address_details_interface_async ();
+      this._test_postal_address_details_interface_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
diff --git a/tests/eds/remove-persona.vala b/tests/eds/remove-persona.vala
index eb23447..b674b82 100644
--- a/tests/eds/remove-persona.vala
+++ b/tests/eds/remove-persona.vala
@@ -66,7 +66,7 @@ public class RemovePersonaTests : Folks.TestCase
       this._persona_removed = false;
       this._individual_removed = false;
 
-      this._test_remove_persona_async ();
+      this._test_remove_persona_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
@@ -122,7 +122,7 @@ public class RemovePersonaTests : Folks.TestCase
           this._added_persona == false)
         {
           this._added_persona = true;
-          this._add_persona ();
+          this._add_persona.begin ();
         }
     }
 
@@ -175,7 +175,7 @@ public class RemovePersonaTests : Folks.TestCase
               if (this._pstore.personas.has_key (this._persona_id) == true)
                 {
                   this._pstore.personas_changed.connect (this._personas_cb);
-                  this._aggregator.remove_individual (this._individual);
+                  this._aggregator.remove_individual.begin (this._individual);
                 }
             }
         }
diff --git a/tests/eds/removing-contacts.vala b/tests/eds/removing-contacts.vala
index 63dfcd3..6113a14 100644
--- a/tests/eds/removing-contacts.vala
+++ b/tests/eds/removing-contacts.vala
@@ -68,7 +68,7 @@ public class RemovingContactsTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_removal_async ();
+      this._test_removal_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
@@ -116,7 +116,7 @@ public class RemovingContactsTests : Folks.TestCase
           var name = (Folks.NameDetails) i;
           this._added = true;
           assert (name.full_name == "bernie h. innocenti");
-          this._eds_backend.remove_contact (0);
+          this._eds_backend.remove_contact.begin (0);
         }
 
       foreach (Individual i in removed)
diff --git a/tests/eds/set-avatar.vala b/tests/eds/set-avatar.vala
index fb36ce6..0f1a4ef 100644
--- a/tests/eds/set-avatar.vala
+++ b/tests/eds/set-avatar.vala
@@ -73,7 +73,7 @@ public class SetAvatarTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_avatar_async ();
+      this._test_set_avatar_async.begin ();
 
       var timeout_id = Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
@@ -182,7 +182,7 @@ public class SetAvatarTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_individual_avatar_async ();
+      this._test_set_individual_avatar_async.begin ();
 
       var timeout_id = Timeout.add_seconds (5, () =>
         {
diff --git a/tests/eds/set-birthday.vala b/tests/eds/set-birthday.vala
index 26c7f10..e676433 100644
--- a/tests/eds/set-birthday.vala
+++ b/tests/eds/set-birthday.vala
@@ -69,7 +69,7 @@ public class SetBirthdayTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_birthday_async ();
+      this._test_set_birthday_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
diff --git a/tests/eds/set-emails.vala b/tests/eds/set-emails.vala
index a22dd65..8f4ce3d 100644
--- a/tests/eds/set-emails.vala
+++ b/tests/eds/set-emails.vala
@@ -68,7 +68,7 @@ public class SetEmailsTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_emails_async ();
+      this._test_set_emails_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
@@ -123,8 +123,8 @@ public class SetEmailsTests : Folks.TestCase
                       (GLib.HashFunc) EmailFieldDetails.hash,
                       (GLib.EqualFunc) EmailFieldDetails.equal);
                   var email_1 = new EmailFieldDetails ("bernie example org");
-                  email_1.set_parameter (email_1.PARAM_TYPE,
-                      email_1.PARAM_TYPE_OTHER);
+                  email_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
+                      AbstractFieldDetails.PARAM_TYPE_OTHER);
                   emails.add (email_1);
                   ((EmailDetails) p).email_addresses = emails;
                 }
diff --git a/tests/eds/set-gender.vala b/tests/eds/set-gender.vala
index 0ef00c7..f296174 100644
--- a/tests/eds/set-gender.vala
+++ b/tests/eds/set-gender.vala
@@ -69,7 +69,7 @@ public class SetGenderTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_gender_async ();
+      this._test_set_gender_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
diff --git a/tests/eds/set-im-addresses.vala b/tests/eds/set-im-addresses.vala
index cfa9379..9d88b90 100644
--- a/tests/eds/set-im-addresses.vala
+++ b/tests/eds/set-im-addresses.vala
@@ -69,7 +69,7 @@ public class SetIMAddressesTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_im_addresses_async ();
+      this._test_set_im_addresses_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
diff --git a/tests/eds/set-is-favourite.vala b/tests/eds/set-is-favourite.vala
index 05e4e6b..48c686d 100644
--- a/tests/eds/set-is-favourite.vala
+++ b/tests/eds/set-is-favourite.vala
@@ -69,7 +69,7 @@ public class SetIsFavouriteTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_is_favourite_async ();
+      this._test_set_is_favourite_async.begin ();
 
       Timeout.add_seconds (5, () =>
         {
diff --git a/tests/eds/set-names.vala b/tests/eds/set-names.vala
index d7b93af..c974612 100644
--- a/tests/eds/set-names.vala
+++ b/tests/eds/set-names.vala
@@ -76,7 +76,7 @@ public class SetNamesTests : Folks.TestCase
       c1.set ("nickname", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_names_async ();
+      this._test_set_names_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
diff --git a/tests/eds/set-notes.vala b/tests/eds/set-notes.vala
index 67c9b0f..0ab0689 100644
--- a/tests/eds/set-notes.vala
+++ b/tests/eds/set-notes.vala
@@ -70,7 +70,7 @@ public class SetNotesTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_full_name_async ();
+      this._test_set_full_name_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
diff --git a/tests/eds/set-phones.vala b/tests/eds/set-phones.vala
index 1635cae..1ed862c 100644
--- a/tests/eds/set-phones.vala
+++ b/tests/eds/set-phones.vala
@@ -68,7 +68,7 @@ public class SetPhonesTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_phones_async ();
+      this._test_set_phones_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
@@ -123,8 +123,8 @@ public class SetPhonesTests : Folks.TestCase
                       (GLib.HashFunc) PhoneFieldDetails.hash,
                       (GLib.EqualFunc) PhoneFieldDetails.equal);
                   var phone_1 = new PhoneFieldDetails ("1234");
-                  phone_1.set_parameter (phone_1.PARAM_TYPE,
-                      phone_1.PARAM_TYPE_HOME);
+                  phone_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
+                      AbstractFieldDetails.PARAM_TYPE_HOME);
                   phones.add (phone_1);
                   ((PhoneDetails) p).phone_numbers = phones;
                 }
@@ -145,7 +145,8 @@ public class SetPhonesTests : Folks.TestCase
       foreach (var phone_fd in i.phone_numbers)
         {
           var phone_1 = new PhoneFieldDetails ("1234");
-          phone_1.set_parameter (phone_1.PARAM_TYPE, phone_1.PARAM_TYPE_HOME);
+          phone_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
+              AbstractFieldDetails.PARAM_TYPE_HOME);
           if (phone_fd.equal (phone_1))
             {
               this._found_after_update = true;
diff --git a/tests/eds/set-postal-addresses.vala b/tests/eds/set-postal-addresses.vala
index c00f76a..dffb6ff 100644
--- a/tests/eds/set-postal-addresses.vala
+++ b/tests/eds/set-postal-addresses.vala
@@ -63,8 +63,8 @@ public class SetPostalAddressesTests : Folks.TestCase
           "locality", "region", "postal code", "country", "",
           "123");
       this._pa_fd = new PostalAddressFieldDetails (pa);
-      this._pa_fd.add_parameter (this._pa_fd.PARAM_TYPE,
-          this._pa_fd.PARAM_TYPE_OTHER);
+      this._pa_fd.add_parameter (AbstractFieldDetails.PARAM_TYPE,
+          AbstractFieldDetails.PARAM_TYPE_OTHER);
 
       this._found_before_update = false;
       this._found_after_update = false;
@@ -76,7 +76,7 @@ public class SetPostalAddressesTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_postal_addresses_async ();
+      this._test_set_postal_addresses_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
@@ -133,8 +133,8 @@ public class SetPostalAddressesTests : Folks.TestCase
                       "locality", "region", "postal code", "country", "format",
                       "123");
                   var pa_fd_1 = new PostalAddressFieldDetails (pa_1);
-                  pa_fd_1.add_parameter (pa_fd_1.PARAM_TYPE,
-                      pa_fd_1.PARAM_TYPE_OTHER);
+                  pa_fd_1.add_parameter (AbstractFieldDetails.PARAM_TYPE,
+                      AbstractFieldDetails.PARAM_TYPE_OTHER);
                   pa_fds.add (pa_fd_1);
                   ((PostalAddressDetails) p).postal_addresses = pa_fds;
                 }
diff --git a/tests/eds/set-properties-race.vala b/tests/eds/set-properties-race.vala
index 0d76f83..c92db91 100644
--- a/tests/eds/set-properties-race.vala
+++ b/tests/eds/set-properties-race.vala
@@ -63,8 +63,8 @@ public class SetPropertiesRaceTests : Folks.TestCase
           "locality", "region", "postal code", "country", "",
           "123");
       this._pa_fd = new PostalAddressFieldDetails (pa);
-      this._pa_fd.add_parameter (this._pa_fd.PARAM_TYPE,
-          this._pa_fd.PARAM_TYPE_OTHER);
+      this._pa_fd.add_parameter (AbstractFieldDetails.PARAM_TYPE,
+          AbstractFieldDetails.PARAM_TYPE_OTHER);
 
       this._found_before_update = false;
       this._found_after_update = false;
@@ -76,7 +76,7 @@ public class SetPropertiesRaceTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_postal_addresses_async ();
+      this._test_set_postal_addresses_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
@@ -133,8 +133,8 @@ public class SetPropertiesRaceTests : Folks.TestCase
                       "locality", "region", "postal code", "country", "format",
                       "123");
                   var pa_fd_1 = new PostalAddressFieldDetails (pa_1);
-                  pa_fd_1.add_parameter (pa_fd_1.PARAM_TYPE,
-                      pa_fd_1.PARAM_TYPE_OTHER);
+                  pa_fd_1.add_parameter (AbstractFieldDetails.PARAM_TYPE,
+                      AbstractFieldDetails.PARAM_TYPE_OTHER);
                   pa_fds.add (pa_fd_1);
                   ((PostalAddressDetails) p).postal_addresses = pa_fds;
                 }
diff --git a/tests/eds/set-roles.vala b/tests/eds/set-roles.vala
index db234eb..ebdd2f7 100644
--- a/tests/eds/set-roles.vala
+++ b/tests/eds/set-roles.vala
@@ -70,7 +70,7 @@ public class SetRolesTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_roles_async ();
+      this._test_set_roles_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
diff --git a/tests/eds/set-structured-name.vala b/tests/eds/set-structured-name.vala
index 44be975..754e799 100644
--- a/tests/eds/set-structured-name.vala
+++ b/tests/eds/set-structured-name.vala
@@ -71,7 +71,7 @@ public class SetStructuredNameTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_structured_name_async ();
+      this._test_set_structured_name_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
diff --git a/tests/eds/set-urls.vala b/tests/eds/set-urls.vala
index 0f8e233..6b19d54 100644
--- a/tests/eds/set-urls.vala
+++ b/tests/eds/set-urls.vala
@@ -80,7 +80,7 @@ public class SetUrlsTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_set_urls_async ();
+      this._test_set_urls_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
@@ -141,10 +141,12 @@ public class SetUrlsTests : Folks.TestCase
                   var p2 = new UrlFieldDetails (this._url_extra_2);
                   urls.add (p2);
                   var p3 = new UrlFieldDetails (this._url_home);
-                  p3.set_parameter(p3.PARAM_TYPE, p3.PARAM_TYPE_HOME_PAGE);
+                  p3.set_parameter(AbstractFieldDetails.PARAM_TYPE,
+                      UrlFieldDetails.PARAM_TYPE_HOME_PAGE);
                   urls.add (p3);
                   var p4 = new UrlFieldDetails (this._url_blog);
-                  p4.set_parameter(p3.PARAM_TYPE, p3.PARAM_TYPE_BLOG);
+                  p4.set_parameter(AbstractFieldDetails.PARAM_TYPE,
+                      UrlFieldDetails.PARAM_TYPE_BLOG);
                   urls.add (p4);
 
                   ((UrlDetails) p).urls = urls;
diff --git a/tests/eds/updating-contacts.vala b/tests/eds/updating-contacts.vala
index 4943860..2937e6e 100644
--- a/tests/eds/updating-contacts.vala
+++ b/tests/eds/updating-contacts.vala
@@ -68,7 +68,7 @@ public class UpdatingContactsTests : Folks.TestCase
       c1.set ("full_name", (owned) v);
       this._eds_backend.add_contact (c1);
 
-      this._test_updates_async ();
+      this._test_updates_async.begin ();
 
       Timeout.add_seconds (5, () => {
             this._main_loop.quit ();
@@ -116,7 +116,7 @@ public class UpdatingContactsTests : Folks.TestCase
             {
               i.notify["full-name"].connect (this._notify_full_name_cb);
               this._found_before_update = true;
-              this._update_contact ();
+              this._update_contact.begin ();
             }
         }
 
diff --git a/tests/key-file/individual-retrieval.vala b/tests/key-file/individual-retrieval.vala
index 744e71e..9d2c529 100644
--- a/tests/key-file/individual-retrieval.vala
+++ b/tests/key-file/individual-retrieval.vala
@@ -92,7 +92,7 @@ public class IndividualRetrievalTests : Folks.TestCase
               assert (i == null);
             }
         });
-      aggregator.prepare ();
+      aggregator.prepare.begin ();
 
       /* Kill the main loop after a few seconds. If there are still individuals
        * in the set of expected individuals, the aggregator has either failed
@@ -143,7 +143,7 @@ public class IndividualRetrievalTests : Folks.TestCase
               assert (i == null);
             }
         });
-      aggregator.prepare ();
+      aggregator.prepare.begin ();
 
       /* Kill the main loop after a few seconds. If there are still individuals
        * in the set of expected individuals, the aggregator has either failed
diff --git a/tests/lib/test-case.vala b/tests/lib/test-case.vala
index f903370..a0715a1 100644
--- a/tests/lib/test-case.vala
+++ b/tests/lib/test-case.vala
@@ -71,7 +71,7 @@ public abstract class Folks.TestCase : Object
 
       public void set_up (void* fixture)
         {
-          GLib.set_printerr_handler (this._printerr_func_stack_trace);
+          GLib.set_printerr_handler (Adaptor._printerr_func_stack_trace);
           Log.set_default_handler (this._log_func_stack_trace);
 
           this._test_case.set_up ();
diff --git a/tests/telepathy/individual-properties.vala b/tests/telepathy/individual-properties.vala
index 09fabb3..c31e00b 100644
--- a/tests/telepathy/individual-properties.vala
+++ b/tests/telepathy/individual-properties.vala
@@ -182,7 +182,7 @@ public class IndividualPropertiesTests : Folks.TestCase
               assert (i == null);
             }
         });
-      aggregator.prepare ();
+      aggregator.prepare.begin ();
 
       /* Kill the main loop after a few seconds. If there are still individuals
        * in the set of expected individuals, the aggregator has either failed
@@ -259,7 +259,7 @@ public class IndividualPropertiesTests : Folks.TestCase
               assert (i == null);
             }
         });
-      aggregator.prepare ();
+      aggregator.prepare.begin ();
 
       /* Kill the main loop after a few seconds. If the alias hasn't been
        * notified, something along the way failed or been too slow (which we can
@@ -339,7 +339,7 @@ public class IndividualPropertiesTests : Folks.TestCase
               assert (i == null);
             }
         });
-      aggregator.prepare ();
+      aggregator.prepare.begin ();
 
       /* Kill the main loop after a few seconds. If the alias hasn't been
        * notified, something along the way failed or been too slow (which we can
@@ -371,10 +371,10 @@ public class IndividualPropertiesTests : Folks.TestCase
       var aggregator = new IndividualAggregator ();
       aggregator.individuals_changed_detailed.connect ((changes) =>
         {
-          this._change_contact_info_aggregator_individuals_added (changes);
+          this._change_contact_info_aggregator_individuals_added.begin (changes);
         });
 
-      aggregator.prepare ();
+      aggregator.prepare.begin ();
 
       /* Kill the main loop after a few seconds. If the alias hasn't been
        * notified, something along the way failed or been too slow (which we can
diff --git a/tests/telepathy/persona-store-capabilities.vala b/tests/telepathy/persona-store-capabilities.vala
index a4a046a..36e1c36 100644
--- a/tests/telepathy/persona-store-capabilities.vala
+++ b/tests/telepathy/persona-store-capabilities.vala
@@ -82,7 +82,7 @@ public class PersonaStoreCapabilitiesTests : Folks.TestCase
 
           });
 
-      backend_store.load_backends ();
+      backend_store.load_backends.begin ();
 
       Timeout.add_seconds (this._test_timeout, () =>
         {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]