1
=== modified file 'scope/clickstore/store-query.cpp'
2
--- scope/clickstore/store-query.cpp	2014-07-11 14:55:54 +0000
3
+++ scope/clickstore/store-query.cpp	2014-07-11 14:55:54 +0000
4
@@ -60,7 +60,8 @@
5
60
        "schema-version" : 1,
60
        "schema-version" : 1,
6
61
        "template" : {
61
        "template" : {
7
62
            "category-layout" : "grid",
62
            "category-layout" : "grid",
9
63
            "card-size": "small"
63
            "card-size": "small",
10
64
            "collapsed-rows" : 0
11
64
        },
65
        },
12
65
        "components" : {
66
        "components" : {
13
66
            "title" : "title",
67
            "title" : "title",
14
@@ -349,23 +350,29 @@
15
349
                                      const PackageSet& installedPackages,
350
                                      const PackageSet& installedPackages,
16
350
                                      const std::string& categoryTemplate)
351
                                      const std::string& categoryTemplate)
17
351
{
352
{
18
352
    scopes::CategoryRenderer categoryRenderer(categoryTemplate);
19
353
    auto category = register_category(searchReply, "appstore", _("Available"), "", categoryRenderer);
20
354
21
355
    scopes::CategoryRenderer recommendsCatRenderer(categoryTemplate);
22
356
    auto recommendsCategory = register_category(searchReply, "recommends",
23
357
                                                _("Recommended"), "",
24
358
                                                recommendsCatRenderer);
25
359
26
360
    assert(searchReply);
353
    assert(searchReply);
27
361
354
28
362
    run_under_qt([=]()
355
    run_under_qt([=]()
29
363
    {
356
    {
33
364
        auto search_cb = [this, searchReply,
357
        auto search_cb = [this, searchReply, categoryTemplate, installedPackages](Packages packages, Packages recommends) {
31
365
                          category, recommendsCategory,
32
366
                          installedPackages](Packages packages, Packages recommends) {
34
367
                qDebug("search callback");
358
                qDebug("search callback");
35
368
359
36
360
                const scopes::CategoryRenderer categoryRenderer(categoryTemplate);
37
361
38
362
                std::string cat_title(_("Available"));
39
363
                {
40
364
                    char tmp[512];
41
365
                    if (snprintf(tmp, sizeof(tmp), _("%u results in Ubuntu Store"), static_cast<unsigned int>(packages.size())) > 0) {
42
366
                        cat_title = tmp;
43
367
                    }
44
368
                }
45
369
                auto category = register_category(searchReply, "appstore", cat_title, "", categoryRenderer);
46
370
47
371
                const scopes::CategoryRenderer recommendsCatRenderer(categoryTemplate);
48
372
                auto recommendsCategory = register_category(searchReply, "recommends",
49
373
                                                _("Recommended"), "",
50
374
                                                recommendsCatRenderer);
51
375
52
369
                // handle packages data
376
                // handle packages data
53
370
                foreach (auto p, packages) {
377
                foreach (auto p, packages) {
54
371
                    push_package(searchReply, category, installedPackages, p);
378
                    push_package(searchReply, category, installedPackages, p);
55
372
379
56
=== modified file 'scope/tests/test_query.cpp'
57
--- scope/tests/test_query.cpp	2014-07-03 14:58:53 +0000
58
+++ scope/tests/test_query.cpp	2014-07-11 14:55:54 +0000
59
@@ -135,6 +135,8 @@
60
135
    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
135
    q.wrap_add_available_apps(reply, no_installed_packages, FAKE_CATEGORY_TEMPLATE);
61
136
}
136
}
62
137
137
63
138
MATCHER_P(CategoryHasNumberOfResults, number, "") { return arg.find(std::to_string(number)) != std::string::npos; }
64
139
65
138
TEST(QueryTest, testAddAvailableAppsPushesResults)
140
TEST(QueryTest, testAddAvailableAppsPushesResults)
66
139
{
141
{
67
140
    click::Packages packages {
142
    click::Packages packages {
68
@@ -151,7 +153,10 @@
69
151
153
70
152
    scopes::CategoryRenderer renderer("{}");
154
    scopes::CategoryRenderer renderer("{}");
71
153
    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
155
    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
73
154
    EXPECT_CALL(q, register_category(_, _, _, _, _)).Times(2).WillRepeatedly(Return(ptrCat));
156
74
157
    ON_CALL(q, register_category(_, _, _, _, _)).WillByDefault(Return(ptrCat));
75
158
    EXPECT_CALL(q, register_category(_, "appstore", CategoryHasNumberOfResults(1), _, _));
76
159
    EXPECT_CALL(q, register_category(_, "recommends", _, _, _));
77
155
160
78
156
    scopes::testing::MockSearchReply mock_reply;
161
    scopes::testing::MockSearchReply mock_reply;
79
157
    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
162
    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
Status:	Merged
Approved by:	Alejandro J. Cura on 2014-07-11
Approved revision:	325
Merged at revision:	326
Proposed branch:	lp:~stolowski/unity-scope-click/number-of-store-results
Merge into:	lp:unity-scope-click/devel
Prerequisite:	lp:~stolowski/unity-scope-click/update-for-design
Diff against target:	79 lines (+25/-13) 2 files modified scope/clickstore/store-query.cpp (+19/-12) scope/tests/test_query.cpp (+6/-1)
To merge this branch:	bzr merge lp:~stolowski/unity-scope-click/number-of-store-results
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alejandro J. Cura (community)		2014-07-11	Approve on 2014-07-11
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-11
Review via email: mp+226436@code.launchpad.net