Attachment 46296 Details for Bug 32087 – [PATCH 2/4] Add a regression test for registering an object on two connections

[patch] [PATCH 2/4] Add a regression test for registering an object on two connections

0002-Add-a-regression-test-for-registering-an-object-on-t.patch (text/plain), 4.73 KB, created by Simon McVittie on 2011-05-03 10:57:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-03 10:57:32 UTC

Size: 4.73 KB

patch

obsolete

>From 06f508064d8263bd4b19b7a85e817253b4962d10 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 3 May 2011 18:43:29 +0100
>Subject: [PATCH 2/4] Add a regression test for registering an object on two
> connections
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32087
>---
> test/core/registrations.c |  101 +++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 101 insertions(+), 0 deletions(-)
>
>diff --git a/test/core/registrations.c b/test/core/registrations.c
>index bcdaa14..370c21d 100644
>--- a/test/core/registrations.c
>+++ b/test/core/registrations.c
>@@ -35,6 +35,8 @@
>  * DEALINGS IN THE SOFTWARE.
>  */
> 
>+#include <config.h>
>+
> #include <dbus/dbus-glib.h>
> #include <dbus/dbus-glib-lowlevel.h>
> 
>@@ -44,7 +46,10 @@ GMainLoop *loop = NULL;
> 
> typedef struct {
>     DBusGConnection *bus;
>+    DBusGConnection *bus2;
>     GObject *object;
>+    DBusMessage *frobnicate1_message;
>+    DBusMessage *frobnicate2_message;
> } Fixture;
> 
> static void
>@@ -54,6 +59,9 @@ setup (Fixture *f,
>   f->bus = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, NULL);
>   g_assert (f->bus != NULL);
> 
>+  f->bus2 = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, NULL);
>+  g_assert (f->bus2 != NULL);
>+
>   f->object = g_object_new (MY_TYPE_OBJECT, NULL);
>   g_assert (MY_IS_OBJECT (f->object));
> }
>@@ -70,6 +78,12 @@ teardown (Fixture *f,
>       dbus_g_connection_unref (f->bus);
>     }
> 
>+  if (f->bus2 != NULL)
>+    {
>+      dbus_connection_close (dbus_g_connection_get_connection (f->bus2));
>+      dbus_g_connection_unref (f->bus2);
>+    }
>+
>   if (f->object != NULL)
>     {
>       g_object_unref (f->object);
>@@ -162,6 +176,91 @@ test_reregister (Fixture *f,
>   g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") == NULL);
> }
> 
>+static DBusHandlerResult
>+frobnicate_cb (DBusConnection *conn,
>+    DBusMessage *message,
>+    void *user_data)
>+{
>+  Fixture *f = user_data;
>+
>+  if (dbus_message_is_signal (message,
>+        "org.freedesktop.DBus.GLib.Tests.MyObject", "Frobnicate"))
>+    {
>+      const char *sender = dbus_message_get_sender (message);
>+      const char *path = dbus_message_get_path (message);
>+
>+      g_assert (sender != NULL);
>+      g_assert (path != NULL);
>+
>+      if (g_strcmp0 (path, "/foo") == 0)
>+        {
>+          g_assert_cmpstr (sender, ==, dbus_bus_get_unique_name (
>+                dbus_g_connection_get_connection (f->bus)));
>+
>+          g_assert (f->frobnicate1_message == NULL);
>+          f->frobnicate1_message = dbus_message_ref (message);
>+        }
>+      else
>+        {
>+          g_assert_cmpstr (path, ==, "/bar");
>+          g_assert_cmpstr (sender, ==, dbus_bus_get_unique_name (
>+                dbus_g_connection_get_connection (f->bus2)));
>+
>+          g_assert (f->frobnicate2_message == NULL);
>+          f->frobnicate2_message = dbus_message_ref (message);
>+        }
>+    }
>+
>+  return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
>+}
>+
>+static void
>+test_twice (Fixture *f,
>+    gconstpointer test_data G_GNUC_UNUSED)
>+{
>+  dbus_bool_t mem;
>+
>+  g_test_bug ("32087");
>+
>+  dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
>+
>+  dbus_g_connection_register_g_object (f->bus2, "/bar", f->object);
>+
>+  g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
>+      f->object);
>+  g_assert (dbus_g_connection_lookup_g_object (f->bus2, "/bar") ==
>+      f->object);
>+
>+  dbus_bus_add_match (dbus_g_connection_get_connection (f->bus),
>+      "", NULL);
>+  mem = dbus_connection_add_filter (dbus_g_connection_get_connection (f->bus),
>+      frobnicate_cb, f, NULL);
>+  g_assert (mem);
>+
>+  my_object_emit_frobnicate ((MyObject *) f->object, NULL);
>+
>+  /* The object should emit the signal once onto each connection,
>+   * from the appropriate location */
>+  while (f->frobnicate1_message == NULL || f->frobnicate2_message == NULL)
>+    g_main_context_iteration (NULL, TRUE);
>+
>+  dbus_message_unref (f->frobnicate1_message);
>+  f->frobnicate1_message = NULL;
>+  dbus_message_unref (f->frobnicate2_message);
>+  f->frobnicate2_message = NULL;
>+
>+  /* try again, to catch any extra emissions */
>+  my_object_emit_frobnicate ((MyObject *) f->object, NULL);
>+
>+  while (f->frobnicate1_message == NULL || f->frobnicate2_message == NULL)
>+    g_main_context_iteration (NULL, TRUE);
>+
>+  dbus_message_unref (f->frobnicate1_message);
>+  f->frobnicate1_message = NULL;
>+  dbus_message_unref (f->frobnicate2_message);
>+  f->frobnicate2_message = NULL;
>+}
>+
> int
> main (int argc, char **argv)
> {
>@@ -183,6 +282,8 @@ main (int argc, char **argv)
>       setup, test_unregister_on_forced_dispose, teardown);
>   g_test_add ("/registrations/reregister", Fixture, NULL,
>       setup, test_reregister, teardown);
>+  g_test_add ("/registrations/twice", Fixture, NULL,
>+      setup, test_twice, teardown);
> 
>   return g_test_run ();
> }
>-- 
>1.7.4.4
>

Actions: View | Splinter Review

Attachments on bug 32087: 46295 | 46296 | 46297 | 46298 | 47313

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.