From 6786532d0efae7037c1b5d4f970359c6410d2cd7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:42:20 -0500 Subject: Making a new manager --- tests/service-version-multiwatch-manager.c | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 tests/service-version-multiwatch-manager.c (limited to 'tests/service-version-multiwatch-manager.c') diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c new file mode 100644 index 0000000..7293d43 --- /dev/null +++ b/tests/service-version-multiwatch-manager.c @@ -0,0 +1,52 @@ + +#include +#include "libindicator/indicator-service-manager.h" +#include "service-version-values.h" + +static GMainLoop * mainloop = NULL; +static gboolean passed = FALSE; + +gboolean +timeout (gpointer data) +{ + g_debug("Timeout."); + passed = FALSE; + g_main_loop_quit(mainloop); + return FALSE; +} + +void +connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) +{ + if (!connected) return; + g_debug("Connection From Service."); + passed = TRUE; + g_main_loop_quit(mainloop); + return; +} + +int +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, G_CALLBACK(connection_good), 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_debug("Quiting"); + if (passed) { + g_debug("Passed"); + return 0; + } + g_debug("Failed"); + return 1; +} -- cgit v1.2.3 From 56dd41e5fcadc452ad1c5b0892e3cd0b5fa3da2f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:50:25 -0500 Subject: Delaying the watchers to ensure that we don't dbus activate, and removing the session.conf to even allow for that. --- tests/service-version-multiwatch-manager.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'tests/service-version-multiwatch-manager.c') diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index 7293d43..2edbd73 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -5,6 +5,7 @@ static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; +static IndicatorServiceManager * goodis = NULL; gboolean timeout (gpointer data) @@ -25,6 +26,17 @@ connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user return; } +gboolean +delay_start (gpointer data) +{ + 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, G_CALLBACK(connection_good), NULL); + + g_timeout_add_seconds(1, timeout, NULL); + + return FALSE; +} + int main (int argc, char ** argv) { @@ -32,10 +44,7 @@ main (int argc, char ** argv) 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, G_CALLBACK(connection_good), NULL); - - g_timeout_add_seconds(1, timeout, NULL); + g_timeout_add(500, delay_start, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From b43f81d0ece9bb9c150ccbeba793f385bef6ce3b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:58:17 -0500 Subject: A couple debug messages to make the test easier to read the output from. --- tests/service-version-multiwatch-manager.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/service-version-multiwatch-manager.c') diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index 2edbd73..771426f 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -29,6 +29,8 @@ connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user gboolean delay_start (gpointer data) { + g_debug("Starting Manager"); + 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, G_CALLBACK(connection_good), NULL); -- cgit v1.2.3