1
=== modified file 'scope/clickapps/apps-query.cpp'
2
--- scope/clickapps/apps-query.cpp	2014-07-17 20:05:57 +0000
3
+++ scope/clickapps/apps-query.cpp	2014-07-22 09:41:46 +0000
4
@@ -267,11 +267,15 @@
5
267
            cat_title = tmp;
267
            cat_title = tmp;
6
268
        }
268
        }
7
269
    }
269
    }
8
270
    else if (!query().department_id().empty())
9
271
    {
10
272
        cat_title = _("Get more apps like this from the Store");
11
273
    }
12
270
274
13
271
    scopes::CategoryRenderer rdr(CATEGORY_STORE);
275
    scopes::CategoryRenderer rdr(CATEGORY_STORE);
14
272
    auto cat = searchReply->register_category("store", cat_title, "", rdr);
276
    auto cat = searchReply->register_category("store", cat_title, "", rdr);
15
273
277
17
274
    const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore", querystr, "");
278
    const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore", querystr, querystr.empty() ? query().department_id() : "");
18
275
279
19
276
    scopes::CategorisedResult res(cat);
280
    scopes::CategorisedResult res(cat);
20
277
    res.set_title(title);
281
    res.set_title(title);
21
278
282
22
=== modified file 'scope/tests/test_apps_query.cpp'
23
--- scope/tests/test_apps_query.cpp	2014-07-18 15:01:41 +0000
24
+++ scope/tests/test_apps_query.cpp	2014-07-22 09:41:46 +0000
25
@@ -151,6 +151,27 @@
26
151
    q2.add_fake_store_app(reply2);
151
    q2.add_fake_store_app(reply2);
27
152
}
152
}
28
153
153
29
154
TEST(Query, testUbuntuStoreFakeResultWithDepartment)
30
155
{
31
156
    const scopes::SearchMetadata metadata("en_EN", "phone");
32
157
    const unity::scopes::CannedQuery query("foo.scope", "", "music-department");
33
158
34
159
    click::apps::Query q(query, nullptr, metadata);
35
160
36
161
    scopes::CategoryRenderer renderer("{}");
37
162
    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
38
163
39
164
    scopes::testing::MockSearchReply mock_reply;
40
165
    scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
41
166
42
167
    const unity::scopes::CannedQuery target_query("com.canonical.scopes.clickstore", "", "music-department");
43
168
44
169
    EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
45
170
    EXPECT_CALL(mock_reply, push(Matcher<const unity::scopes::CategorisedResult&>(ResultUriMatchesCannedQuery(target_query))));
46
171
47
172
    q.add_fake_store_app(reply);
48
173
}
49
174
50
154
// this matcher expects a list of department ids in depts:
175
// this matcher expects a list of department ids in depts:
51
155
// first on the list is the root, followed by children ids.
176
// first on the list is the root, followed by children ids.
52
156
// the arg of the matcher is unity::scopes::Department ptr.
177
// the arg of the matcher is unity::scopes::Department ptr.
Status:	Merged
Approved by:	Alejandro J. Cura on 2014-07-22
Approved revision:	329
Merged at revision:	353
Proposed branch:	lp:~stolowski/unity-scope-click/local-departments-store-link
Merge into:	lp:unity-scope-click/devel
Prerequisite:	lp:~stolowski/unity-scope-click/use-local-departments
Diff against target:	52 lines (+26/-1) 2 files modified scope/clickapps/apps-query.cpp (+5/-1) scope/tests/test_apps_query.cpp (+21/-0)
To merge this branch:	bzr merge lp:~stolowski/unity-scope-click/local-departments-store-link
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alejandro J. Cura (community)		2014-07-16	Approve on 2014-07-22
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-22
Review via email: mp+226987@code.launchpad.net
1	=== modified file 'scope/clickapps/apps-query.cpp'
2	--- scope/clickapps/apps-query.cpp 2014-07-17 20:05:57 +0000
3	+++ scope/clickapps/apps-query.cpp 2014-07-22 09:41:46 +0000
4	@@ -267,11 +267,15 @@
5	267	cat_title = tmp;	267	cat_title = tmp;
6	268	}	268	}
7	269	}	269	}
8			270	else if (!query().department_id().empty())
9			271	{
10			272	cat_title = _("Get more apps like this from the Store");
11			273	}
12	270		274
13	271	scopes::CategoryRenderer rdr(CATEGORY_STORE);	275	scopes::CategoryRenderer rdr(CATEGORY_STORE);
14	272	auto cat = searchReply->register_category("store", cat_title, "", rdr);	276	auto cat = searchReply->register_category("store", cat_title, "", rdr);
15	273		277
17	274	const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore", querystr, "");	278	const unity::scopes::CannedQuery store_scope("com.canonical.scopes.clickstore", querystr, querystr.empty() ? query().department_id() : "");
18	275		279
19	276	scopes::CategorisedResult res(cat);	280	scopes::CategorisedResult res(cat);
20	277	res.set_title(title);	281	res.set_title(title);
21	278		282
22	=== modified file 'scope/tests/test_apps_query.cpp'
23	--- scope/tests/test_apps_query.cpp 2014-07-18 15:01:41 +0000
24	+++ scope/tests/test_apps_query.cpp 2014-07-22 09:41:46 +0000
25	@@ -151,6 +151,27 @@
26	151	q2.add_fake_store_app(reply2);	151	q2.add_fake_store_app(reply2);
27	152	}	152	}
28	153		153
29			154	TEST(Query, testUbuntuStoreFakeResultWithDepartment)
30			155	{
31			156	const scopes::SearchMetadata metadata("en_EN", "phone");
32			157	const unity::scopes::CannedQuery query("foo.scope", "", "music-department");
33			158
34			159	click::apps::Query q(query, nullptr, metadata);
35			160
36			161	scopes::CategoryRenderer renderer("{}");
37			162	auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
38			163
39			164	scopes::testing::MockSearchReply mock_reply;
40			165	scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
41			166
42			167	const unity::scopes::CannedQuery target_query("com.canonical.scopes.clickstore", "", "music-department");
43			168
44			169	EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
45			170	EXPECT_CALL(mock_reply, push(Matcher<const unity::scopes::CategorisedResult&>(ResultUriMatchesCannedQuery(target_query))));
46			171
47			172	q.add_fake_store_app(reply);
48			173	}
49			174
50	154	// this matcher expects a list of department ids in depts:	175	// this matcher expects a list of department ids in depts:
51	155	// first on the list is the root, followed by children ids.	176	// first on the list is the root, followed by children ids.
52	156	// the arg of the matcher is unity::scopes::Department ptr.	177	// the arg of the matcher is unity::scopes::Department ptr.