Re: [PATCH v3 4/4] unit: dbus: Add test for disconnect watch API

Test the dbus disconnect watch support. --- Makefile.am | 3 + unit/test-dbus-watch.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 unit/test-dbus-watch.c

diff --git a/Makefile.am b/Makefile.am index 50f81eb..eff88f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,6 +102,7 @@ unit_tests = unit/test-unit \ unit/test-dbus-util \ unit/test-dbus-message \ unit/test-dbus-service \ + unit/test-dbus-watch \ unit/test-gvariant-util \ unit/test-gvariant-message \ unit/test-siphash \ @@ -147,6 +148,8 @@ unit_test_dbus_util_LDADD = ell/libell-private.la unit_test_dbus_service_LDADD = ell/libell-private.la +unit_test_dbus_watch_LDADD = ell/libell-private.la + unit_test_gvariant_util_LDADD = ell/libell-private.la unit_test_gvariant_message_LDADD = ell/libell-private.la diff --git a/unit/test-dbus-watch.c b/unit/test-dbus-watch.c new file mode 100644 index 0000000..5e7cf60 --- /dev/null +++ b/unit/test-dbus-watch.c @@ -0,0 +1,153 @@ +/* + * + * Embedded Linux library + * + * Copyright (C) 2011-2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <unistd.h> +#include <stdlib.h> +#include <sys/wait.h> +#include <assert.h> +#include <time.h> +#include <stdio.h> + +#include <ell/ell.h> +#include "ell/dbus-private.h" + +#define DBUS_SERVICE_DBUS "org.freedesktop.DBus" +#define DBUS_PATH_DBUS "/org/freedesktop/DBus" +#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus" +#define DBUS_MAXIMUM_MATCH_RULE_LENGTH 1024 + +struct watch_test { + const char *name; + const char *expected; + int count; +};

+ +static struct watch_test match_test = { + .name = ":1.101", + .expected = "type='signal'," + "sender='org.freedesktop.DBus'," + "path='/org/freedesktop/DBus'," + "interface='org.freedesktop.DBus'," + "member='NameOwnerChanged'," + "arg0=':1.101'", +}; + +static struct watch_test disconnect_test = { + .name = ":101.1", + .count = 0, +}; + +static void verify_match(struct _dbus_filter_data *data, + l_dbus_message_func_t filter) +{ + struct watch_test *test = data->user_data; + char rule[DBUS_MAXIMUM_MATCH_RULE_LENGTH]; + + _dbus1_format_rule(data, rule, sizeof(rule)); + + assert(strcmp(rule, test->expected) == 0); +} + +static void test_match(const void *test_data) +{ + struct watch_test *test = (struct watch_test *)test_data; + struct _dbus_filter_data *data; + + data = _dbus1_filter_data_get(NULL, _dbus1_service_filter, + DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "NameOwnerChanged", + test->name, + NULL, + test, + NULL, + verify_match); + + _dbus1_filter_data_destroy(data, verify_match);

+} + +static void match(struct _dbus_filter_data *data, l_dbus_message_func_t filter) +{ + data->handle_func = filter; +} + +static void disconnect_cb(struct l_dbus *dbus, void *user_data) +{ + struct watch_test *data = user_data; + + data->count++;

+} + +static void send_filter_signal(struct _dbus_filter_data *data, + const char *name, const char *old, const char *new) +{ + struct l_dbus_message *message; + + message = _dbus_message_new_signal(2, DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, + "NameOwnerChanged"); + l_dbus_message_set_arguments(message, "sss", name, old, new); + _dbus_message_set_sender(message, DBUS_SERVICE_DBUS); + _dbus_message_filter_dispatcher(message, data); + l_dbus_message_unref(message); +} + +static void test_disconnect_watch(const void *test_data) +{ + struct watch_test *test = (struct watch_test *)test_data; + struct _dbus_filter_data *data; + + data = _dbus1_filter_data_get(NULL, _dbus1_service_filter, + DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "NameOwnerChanged", + test->name, + disconnect_cb, + test, + NULL, + match); + + send_filter_signal(data, ":0.1", ":0.1", ""); + assert(test->count == 0); + + send_filter_signal(data, ":0.1", ":0.1", ":0.2"); + assert(test->count == 0); + + send_filter_signal(data, ":101.1", ":101.1", ""); + assert(test->count == 1); + + _dbus1_filter_data_destroy(data, match); +} + +int main(int argc, char *argv[]) +{ + l_test_init(&argc, &argv); + + l_test_add("DBus filter", test_match, &match_test); + + l_test_add("DBus disconnect watch", test_disconnect_watch, + &disconnect_test); + + return l_test_run(); +}