Merge lp:~ted/indicator-datetime/tests-fixes into lp:indicator-datetime

[Ted Gould]

Use an explicit registry object so that it gets free'd when the function exits

Upstream UAL changed so that discover() is using the registry. If it isn't given one it uses a default registry, but that only gets free'd when the process exits. Which is fine for running applications but can break tests as they'll run multiple tests in the same PID. By using an explicit registry we can control the lifecycle of it directly.

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

PASSED: Continuous integration, rev:460
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/720
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/726
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/534/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/534/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/534/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/534/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/534/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/534/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/534/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/534/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/534
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/534/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-datetime-ci/3/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[Charles Kerr (charlesk)]

Approved, but doesn't this make the single-argument version of discover() useful only for apps that don't have tests? If so, shouldn't it be removed upstream?

[Ted Gould (ted)]

On Wed, 2016-09-21 at 23:56 +0000, Charles Kerr wrote:
> Approved, but doesn't this make the single-argument version of
> discover() useful only for apps that don't have tests? If so,
> shouldn't it be removed upstream?
Yes, and I probably will next ABI change. But, the other option is
there's a clearDefault() command that can force the default registry
instance to be free'd that can go in TearDown(). Here it made more
sense to put it in the function because we don't need the registry
sitting around at all for such a simple lookup that is relatively
infrequent.

=== modified file 'src/notifications.cpp'
--- src/notifications.cpp	2016-06-30 00:37:56 +0000
+++ src/notifications.cpp	2016-09-21 22:10:24 +0000
@@ -25,6 +25,7 @@
 #include <messaging-menu/messaging-menu-message.h>
 
 #include <libubuntu-app-launch-2/ubuntu-app-launch/appid.h>
+#include <libubuntu-app-launch-2/ubuntu-app-launch/registry.h>
 
 #include <uuid/uuid.h>
 
@@ -460,7 +461,8 @@
 
     static std::string calendar_app_id()
     {
-        auto app_id = ubuntu::app_launch::AppID::discover("com.ubuntu.calendar");
+        auto registry = std::make_shared<ubuntu::app_launch::Registry>();
+        auto app_id = ubuntu::app_launch::AppID::discover(registry, "com.ubuntu.calendar");
         if (!app_id.empty())
             // Due the use of old API by messaging_menu we need append a extra ".desktop" to the app_id.
             return std::string(app_id) + ".desktop";