Merge lp:~ted/ubuntu-app-launch/zg-reenable into lp:ubuntu-app-launch/14.04

[Ted Gould]

Reenable ZG and port to libzg-2.0

Switches back on ZG after we turned it off for the release, so that it's back for this one. Also upgrades to libzg-2 and adds a test for it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/144/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/3/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/upstart-app-launch-ci/144/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

The code looks ok and the tests are a nice plus, just need to make Jenkins happy...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/149/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/8/console

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

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-app-launch/zg-reenable]

88. By Ted Gould on 2013-11-19

Updating mock lib branch

89. By Ted Gould on 2013-11-19

Put ZG in the wrong package

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:88
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/152/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/11/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/153/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/12/console

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

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-app-launch/zg-reenable]

90. By Ted Gould on 2013-11-19

Avoid an error in the ZG headers

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/13

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-19 04:12:01 +0000
+++ CMakeLists.txt	2013-11-19 04:12:01 +0000
@@ -25,7 +25,7 @@
 
 set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wno-error=unused-function")
 
 enable_testing()
 
@@ -41,7 +41,7 @@
 pkg_check_modules(JSONGLIB REQUIRED json-glib-1.0)
 include_directories(${JSONGLIB_INCLUDE_DIRS})
 
-pkg_check_modules(ZEITGEIST REQUIRED zeitgeist-1.0)
+pkg_check_modules(ZEITGEIST REQUIRED zeitgeist-2.0)
 include_directories(${ZEITGEIST_INCLUDE_DIRS})
 
 pkg_check_modules(LIBUPSTART REQUIRED libupstart libnih libnih-dbus dbus-1)
@@ -157,7 +157,7 @@
 
 add_executable(zg-report-app zg-report-app.c)
 set_target_properties(zg-report-app PROPERTIES OUTPUT_NAME "zg-report-app")
-target_link_libraries(zg-report-app ${ZEITGEIST_LIBRARIES})
+target_link_libraries(zg-report-app ${ZEITGEIST_LIBRARIES} ${GOBJECT2_LIBRARIES} ${GLIB2_LIBRARIES})
 install(TARGETS zg-report-app RUNTIME DESTINATION "${pkglibexecdir}")
 
 #######################

=== modified file 'application-click.conf.in'
--- application-click.conf.in	2013-10-02 15:01:22 +0000
+++ application-click.conf.in	2013-11-19 04:12:01 +0000
@@ -26,8 +26,5 @@
 # Remember, this is confined
 exec @pkglibexecdir@/exec-line-exec
 
-# Disabled for Phone 1.0 which doesn't yet have ZG installed on it,
-# so we don't need to log the data.
-#
-# post-start exec @pkglibexecdir@/zg-report-app open
-# post-stop exec @pkglibexecdir@/zg-report-app close
+post-start exec @pkglibexecdir@/zg-report-app open
+post-stop exec @pkglibexecdir@/zg-report-app close

=== modified file 'application-legacy.conf.in'
--- application-legacy.conf.in	2013-10-02 15:01:22 +0000
+++ application-legacy.conf.in	2013-11-19 04:12:01 +0000
@@ -26,8 +26,5 @@
 
 exec @pkglibexecdir@/exec-line-exec
 
-# Disabled for Phone 1.0 which doesn't yet have ZG installed on it,
-# so we don't need to log the data.
-#
-# post-start exec @pkglibexecdir@/zg-report-app open
-# post-stop exec @pkglibexecdir@/zg-report-app close
+post-start exec @pkglibexecdir@/zg-report-app open
+post-stop exec @pkglibexecdir@/zg-report-app close

=== modified file 'debian/control'
--- debian/control	2013-11-19 04:12:01 +0000
+++ debian/control	2013-11-19 04:12:01 +0000
@@ -15,7 +15,7 @@
                libnih-dbus-dev,
                libnih-dev,
                libupstart-dev,
-               libzeitgeist-dev,
+               libzeitgeist-2.0-dev,
                python3-dbusmock,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/upstart-app-launch
@@ -30,6 +30,7 @@
          ${misc:Depends},
          click (>= 0.4.9),
          click-apparmor,
+         zeitgeist,
 Description: Upstart Job for Launching Applications
  Upstart Job file and associated utilities that is used to launch
  applications in a standard and confined way.

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-11-19 04:12:01 +0000
+++ tests/CMakeLists.txt	2013-11-19 04:12:01 +0000
@@ -43,3 +43,13 @@
 add_test (NAME libual-test-pid COMMAND libual-test --gtest_filter=*ApplicationPid)
 add_test (NAME libual-test-list COMMAND libual-test --gtest_filter=*ApplicationList)
 add_test (NAME libual-test-observer COMMAND libual-test --gtest_filter=*StartStopObserver)
+
+# ZG Test
+
+add_definitions ( -DZG_EVENT_TOOL="${CMAKE_BINARY_DIR}/zg-report-app" )
+
+add_executable (zg-test
+	zg-test.cc)
+target_link_libraries (zg-test gtest ${GTEST_LIBS} ${DBUSTEST_LIBRARIES} ${GIO2_LIBRARIES})
+add_test (zg-test zg-test)
+

=== added file 'tests/zg-test.cc'
--- tests/zg-test.cc	1970-01-01 00:00:00 +0000
+++ tests/zg-test.cc	2013-11-19 04:12:01 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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>
+#include <libdbustest/dbus-test.h>
+
+TEST(ZGEvent, OpenTest)
+{
+	DbusTestService * service = dbus_test_service_new(NULL);
+
+	DbusTestDbusMock * mock = dbus_test_dbus_mock_new("org.gnome.zeitgeist.Engine");
+	DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/org/gnome/zeitgeist/log/activity", "org.gnome.zeitgeist.Log", NULL);
+
+	dbus_test_dbus_mock_object_add_method(mock, obj,
+		"InsertEvents",
+		G_VARIANT_TYPE("a(asaasay)"),
+		G_VARIANT_TYPE("au"),
+		"ret = [ 0 ]",
+		NULL);
+
+	dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
+
+	DbusTestProcess * zgevent = dbus_test_process_new(ZG_EVENT_TOOL);
+	dbus_test_process_append_param(zgevent, "open");
+	g_setenv("APP_ID", "foo", 1);
+	dbus_test_task_set_wait_for(DBUS_TEST_TASK(zgevent), "org.gnome.zeitgeist.Engine");
+	dbus_test_task_set_name(DBUS_TEST_TASK(zgevent), "ZGEvent");
+
+	dbus_test_service_add_task(service, DBUS_TEST_TASK(zgevent));
+
+	dbus_test_service_start_tasks(service);
+
+	/* Give it time to send the event and exit */
+	g_usleep(100000);
+	while (g_main_pending()) {
+		g_main_iteration(TRUE);
+	}
+
+	ASSERT_EQ(dbus_test_task_get_state(DBUS_TEST_TASK(zgevent)), DBUS_TEST_TASK_STATE_FINISHED);
+	ASSERT_TRUE(dbus_test_task_passed(DBUS_TEST_TASK(zgevent)));
+
+	guint numcalls = 0;
+	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "InsertEvents", &numcalls, NULL);
+
+	ASSERT_NE(calls, nullptr);
+	ASSERT_EQ(numcalls, 1);
+
+	g_object_unref(zgevent);
+	g_object_unref(mock);
+	g_object_unref(service);
+}

=== modified file 'zg-report-app.c'
--- zg-report-app.c	2013-09-22 18:43:26 +0000
+++ zg-report-app.c	2013-11-19 04:12:01 +0000
@@ -23,7 +23,7 @@
 static gboolean
 watchdog_timeout (gpointer user_data)
 {
-	g_error("Watchdog triggered, took to long to submit into Zeitgeist Database!");
+	g_error("Watchdog triggered, took too long to submit into Zeitgeist Database!");
 	g_main_loop_quit((GMainLoop *)user_data);
 
 	return G_SOURCE_REMOVE;
@@ -35,7 +35,7 @@
 	GError * error = NULL;
 	GArray * result = NULL;
 
-	result = zeitgeist_log_insert_events_finish(ZEITGEIST_LOG(obj), res, &error);
+	result = zeitgeist_log_insert_event_finish(ZEITGEIST_LOG(obj), res, &error);
 
 	if (error != NULL) {
 		g_error("Unable to submit Zeitgeist Event: %s", error->message);
@@ -83,7 +83,7 @@
 
 	GMainLoop * main_loop = g_main_loop_new(NULL, FALSE);
 
-	zeitgeist_log_insert_events(log, NULL, insert_complete, main_loop, event, NULL);
+	zeitgeist_log_insert_event(log, event, NULL, insert_complete, main_loop);
 	g_timeout_add_seconds(4, watchdog_timeout, main_loop);
 
 	g_main_loop_run(main_loop);