diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-09 10:42:20 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-09 10:42:20 -0500 |
| commit | 6786532d0efae7037c1b5d4f970359c6410d2cd7 (patch) | |
| tree | e437802f4be49f57899ef53aa0ec1ffbe6bcfdb1 | |
| parent | 01130c5baedfd8547c984a14423a613282e71d42 (diff) | |
| download | libayatana-indicator-6786532d0efae7037c1b5d4f970359c6410d2cd7.tar.gz libayatana-indicator-6786532d0efae7037c1b5d4f970359c6410d2cd7.tar.bz2 libayatana-indicator-6786532d0efae7037c1b5d4f970359c6410d2cd7.zip | |
Making a new manager
| -rw-r--r-- | tests/Makefile.am | 18 | ||||
| -rw-r--r-- | tests/service-version-multiwatch-manager.c | 52 |
2 files changed, 68 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 04a6ed3..35e07f4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -307,9 +307,23 @@ DISTCLEANFILES += service-version-tester service-version-bad.service service-ver # Service Versions ############################# -service-version-multiwatch-tester: service-version-manager service-version-good-service session.conf service-version-good.service Makefile.am +check_PROGRAMS += service-version-multiwatch-manager + +service_version_manager_SOURCES = \ + service-version-values.h \ + service-version-multiwatch-manager.c + +service_version_multiwatch_manager_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_version_multiwatch_manager_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +service-version-multiwatch-tester: service-version-multiwatch-manager service-version-good-service session.conf service-version-good.service Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-version-manager --task-name Manager1 --task ./service-version-manager --task-name Manager2 >> $@ + @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ @chmod +x $@ TESTS += service-version-multiwatch-tester 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 <glib.h> +#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; +} |