Merge lp:~ted/ubuntu-app-launch/second-exec-test into lp:ubuntu-app-launch/13.10

[Ted Gould]

Testing of the second exec logic.

Testing of the second exec logic.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-armhf-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-saucy-i386-ci/103

Click here to trigger a rebuild:
http://s-jenkins:8080/job/upstart-app-launch-ci/103/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Looks very good! I only have a couple of trivial issues.

- if you're going to init resume_timeout to 0 in its declaration, you need to pass -std=c++11 to gcc

- last_resume_appid and last_focus_appid are leaked when the test ends -- a std::string might be better here

[Ted Gould (ted)]

On Mon, 2013-09-30 at 16:57 +0000, Charles Kerr wrote:

> - if you're going to init resume_timeout to 0 in its declaration, you need to pass -std=c++11 to gcc

Fixed r106.

> - last_resume_appid and last_focus_appid are leaked when the test ends -- a std::string might be better here

Fixed r107.

[lp:~ted/ubuntu-app-launch/second-exec-test]

106. By Ted Gould on 2013-09-30

Update the C++ standard to allow initializing variables

107. By Ted Gould on 2013-09-30

Switch to std::string to get a free destructor

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-26 21:27:06 +0000
+++ CMakeLists.txt	2013-09-30 17:16:20 +0000
@@ -161,7 +161,7 @@
 # second-exec
 #######################
 
-add_executable(second-exec second-exec.c)
+add_executable(second-exec second-exec.c second-exec-core.c second-exec-core.h)
 set_target_properties(second-exec PROPERTIES OUTPUT_NAME "second-exec")
 target_link_libraries(second-exec helpers upstart-launcher)
 install(TARGETS second-exec RUNTIME DESTINATION "${pkglibexecdir}")

=== renamed file 'second-exec.c' => 'second-exec-core.c'
--- second-exec.c	2013-09-27 14:11:43 +0000
+++ second-exec-core.c	2013-09-30 17:16:20 +0000
@@ -22,6 +22,7 @@
 #include <libnih-dbus.h>
 #include "libupstart-app-launch/upstart-app-launch.h"
 #include "helpers.h"
+#include "second-exec-core.h"
 
 /* Globals */
 GPid app_pid = 0;
@@ -301,16 +302,11 @@
 	return;
 }
 
-int
-main (int argc, char * argv[])
+gboolean
+second_exec (const gchar * app_id, const gchar * appuris)
 {
-	if (argc != 1) {
-		g_error("Should be called as: %s", argv[0]);
-		return 1;
-	}
-
-	appid = g_getenv("APP_ID");
-	input_uris = g_getenv("APP_URIS");
+	appid = app_id;
+	input_uris = appuris;
 
 	/* DBus tell us! */
 	GError * error = NULL;
@@ -318,7 +314,7 @@
 	if (error != NULL) {
 		g_error("Unable to get session bus");
 		g_error_free(error);
-		return 1;
+		return FALSE;
 	}
 
 	/* Allocate main loop */
@@ -390,6 +386,7 @@
 	/* Clean up */
 	if (app_data != NULL) {
 		g_variant_unref(app_data);
+		app_data = NULL;
 	}
 
 	g_main_loop_unref(mainloop);
@@ -397,7 +394,8 @@
 
 	if (dbus_path != NULL) {
 		nih_free(dbus_path);
+		dbus_path = NULL;
 	}
 
-	return 0;
+	return TRUE;
 }

=== added file 'second-exec-core.h'
--- second-exec-core.h	1970-01-01 00:00:00 +0000
+++ second-exec-core.h	2013-09-30 17:16:20 +0000
@@ -0,0 +1,24 @@
+
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <glib.h>
+
+gboolean second_exec (const gchar * app_id, const gchar * appuris);
+

=== added file 'second-exec.c'
--- second-exec.c	1970-01-01 00:00:00 +0000
+++ second-exec.c	2013-09-30 17:16:20 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "second-exec-core.h"
+
+int
+main (int argc, char * argv[])
+{
+	if (argc != 1) {
+		g_error("Should be called as: %s", argv[0]);
+		return 1;
+	}
+
+	const gchar * appid = g_getenv("APP_ID");
+	const gchar * appuris = g_getenv("APP_URIS");
+
+	if (second_exec(appid, appuris)) {
+		return 0;
+	} else {
+		return 1;
+	}
+}

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-09-24 02:48:57 +0000
+++ tests/CMakeLists.txt	2013-09-30 17:16:20 +0000
@@ -1,4 +1,6 @@
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
 # Google Test
 
 include_directories(${GTEST_INCLUDE_DIR})
@@ -15,3 +17,14 @@
 
 add_test (helper-test helper-test)
 
+# Second Exec Test
+
+include_directories("${CMAKE_SOURCE_DIR}/libupstart-app-launch")
+
+add_executable (second-exec-test
+	second-exec-test.cc
+	"${CMAKE_SOURCE_DIR}/second-exec-core.c"
+	upstart-app-launch-mock.c)
+target_link_libraries (second-exec-test helpers gtest ${GTEST_LIBS} ${LIBUPSTART_LIBRARIES} upstart-launcher)
+add_test (second-exec-test second-exec-test)
+

=== added file 'tests/second-exec-test.cc'
--- tests/second-exec-test.cc	1970-01-01 00:00:00 +0000
+++ tests/second-exec-test.cc	2013-09-30 17:16:20 +0000
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <gio/gio.h>
+
+extern "C" {
+#include "../second-exec-core.h"
+#include "upstart-app-launch.h"
+#include "upstart-app-launch-mock.h"
+}
+
+class SecondExecTest : public ::testing::Test
+{
+	private:
+		GTestDBus * testbus = NULL;
+
+	protected:
+		std::string last_focus_appid;
+		std::string last_resume_appid;
+		guint resume_timeout = 0;
+
+	private:
+		static void focus_cb (const gchar * appid, gpointer user_data) {
+			SecondExecTest * _this = static_cast<SecondExecTest *>(user_data);
+			_this->last_focus_appid = appid;
+		}
+
+		static void resume_cb (const gchar * appid, gpointer user_data) {
+			SecondExecTest * _this = static_cast<SecondExecTest *>(user_data);
+			_this->last_resume_appid = appid;
+
+			if (_this->resume_timeout > 0) {
+				_this->pause(_this->resume_timeout);
+			}
+		}
+
+	protected:
+		virtual void SetUp() {
+			testbus = g_test_dbus_new(G_TEST_DBUS_NONE);
+			g_test_dbus_up(testbus);
+
+			upstart_app_launch_observer_add_app_focus(focus_cb, this);
+			upstart_app_launch_observer_add_app_resume(resume_cb, this);
+
+			return;
+		}
+		virtual void TearDown() {
+			upstart_app_launch_observer_delete_app_focus(focus_cb, this);
+			upstart_app_launch_observer_delete_app_resume(resume_cb, this);
+
+			g_test_dbus_down(testbus);
+			g_object_unref(testbus);
+
+			return;
+		}
+
+		static gboolean pause_helper (gpointer pmainloop) {
+			g_main_loop_quit((GMainLoop *)pmainloop);
+			return G_SOURCE_REMOVE;
+		}
+
+		void pause (guint time) {
+			if (time > 0) {
+				GMainLoop * mainloop = g_main_loop_new(NULL, FALSE);
+				guint timer = g_timeout_add(time, pause_helper, mainloop);
+
+				g_main_loop_run(mainloop);
+
+				g_source_remove(timer);
+				g_main_loop_unref(mainloop);
+			}
+
+			while (g_main_pending()) {
+				g_main_iteration(TRUE);
+			}
+
+			return;
+		}
+};
+
+TEST_F(SecondExecTest, AppIdTest)
+{
+	ASSERT_TRUE(second_exec("foo", NULL));
+	pause(0); /* Ensure all the events come through */
+	ASSERT_STREQ(this->last_focus_appid.c_str(), "foo");
+	ASSERT_STREQ(this->last_resume_appid.c_str(), "foo");
+}
+
+GDBusMessage *
+filter_func_good (GDBusConnection * conn, GDBusMessage * message, gboolean incomming, gpointer user_data)
+{
+	if (!incomming) {
+		return message;
+	}
+
+	if (g_strcmp0(g_dbus_message_get_path(message), (gchar *)user_data) == 0) {
+		GDBusMessage * reply = g_dbus_message_new_method_reply(message);
+		g_dbus_connection_send_message(conn, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
+		g_object_unref(message);
+		return NULL;
+	}
+
+	return message;
+}
+
+TEST_F(SecondExecTest, UrlSendTest)
+{
+	upstart_app_launch_mock_set_primary_pid(getpid());
+
+	GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+	guint filter = g_dbus_connection_add_filter(session,
+		filter_func_good,
+		(gpointer)"/foo",
+		NULL);
+
+	ASSERT_TRUE(second_exec("foo", "http://www.test.com"));
+	pause(100); /* Ensure all the events come through */
+
+	ASSERT_STREQ(this->last_focus_appid.c_str(), "foo");
+	ASSERT_STREQ(this->last_resume_appid.c_str(), "foo");
+
+	g_dbus_connection_remove_filter(session, filter);
+	g_object_unref(session);
+}
+
+TEST_F(SecondExecTest, UrlSendNoObjectTest)
+{
+	upstart_app_launch_mock_set_primary_pid(getpid());
+
+	ASSERT_TRUE(second_exec("foo", "http://www.test.com"));
+	pause(100); /* Ensure all the events come through */
+
+	ASSERT_STREQ(this->last_focus_appid.c_str(), "foo");
+	ASSERT_STREQ(this->last_resume_appid.c_str(), "foo");
+}
+
+TEST_F(SecondExecTest, UnityTimeoutTest)
+{
+	this->resume_timeout = 100;
+
+	ASSERT_TRUE(second_exec("foo", NULL));
+	pause(100); /* Ensure all the events come through */
+	ASSERT_STREQ(this->last_focus_appid.c_str(), "foo");
+	ASSERT_STREQ(this->last_resume_appid.c_str(), "foo");
+}
+
+TEST_F(SecondExecTest, UnityTimeoutUriTest)
+{
+	this->resume_timeout = 200;
+
+	ASSERT_TRUE(second_exec("foo", "http://www.test.com"));
+	pause(100); /* Ensure all the events come through */
+	ASSERT_STREQ(this->last_focus_appid.c_str(), "foo");
+	ASSERT_STREQ(this->last_resume_appid.c_str(), "foo");
+}
+
+GDBusMessage *
+filter_respawn (GDBusConnection * conn, GDBusMessage * message, gboolean incomming, gpointer user_data)
+{
+	if (g_strcmp0(g_dbus_message_get_member(message), "UnityResumeResponse") == 0) {
+		g_object_unref(message);
+		return NULL;
+	}
+
+	return message;
+}
+
+TEST_F(SecondExecTest, UnityLostTest)
+{
+	upstart_app_launch_mock_set_primary_pid(getpid());
+
+	GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+	guint filter = g_dbus_connection_add_filter(session,
+		filter_respawn,
+		NULL,
+		NULL);
+
+	guint start = g_get_monotonic_time();
+
+	ASSERT_TRUE(second_exec("foo", "http://www.test.com"));
+
+	guint end = g_get_monotonic_time();
+
+	ASSERT_LT(end - start, 600 * 1000);
+
+	pause(100); /* Ensure all the events come through */
+	ASSERT_STREQ(this->last_focus_appid.c_str(), "foo");
+	ASSERT_STREQ(this->last_resume_appid.c_str(), "foo");
+
+	g_dbus_connection_remove_filter(session, filter);
+	g_object_unref(session);
+}
+
+

=== added file 'tests/upstart-app-launch-mock.c'
--- tests/upstart-app-launch-mock.c	1970-01-01 00:00:00 +0000
+++ tests/upstart-app-launch-mock.c	2013-09-30 17:16:20 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "upstart-app-launch.h"
+#include "upstart-app-launch-mock.h"
+
+static GPid primary_pid = 0;
+static gchar * primary_pid_appid = NULL;
+
+GPid
+upstart_app_launch_get_primary_pid (const gchar * appid)
+{
+	g_free(primary_pid_appid);
+	primary_pid_appid = g_strdup(appid);
+	return primary_pid;
+}
+
+void
+upstart_app_launch_mock_set_primary_pid (GPid pid)
+{
+	primary_pid = pid;
+	return;
+}

=== added file 'tests/upstart-app-launch-mock.h'
--- tests/upstart-app-launch-mock.h	1970-01-01 00:00:00 +0000
+++ tests/upstart-app-launch-mock.h	2013-09-30 17:16:20 +0000
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+void upstart_app_launch_mock_set_primary_pid (GPid pid);
+