Attachment 87940 Details for Bug 48821 – [02/11] dbus_g_connection_call_async: add and test

[patch] [02/11] dbus_g_connection_call_async: add and test

0002-dbus_g_connection_call_async-add-and-test.patch (text/plain), 22.79 KB, created by Simon McVittie on 2013-10-21 17:26:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-21 17:26:52 UTC

Size: 22.79 KB

patch

obsolete

>From 972f610fede351620ce6c8f4a3be7877195dc8f9 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 21 Oct 2013 12:54:29 +0100
>Subject: [PATCH 02/11] dbus_g_connection_call_async: add and test
>
>This is basically the same API as g_dbus_connection_call_async, but
>implemented in terms of libdbus. This means we can use a DBusGConnection
>in telepathy-glib to make method calls that look suspiciously like a
>GDBus call, reducing the size of the "flag day" commit we'll have to
>make when we switch from dbus-glib to GDBus.
>
>To support this, make GIO a public dependency.
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> .gitignore                           |   1 +
> dbus-glib-1-uninstalled.pc.in        |   2 +-
> dbus-glib-1.pc.in                    |   2 +-
> dbus/Makefile.am                     |   1 +
> dbus/dbus-gdbus.c                    | 249 ++++++++++++++++++++++++++++++
> dbus/dbus-glib.h                     |  16 ++
> doc/reference/dbus-glib-sections.txt |   3 +
> test/core/Makefile.am                |  10 ++
> test/core/not-quite-gdbus.c          | 290 +++++++++++++++++++++++++++++++++++
> test/core/run-test.sh                |   1 +
> 10 files changed, 573 insertions(+), 2 deletions(-)
> create mode 100644 dbus/dbus-gdbus.c
> create mode 100644 test/core/not-quite-gdbus.c
>
>diff --git a/.gitignore b/.gitignore
>index fc19cfb..79112b5 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -109,6 +109,7 @@ test/core/test-service-glib-glue.h
> /test/core/test-service-glib-subclass-glue.h
> test/core/test-thread-client
> test/core/test-thread-server
>+/test/core/test-not-quite-gdbus
> /test/core/test-registrations
> /test/core/test-variant-recursion
> test/data/valid-service-files/debug-echo.service
>diff --git a/dbus-glib-1-uninstalled.pc.in b/dbus-glib-1-uninstalled.pc.in
>index 150db5f..d5061d3 100644
>--- a/dbus-glib-1-uninstalled.pc.in
>+++ b/dbus-glib-1-uninstalled.pc.in
>@@ -6,7 +6,7 @@ includedir=@includedir@
> Name: dbus-glib
> Description: GLib integration for the free desktop message bus
> Version: @VERSION@
>-Requires: dbus-1 glib-2.0 gobject-2.0
>+Requires: dbus-1 glib-2.0 gobject-2.0 gio-2.0
> Libs: ${pc_top_builddir}/${pcfiledir}/dbus/libdbus-glib-1.la
> Cflags: -I${pc_top_builddir}/${pcfiledir}
> 
>diff --git a/dbus-glib-1.pc.in b/dbus-glib-1.pc.in
>index 599901a..c86f33b 100644
>--- a/dbus-glib-1.pc.in
>+++ b/dbus-glib-1.pc.in
>@@ -6,7 +6,7 @@ includedir=@includedir@
> Name: dbus-glib
> Description: GLib integration for the free desktop message bus
> Version: @VERSION@
>-Requires: dbus-1 glib-2.0 gobject-2.0
>+Requires: dbus-1 glib-2.0 gobject-2.0 gio-2.0
> Libs: -L${libdir} -ldbus-glib-1
> Cflags: -I${includedir}/dbus-1.0
> 
>diff --git a/dbus/Makefile.am b/dbus/Makefile.am
>index ef677f0..869190b 100644
>--- a/dbus/Makefile.am
>+++ b/dbus/Makefile.am
>@@ -25,6 +25,7 @@ DBUS_GLIB_INTERNALS = \
> 	dbus-gvalue-utils.h
> 
> libdbus_glib_1_la_SOURCES = 			\
>+	dbus-gdbus.c				\
> 	dbus-glib.c				\
> 	dbus-gmain.c				\
> 	dbus-gmarshal.c				\
>diff --git a/dbus/dbus-gdbus.c b/dbus/dbus-gdbus.c
>new file mode 100644
>index 0000000..54c6750
>--- /dev/null
>+++ b/dbus/dbus-gdbus.c
>@@ -0,0 +1,249 @@
>+/* dbus-gdbus - make dbus-glib behave enough like GDBus to facilitate porting
>+ *
>+ * Copyright Â© 2012 Collabora Ltd. <http://www.collabora.co.uk/>
>+ *
>+ * Licensed under the Academic Free License version 2.1
>+ *
>+ * This program is free software; you can redistribute it and/or modify
>+ * it under the terms of the GNU General Public License as published by
>+ * the Free Software Foundation; either version 2 of the License, or
>+ * (at your option) any later version.
>+ */
>+
>+#include "config.h"
>+
>+#include <dbus/dbus-glib-lowlevel.h>
>+
>+static void oom (void) G_GNUC_NORETURN;
>+static void
>+oom (void)
>+{
>+  g_error ("no memory");
>+}
>+
>+static GQuark
>+expected_type_quark (void)
>+{
>+  static GQuark q;
>+
>+  if (G_UNLIKELY (q == 0))
>+    q = g_quark_from_static_string ("dbus-glib-expected-reply-type");
>+
>+  return q;
>+}
>+
>+static void
>+pc_notify (DBusPendingCall *pc,
>+    gpointer data)
>+{
>+  GSimpleAsyncResult *simple = data;
>+
>+  if (pc != NULL)
>+    {
>+      g_simple_async_result_set_op_res_gpointer (simple,
>+          dbus_pending_call_steal_reply (pc),
>+          (GDestroyNotify) dbus_message_unref);
>+
>+      dbus_pending_call_unref (pc);
>+    }
>+
>+  /* We have to do the real work in an idle, so we don't break re-entrant
>+   * calls (the dbus-glib event source isn't re-entrant) */
>+  g_simple_async_result_complete_in_idle (simple);
>+
>+  /* simple is unreffed by the pending call's destructor */
>+}
>+
>+/**
>+ * dbus_g_connection_call_async:
>+ * @self: a D-Bus connection
>+ * @bus_name: (allow-none): the well-known or unique name of a bus client,
>+ *  or %NULL to send a method call message with no destination (typically
>+ *  only useful on peer-to-peer connections)
>+ * @object_path: the object-path of a remote object
>+ * @interface_name: the interface on which to call a method
>+ * @method_name: the method to call
>+ * @parameters: (allow-none): the method's parameters encapsulated in a
>+ *  tuple; %NULL or () if there are no parameters
>+ * @reply_type: (allow-none): the type of reply to expect encapsulated
>+ *  in a tuple (e.g. () if nothing is expected, (i) if one 32-bit integer
>+ *  is expected, or (sss) if three strings are expected) or %NULL to
>+ *  accept anything
>+ * @flags: flags affecting the call; %G_DBUS_CALL_FLAGS_NO_AUTO_START is
>+ *  the only flag supported
>+ * @timeout_msec: timeout for the call, -1 to use a default,
>+ *  or %G_MAXINT32 to mean "infinite timeout"
>+ * @cancellable: (allow-none): may be cancelled to avoid the callback
>+ *  being called (but the D-Bus message will still be sent)
>+ * @callback: (allow-none): function to call when a reply is received
>+ * @user_data: (allow-none): user data for @callback
>+ *
>+ * Call a D-Bus method via dbus-glib, with a GDBus-style API.
>+ */
>+void
>+dbus_g_connection_call_async (DBusGConnection *self,
>+    const gchar *bus_name,
>+    const gchar *object_path,
>+    const gchar *interface_name,
>+    const gchar *method_name,
>+    GVariant *parameters,
>+    const GVariantType *reply_type,
>+    GDBusCallFlags flags,
>+    gint timeout_msec,
>+    GCancellable *cancellable,
>+    GAsyncReadyCallback callback,
>+    gpointer user_data)
>+{
>+  DBusConnection *libdbus = dbus_g_connection_get_connection (self);
>+  DBusMessage *message;
>+  DBusPendingCall *pc = NULL;
>+  GSimpleAsyncResult *simple;
>+  GError *error = NULL;
>+
>+  g_return_if_fail (bus_name == NULL || g_dbus_is_name (bus_name));
>+  g_return_if_fail (object_path != NULL);
>+  g_return_if_fail (g_variant_is_object_path (object_path));
>+  g_return_if_fail (interface_name != NULL);
>+  g_return_if_fail (g_dbus_is_interface_name (interface_name));
>+  g_return_if_fail (method_name != NULL);
>+  g_return_if_fail (g_dbus_is_member_name (method_name));
>+  g_return_if_fail (timeout_msec >= -1);
>+  g_return_if_fail (parameters == NULL ||
>+      g_variant_is_of_type (parameters, G_VARIANT_TYPE_TUPLE));
>+
>+  /* only one flag is supported */
>+  g_return_if_fail (flags == (flags & G_DBUS_CALL_FLAGS_NO_AUTO_START));
>+
>+  message = dbus_message_new_method_call (bus_name, object_path,
>+      interface_name, method_name);
>+
>+  if (message == NULL)
>+    oom ();
>+
>+  if (flags & G_DBUS_CALL_FLAGS_NO_AUTO_START)
>+    dbus_message_set_auto_start (message, FALSE);
>+
>+  if (parameters != NULL &&
>+      !dbus_g_message_write_variants (message, parameters, &error))
>+    {
>+      /* This is morally equivalent to a g_return_if_fail: you shouldn't
>+       * provide bad parameters */
>+      g_critical ("%s", error->message);
>+      return;
>+    }
>+
>+  if (callback == NULL)
>+    {
>+      dbus_message_set_no_reply (message, TRUE);
>+
>+      if (!dbus_connection_send (libdbus, message, NULL))
>+        oom ();
>+
>+      dbus_message_unref (message);
>+      return;
>+    }
>+
>+  simple = g_simple_async_result_new (NULL,
>+      callback,
>+      user_data,
>+      dbus_g_connection_call_async);
>+  g_simple_async_result_set_check_cancellable (simple, cancellable);
>+
>+  if (reply_type != NULL)
>+    g_object_set_qdata_full ((GObject *) simple, expected_type_quark (),
>+        g_variant_type_copy (reply_type),
>+        (GDestroyNotify) g_variant_type_free);
>+
>+  if (!dbus_connection_send_with_reply (libdbus, message, &pc,
>+        timeout_msec))
>+    oom ();
>+
>+  dbus_message_unref (message);
>+
>+  if (pc == NULL || dbus_pending_call_get_completed (pc))
>+    {
>+      pc_notify (pc, simple);
>+    }
>+  else if (!dbus_pending_call_set_notify (pc, pc_notify, simple,
>+        g_object_unref))
>+    {
>+      oom ();
>+    }
>+}
>+
>+/**
>+ * dbus_g_connection_call_finish:
>+ * @result: the result passed to @callback by dbus_g_connection_call_async()
>+ * @error: used to indicate the error if %NULL is returned
>+ *
>+ * Interpret the result of dbus_g_connection_call_async().
>+ *
>+ * If @reply_type was passed to dbus_g_connection_call_async(), then
>+ * the returned tuple, if non-%NULL, is guaranteed to have that type;
>+ * any deviation from that type will be mapped to a %DBUS_GERROR_INVALID_ARGS
>+ * error instead.
>+ *
>+ * Returns: (transfer full): the return values of the call, encapsulated
>+ *  in a tuple; an empty tuple if if nothing was returned, or %NULL on error
>+ */
>+GVariant *
>+dbus_g_connection_call_finish (GAsyncResult *result,
>+    GError **error)
>+{
>+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
>+  DBusMessage *reply;
>+
>+  if (g_simple_async_result_propagate_error (simple, error))
>+    return NULL;
>+
>+  g_return_val_if_fail (g_simple_async_result_is_valid (result,
>+        NULL, dbus_g_connection_call_async), NULL);
>+
>+  reply = g_simple_async_result_get_op_res_gpointer (simple);
>+
>+  if (reply == NULL)
>+    {
>+      g_set_error_literal (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED,
>+          "DBusConnection disconnected");
>+      return NULL;
>+    }
>+  else if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_METHOD_RETURN)
>+    {
>+      GVariant *tuple = dbus_g_message_read_variants (reply, error);
>+      GVariantType *expected;
>+
>+      expected = g_object_get_qdata ((GObject *) simple,
>+          expected_type_quark ());
>+
>+      if (expected != NULL && !g_variant_is_of_type (tuple, expected))
>+        {
>+          gchar *str = g_variant_type_dup_string (expected);
>+
>+          g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS,
>+              "Method returned type \"%s\", we expected \"%s\"",
>+              g_variant_get_type_string (tuple), str);
>+          g_free (str);
>+          g_variant_unref (tuple);
>+          tuple = NULL;
>+        }
>+
>+      return tuple;
>+    }
>+  else
>+    {
>+      DBusError dbus_error = DBUS_ERROR_INIT;
>+
>+      if (dbus_set_error_from_message (&dbus_error, reply))
>+        {
>+          dbus_set_g_error (error, &dbus_error);
>+          dbus_error_free (&dbus_error);
>+        }
>+      else
>+        {
>+          g_set_error_literal (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS,
>+              "Unexpected message type from method call");
>+        }
>+
>+      return NULL;
>+    }
>+}
>diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h
>index 9aa71c1..80a6099 100644
>--- a/dbus/dbus-glib.h
>+++ b/dbus/dbus-glib.h
>@@ -26,6 +26,7 @@
> 
> #include <glib-object.h>
> #include <dbus/dbus-shared.h>
>+#include <gio/gio.h>
> 
> G_BEGIN_DECLS
> 
>@@ -337,6 +338,21 @@ typedef struct {
>   gpointer userdata;
> } DBusGAsyncData;
> 
>+void dbus_g_connection_call_async (DBusGConnection *self,
>+    const gchar *bus_name,
>+    const gchar *object_path,
>+    const gchar *interface_name,
>+    const gchar *method_name,
>+    GVariant *parameters,
>+    const GVariantType *reply_type,
>+    GDBusCallFlags flags,
>+    gint timeout_msec,
>+    GCancellable *cancellable,
>+    GAsyncReadyCallback callback,
>+    gpointer user_data);
>+GVariant *dbus_g_connection_call_finish (GAsyncResult *result,
>+    GError **error);
>+
> #undef DBUS_INSIDE_DBUS_GLIB_H
> 
> #include <dbus/dbus-gvalue-parse-variant.h>
>diff --git a/doc/reference/dbus-glib-sections.txt b/doc/reference/dbus-glib-sections.txt
>index b54358c..0b57641 100644
>--- a/doc/reference/dbus-glib-sections.txt
>+++ b/doc/reference/dbus-glib-sections.txt
>@@ -15,6 +15,9 @@ dbus_g_connection_get_connection
> dbus_g_connection_register_g_object
> dbus_g_connection_unregister_g_object
> dbus_g_connection_lookup_g_object
>+<SUBSECTION>
>+dbus_g_connection_call_async
>+dbus_g_connection_call_finish
> <SUBSECTION Standard>
> dbus_g_connection_get_g_type
> </SECTION>
>diff --git a/test/core/Makefile.am b/test/core/Makefile.am
>index 700120d..04981b3 100644
>--- a/test/core/Makefile.am
>+++ b/test/core/Makefile.am
>@@ -57,6 +57,7 @@ noinst_PROGRAMS = \
> 	peer-client \
> 	test-types \
> 	test-30574 \
>+	test-not-quite-gdbus \
> 	test-private \
> 	test-peer-on-bus \
> 	test-proxy-noc \
>@@ -68,6 +69,15 @@ noinst_PROGRAMS = \
> test_30574_SOURCES = \
> 	30574.c
> 
>+test_not_quite_gdbus_SOURCES = \
>+	my-object.c \
>+	my-object.h \
>+	my-object-subclass.c \
>+	my-object-subclass.h \
>+	my-object-marshal.c \
>+	not-quite-gdbus.c \
>+	$(NULL)
>+
> test_private_SOURCES = \
> 	my-object.c \
> 	my-object.h \
>diff --git a/test/core/not-quite-gdbus.c b/test/core/not-quite-gdbus.c
>new file mode 100644
>index 0000000..2f0f3df
>--- /dev/null
>+++ b/test/core/not-quite-gdbus.c
>@@ -0,0 +1,290 @@
>+/* Regression test for imitating GDBus.
>+ *
>+ * Copyright Â© 2008-2013 Collabora Ltd. <http://www.collabora.co.uk/>
>+ * Copyright Â© 2008-2011 Nokia Corporation
>+ *
>+ * In preparation for dbus-glib relicensing (if it ever happens), this file is
>+ * licensed under (at your option) either the AFL v2.1, the GPL v2 or later,
>+ * or an MIT/X11-style license:
>+ *
>+ * Licensed under the Academic Free License version 2.1
>+ *
>+ * This program is free software; you can redistribute it and/or modify
>+ * it under the terms of the GNU General Public License as published by
>+ * the Free Software Foundation; either version 2 of the License, or
>+ * (at your option) any later version.
>+ *
>+ * Permission is hereby granted, free of charge, to any person
>+ * obtaining a copy of this software and associated documentation
>+ * files (the "Software"), to deal in the Software without
>+ * restriction, including without limitation the rights to use, copy,
>+ * modify, merge, publish, distribute, sublicense, and/or sell copies
>+ * of the Software, and to permit persons to whom the Software is
>+ * furnished to do so, subject to the following conditions:
>+ *
>+ * The above copyright notice and this permission notice shall be
>+ * included in all copies or substantial portions of the Software.
>+ *
>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
>+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
>+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
>+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>+ * DEALINGS IN THE SOFTWARE.
>+ */
>+
>+#include <config.h>
>+
>+#include <dbus/dbus-glib.h>
>+#include <dbus/dbus-glib-lowlevel.h>
>+
>+#include "my-object.h"
>+
>+GMainLoop *loop = NULL;
>+
>+typedef struct {
>+    DBusError dbus_error;
>+    DBusGConnection *bus;
>+    DBusConnection *libdbus;
>+    const char *unique_name;
>+    GObject *object;
>+} Fixture;
>+
>+/* tp_* functions from telepathy-glib, under a permissive license:
>+ *
>+ * Copying and distribution of [the file they came from], with or without
>+ * modification, are permitted in any medium without royalty provided the
>+ * copyright notice and this notice are preserved. */
>+
>+/* A GAsyncReadyCallback whose user_data is a GAsyncResult **. It writes a
>+ * reference to the result into that pointer. */
>+static void
>+tp_tests_result_ready_cb (GObject *object,
>+    GAsyncResult *res,
>+    gpointer user_data)
>+{
>+  GAsyncResult **result = user_data;
>+
>+  *result = g_object_ref (res);
>+}
>+
>+/* Run until *result contains a result. Intended to be used with a pending
>+ * async call that uses tp_tests_result_ready_cb. */
>+static void
>+tp_tests_run_until_result (GAsyncResult **result)
>+{
>+  /* not synchronous */
>+  g_assert (*result == NULL);
>+
>+  while (*result == NULL)
>+    g_main_context_iteration (NULL, TRUE);
>+}
>+
>+#define IFACE "org.freedesktop.DBus.GLib.Tests.MyObject"
>+
>+static void
>+setup (Fixture *f,
>+    gconstpointer path_to_use)
>+{
>+  dbus_error_init (&f->dbus_error);
>+
>+  f->bus = dbus_g_bus_get_private (DBUS_BUS_SESSION, NULL, NULL);
>+  g_assert (f->bus != NULL);
>+
>+  f->object = g_object_new (MY_TYPE_OBJECT, NULL);
>+  g_assert (MY_IS_OBJECT (f->object));
>+
>+  f->libdbus = dbus_g_connection_get_connection (f->bus);
>+  f->unique_name = dbus_bus_get_unique_name (f->libdbus);
>+
>+  dbus_g_connection_register_g_object (f->bus, "/foo", f->object);
>+  g_assert (dbus_g_connection_lookup_g_object (f->bus, "/foo") ==
>+      f->object);
>+}
>+
>+static void
>+teardown (Fixture *f,
>+    gconstpointer test_data G_GNUC_UNUSED)
>+{
>+  /* we close the connection before releasing the object, to test fd.o #5688
>+   * in test_lookup() */
>+  if (f->bus != NULL)
>+    {
>+      dbus_connection_close (dbus_g_connection_get_connection (f->bus));
>+      dbus_g_connection_unref (f->bus);
>+    }
>+
>+  if (f->object != NULL)
>+    {
>+      g_object_unref (f->object);
>+    }
>+
>+  /* This is safe to call on an initialized-but-unset DBusError, a bit like
>+   * g_clear_error */
>+  dbus_error_free (&f->dbus_error);
>+}
>+
>+static void
>+test_success (Fixture *f,
>+    gconstpointer test_data G_GNUC_UNUSED)
>+{
>+  GAsyncResult *result = NULL;
>+  GError *error = NULL;
>+  GVariant *v;
>+
>+  /* called for its side-effect: increment val from 0 to 1 */
>+  dbus_g_connection_call_async (f->bus, f->unique_name, "/foo", IFACE,
>+      "IncrementVal", NULL, NULL, G_DBUS_CALL_FLAGS_NONE,
>+      -1, NULL, NULL, NULL);
>+
>+  /* called for its reply */
>+  dbus_g_connection_call_async (f->bus, f->unique_name, "/foo", IFACE,
>+      "GetVal", NULL, G_VARIANT_TYPE ("(u)"), G_DBUS_CALL_FLAGS_NONE,
>+      -1, NULL, tp_tests_result_ready_cb, &result);
>+  tp_tests_run_until_result (&result);
>+
>+  v = dbus_g_connection_call_finish (result, &error);
>+  g_assert_no_error (error);
>+  g_assert (g_variant_is_of_type (v, G_VARIANT_TYPE ("(u)")));
>+  g_assert_cmpuint (g_variant_get_uint32 (g_variant_get_child_value (v, 0)),
>+    ==, 1);
>+  g_variant_unref (v);
>+  g_clear_object (&result);
>+
>+  /* called for its reply */
>+  dbus_g_connection_call_async (f->bus, f->unique_name, "/foo", IFACE,
>+      "Increment",
>+      g_variant_new_parsed ("(uint32 256,)"),
>+      G_VARIANT_TYPE ("(u)"),
>+      G_DBUS_CALL_FLAGS_NONE,
>+      -1,
>+      NULL,
>+      tp_tests_result_ready_cb,
>+      &result);
>+  tp_tests_run_until_result (&result);
>+
>+  v = dbus_g_connection_call_finish (result, &error);
>+  g_assert_no_error (error);
>+  g_assert (g_variant_is_of_type (v, G_VARIANT_TYPE ("(u)")));
>+  g_assert_cmpuint (g_variant_get_uint32 (g_variant_get_child_value (v, 0)),
>+    ==, 257);
>+  g_variant_unref (v);
>+  g_clear_object (&result);
>+}
>+
>+static void
>+test_failure (Fixture *f,
>+    gconstpointer test_data G_GNUC_UNUSED)
>+{
>+  GAsyncResult *result = NULL;
>+  GError *error = NULL;
>+  GVariant *v;
>+
>+  my_object_save_error ((MyObject *) f->object, G_IO_ERROR, G_IO_ERROR_BUSY,
>+      "No.");
>+
>+  dbus_g_connection_call_async (f->bus, f->unique_name, "/foo", IFACE,
>+      "ThrowError", NULL, NULL, G_DBUS_CALL_FLAGS_NONE,
>+      -1, NULL, tp_tests_result_ready_cb, &result);
>+  tp_tests_run_until_result (&result);
>+
>+  v = dbus_g_connection_call_finish (result, &error);
>+  g_assert_error (error, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION);
>+  g_assert (v == NULL);
>+  g_clear_object (&result);
>+  g_clear_error (&error);
>+}
>+
>+static void
>+test_cancel (Fixture *f,
>+    gconstpointer test_data G_GNUC_UNUSED)
>+{
>+  GAsyncResult *result = NULL;
>+  GError *error = NULL;
>+  GVariant *v;
>+  GCancellable *cancellable = g_cancellable_new ();
>+
>+  dbus_g_connection_call_async (f->bus, f->unique_name, "/foo", IFACE,
>+      "ThrowError", NULL, NULL, G_DBUS_CALL_FLAGS_NONE,
>+      -1, cancellable, tp_tests_result_ready_cb, &result);
>+  g_cancellable_cancel (cancellable);
>+
>+  tp_tests_run_until_result (&result);
>+
>+  v = dbus_g_connection_call_finish (result, &error);
>+  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
>+  g_assert (v == NULL);
>+  g_clear_object (&result);
>+  g_clear_error (&error);
>+}
>+
>+static void
>+test_disconnect (Fixture *f,
>+    gconstpointer test_data G_GNUC_UNUSED)
>+{
>+  GAsyncResult *result = NULL;
>+  GError *error = NULL;
>+  GVariant *v;
>+
>+  dbus_connection_close (f->libdbus);
>+
>+  dbus_g_connection_call_async (f->bus, f->unique_name, "/foo", IFACE,
>+      "ThrowError", NULL, NULL, G_DBUS_CALL_FLAGS_NONE,
>+      -1, NULL, tp_tests_result_ready_cb, &result);
>+
>+  tp_tests_run_until_result (&result);
>+
>+  v = dbus_g_connection_call_finish (result, &error);
>+  g_assert_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED);
>+  g_assert (v == NULL);
>+  g_clear_object (&result);
>+  g_clear_error (&error);
>+}
>+
>+static void
>+test_mismatch (Fixture *f,
>+    gconstpointer test_data G_GNUC_UNUSED)
>+{
>+  GAsyncResult *result = NULL;
>+  GError *error = NULL;
>+  GVariant *v;
>+
>+  /* deliberately mismatched: it will return (u) but we ask for (s) */
>+  dbus_g_connection_call_async (f->bus, f->unique_name, "/foo", IFACE,
>+      "GetVal", NULL, G_VARIANT_TYPE ("(s)"), G_DBUS_CALL_FLAGS_NONE,
>+      -1, NULL, tp_tests_result_ready_cb, &result);
>+  tp_tests_run_until_result (&result);
>+
>+  v = dbus_g_connection_call_finish (result, &error);
>+  g_assert_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_ARGS);
>+  g_assert (v == NULL);
>+  g_clear_object (&result);
>+  g_clear_error (&error);
>+}
>+
>+int
>+main (int argc, char **argv)
>+{
>+  loop = g_main_loop_new (NULL, FALSE);
>+
>+  g_type_init ();
>+  g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
>+  dbus_g_type_specialized_init ();
>+  g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
>+  g_test_init (&argc, &argv, NULL);
>+
>+  g_test_add ("/not-quite-gdbus/success", Fixture, NULL,
>+      setup, test_success, teardown);
>+  g_test_add ("/not-quite-gdbus/cancel", Fixture, NULL,
>+      setup, test_cancel, teardown);
>+  g_test_add ("/not-quite-gdbus/disconnect", Fixture, NULL,
>+      setup, test_disconnect, teardown);
>+  g_test_add ("/not-quite-gdbus/failure", Fixture, NULL,
>+      setup, test_failure, teardown);
>+  g_test_add ("/not-quite-gdbus/mismatch", Fixture, NULL,
>+      setup, test_mismatch, teardown);
>+
>+  return g_test_run ();
>+}
>diff --git a/test/core/run-test.sh b/test/core/run-test.sh
>index dbc35f7..de89cfd 100755
>--- a/test/core/run-test.sh
>+++ b/test/core/run-test.sh
>@@ -52,4 +52,5 @@ else
>   ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-private || die "test-private failed"
>   ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-error-mapping || die "test-error-mapping failed"
>   ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-peer-on-bus || die "test-peer-on-bus failed"
>+  ${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/core/test-not-quite-gdbus || die "test-not-quite-gdbus failed"
> fi
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 48821: 60172 | 60173 | 60174 | 87939 | 87940 | 87941 | 87942 | 87943 | 87944 | 87945 | 87946 | 87947 | 87948 | 87949

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.