unity-scope-click

Merge lp:~ken-vandine/unity-scope-click/ual_api_change into lp:unity-scope-click

  1. ual_api_change
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: dobey
Approved revision: 517
Merged at revision: 514
Proposed branch: lp:~ken-vandine/unity-scope-click/ual_api_change
Merge into: lp:unity-scope-click
Diff against target: 52 lines (+5/-2)
3 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
libclickscope/tests/mock_ual.h (+3/-0)
To merge this branch: bzr merge lp:~ken-vandine/unity-scope-click/ual_api_change
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
dobey (community) Approve
Review via email: mp+316755@code.launchpad.net

Commit message

Handle ubuntu-app-launch API change

Description of the change

Handle ubuntu-app-launch API change

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:514
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/139/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1656/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1663
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1438/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1438/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1438/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1438/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1438/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1438/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/139/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/unity-scope-click/ual_api_change updated
515. By Ken VanDine

fixed UAL mock to match UAL changes

516. By Ken VanDine

dropped debian/changelog entry

Revision history for this message
dobey (dobey) :
review: Needs Fixing
lp:~ken-vandine/unity-scope-click/ual_api_change updated
517. By Ken VanDine

Fixed mock method

Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:515
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/140/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1662/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1669
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1444/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1444/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1444/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1444/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1444/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1444/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/140/rebuild

review: Needs Fixing (continuous-integration)
lp:~ken-vandine/unity-scope-click/ual_api_change updated
518. By Ken VanDine

Mock popularity too

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-01-12 14:22:58 +0000
3+++ CMakeLists.txt 2017-02-13 21:01:30 +0000
4@@ -23,7 +23,7 @@
5 find_package (GMock)
6 find_package (PkgConfig REQUIRED)
7
8-pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2>=0.9 gobject-2.0)
9+pkg_check_modules(UAL REQUIRED ubuntu-app-launch-3 gobject-2.0)
10 add_definitions(${UAL_CFLAGS} ${UAL_CFLAGS_OTHER})
11
12 pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.7 libunity-api>=0.1.3)
13
14=== modified file 'debian/control'
15--- debian/control 2017-01-12 14:22:58 +0000
16+++ debian/control 2017-02-13 21:01:30 +0000
17@@ -14,7 +14,7 @@
18 libboost-locale-dev,
19 libglib2.0-dev (>= 2.32),
20 libjsoncpp-dev,
21- libubuntu-app-launch2-dev (>= 0.9),
22+ libubuntu-app-launch3-dev,
23 libubuntuoneauth-2.0-dev (>= 15.10),
24 libunity-api-dev (>= 7.80.7),
25 libunity-scopes-dev (>= 0.6.7~),
26
27=== modified file 'libclickscope/tests/mock_ual.h'
28--- libclickscope/tests/mock_ual.h 2016-10-04 17:35:15 +0000
29+++ libclickscope/tests/mock_ual.h 2017-02-13 21:01:30 +0000
30@@ -117,6 +117,7 @@
31 MOCK_METHOD0(defaultDepartment, const ual::Application::Info::DefaultDepartment&());
32 MOCK_METHOD0(screenshotPath, const ual::Application::Info::IconPath&());
33 MOCK_METHOD0(keywords, const ual::Application::Info::Keywords&());
34+ MOCK_METHOD0(popularity, const ual::Application::Info::Popularity&());
35
36 MOCK_METHOD0(splash, ual::Application::Info::Splash());
37 MOCK_METHOD0(supportedOrientations, ual::Application::Info::Orientations());
38@@ -143,12 +144,14 @@
39 MOCK_METHOD0(pause, void());
40 MOCK_METHOD0(resume, void());
41 MOCK_METHOD0(stop, void());
42+ MOCK_METHOD0(focus, void());
43 };
44
45 MOCK_METHOD0(hasInstances, bool());
46 MOCK_METHOD0(instances, std::vector<std::shared_ptr<ual::Application::Instance>>());
47 MOCK_METHOD1(launch, std::shared_ptr<ual::Application::Instance>(const std::vector<ual::Application::URL>&));
48 MOCK_METHOD1(launchTest, std::shared_ptr<ual::Application::Instance>(const std::vector<ual::Application::URL>&));
49+ MOCK_METHOD1(findInstance, std::shared_ptr<ual::Application::Instance>(const pid_t&));
50
51 private:
52 ual::AppID m_app_id;

Subscribers

People subscribed via source and target branches

to all changes: