From 5f83cb772c3bc8cbe36b677386a34e16285bc630 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 22 Feb 2011 13:04:18 +0000 Subject: [PATCH 3/5] Add an end-to-end sanity check for TCP and Unix DBusServer/DBusConnection --- test/.gitignore | 1 + test/Makefile.am | 18 +++++- test/loopback.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 220 insertions(+), 1 deletions(-) create mode 100644 test/loopback.c diff --git a/test/.gitignore b/test/.gitignore index f7a6587..e67d1b9 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -23,3 +23,4 @@ decode-gcov shell-test test-shell-service test-names +test-loopback diff --git a/test/Makefile.am b/test/Makefile.am index 9d0681b..a6b83b6 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -52,7 +52,8 @@ test_segfault_SOURCES = \ test_sleep_forever_SOURCES = \ test-sleep-forever.c -# When any programs are not linked to libdbus-internal, fix this. +# This assumes that most tests will be linked to libdbus-internal; +# tests linked to only the public libdbus have their own CPPFLAGS. AM_CPPFLAGS=-DDBUS_STATIC_BUILD TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) @@ -71,6 +72,21 @@ spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ EXTRA_DIST= +modular_tests = \ + test-loopback + +test_loopback_SOURCES = loopback.c +test_loopback_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) +test_loopback_LDFLAGS = @R_DYNAMIC_LDFLAG@ +test_loopback_LDADD = $(top_builddir)/dbus/libdbus-1.la \ + $(GLIB_LIBS) \ + $(DBUS_GLIB_LIBS) + +if DBUS_ENABLE_MODULAR_TESTS +noinst_PROGRAMS += $(modular_tests) +TESTS += $(modular_tests) +endif DBUS_ENABLE_MODULAR_TESTS + ## keep these in creation order, i.e. uppermost dirs first TESTDIRS= \ data \ diff --git a/test/loopback.c b/test/loopback.c new file mode 100644 index 0000000..0567edb --- /dev/null +++ b/test/loopback.c @@ -0,0 +1,202 @@ +/* Simple sanity-check for loopback through TCP and Unix sockets. + * + * Author: Simon McVittie + * Copyright © 2010 Nokia Corporation + * + * 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 + +#include + +#include +#include + +typedef struct { + DBusError e; + + DBusServer *server; + DBusConnection *server_conn; + /* queue of DBusMessage */ + GQueue server_messages; + + DBusConnection *client_conn; +} Fixture; + +static void +assert_no_error (const DBusError *e) +{ + if (G_UNLIKELY (dbus_error_is_set (e))) + g_error ("expected success but got error: %s: %s", e->name, e->message); +} + +static DBusHandlerResult +server_message_cb (DBusConnection *server_conn, + DBusMessage *message, + void *data) +{ + Fixture *f = data; + + g_assert (server_conn == f->server_conn); + g_queue_push_tail (&f->server_messages, dbus_message_ref (message)); + + return DBUS_HANDLER_RESULT_HANDLED; +} + +static void +new_conn_cb (DBusServer *server, + DBusConnection *server_conn, + void *data) +{ + Fixture *f = data; + dbus_bool_t have_mem; + + g_assert (f->server_conn == NULL); + f->server_conn = dbus_connection_ref (server_conn); + dbus_connection_setup_with_g_main (server_conn, NULL); + + have_mem = dbus_connection_add_filter (server_conn, + server_message_cb, f, NULL); + g_assert (have_mem); +} + +static void +setup (Fixture *f, + gconstpointer addr) +{ + dbus_error_init (&f->e); + g_queue_init (&f->server_messages); + + f->server = dbus_server_listen (addr, &f->e); + assert_no_error (&f->e); + g_assert (f->server != NULL); + + dbus_server_set_new_connection_function (f->server, + new_conn_cb, f, NULL); + dbus_server_setup_with_g_main (f->server, NULL); +} + +static void +test_connect (Fixture *f, + gconstpointer addr G_GNUC_UNUSED) +{ + g_assert (f->server_conn == NULL); + + f->client_conn = dbus_connection_open_private ( + dbus_server_get_address (f->server), &f->e); + assert_no_error (&f->e); + g_assert (f->client_conn != NULL); + dbus_connection_setup_with_g_main (f->client_conn, NULL); + + while (f->server_conn == NULL) + { + g_print ("."); + g_main_context_iteration (NULL, TRUE); + } +} + +static void +test_message (Fixture *f, + gconstpointer addr) +{ + dbus_bool_t have_mem; + dbus_uint32_t serial; + DBusMessage *outgoing, *incoming; + + test_connect (f, addr); + + outgoing = dbus_message_new_signal ("/com/example/Hello", + "com.example.Hello", "Greeting"); + g_assert (outgoing != NULL); + + have_mem = dbus_connection_send (f->client_conn, outgoing, &serial); + g_assert (have_mem); + g_assert (serial != 0); + + while (g_queue_is_empty (&f->server_messages)) + { + g_print ("."); + g_main_context_iteration (NULL, TRUE); + } + + g_assert_cmpuint (g_queue_get_length (&f->server_messages), ==, 1); + + incoming = g_queue_pop_head (&f->server_messages); + + g_assert (!dbus_message_contains_unix_fds (incoming)); + g_assert_cmpstr (dbus_message_get_destination (incoming), ==, NULL); + g_assert_cmpstr (dbus_message_get_error_name (incoming), ==, NULL); + g_assert_cmpstr (dbus_message_get_interface (incoming), ==, + "com.example.Hello"); + g_assert_cmpstr (dbus_message_get_member (incoming), ==, "Greeting"); + g_assert_cmpstr (dbus_message_get_sender (incoming), ==, NULL); + g_assert_cmpstr (dbus_message_get_signature (incoming), ==, ""); + g_assert_cmpstr (dbus_message_get_path (incoming), ==, "/com/example/Hello"); + g_assert_cmpuint (dbus_message_get_serial (incoming), ==, serial); +} + +static void +teardown (Fixture *f, + gconstpointer addr G_GNUC_UNUSED) +{ + if (f->client_conn != NULL) + { + dbus_connection_close (f->client_conn); + dbus_connection_unref (f->client_conn); + f->client_conn = NULL; + } + + if (f->server_conn != NULL) + { + dbus_connection_close (f->server_conn); + dbus_connection_unref (f->server_conn); + f->server_conn = NULL; + } + + if (f->server != NULL) + { + dbus_server_disconnect (f->server); + dbus_server_unref (f->server); + f->server = NULL; + } +} + +int +main (int argc, + char **argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add ("/connect/tcp", Fixture, "tcp:host=127.0.0.1", setup, + test_connect, teardown); + g_test_add ("/message/tcp", Fixture, "tcp:host=127.0.0.1", setup, + test_message, teardown); + +#ifdef DBUS_UNIX + g_test_add ("/connect/unix", Fixture, "unix:tmpdir=/tmp", setup, + test_connect, teardown); + g_test_add ("/message/unix", Fixture, "unix:tmpdir=/tmp", setup, + test_message, teardown); +#endif + + return g_test_run (); +} -- 1.7.4.1