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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2017-01-12 14:22:58 +0000
+++ CMakeLists.txt 2017-02-13 21:01:30 +0000
@@ -23,7 +23,7 @@
23find_package (GMock)23find_package (GMock)
24find_package (PkgConfig REQUIRED)24find_package (PkgConfig REQUIRED)
2525
26pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2>=0.9 gobject-2.0)26pkg_check_modules(UAL REQUIRED ubuntu-app-launch-3 gobject-2.0)
27add_definitions(${UAL_CFLAGS} ${UAL_CFLAGS_OTHER})27add_definitions(${UAL_CFLAGS} ${UAL_CFLAGS_OTHER})
2828
29pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.7 libunity-api>=0.1.3)29pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.7 libunity-api>=0.1.3)
3030
=== modified file 'debian/control'
--- debian/control 2017-01-12 14:22:58 +0000
+++ debian/control 2017-02-13 21:01:30 +0000
@@ -14,7 +14,7 @@
14 libboost-locale-dev,14 libboost-locale-dev,
15 libglib2.0-dev (>= 2.32),15 libglib2.0-dev (>= 2.32),
16 libjsoncpp-dev,16 libjsoncpp-dev,
17 libubuntu-app-launch2-dev (>= 0.9),17 libubuntu-app-launch3-dev,
18 libubuntuoneauth-2.0-dev (>= 15.10),18 libubuntuoneauth-2.0-dev (>= 15.10),
19 libunity-api-dev (>= 7.80.7),19 libunity-api-dev (>= 7.80.7),
20 libunity-scopes-dev (>= 0.6.7~),20 libunity-scopes-dev (>= 0.6.7~),
2121
=== modified file 'libclickscope/tests/mock_ual.h'
--- libclickscope/tests/mock_ual.h 2016-10-04 17:35:15 +0000
+++ libclickscope/tests/mock_ual.h 2017-02-13 21:01:30 +0000
@@ -117,6 +117,7 @@
117 MOCK_METHOD0(defaultDepartment, const ual::Application::Info::DefaultDepartment&());117 MOCK_METHOD0(defaultDepartment, const ual::Application::Info::DefaultDepartment&());
118 MOCK_METHOD0(screenshotPath, const ual::Application::Info::IconPath&());118 MOCK_METHOD0(screenshotPath, const ual::Application::Info::IconPath&());
119 MOCK_METHOD0(keywords, const ual::Application::Info::Keywords&());119 MOCK_METHOD0(keywords, const ual::Application::Info::Keywords&());
120 MOCK_METHOD0(popularity, const ual::Application::Info::Popularity&());
120121
121 MOCK_METHOD0(splash, ual::Application::Info::Splash());122 MOCK_METHOD0(splash, ual::Application::Info::Splash());
122 MOCK_METHOD0(supportedOrientations, ual::Application::Info::Orientations());123 MOCK_METHOD0(supportedOrientations, ual::Application::Info::Orientations());
@@ -143,12 +144,14 @@
143 MOCK_METHOD0(pause, void());144 MOCK_METHOD0(pause, void());
144 MOCK_METHOD0(resume, void());145 MOCK_METHOD0(resume, void());
145 MOCK_METHOD0(stop, void());146 MOCK_METHOD0(stop, void());
147 MOCK_METHOD0(focus, void());
146 };148 };
147149
148 MOCK_METHOD0(hasInstances, bool());150 MOCK_METHOD0(hasInstances, bool());
149 MOCK_METHOD0(instances, std::vector<std::shared_ptr<ual::Application::Instance>>());151 MOCK_METHOD0(instances, std::vector<std::shared_ptr<ual::Application::Instance>>());
150 MOCK_METHOD1(launch, std::shared_ptr<ual::Application::Instance>(const std::vector<ual::Application::URL>&));152 MOCK_METHOD1(launch, std::shared_ptr<ual::Application::Instance>(const std::vector<ual::Application::URL>&));
151 MOCK_METHOD1(launchTest, std::shared_ptr<ual::Application::Instance>(const std::vector<ual::Application::URL>&));153 MOCK_METHOD1(launchTest, std::shared_ptr<ual::Application::Instance>(const std::vector<ual::Application::URL>&));
154 MOCK_METHOD1(findInstance, std::shared_ptr<ual::Application::Instance>(const pid_t&));
152155
153 private:156 private:
154 ual::AppID m_app_id;157 ual::AppID m_app_id;

Subscribers

People subscribed via source and target branches

to all changes: