Merge lp:~alecu/unity-scope-click/split-department-test into lp:unity-scope-click/devel

[Alejandro J. Cura]

Split a big test into two, and a few renames to follow coding convention.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:325
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/210/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/184
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/184

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/210/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Thanks! +1

review: Approve

=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-07-16 13:16:12 +0000
+++ scope/tests/test_apps_query.cpp	2014-07-16 23:58:23 +0000
@@ -169,18 +169,21 @@
     return true;
 }
 
-TEST(Query, Departments)
-{
+class DepartmentsTest : public ::testing::Test {
+protected:
     const std::vector<click::Application> installed_apps = {{"app1", "App1", 0.0f, "icon", "url", "descr", "scrshot"}};
-    const scopes::SearchMetadata metadata("en_EN", "phone");
-    auto clickif = std::make_shared<MockClickInterface>();
-
-    const scopes::CategoryRenderer renderer("{}");
-    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
-    auto depts_db = std::make_shared<MockDepartmentsDb>(":memory:");
-
+    const scopes::SearchMetadata metadata{"en_EN", "phone"};
+    const scopes::CategoryRenderer renderer{"{}"};
     const std::list<std::string> expected_locales {"en_EN", "en_US", ""};
 
+};
+
+TEST_F(DepartmentsTest, testRootDepartment)
+{
+    auto clickif = std::make_shared<MockClickInterface>();
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+    auto depts_db = std::make_shared<MockDepartmentsDb>(":memory:");
+
     // query for root of the departments tree
     {
         const unity::scopes::CannedQuery query("foo.scope", "", "");
@@ -211,6 +214,13 @@
 
         q.run(reply);
     }
+}
+
+TEST_F(DepartmentsTest, testLeafDepartment)
+{
+    auto clickif = std::make_shared<MockClickInterface>();
+    auto ptrCat = std::make_shared<FakeCategory>("id", "", "", renderer);
+    auto depts_db = std::make_shared<MockDepartmentsDb>(":memory:");
 
     // query for a leaf department
     {