this._start_time = new DateTime.now_utc ();
- this._test_add_persona_async ();
+ this._test_add_persona_async.begin ();
this._main_loop.run ();
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 ())
this._added_contacts == false)
{
this._added_contacts = true;
- this._add_contacts ();
+ this._add_contacts.begin ();
}
}
}
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);
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, () =>
{
(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 (
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 (
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;
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)
this._added_persona == false)
{
this._added_persona = true;
- this._add_persona ();
+ this._add_persona.begin ();
}
}
}
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, () =>
{
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);
}
}
}
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)
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, () =>
{
}
}
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);
}
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, () =>
{
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, () =>
{
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, () =>
{
assert (pstore2 != null);
assert (pstore2.is_prepared == true);
- this._add_personas (pstore, pstore2);
+ this._add_personas.begin (pstore, pstore2);
});
}
catch (GLib.Error e)
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, () =>
{
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)
}
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);
}
}
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, () =>
{
}
});
- backend_store.load_backends ();
+ backend_store.load_backends.begin ();
Timeout.add_seconds (3, () =>
{
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, () =>
{
{
this._phones_count++;
foreach (var t in phone_fd.get_parameter_values (
- phone_fd.PARAM_TYPE))
+ AbstractFieldDetails.PARAM_TYPE))
{
string? v = null;
{
v = "car_phone";
}
- else if (t == phone_fd.PARAM_TYPE_HOME)
+ else if (t == AbstractFieldDetails.PARAM_TYPE_HOME)
{
v = "home_phone";
}
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);
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" */
this._found_postal_address = false;
- this._test_postal_address_details_interface_async ();
+ this._test_postal_address_details_interface_async.begin ();
Timeout.add_seconds (5, () =>
{
this._persona_removed = false;
this._individual_removed = false;
- this._test_remove_persona_async ();
+ this._test_remove_persona_async.begin ();
Timeout.add_seconds (5, () =>
{
this._added_persona == false)
{
this._added_persona = true;
- this._add_persona ();
+ this._add_persona.begin ();
}
}
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);
}
}
}
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 ();
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)
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 ();
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, () =>
{
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 ();
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 ();
(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;
}
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, () =>
{
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 ();
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, () =>
{
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 ();
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 ();
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 ();
(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;
}
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;
"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;
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 ();
"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;
}
"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;
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 ();
"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;
}
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 ();
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 ();
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 ();
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;
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 ();
{
i.notify["full-name"].connect (this._notify_full_name_cb);
this._found_before_update = true;
- this._update_contact ();
+ this._update_contact.begin ();
}
}
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
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
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 ();
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
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
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
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
});
- backend_store.load_backends ();
+ backend_store.load_backends.begin ();
Timeout.add_seconds (this._test_timeout, () =>
{