From 1eb95195cf700be816361721fbc89ae48564b299 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 27 Feb 2013 14:00:22 +0200 Subject: [PATCH] unit: Add gdbus/client_string_changed --- unit/test-gdbus-client.c | 93 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 3 deletions(-) diff --git a/unit/test-gdbus-client.c b/unit/test-gdbus-client.c index 679c27d96..a59438489 100644 --- a/unit/test-gdbus-client.c +++ b/unit/test-gdbus-client.c @@ -92,6 +92,9 @@ static void destroy_context(struct context *context) if (context == NULL) return; + if (context->timeout_source > 0) + g_source_remove(context->timeout_source); + g_dbus_detach_object_manager(context->dbus_conn); dbus_connection_flush(context->dbus_conn); @@ -181,9 +184,6 @@ static void client_connect_disconnect(void) g_main_loop_run(context->main_loop); - if (context->timeout_source > 0) - g_source_remove(context->timeout_source); - g_dbus_unregister_interface(context->dbus_conn, SERVICE_PATH, SERVICE_NAME); @@ -695,6 +695,90 @@ static void client_set_string_property(void) destroy_context(context); } +static gboolean string_exists(const GDBusPropertyTable *property, void *data) +{ + struct context *context = data; + + return context->data != NULL; +} + +static gboolean timeout_test(gpointer user_data) +{ + struct context *context = user_data; + + if (g_test_verbose()) + g_print("timeout triggered\n"); + + context->timeout_source = 0; + + g_assert_not_reached(); + + return FALSE; +} + +static gboolean emit_string_change(void *user_data) +{ + struct context *context = user_data; + + context->data = g_strdup("value1"); + + g_dbus_emit_property_changed(context->dbus_conn, SERVICE_PATH, + SERVICE_NAME, "String"); + + context->timeout_source = g_timeout_add_seconds(2, timeout_test, + context); + + return FALSE; +} + +static void proxy_string_changed(GDBusProxy *proxy, void *user_data) +{ + struct context *context = user_data; + DBusMessageIter iter; + + if (g_test_verbose()) + g_print("proxy %s found\n", + g_dbus_proxy_get_interface(proxy)); + + g_assert(!g_dbus_proxy_get_property(proxy, "String", &iter)); + + g_idle_add(emit_string_change, context); +} + +static void client_string_changed(void) +{ + struct context *context = create_context(); + static const GDBusPropertyTable string_properties[] = { + { "String", "s", get_string, NULL, string_exists }, + { }, + }; + + if (context == NULL) + return; + + g_dbus_register_interface(context->dbus_conn, + SERVICE_PATH, SERVICE_NAME, + methods, signals, string_properties, + context, NULL); + + context->dbus_client = g_dbus_client_new(context->dbus_conn, + SERVICE_NAME, SERVICE_PATH); + + g_dbus_client_set_disconnect_watch(context->dbus_client, + disconnect_handler, context); + g_dbus_client_set_proxy_handlers(context->dbus_client, + proxy_string_changed, NULL, + property_string_changed, + context); + + g_main_loop_run(context->main_loop); + + g_dbus_unregister_interface(context->dbus_conn, + SERVICE_PATH, SERVICE_NAME); + + destroy_context(context); +} + int main(int argc, char *argv[]) { g_test_init(&argc, &argv, NULL); @@ -722,5 +806,8 @@ int main(int argc, char *argv[]) g_test_add_func("/gdbus/client_set_string_property", client_set_string_property); + g_test_add_func("/gdbus/client_string_changed", + client_string_changed); + return g_test_run(); } -- 2.47.3