From 7c7b497e39c3a00b898a3d854a284de06e5fd081 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:52:28 -0500 Subject: Okay, we need our own service too. Bah. --- .bzrignore | 1 + tests/Makefile.am | 18 ++++++++++-- tests/service-version-multiwatch-service.c | 47 ++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 tests/service-version-multiwatch-service.c diff --git a/.bzrignore b/.bzrignore index f48ec1e..cef9d4e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -154,3 +154,4 @@ tests/test-desktop-shortcuts-touch-test libindicator/libindicator_la-indicator-image-helper.lo tests/service-version-multiwatch-manager tests/service-version-multiwatch-tester +tests/service-version-multiwatch-service diff --git a/tests/Makefile.am b/tests/Makefile.am index 12d6dc3..6a7fb42 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -321,9 +321,23 @@ 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 Makefile.am +check_PROGRAMS += service-version-multiwatch-service + +service_version_multiwatch_service_SOURCES = \ + service-version-values.h \ + service-version-multiwatch-service.c + +service_version_multiwatch_service_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_version_multiwatch_service_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --task ./service-version-good-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ + @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --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-service.c b/tests/service-version-multiwatch-service.c new file mode 100644 index 0000000..bcfe46d --- /dev/null +++ b/tests/service-version-multiwatch-service.c @@ -0,0 +1,47 @@ + +#include +#include "libindicator/indicator-service.h" +#include "service-version-values.h" + +static GMainLoop * mainloop = NULL; +static gboolean passed = FALSE; + +gboolean +timeout (gpointer data) +{ + passed = FALSE; + g_debug("Timeout with no shutdown."); + g_main_loop_quit(mainloop); + return FALSE; +} + +void +shutdown (void) +{ + g_debug("Shutdown"); + passed = TRUE; + g_main_loop_quit(mainloop); + return; +} + +int +main (int argc, char ** argv) +{ + g_type_init(); + + IndicatorService * is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); + g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); + + g_timeout_add_seconds(1, timeout, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_debug("Quiting"); + if (passed) { + g_debug("Passed"); + return 0; + } + g_debug("Failed"); + return 1; +} -- cgit v1.2.3