Attachment 49908 Details for Bug 26205 – Tests: verify TP_CONNECTION_FEATURE_CONTACT_LIST also prepare TpContact

[patch] Tests: verify TP_CONNECTION_FEATURE_CONTACT_LIST also prepare TpContact

Tests-verify-TPCONNECTIONFEATURECONTACTLIST-also-p.patch (text/plain), 3.09 KB, created by Guillaume Desmottes on 2011-08-04 04:09:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2011-08-04 04:09:23 UTC

Size: 3.09 KB

patch

obsolete

>From 43238c55ba067dc0bdda3e57b0a4776803e11c0d Mon Sep 17 00:00:00 2001
>From: Xavier Claessens <xclaesse@gmail.com>
>Date: Thu, 28 Jul 2011 11:02:53 +0200
>Subject: [PATCH] Tests: verify TP_CONNECTION_FEATURE_CONTACT_LIST also prepare TpContact
>
>---
> tests/dbus/contacts.c |   36 ++++++++++++++++++++++++++++++++++++
> 1 files changed, 36 insertions(+), 0 deletions(-)
>
>diff --git a/tests/dbus/contacts.c b/tests/dbus/contacts.c
>index 708a6ce..29706fc 100644
>--- a/tests/dbus/contacts.c
>+++ b/tests/dbus/contacts.c
>@@ -2531,7 +2531,19 @@ test_contact_list (Fixture *f,
>     gconstpointer unused G_GNUC_UNUSED)
> {
>   const GQuark conn_features[] = { TP_CONNECTION_FEATURE_CONTACT_LIST, 0 };
>+  const TpContactFeature contact_features[] = { TP_CONTACT_FEATURE_ALIAS };
>   Result result = { g_main_loop_new (NULL, FALSE), NULL, NULL, NULL };
>+  TestContactListManager *manager;
>+  TpSimpleClientFactory *factory;
>+  const gchar *id = "contact-list-id";
>+  const gchar *alias = "Contact List Alias";
>+  const gchar *message = "I'm your best friend";
>+  TpHandle handle;
>+  GPtrArray *contacts;
>+  TpContact *contact;
>+
>+  manager = tp_tests_contacts_connection_get_contact_list_manager (
>+      f->service_conn);
> 
>   /* Connection is OFFLINE initially */
>   tp_tests_proxy_run_until_prepared (f->client_conn, conn_features);
>@@ -2541,6 +2553,17 @@ test_contact_list (Fixture *f,
>   g_assert (!tp_connection_get_can_change_contact_list (f->client_conn));
>   g_assert (!tp_connection_get_request_uses_message (f->client_conn));
> 
>+  /* Add a remote-pending contact in our roster CM-side */
>+  handle = tp_handle_ensure (f->service_repo, id, NULL, NULL);
>+  tp_tests_contacts_connection_change_aliases (f->service_conn,
>+      1, &handle, &alias);
>+  test_contact_list_manager_request_subscription (manager, 1, &handle, message);
>+
>+  /* Tell connection's factory contact features we want */
>+  factory = tp_proxy_get_factory (f->client_conn);
>+  tp_simple_client_factory_add_contact_features (factory,
>+      G_N_ELEMENTS (contact_features), contact_features);
>+
>   /* Now put it online and wait for contact list state move to success */
>   g_signal_connect_swapped (f->client_conn, "notify::contact-list-state",
>       G_CALLBACK (finish), &result);
>@@ -2551,6 +2574,19 @@ test_contact_list (Fixture *f,
> 
>   g_assert_cmpint (tp_connection_get_contact_list_state (f->client_conn), ==,
>       TP_CONTACT_LIST_STATE_SUCCESS);
>+
>+  /* SUCCESS state must have been delayed until TpContact is prepared */
>+  contacts = tp_connection_dup_contact_list (f->client_conn);
>+  g_assert (contacts != NULL);
>+  g_assert_cmpint (contacts->len, ==, 1);
>+  contact = g_ptr_array_index (contacts, 0);
>+  g_assert (contact != NULL);
>+  g_assert_cmpstr (tp_contact_get_identifier (contact), ==, id);
>+  g_assert_cmpstr (tp_contact_get_alias (contact), ==, alias);
>+  /* Even if we didn't explicitely asked that feature, we should have it for free */
>+  g_assert (tp_contact_has_feature (contact, TP_CONTACT_FEATURE_SUBSCRIPTION_STATES));
>+  g_assert_cmpint (tp_contact_get_subscribe_state (contact), ==, TP_SUBSCRIPTION_STATE_ASK);
>+  g_ptr_array_unref (contacts);
> }
> 
> static void
>-- 
>1.7.4.1

Actions: View | Splinter Review

Attachments on bug 26205: 48574 | 49903 | 49904 | 49905 | 49906 | 49907 | 49908

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.