Merge lp:~unity-team/unity-scope-click/fix-1390191-rtm into lp:unity-scope-click/rtm-14.09

[Paweł Stołowski]

Removed the restriction in get_children method that filtered empty departments out.

Removed the restriction in get_children method that filtered empty departments out.

The database stores only the ids of applications installed via the Store and doesn't know about preinstalled apps which provide department id via X-Default-Department-ID (so from the db point of view some departments may appear empty). We then intersect them with the set of departments we have for currently installed apps (we get them from the database again and from .desktop files via the special key), so at this point empty departments are discarded and not shown - doing so right in get_children() was a premature optimization.

A simple way of reproducing and then testing the fix:
- make sure you have no apps installed from Travel Local department.
- add X-Ubuntu-Default-Department-ID=travel-local to /home/phablet/.local/share/applications/com.nokia.heremaps_here_1.0.4.desktop
- reboot
- without the fix Travel Local department won't be shown in Apps departments menu; with the fix it will be shown, and will have Here Maps app in it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-14.09-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-rtm-14.09-14.09-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-rtm-14.09-ci/6/rebuild

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/departments-db.cpp'
--- libclickscope/click/departments-db.cpp	2014-08-19 15:34:58 +0000
+++ libclickscope/click/departments-db.cpp	2014-11-19 14:07:51 +0000
@@ -221,12 +221,8 @@
     while (select_children_depts_->next())
     {
         auto const child_id = select_children_depts_->value(0).toString().toStdString();
-        // only return child department if it's not empty
-        if (!is_empty(child_id))
-        {
-            const DepartmentInfo inf(child_id, select_children_depts_->value(1).toBool());
-            depts.push_back(inf);
-        }
+        const DepartmentInfo inf(child_id, select_children_depts_->value(1).toBool());
+        depts.push_back(inf);
     }
 
     select_children_depts_->finish();

=== modified file 'libclickscope/tests/test_departments-db.cpp'
--- libclickscope/tests/test_departments-db.cpp	2014-08-07 15:34:47 +0000
+++ libclickscope/tests/test_departments-db.cpp	2014-11-19 14:07:51 +0000
@@ -188,10 +188,10 @@
     }
     {
         auto depts = db->get_children_departments("games");
-        EXPECT_EQ(2u, depts.size());
+        EXPECT_EQ(3u, depts.size());
         EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("rpg", false)) != depts.end());
         EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("fps", false)) != depts.end());
-        EXPECT_FALSE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("card", false)) != depts.end());
+        EXPECT_TRUE(std::find(depts.begin(), depts.end(), DepartmentsDb::DepartmentInfo("card", false)) != depts.end());
     }
 }