Merge lp:~ted/ubuntu-app-launch/primary-pid-no-app into lp:ubuntu-app-launch/16.10

[Ted Gould]

Use at() instead of operator[]() so that we get an exception on bounds checking

Didn't realize that vector's operator[]() doesn't do any bounds checking and it just crashes. Which is stupid, but supported by the documentation. Switching to use at() that does do bounds checking and throws an exception that we can catch as we'd expected.

[dobey (dobey)]

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:246
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/69/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/487/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/493
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/398
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/398
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/398
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/328/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/328
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/328/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/328
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/328/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/328/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/328
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/328/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/328
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/328/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/328/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/328
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/328/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/328
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/328/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/69/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.cpp'
--- libubuntu-app-launch/ubuntu-app-launch.cpp	2016-08-04 15:04:04 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.cpp	2016-08-25 14:25:42 +0000
@@ -465,7 +465,7 @@
 		auto registry = ubuntu::app_launch::Registry::getDefault();
 		auto appId = ubuntu::app_launch::AppID::find(appid);
 		auto app = ubuntu::app_launch::Application::create(appId, registry);
-		app->instances()[0]->pause();
+		app->instances().at(0)->pause();
 		return TRUE;
 	} catch (...) {
 		return FALSE;
@@ -479,7 +479,7 @@
 		auto registry = ubuntu::app_launch::Registry::getDefault();
 		auto appId = ubuntu::app_launch::AppID::find(appid);
 		auto app = ubuntu::app_launch::Application::create(appId, registry);
-		app->instances()[0]->resume();
+		app->instances().at(0)->resume();
 		return TRUE;
 	} catch (...) {
 		return FALSE;
@@ -1211,7 +1211,7 @@
 		auto registry = std::make_shared<ubuntu::app_launch::Registry>();
 		auto appId = ubuntu::app_launch::AppID::find(appid);
 		auto app = ubuntu::app_launch::Application::create(appId, registry);
-		return app->instances()[0]->primaryPid();
+		return app->instances().at(0)->primaryPid();
 	} catch (...) {
 		return 0;
 	}
@@ -1227,7 +1227,7 @@
 		auto registry = std::make_shared<ubuntu::app_launch::Registry>();
 		auto appId = ubuntu::app_launch::AppID::find(appid);
 		auto app = ubuntu::app_launch::Application::create(appId, registry);
-		auto pids = app->instances()[0]->pids();
+		auto pids = app->instances().at(0)->pids();
 
 		GList * retval = nullptr;
 		for (auto pid : pids) {
@@ -1249,7 +1249,7 @@
 		auto appId = ubuntu::app_launch::AppID::find(appid);
 		auto app = ubuntu::app_launch::Application::create(appId, registry);
 
-		if (app->instances()[0]->hasPid(pid)) {
+		if (app->instances().at(0)->hasPid(pid)) {
 			return TRUE;
 		} else {
 			return FALSE;
 
=== modified file 'tests/libual-test.cc'
--- tests/libual-test.cc	2016-08-17 13:17:08 +0000
+++ tests/libual-test.cc	2016-08-25 14:25:42 +0000
@@ -509,6 +509,8 @@
 	EXPECT_TRUE(g_variant_equal(calls->params, g_variant_new("(ss)", "freezer", "upstart/application-legacy-multiple-2342345")));
 	ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
 
+	/* Check non running app */
+	EXPECT_EQ(0, ubuntu_app_launch_get_primary_pid("chatter.robert-ancell_chatter_2"));
 }
 
 TEST_F(LibUAL, ApplicationId)