Attachment 96669 Details for Bug 76828 – 3/3] Restore lost test coverage from get-interface-after-invalidate test

[patch] 3/3] Restore lost test coverage from get-interface-after-invalidate test

0003-Restore-lost-test-coverage-from-get-interface-after-.patch (text/plain), 2.41 KB, created by Simon McVittie on 2014-03-31 15:11:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-03-31 15:11:12 UTC

Size: 2.41 KB

patch

obsolete

>From 2caf621fe4b6c8e92ac55fc8f572c160cd9af8db Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 31 Mar 2014 16:10:14 +0100
>Subject: [PATCH 3/3] Restore lost test coverage from
> get-interface-after-invalidate test
>
>---
> tests/dbus/call-cancellation.c | 23 ++++++++++++++++++++++-
> 1 file changed, 22 insertions(+), 1 deletion(-)
>
>diff --git a/tests/dbus/call-cancellation.c b/tests/dbus/call-cancellation.c
>index f4386f3..acbafd6 100644
>--- a/tests/dbus/call-cancellation.c
>+++ b/tests/dbus/call-cancellation.c
>@@ -238,18 +238,21 @@ new_proxy (Fixture *f,
>     int which)
> {
>   TpClientFactory *local_factory;
>+  TpProxy *ret;
> 
>   if (which == TEST_F)
>     local_factory = f->private_factory;
>   else
>     local_factory = f->factory;
> 
>-  return tp_tests_object_new_static_class (TP_TYPE_PROXY,
>+  ret = tp_tests_object_new_static_class (TP_TYPE_PROXY,
>       "bus-name", g_dbus_connection_get_unique_name (
>           tp_client_factory_get_dbus_connection (f->factory)),
>       "object-path", "/",
>       "factory", local_factory,
>       NULL);
>+  tp_proxy_add_interface_by_id (ret, TP_IFACE_QUARK_CHANNEL_DISPATCHER);
>+  return ret;
> }
> 
> static void
>@@ -260,6 +263,8 @@ test (Fixture *f,
>   GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Because I said so" };
>   TpProxyPendingCall *pc;
>   guint i;
>+  GError *error = NULL;
>+  gboolean still_alive;
> 
>   g_message ("Creating proxies");
> 
>@@ -302,7 +307,23 @@ test (Fixture *f,
>       destroy_user_data, NULL);
>   MYASSERT (!tp_intset_is_member (freed_user_data, TEST_C), "");
>   g_message ("Forcibly invalidating c");
>+
>+  still_alive = tp_proxy_check_interface_by_id (f->proxies[TEST_C],
>+      TP_IFACE_QUARK_CHANNEL_DISPATCHER, &error);
>+  g_assert_no_error (error);
>+  g_assert (still_alive);
>+
>   tp_proxy_invalidate (f->proxies[TEST_C], &err);
>+
>+  /* previously tested by get-interface-after-invalidate.c, but
>+   * that test has been removed because it used TpDBusDaemon directly */
>+  still_alive = tp_proxy_check_interface_by_id (f->proxies[TEST_C],
>+      TP_IFACE_QUARK_CHANNEL_DISPATCHER, &error);
>+  g_assert_error (error, err.domain, err.code);
>+  g_assert_cmpstr (error->message, ==, err.message);
>+  g_assert (!still_alive);
>+  g_error_free (error);
>+
>   MYASSERT (!tp_intset_is_member (freed_user_data, TEST_C), "");
>   MYASSERT (!tp_intset_is_member (method_ok, TEST_C), "");
>   MYASSERT (!tp_intset_is_member (method_error, TEST_C), "");
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 76828: 96667 | 96668 | 96669 | 96679 | 96775

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.