aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-09 13:08:22 -0500
committerTed Gould <ted@gould.cx>2010-07-09 13:08:22 -0500
commited191e6c58df840aec26d068e2b206dc15264459 (patch)
tree399c87c5e78b1d6297a40acfe54f1186d83b1f20
parentbaa324ffb3a29cea02194be5674d60cd5dab079a (diff)
parent57503088efa419f9c7ceb6c77a06df5c3a1a2556 (diff)
downloadlibayatana-indicator-ed191e6c58df840aec26d068e2b206dc15264459.tar.gz
libayatana-indicator-ed191e6c58df840aec26d068e2b206dc15264459.tar.bz2
libayatana-indicator-ed191e6c58df840aec26d068e2b206dc15264459.zip
Taking it to the next level with impoliteness.
-rw-r--r--.bzrignore1
-rw-r--r--tests/Makefile.am18
-rw-r--r--tests/service-version-multiwatch-manager-impolite.c61
3 files changed, 78 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore
index cef9d4e..c3c6afd 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -155,3 +155,4 @@ libindicator/libindicator_la-indicator-image-helper.lo
tests/service-version-multiwatch-manager
tests/service-version-multiwatch-tester
tests/service-version-multiwatch-service
+tests/service-version-multiwatch-manager-impolite
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 852a963..9d5e496 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -321,6 +321,20 @@ service_version_multiwatch_manager_LDADD = \
$(LIBINDICATOR_LIBS) \
$(top_builddir)/libindicator/.libs/libindicator.a
+check_PROGRAMS += service-version-multiwatch-manager-impolite
+
+service_version_manager_impolite_SOURCES = \
+ service-version-values.h \
+ service-version-multiwatch-manager-impolite.c
+
+service_version_multiwatch_manager_impolite_CFLAGS = \
+ -Wall -Werror \
+ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_version_multiwatch_manager_impolite_LDADD = \
+ $(LIBINDICATOR_LIBS) \
+ $(top_builddir)/libindicator/.libs/libindicator.a
+
check_PROGRAMS += service-version-multiwatch-service
service_version_multiwatch_service_SOURCES = \
@@ -335,9 +349,9 @@ 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
+service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am
@echo "#!/bin/sh" > $@
- @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 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 >> $@
+ @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 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 --task ./service-version-multiwatch-manager-impolite --task-name Impolite1 --task ./service-version-multiwatch-manager-impolite --task-name Impolite2 --task ./service-version-multiwatch-manager-impolite --task-name Impolite3 >> $@
@chmod +x $@
TESTS += service-version-multiwatch-tester
diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c
new file mode 100644
index 0000000..8bfd3c6
--- /dev/null
+++ b/tests/service-version-multiwatch-manager-impolite.c
@@ -0,0 +1,61 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service-manager.h"
+#include "service-version-values.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+static IndicatorServiceManager * goodis = NULL;
+
+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;
+}
+
+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);
+
+ g_timeout_add_seconds(1, timeout, NULL);
+
+ return FALSE;
+}
+
+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"));
+
+ g_timeout_add(500, delay_start, 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;
+}