aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-10-30 17:18:10 -0500
committerTed Gould <ted@canonical.com>2009-10-30 17:18:10 -0500
commit911b9d7f93b4319665b5fa63b84032df230412ba (patch)
tree811911ff0ca745a685af2adee4ec8fee919b1671
parentaa1549d81d1d0eb1f92d4fb5b0339ba4ceab72cd (diff)
downloadlibayatana-indicator-911b9d7f93b4319665b5fa63b84032df230412ba.tar.gz
libayatana-indicator-911b9d7f93b4319665b5fa63b84032df230412ba.tar.bz2
libayatana-indicator-911b9d7f93b4319665b5fa63b84032df230412ba.zip
Adding a test that ensures we don't get a connect signal.
-rw-r--r--.bzrignore2
-rw-r--r--tests/Makefile.am24
-rw-r--r--tests/service-manager-no-connect.c46
3 files changed, 72 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 1bdd142..8bbe474 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -124,3 +124,5 @@ libindicator/libindicator_la-indicator-service-manager.lo
tests/service-shutdown-timeout
tests/loader-tester
tests/service-shutdown-timeout-tester
+tests/service-manager-no-connect
+tests/service-manager-no-connect-tester
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 485d02e..dd047d3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ DISTCLEANFILES =
check_PROGRAMS = \
test-loader \
+ service-manager-no-connect \
service-shutdown-timeout
lib_LTLIBRARIES = \
@@ -105,6 +106,29 @@ TESTS += service-shutdown-timeout-tester
DISTCLEANFILES += service-shutdown-timeout-tester
#############################
+# Service Manager No Connect
+#############################
+
+service_manager_no_connect_SOURCES = \
+ service-manager-no-connect.c
+
+service_manager_no_connect_CFLAGS = \
+ -Wall -Werror \
+ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_manager_no_connect_LDADD = \
+ $(LIBINDICATOR_LIBS) \
+ $(top_builddir)/libindicator/.libs/libindicator.a
+
+service-manager-no-connect-tester: service-manager-no-connect Makefile
+ @echo "#!/bin/sh" > service-manager-no-connect-tester
+ @echo $(DBUS_RUNNER) --task ./service-manager-no-connect >> service-manager-no-connect-tester
+ @chmod +x service-manager-no-connect-tester
+
+TESTS += service-manager-no-connect-tester
+DISTCLEANFILES += service-manager-no-connect-tester
+
+#############################
# Test stuff
#############################
diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c
new file mode 100644
index 0000000..8006eda
--- /dev/null
+++ b/tests/service-manager-no-connect.c
@@ -0,0 +1,46 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service-manager.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+
+gboolean
+timeout (gpointer data)
+{
+ passed = TRUE;
+ g_error("Timeout with no connection.");
+ g_main_loop_quit(mainloop);
+ return FALSE;
+}
+
+void
+connection (void)
+{
+ g_debug("Connection");
+ passed = FALSE;
+ g_main_loop_quit(mainloop);
+ return;
+}
+
+int
+main (int argc, char ** argv)
+{
+ g_type_init();
+
+ IndicatorServiceManager * is = indicator_service_manager_new("my.test.name");
+ g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection, 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;
+}