From 75742242000e782719bc1656f0a7da72b059e88e Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 21 Oct 2003 05:46:52 +0000 Subject: 2003-10-20 Havoc Pennington hmm, make check is currently not passing. * doc/dbus-specification.xml: add requirement that custom type names follow the same rules as interface names. * dbus/dbus-protocol.h: change some of the byte codes, to avoid duplication and allow 'c' to be 'custom'; dict is now 'm' for 'map' * doc/dbus-specification.xml: update type codes to match dbus-protocol.h, using the ASCII byte values. Rename type NAMED to CUSTOM. Add type OBJECT_PATH to the spec. 2003-10-17 Havoc Pennington * bus/driver.c (create_unique_client_name): use "." as separator in base service names instead of '-' * dbus/dbus-string.c (_dbus_string_get_byte): allow getting nul byte at the end of the string * dbus/dbus-internals.h (_DBUS_LIKELY, _DBUS_UNLIKELY): add optimization macros since string validation seems to be a slow point. * doc/dbus-specification.xml: restrict valid service/interface/member/error names. Add test suite code for the name validation. * dbus/dbus-string.c: limit service/interface/member/error names to [0-9][A-Z][a-z]_ * dbus/dbus-connection.c (dbus_connection_dispatch): add missing format arg to verbose spew * glib/dbus-gproxy.c (dbus_gproxy_call_no_reply): if not out of memory, return instead of g_error * test/test-service.c (path_message_func): support emitting a signal on request * dbus/dbus-bus.c (init_connections_unlocked): only fill in activation bus type if DBUS_BUS_ACTIVATION was set; default to assuming the activation bus was the session bus so that services started manually will still register. (init_connections_unlocked): fix so that in OOM situation we get the same semantics when retrying the function * test/test-service.c (main): change to use path registration, to test those codepaths; register with DBUS_BUS_ACTIVATION rather than DBUS_BUS_SESSION --- test/glib/Makefile.am | 7 +++++- test/glib/run-test.sh | 3 ++- test/glib/test-dbus-glib.c | 56 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 62 insertions(+), 4 deletions(-) (limited to 'test/glib') diff --git a/test/glib/Makefile.am b/test/glib/Makefile.am index 608e7d01..ba1f181d 100644 --- a/test/glib/Makefile.am +++ b/test/glib/Makefile.am @@ -32,13 +32,18 @@ endif ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we ## build even when not doing "make check" -noinst_PROGRAMS= test-dbus-glib $(THREAD_APPS) +noinst_PROGRAMS= test-dbus-glib test-service-glib $(THREAD_APPS) test_dbus_glib_SOURCES= \ test-dbus-glib.c test_dbus_glib_LDADD= $(top_builddir)/glib/libdbus-glib-1.la +test_service_glib_SOURCES= \ + test-service-glib.c + +test_service_glib_LDADD= $(top_builddir)/glib/libdbus-glib-1.la + else ### not building tests diff --git a/test/glib/run-test.sh b/test/glib/run-test.sh index a51396bb..ce2f469b 100755 --- a/test/glib/run-test.sh +++ b/test/glib/run-test.sh @@ -5,6 +5,7 @@ SCRIPTNAME=$0 function die() { if ! test -z "$DBUS_SESSION_BUS_PID" ; then + echo "killing message bus" kill -9 $DBUS_SESSION_BUS_PID fi echo $SCRIPTNAME: $* >&2 @@ -45,7 +46,7 @@ fi echo "Started test bus pid $DBUS_SESSION_BUS_PID at $DBUS_SESSION_BUS_ADDRESS" -$DBUS_TOP_BUILDDIR/test/glib/test-dbus-glib || die "test-dbus-glib failed" +$DEBUG $DBUS_TOP_BUILDDIR/test/glib/test-dbus-glib || die "test-dbus-glib failed" ## we kill -TERM so gcov data can be written out diff --git a/test/glib/test-dbus-glib.c b/test/glib/test-dbus-glib.c index fb8be4cc..5cb31235 100644 --- a/test/glib/test-dbus-glib.c +++ b/test/glib/test-dbus-glib.c @@ -4,11 +4,43 @@ #include #include +static GMainLoop *loop = NULL; +static int n_times_foo_received = 0; + +static void +foo_signal_handler (DBusGProxy *proxy, + DBusMessage *signal, + void *user_data) +{ + double d; + DBusError derror; + + if (!dbus_message_is_signal (signal, + "org.freedesktop.TestSuite", + "Foo")) + { + g_printerr ("Signal handler received the wrong message\n"); + exit (1); + } + + dbus_error_init (&derror); + if (!dbus_message_get_args (signal, &derror, DBUS_TYPE_DOUBLE, + &d, DBUS_TYPE_INVALID)) + { + g_printerr ("failed to get signal args: %s\n", derror.message); + dbus_error_free (&derror); + exit (1); + } + + n_times_foo_received += 1; + + g_main_loop_quit (loop); +} + int main (int argc, char **argv) { DBusConnection *connection; - GMainLoop *loop; GError *error; DBusGProxy *driver; DBusGProxy *proxy; @@ -135,7 +167,7 @@ main (int argc, char **argv) proxy = dbus_gproxy_new_for_service (connection, "org.freedesktop.DBus.TestSuiteEchoService", - "/fixme/the/test/service/ignores/this", /* FIXME */ + "/org/freedesktop/TestSuite", "org.freedesktop.TestSuite"); call = dbus_gproxy_begin_call (proxy, "Echo", @@ -156,6 +188,26 @@ main (int argc, char **argv) g_print ("String echoed = \"%s\"\n", str); dbus_free (str); + + /* Test oneway call and signal handling */ + + dbus_gproxy_connect_signal (proxy, "Foo", + foo_signal_handler, + NULL, NULL); + + dbus_gproxy_call_no_reply (proxy, "EmitFoo", + DBUS_TYPE_INVALID); + + dbus_connection_flush (connection); + + g_main_loop_run (loop); + + if (n_times_foo_received != 1) + { + g_printerr ("Foo signal received %d times, should have been 1\n", + n_times_foo_received); + exit (1); + } g_object_unref (G_OBJECT (driver)); g_object_unref (G_OBJECT (proxy)); -- cgit