Merging in trunk to solve conflicts

5 files changed, 240 insertions, 1 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d6a1048..da33551 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -310,6 +310,60 @@ TESTS += service-version-tester
 DISTCLEANFILES += service-version-tester service-version-bad.service service-version-good.service
 
 #############################
+# Service Versions
+#############################
+
+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
+
+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 = \
+	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 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 --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
+DISTCLEANFILES += service-version-multiwatch-tester
+
+#############################
 # Service Manager Shutdown
 #############################
 
diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c
index bcfe46d..12a6a32 100644
--- a/tests/service-version-good-service.c
+++ b/tests/service-version-good-service.c
@@ -5,12 +5,19 @@
 
 static GMainLoop * mainloop = NULL;
 static gboolean passed = FALSE;
+static IndicatorService * is = NULL;
 
 gboolean
 timeout (gpointer data)
 {
 	passed = FALSE;
 	g_debug("Timeout with no shutdown.");
+
+	if (is != NULL) {
+		g_object_unref(is);
+		is = NULL;
+	}
+
 	g_main_loop_quit(mainloop);
 	return FALSE;
 }
@@ -20,6 +27,12 @@ shutdown (void)
 {
 	g_debug("Shutdown");
 	passed = TRUE;
+
+	if (is != NULL) {
+		g_object_unref(is);
+		is = NULL;
+	}
+
 	g_main_loop_quit(mainloop);
 	return;
 }
@@ -29,7 +42,7 @@ main (int argc, char ** argv)
 {
 	g_type_init();
 
-	IndicatorService * is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD);
+	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);
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;
+}
diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c
new file mode 100644
index 0000000..771426f
--- /dev/null
+++ b/tests/service-version-multiwatch-manager.c
@@ -0,0 +1,63 @@
+
+#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_object_unref(goodis);
+
+	g_debug("Quiting");
+	if (passed) {
+		g_debug("Passed");
+		return 0;
+	}
+	g_debug("Failed");
+	return 1;
+}
diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c
new file mode 100644
index 0000000..9920306
--- /dev/null
+++ b/tests/service-version-multiwatch-service.c
@@ -0,0 +1,48 @@
+
+#include <glib.h>
+#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();
+	g_debug("Service starting");
+
+	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(2, 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;
+}