unity-scope-click

Merge lp:~mterry/unity-scope-click/gmock into lp:unity-scope-click

  1. gmock
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: dobey
Approved revision: 505
Merged at revision: 504
Proposed branch: lp:~mterry/unity-scope-click/gmock
Merge into: lp:unity-scope-click
Diff against target: 410 lines (+50/-56)
9 files modified
CMakeLists.txt (+1/-7)
libclickscope/tests/test_configuration.cpp (+1/-1)
libclickscope/tests/test_departments-db.cpp (+10/-10)
libclickscope/tests/test_departments.cpp (+4/-4)
libclickscope/tests/test_index.cpp (+3/-3)
libclickscope/tests/test_interface.cpp (+8/-8)
libclickscope/tests/test_package.cpp (+6/-6)
libclickscope/tests/test_preview.cpp (+4/-4)
libclickscope/tests/test_reviews.cpp (+13/-13)
To merge this branch: bzr merge lp:~mterry/unity-scope-click/gmock
Reviewer Review Type Date Requested Status
dobey (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+312382@code.launchpad.net

Commit message

Fix build with new gmock

Description of the change

I'm working on a separate branch and ran into this gmock issue first.

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:504
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/128/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1227/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1234
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1017/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1017/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

16:20:12 [ FAILED ] PackageTest.testPackageListFromJsonNodeMany

Not sure why your changes would cause this, but seems this test is now failing everywhere.

review: Needs Fixing
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

I don't know this code very well, I'm not the best person to root-cause a failing test; but feel free to take this MP as a base in order to fix the ftbfs.

(The failure seems unrelated to this branch at first blush: a comparison of 1 v 3, not just a sign error.)

Revision history for this message
dobey (dobey) :
review: Needs Fixing
lp:~mterry/unity-scope-click/gmock updated
505. By Michael Terry

Fix test

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

PASSED: Continuous integration, rev:505
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/133/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1255
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1262
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1045/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1045
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1045/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

Nice, I uploaded your fix and now CI is cool with it.

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2016-10-24 21:26:23 +0000
+++ CMakeLists.txt 2016-12-08 19:58:50 +0000
@@ -20,6 +20,7 @@
20find_program(INTLTOOL_MERGE intltool-merge)20find_program(INTLTOOL_MERGE intltool-merge)
2121
22include(UseGSettings)22include(UseGSettings)
23find_package (GMock)
23find_package (PkgConfig REQUIRED)24find_package (PkgConfig REQUIRED)
2425
25pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2>=0.9 gobject-2.0)26pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2>=0.9 gobject-2.0)
@@ -47,13 +48,6 @@
47SET (APPS_LIB_UNVERSIONED scope)48SET (APPS_LIB_UNVERSIONED scope)
48SET (APPS_LIB_NAME ${APPS_LIB_UNVERSIONED}-${SCOPE_LIB_API_VERSION})49SET (APPS_LIB_NAME ${APPS_LIB_UNVERSIONED}-${SCOPE_LIB_API_VERSION})
4950
50# Build with system gmock and embedded gtest
51set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
52set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
53set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
54
55add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
56
57# Add our own subdirectories.51# Add our own subdirectories.
58add_subdirectory(tests)52add_subdirectory(tests)
59add_subdirectory(bin)53add_subdirectory(bin)
6054
=== modified file 'libclickscope/tests/test_configuration.cpp'
--- libclickscope/tests/test_configuration.cpp 2016-06-30 20:42:56 +0000
+++ libclickscope/tests/test_configuration.cpp 2016-12-08 19:58:50 +0000
@@ -141,7 +141,7 @@
141 .Times(1)141 .Times(1)
142 .WillOnce(Return(response));142 .WillOnce(Return(response));
143 auto frameworks = locator.get_available_frameworks();143 auto frameworks = locator.get_available_frameworks();
144 EXPECT_EQ(0, frameworks.size());144 EXPECT_EQ(0u, frameworks.size());
145}145}
146146
147TEST(Configuration, getLanguageCorrect)147TEST(Configuration, getLanguageCorrect)
148148
=== modified file 'libclickscope/tests/test_departments-db.cpp'
--- libclickscope/tests/test_departments-db.cpp 2014-11-19 14:28:30 +0000
+++ libclickscope/tests/test_departments-db.cpp 2016-12-08 19:58:50 +0000
@@ -147,12 +147,12 @@
147TEST_F(DepartmentsDbTest, testDepartmentNameUpdates)147TEST_F(DepartmentsDbTest, testDepartmentNameUpdates)
148{148{
149 {149 {
150 EXPECT_EQ(7u, db->department_name_count());150 EXPECT_EQ(7, db->department_name_count());
151 db->store_department_name("tools", "", "Tools!");151 db->store_department_name("tools", "", "Tools!");
152 EXPECT_EQ("Tools!", db->get_department_name("tools", {"en_EN", ""}));152 EXPECT_EQ("Tools!", db->get_department_name("tools", {"en_EN", ""}));
153 db->store_department_name("games", "pl_PL", "Gry!!!");153 db->store_department_name("games", "pl_PL", "Gry!!!");
154 EXPECT_EQ("Gry!!!", db->get_department_name("games", {"pl_PL"}));154 EXPECT_EQ("Gry!!!", db->get_department_name("games", {"pl_PL"}));
155 EXPECT_EQ(7u, db->department_name_count());155 EXPECT_EQ(7, db->department_name_count());
156 }156 }
157}157}
158158
@@ -173,7 +173,7 @@
173TEST_F(DepartmentsDbTest, testDepartmentChildrenLookup)173TEST_F(DepartmentsDbTest, testDepartmentChildrenLookup)
174{174{
175 {175 {
176 EXPECT_EQ(0, db->get_children_departments("xyz").size());176 EXPECT_EQ(0u, db->get_children_departments("xyz").size());
177 }177 }
178 {178 {
179 auto depts = db->get_children_departments("");179 auto depts = db->get_children_departments("");
@@ -213,7 +213,7 @@
213 }213 }
214 {214 {
215 auto pkgs = db->get_packages_for_department("card", false);215 auto pkgs = db->get_packages_for_department("card", false);
216 EXPECT_EQ(0, pkgs.size());216 EXPECT_EQ(0u, pkgs.size());
217 }217 }
218}218}
219219
@@ -234,24 +234,24 @@
234 }234 }
235 {235 {
236 auto pkgs = db->get_packages_for_department("card", true);236 auto pkgs = db->get_packages_for_department("card", true);
237 EXPECT_EQ(0, pkgs.size());237 EXPECT_EQ(0u, pkgs.size());
238 }238 }
239}239}
240240
241TEST_F(DepartmentsDbTest, testPackageUpdates)241TEST_F(DepartmentsDbTest, testPackageUpdates)
242{242{
243 auto pkgs = db->get_packages_for_department("fps");243 auto pkgs = db->get_packages_for_department("fps");
244 EXPECT_EQ(1, pkgs.size());244 EXPECT_EQ(1u, pkgs.size());
245 EXPECT_TRUE(pkgs.find("game2") != pkgs.end());245 EXPECT_TRUE(pkgs.find("game2") != pkgs.end());
246246
247 // game2 gets moved to card and removed from fps247 // game2 gets moved to card and removed from fps
248 db->store_package_mapping("game2", "card");248 db->store_package_mapping("game2", "card");
249249
250 pkgs = db->get_packages_for_department("fps", false);250 pkgs = db->get_packages_for_department("fps", false);
251 EXPECT_EQ(0, pkgs.size());251 EXPECT_EQ(0u, pkgs.size());
252 EXPECT_TRUE(pkgs.find("game2") == pkgs.end());252 EXPECT_TRUE(pkgs.find("game2") == pkgs.end());
253 pkgs = db->get_packages_for_department("card", false);253 pkgs = db->get_packages_for_department("card", false);
254 EXPECT_EQ(1, pkgs.size());254 EXPECT_EQ(1u, pkgs.size());
255 EXPECT_TRUE(pkgs.find("game2") != pkgs.end());255 EXPECT_TRUE(pkgs.find("game2") != pkgs.end());
256}256}
257257
@@ -279,8 +279,8 @@
279 db->store_department_mapping("office", "tools");279 db->store_department_mapping("office", "tools");
280 db->store_department_mapping("office", "tools");280 db->store_department_mapping("office", "tools");
281281
282 EXPECT_EQ(7u, db->department_name_count());282 EXPECT_EQ(7, db->department_name_count());
283 EXPECT_EQ(4u, db->package_count());283 EXPECT_EQ(4, db->package_count());
284}284}
285285
286TEST_F(DepartmentsDbTest, testSqlQueriesFinished)286TEST_F(DepartmentsDbTest, testSqlQueriesFinished)
287287
=== modified file 'libclickscope/tests/test_departments.cpp'
--- libclickscope/tests/test_departments.cpp 2016-06-30 20:42:56 +0000
+++ libclickscope/tests/test_departments.cpp 2016-12-08 19:58:50 +0000
@@ -89,13 +89,13 @@
89 {89 {
90 const std::string jsonstr("{{{");90 const std::string jsonstr("{{{");
91 auto depts = click::Department::from_json(jsonstr);91 auto depts = click::Department::from_json(jsonstr);
92 EXPECT_EQ(0, depts.size());92 EXPECT_EQ(0u, depts.size());
93 }93 }
94 // one of the departments is invalid94 // one of the departments is invalid
95 {95 {
96 const std::string jsonstr(FAKE_JSON_BROKEN_DEPARTMENTS);96 const std::string jsonstr(FAKE_JSON_BROKEN_DEPARTMENTS);
97 auto depts = click::Department::from_json(jsonstr);97 auto depts = click::Department::from_json(jsonstr);
98 EXPECT_EQ(1, depts.size());98 EXPECT_EQ(1u, depts.size());
99 }99 }
100}100}
101101
@@ -112,7 +112,7 @@
112 lut.rebuild(root);112 lut.rebuild(root);
113113
114 {114 {
115 EXPECT_EQ(2u, lut.size());115 EXPECT_EQ(2, lut.size());
116 EXPECT_EQ("games", lut.get_parent("strategy")->id());116 EXPECT_EQ("games", lut.get_parent("strategy")->id());
117 EXPECT_EQ("games", lut.get_parent("rpg")->id());117 EXPECT_EQ("games", lut.get_parent("rpg")->id());
118 EXPECT_EQ(nullptr, lut.get_parent("games"));118 EXPECT_EQ(nullptr, lut.get_parent("games"));
@@ -137,7 +137,7 @@
137 }137 }
138 {138 {
139 lut.rebuild(root);139 lut.rebuild(root);
140 EXPECT_EQ(2u, lut.size());140 EXPECT_EQ(2, lut.size());
141 }141 }
142}142}
143143
144144
=== modified file 'libclickscope/tests/test_index.cpp'
--- libclickscope/tests/test_index.cpp 2016-05-10 13:42:12 +0000
+++ libclickscope/tests/test_index.cpp 2016-12-08 19:58:50 +0000
@@ -603,14 +603,14 @@
603TEST_F(IndexTest, testPackageListsFromJsonNodeNoRecommends)603TEST_F(IndexTest, testPackageListsFromJsonNodeNoRecommends)
604{604{
605 auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_ONE);605 auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_ONE);
606 EXPECT_EQ(1, lists.first.size());606 EXPECT_EQ(1u, lists.first.size());
607 EXPECT_EQ(0, lists.second.size());607 EXPECT_EQ(0u, lists.second.size());
608}608}
609609
610TEST_F(IndexTest, testPackageListsFromJsonNodeHasRecommends)610TEST_F(IndexTest, testPackageListsFromJsonNodeHasRecommends)
611{611{
612 auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_RECOMMENDS);612 auto lists = indexPtr->package_lists_from_json(FAKE_JSON_SEARCH_RESULT_RECOMMENDS);
613 EXPECT_EQ(1, lists.second.size());613 EXPECT_EQ(1u, lists.second.size());
614}614}
615615
616TEST_F(MockPackageManager, testUninstallCommandCorrect)616TEST_F(MockPackageManager, testUninstallCommandCorrect)
617617
=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp 2016-10-04 17:35:15 +0000
+++ libclickscope/tests/test_interface.cpp 2016-12-08 19:58:50 +0000
@@ -162,7 +162,7 @@
162 EXPECT_CALL(iface, installed_apps()).Times(1).162 EXPECT_CALL(iface, installed_apps()).Times(1).
163 WillOnce(Return(applist));163 WillOnce(Return(applist));
164 auto results = iface.search("", ignoredApps);164 auto results = iface.search("", ignoredApps);
165 ASSERT_EQ(1, results.size());165 ASSERT_EQ(1u, results.size());
166}166}
167167
168TEST_F(ClickInterfaceTest, testFindAppsOneException)168TEST_F(ClickInterfaceTest, testFindAppsOneException)
@@ -176,7 +176,7 @@
176 std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Clock", "The clock", "/opt/click.ubuntu.com/foo/bar/clock.png")}),176 std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Clock", "The clock", "/opt/click.ubuntu.com/foo/bar/clock.png")}),
177 }));177 }));
178 auto results = iface.search("");178 auto results = iface.search("");
179 ASSERT_EQ(1, results.size());179 ASSERT_EQ(1u, results.size());
180}180}
181181
182TEST_F(ClickInterfaceTest, testFindClockUsesShortAppid)182TEST_F(ClickInterfaceTest, testFindClockUsesShortAppid)
@@ -217,7 +217,7 @@
217 std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Skipped", "An app that's skipped", "skipped-app")})217 std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Skipped", "An app that's skipped", "skipped-app")})
218 }));218 }));
219 auto results = iface.search("");219 auto results = iface.search("");
220 ASSERT_EQ(0, results.size());220 ASSERT_EQ(0u, results.size());
221}221}
222222
223TEST_F(ClickInterfaceTest, testFindLegacyAppNotSkipped)223TEST_F(ClickInterfaceTest, testFindLegacyAppNotSkipped)
@@ -281,7 +281,7 @@
281 depts_db->store_department_mapping("accessories", "");281 depts_db->store_department_mapping("accessories", "");
282282
283 auto results = iface.search("", ignoredApps, "utilies", depts_db);283 auto results = iface.search("", ignoredApps, "utilies", depts_db);
284 ASSERT_EQ(0, results.size());284 ASSERT_EQ(0u, results.size());
285285
286 // address book applicaton moved to utilities286 // address book applicaton moved to utilities
287 depts_db->store_package_mapping("address-book-app.desktop", "utilities");287 depts_db->store_package_mapping("address-book-app.desktop", "utilities");
@@ -418,7 +418,7 @@
418418
419 auto results = iface.search("rss");419 auto results = iface.search("rss");
420420
421 EXPECT_EQ(1, results.size());421 EXPECT_EQ(1u, results.size());
422}422}
423423
424TEST_F(ClickInterfaceTest, testFindAppByKeywordCaseInsensitive)424TEST_F(ClickInterfaceTest, testFindAppByKeywordCaseInsensitive)
@@ -437,7 +437,7 @@
437437
438 auto results = iface.search("RsS");438 auto results = iface.search("RsS");
439439
440 EXPECT_EQ(1, results.size());440 EXPECT_EQ(1u, results.size());
441}441}
442442
443TEST_F(ClickInterfaceTest, testFindAppAccented)443TEST_F(ClickInterfaceTest, testFindAppAccented)
@@ -452,7 +452,7 @@
452452
453 auto results = iface.search("Cámara");453 auto results = iface.search("Cámara");
454454
455 EXPECT_EQ(1, results.size());455 EXPECT_EQ(1u, results.size());
456}456}
457457
458TEST_F(ClickInterfaceTest, testFindAppAccented2)458TEST_F(ClickInterfaceTest, testFindAppAccented2)
@@ -467,7 +467,7 @@
467467
468 auto results = iface.search("Camara");468 auto results = iface.search("Camara");
469469
470 EXPECT_EQ(1, results.size());470 EXPECT_EQ(1u, results.size());
471}471}
472472
473473
474474
=== modified file 'libclickscope/tests/test_package.cpp'
--- libclickscope/tests/test_package.cpp 2015-01-20 17:04:54 +0000
+++ libclickscope/tests/test_package.cpp 2016-12-08 19:58:50 +0000
@@ -47,7 +47,7 @@
47 auto const ci_package = embedded[Package::JsonKeys::ci_package];47 auto const ci_package = embedded[Package::JsonKeys::ci_package];
4848
49 Packages pl = package_list_from_json_node(ci_package);49 Packages pl = package_list_from_json_node(ci_package);
50 ASSERT_EQ(1, pl.size());50 ASSERT_EQ(1u, pl.size());
51}51}
5252
53TEST_F(PackageTest, testPackageListFromJsonNodeSingleScope)53TEST_F(PackageTest, testPackageListFromJsonNodeSingleScope)
@@ -58,7 +58,7 @@
58 auto const ci_package = embedded[Package::JsonKeys::ci_package];58 auto const ci_package = embedded[Package::JsonKeys::ci_package];
5959
60 Packages pl = package_list_from_json_node(ci_package);60 Packages pl = package_list_from_json_node(ci_package);
61 ASSERT_EQ(1, pl.size());61 ASSERT_EQ(1u, pl.size());
62 EXPECT_EQ("scope", pl[0].content);62 EXPECT_EQ("scope", pl[0].content);
63}63}
6464
@@ -70,7 +70,7 @@
70 auto const ci_package = embedded[Package::JsonKeys::ci_package];70 auto const ci_package = embedded[Package::JsonKeys::ci_package];
7171
72 Packages pl = package_list_from_json_node(ci_package);72 Packages pl = package_list_from_json_node(ci_package);
73 ASSERT_GT(pl.size(), 1);73 ASSERT_LT(1u, pl.size());
74}74}
7575
76TEST_F(PackageTest, testPackageListFromJsonNodeMissingData)76TEST_F(PackageTest, testPackageListFromJsonNodeMissingData)
@@ -81,7 +81,7 @@
81 auto const ci_package = embedded[Package::JsonKeys::ci_package];81 auto const ci_package = embedded[Package::JsonKeys::ci_package];
8282
83 Packages pl = package_list_from_json_node(ci_package);83 Packages pl = package_list_from_json_node(ci_package);
84 ASSERT_EQ(1, pl.size());84 ASSERT_EQ(1u, pl.size());
85}85}
8686
87TEST_F(PackageTest, testPackageParsesMultiplePrices)87TEST_F(PackageTest, testPackageParsesMultiplePrices)
@@ -92,7 +92,7 @@
92 auto const ci_package = embedded[Package::JsonKeys::ci_package];92 auto const ci_package = embedded[Package::JsonKeys::ci_package];
9393
94 Packages pl = package_list_from_json_node(ci_package);94 Packages pl = package_list_from_json_node(ci_package);
95 ASSERT_EQ(3, pl[0].prices.size());95 ASSERT_EQ(3u, pl[0].prices.size());
96}96}
9797
98TEST_F(PackageTest, testPackageParsesVersion)98TEST_F(PackageTest, testPackageParsesVersion)
@@ -109,5 +109,5 @@
109TEST_F(PackageTest, testPackageDetailsParsesMultiplePrices)109TEST_F(PackageTest, testPackageDetailsParsesMultiplePrices)
110{110{
111 auto details = PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS);111 auto details = PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS);
112 ASSERT_EQ(3, details.package.prices.size());112 ASSERT_EQ(3u, details.package.prices.size());
113}113}
114114
=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp 2016-10-24 21:26:23 +0000
+++ libclickscope/tests/test_preview.cpp 2016-12-08 19:58:50 +0000
@@ -139,7 +139,7 @@
139 details.more_screenshots_urls = {"sshot2", "sshot3"};139 details.more_screenshots_urls = {"sshot2", "sshot3"};
140140
141 auto widgets = preview.screenshotsWidgets(details);141 auto widgets = preview.screenshotsWidgets(details);
142 ASSERT_EQ(widgets.size(), 1);142 ASSERT_EQ(1u, widgets.size());
143 auto first_widget = widgets.front();143 auto first_widget = widgets.front();
144 auto attributes = first_widget.attribute_values();144 auto attributes = first_widget.attribute_values();
145 auto sources = attributes["sources"].get_array();145 auto sources = attributes["sources"].get_array();
@@ -247,7 +247,7 @@
247 PreviewStrategyDescriptionTest()247 PreviewStrategyDescriptionTest()
248 {248 {
249 }249 }
250 void assertWidgetAttribute(int n, std::string attribute_name, std::string expected_value)250 void assertWidgetAttribute(unsigned int n, std::string attribute_name, std::string expected_value)
251 {251 {
252 ASSERT_GT(widgets.size(), n);252 ASSERT_GT(widgets.size(), n);
253 auto widget = std::next(widgets.begin(), n);253 auto widget = std::next(widgets.begin(), n);
@@ -297,7 +297,7 @@
297 details = click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS_DEB);297 details = click::PackageDetails::from_json(FAKE_JSON_PACKAGE_DETAILS_DEB);
298 widgets = preview.descriptionWidgets(details);298 widgets = preview.descriptionWidgets(details);
299299
300 ASSERT_EQ(1, widgets.size());300 ASSERT_EQ(1u, widgets.size());
301301
302 assertWidgetAttribute(0, "title", "Info");302 assertWidgetAttribute(0, "title", "Info");
303 assertWidgetAttribute(0, "text", details.description);303 assertWidgetAttribute(0, "text", details.description);
@@ -306,7 +306,7 @@
306TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsNone)306TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgetsNone)
307{307{
308 widgets = preview.descriptionWidgets(details);308 widgets = preview.descriptionWidgets(details);
309 ASSERT_EQ(0, widgets.size());309 ASSERT_EQ(0u, widgets.size());
310}310}
311311
312class FakePreviewStrategy : public click::PreviewStrategy312class FakePreviewStrategy : public click::PreviewStrategy
313313
=== modified file 'libclickscope/tests/test_reviews.cpp'
--- libclickscope/tests/test_reviews.cpp 2016-05-10 13:42:12 +0000
+++ libclickscope/tests/test_reviews.cpp 2016-12-08 19:58:50 +0000
@@ -80,13 +80,13 @@
80 click::ReviewList reviews {r1, r2, r3};80 click::ReviewList reviews {r1, r2, r3};
8181
82 auto newReviews = bring_to_front(reviews, "user2");82 auto newReviews = bring_to_front(reviews, "user2");
83 EXPECT_EQ(newReviews.size(), 3);83 EXPECT_EQ(3u, newReviews.size());
84 auto it = newReviews.begin();84 auto it = newReviews.begin();
85 EXPECT_EQ(2, (*it).id);85 EXPECT_EQ(2u, (*it).id);
86 ++it;86 ++it;
87 EXPECT_EQ(1, (*it).id);87 EXPECT_EQ(1u, (*it).id);
88 ++it;88 ++it;
89 EXPECT_EQ(3, (*it).id);89 EXPECT_EQ(3u, (*it).id);
90}90}
9191
92TEST_F(ReviewsTest, bringToFrontUserMatchesFirstElement)92TEST_F(ReviewsTest, bringToFrontUserMatchesFirstElement)
@@ -102,11 +102,11 @@
102 click::ReviewList reviews {r1, r2};102 click::ReviewList reviews {r1, r2};
103103
104 auto newReviews = bring_to_front(reviews, "user1");104 auto newReviews = bring_to_front(reviews, "user1");
105 EXPECT_EQ(newReviews.size(), 2);105 EXPECT_EQ(2u, newReviews.size());
106 auto it = newReviews.begin();106 auto it = newReviews.begin();
107 EXPECT_EQ(1, (*it).id);107 EXPECT_EQ(1u, (*it).id);
108 ++it;108 ++it;
109 EXPECT_EQ(2, (*it).id);109 EXPECT_EQ(2u, (*it).id);
110}110}
111111
112TEST_F(ReviewsTest, bringToFrontEmptyList)112TEST_F(ReviewsTest, bringToFrontEmptyList)
@@ -114,7 +114,7 @@
114 click::ReviewList reviews;114 click::ReviewList reviews;
115115
116 auto newReviews = bring_to_front(reviews, "user1");116 auto newReviews = bring_to_front(reviews, "user1");
117 EXPECT_EQ(newReviews.size(), 0);117 EXPECT_EQ(0u, newReviews.size());
118}118}
119119
120TEST_F(ReviewsTest, bringToFrontUserDoesntMatch)120TEST_F(ReviewsTest, bringToFrontUserDoesntMatch)
@@ -130,11 +130,11 @@
130 click::ReviewList reviews {r1, r2};130 click::ReviewList reviews {r1, r2};
131131
132 auto newReviews = bring_to_front(reviews, "user0");132 auto newReviews = bring_to_front(reviews, "user0");
133 EXPECT_EQ(newReviews.size(), 2);133 EXPECT_EQ(2u, newReviews.size());
134 auto it = newReviews.begin();134 auto it = newReviews.begin();
135 EXPECT_EQ(1, (*it).id);135 EXPECT_EQ(1u, (*it).id);
136 ++it;136 ++it;
137 EXPECT_EQ(2, (*it).id);137 EXPECT_EQ(2u, (*it).id);
138}138}
139139
140TEST_F(ReviewsTest, testFetchReviewsCallsWebservice)140TEST_F(ReviewsTest, testFetchReviewsCallsWebservice)

Subscribers

People subscribed via source and target branches

to all changes: