Attachment 98908 Details for Bug 77882 – test-base-client: check that Handler.HandledChannels is updated

[patch] test-base-client: check that Handler.HandledChannels is updated

0006-test-base-client-check-that-Handler.HandledChannels-.patch (text/plain), 2.83 KB, created by Guillaume Desmottes on 2014-05-12 12:37:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-05-12 12:37:10 UTC

Size: 2.83 KB

patch

obsolete

>From b913d906f23e7f892df9360df7d340c2b48b890a Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Mon, 12 May 2014 12:52:34 +0200
>Subject: [PATCH 06/11] test-base-client: check that Handler.HandledChannels is
> updated
>
>I want to make sure I'm not going to introduce any regression here.
>---
> tests/dbus/base-client.c | 19 +++++++++++++++----
> 1 file changed, 15 insertions(+), 4 deletions(-)
>
>diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
>index baf1674..caa904e 100644
>--- a/tests/dbus/base-client.c
>+++ b/tests/dbus/base-client.c
>@@ -65,6 +65,7 @@ typedef struct {
>     GPtrArray *delegated;
>     GHashTable *not_delegated;
>     guint nb_delegate_cb;
>+    GPtrArray *handled_channels;
> } Test;
> 
> #define ACCOUNT_PATH TP_ACCOUNT_OBJECT_PATH_BASE "what/ev/er"
>@@ -275,6 +276,7 @@ teardown (Test *test,
> 
>   tp_clear_pointer (&test->delegated, g_ptr_array_unref);
>   tp_clear_pointer (&test->not_delegated, g_hash_table_unref);
>+  g_clear_pointer (&test->handled_channels, g_ptr_array_unref);
> }
> 
> /* Test Basis */
>@@ -710,7 +712,6 @@ get_handler_prop_cb (TpProxy *proxy,
>   gboolean bypass;
>   gboolean valid;
>   const gchar * const * capabilities;
>-  GPtrArray *handled;
> 
>   if (error != NULL)
>     {
>@@ -736,10 +737,12 @@ get_handler_prop_cb (TpProxy *proxy,
>   g_assert (tp_strv_contains (capabilities, "goat"));
>   g_assert (tp_strv_contains (capabilities, "pony"));
> 
>-  handled = tp_asv_get_boxed (properties, "HandledChannels",
>+  g_clear_pointer (&test->handled_channels, g_ptr_array_unref);
>+  test->handled_channels = tp_asv_get_boxed (properties, "HandledChannels",
>       TP_ARRAY_TYPE_OBJECT_PATH_LIST);
>-  g_assert (handled != NULL);
>-  g_assert_cmpint (handled->len, ==, 0);
>+  test->handled_channels = g_boxed_copy (TP_ARRAY_TYPE_OBJECT_PATH_LIST,
>+      test->handled_channels);
>+  g_assert (test->handled_channels != NULL);
> 
> out:
>   g_main_loop_quit (test->mainloop);
>@@ -834,6 +837,7 @@ test_handler (Test *test,
>       TP_IFACE_CLIENT_HANDLER, get_handler_prop_cb, test, NULL, NULL);
>   g_main_loop_run (test->mainloop);
>   g_assert_no_error (test->error);
>+  g_assert_cmpuint (test->handled_channels->len, ==, 0);
> 
>   g_assert (!tp_base_client_is_handling_channel (test->base_client,
>         test->text_chan));
>@@ -855,6 +859,13 @@ test_handler (Test *test,
>   g_assert (tp_base_client_is_handling_channel (test->base_client,
>         test->text_chan_2));
> 
>+  /* Handler properties are updated */
>+  tp_cli_dbus_properties_call_get_all (test->client, -1,
>+      TP_IFACE_CLIENT_HANDLER, get_handler_prop_cb, test, NULL, NULL);
>+  g_main_loop_run (test->mainloop);
>+  g_assert_no_error (test->error);
>+  g_assert_cmpuint (test->handled_channels->len, ==, 2);
>+
>   /* One of the channel is closed */
>   g_signal_connect (test->text_chan, "invalidated",
>       G_CALLBACK (channel_invalidated_cb), test);
>-- 
>1.9.0
>

Actions: View | Splinter Review

Attachments on bug 77882: 98903 | 98904 | 98905 | 98906 | 98907 | 98908 | 98909 | 98910 | 98911 | 98912 | 98913 | 98919 | 99023

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.