From 36f2ede024b05019c50e06d177e0c9be5750e919 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 2 Dec 2009 13:42:29 -0600 Subject: Adding a new test to look at version numbers. --- tests/service-version-manager.c | 61 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 tests/service-version-manager.c (limited to 'tests/service-version-manager.c') diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c new file mode 100644 index 0000000..ca29ea7 --- /dev/null +++ b/tests/service-version-manager.c @@ -0,0 +1,61 @@ + +#include +#include "libindicator/indicator-service-manager.h" +#include "service-version-values.h" + +static GMainLoop * mainloop = NULL; +static gboolean con_good = FALSE; +static gboolean con_bad = FALSE; + +gboolean +timeout (gpointer data) +{ + g_error("Timeout."); + g_main_loop_quit(mainloop); + return FALSE; +} + +void +connection_bad (void) +{ + g_debug("Connection From Bad!"); + con_bad = TRUE; + return; +} + +void +connection_good (void) +{ + g_debug("Connection From Good."); + con_good = TRUE; + return; +} + +int +main (int argc, char ** argv) +{ + g_type_init(); + g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); + + IndicatorServiceManager * goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); + g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection_good, NULL); + + IndicatorServiceManager * badis = indicator_service_manager_new_version("org.ayatana.version.bad", SERVICE_VERSION_GOOD); + g_signal_connect(G_OBJECT(badis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection_bad, NULL); + + g_timeout_add_seconds(1, timeout, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_object_unref(goodis); + g_object_unref(badis); + + g_debug("Quiting"); + if (con_good && !con_bad) { + g_debug("Passed"); + return 0; + } + g_debug("Failed"); + return 1; +} -- cgit v1.2.3 From 6bbe989007e7363daf84d6779d80312ee73daf60 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 2 Dec 2009 15:15:03 -0600 Subject: Printing out the session bus address --- tests/service-version-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/service-version-manager.c') diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c index ca29ea7..b5bb807 100644 --- a/tests/service-version-manager.c +++ b/tests/service-version-manager.c @@ -10,7 +10,7 @@ static gboolean con_bad = FALSE; gboolean timeout (gpointer data) { - g_error("Timeout."); + g_debug("Timeout."); g_main_loop_quit(mainloop); return FALSE; } @@ -36,6 +36,7 @@ main (int argc, char ** argv) { g_type_init(); g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); + g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); IndicatorServiceManager * goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection_good, NULL); -- cgit v1.2.3 From 436bca27a730090096c20637013a3905fe9f9055 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Dec 2009 14:31:10 -0600 Subject: Full signal handlers so that we can see everything. --- tests/service-version-manager.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/service-version-manager.c') diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c index b5bb807..aedc0ed 100644 --- a/tests/service-version-manager.c +++ b/tests/service-version-manager.c @@ -16,16 +16,18 @@ timeout (gpointer data) } void -connection_bad (void) +connection_bad (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { + if (!connected) return; g_debug("Connection From Bad!"); con_bad = TRUE; return; } void -connection_good (void) +connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { + if (!connected) return; g_debug("Connection From Good."); con_good = TRUE; return; @@ -39,10 +41,10 @@ main (int argc, char ** argv) g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); IndicatorServiceManager * goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); - g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection_good, NULL); + g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); IndicatorServiceManager * badis = indicator_service_manager_new_version("org.ayatana.version.bad", SERVICE_VERSION_GOOD); - g_signal_connect(G_OBJECT(badis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection_bad, NULL); + g_signal_connect(G_OBJECT(badis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_bad), NULL); g_timeout_add_seconds(1, timeout, NULL); -- cgit v1.2.3