Merge lp:~dobey/unity-scope-click/sort-az into lp:unity-scope-click/devel

[dobey]

Sort installed apps alphabetically.
Add a test for the sort order.
Move the sorting back to find_installed_apps() to make testing easier.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/sort-az]

286. By dobey on 2014-06-10

Use tolower on the titles when sorting, to avoid eBay sorting after Weather.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/sort-az]

287. By dobey on 2014-06-10

Merge the fix-category branch in.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

The std::transform is happening twice for each comparison done during the sort; this looks bad cpu-wise;

One option to fix this is using a sorted map with the lowercased items as keys. Other option is moving the lowercasing to a method of Application, where we can cache it if needed.

Also, please move the sorting into its own function, and create unit tests for it.

review: Needs Fixing

[lp:~dobey/unity-scope-click/sort-az]

288. By dobey on 2014-06-13

Add dependency on libboost-locale-dev for building.
Move sorting of the apps list to a separate function.
Use boost::locale for sorting of apps by name.
If names are equal, sort based on package name.
Add tests for several different sorting cases.

289. By dobey on 2014-06-13

[ Rodney Dawes ]
* Remove unused method to fix failure building under gcc 4.9.
[ Rodney Dawes ]
* Handle some languages differently when submitting reviews. (LP:
  #1321154). Add runtime dependency on ubuntu-sdk-libs for the
  frameworks list. (LP: #1320975). Support hal+json in the search
  request. Fix issues in autopilot tests. Port autopilot tests to
  python3. Add README and HACKING files. (LP: #1226111). Translations
  updates. . (LP: #1321154, #1226111, #1320975)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/114/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/88/console

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

review: Needs Fixing (continuous-integration)

[lp:~dobey/unity-scope-click/sort-az]

290. By dobey on 2014-06-13

Set the language in the other sorting tests as well, to prevent failures.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Looks good to me.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-05-29 07:10:38 +0000
+++ debian/control	2014-06-13 16:50:42 +0000
@@ -6,6 +6,7 @@
                dh-translations,
                google-mock,
                intltool,
+               libboost-locale-dev,
                libglib2.0-dev (>= 2.32),
                libjsoncpp-dev,
                libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2014-05-26 14:02:45 +0000
+++ libclickscope/click/CMakeLists.txt	2014-06-13 16:50:42 +0000
@@ -36,4 +36,5 @@
   ${UBUNTUONE_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
+  -lboost_locale
 )

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-06-09 16:49:10 +0000
+++ libclickscope/click/interface.cpp	2014-06-13 16:50:42 +0000
@@ -37,6 +37,9 @@
 #include <sys/stat.h>
 #include <map>
 
+#include <boost/locale/collator.hpp>
+#include <boost/locale/generator.hpp>
+
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/exceptions.hpp>
@@ -153,8 +156,7 @@
                                       DESKTOP_FILE_GROUP,
                                       DESKTOP_FILE_KEY_NAME,
                                       domain);
-    struct stat times;
-    app.installed_time = stat(filename.c_str(), &times) == 0 ? times.st_mtime : 0;
+
     app.url = "application:///" + filename;
     if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_ICON)) {
         app.icon_url = add_theme_scheme(keyFile.get_string(DESKTOP_FILE_GROUP,
@@ -188,6 +190,39 @@
     return app;
 }
 
+std::vector<click::Application> Interface::sort_apps(const std::vector<click::Application>& apps)
+{
+    std::vector<click::Application> result = apps;
+    boost::locale::generator gen;
+    const char* lang = getenv(click::Configuration::LANGUAGE_ENVVAR);
+    if (lang == NULL) {
+        lang = "C.UTF-8";
+    }
+    std::locale loc = gen(lang);
+    std::locale::global(loc);
+    typedef boost::locale::collator<char> coll_type;
+
+    // Sort applications alphabetically.
+    std::sort(result.begin(), result.end(), [&loc](const Application& a,
+                                                   const Application& b) {
+                  bool lesser = false;
+                  int order = std::use_facet<coll_type>(loc)
+                      .compare(boost::locale::collator_base::quaternary,
+                               a.title, b.title);
+                  if (order == 0) {
+                      lesser = a.name < b.name;
+                  } else {
+                      // Because compare returns int, not bool, we have to check
+                      // that 0 is greater than the result, which tells us the
+                      // first element should be sorted priori
+                      lesser = order < 0;
+                  }
+                  return lesser;
+              });
+
+    return result;
+}
+
 /* find_installed_apps()
  *
  * Find all of the installed apps matching @search_query in a timeout.
@@ -244,7 +279,7 @@
     };
 
     keyFileLocator->enumerateKeyFilesForInstalledApplications(enumerator);
-    return result;
+    return sort_apps(result);
 }
 
 /* is_non_click_app()

=== modified file 'libclickscope/click/interface.h'
--- libclickscope/click/interface.h	2014-05-26 14:02:45 +0000
+++ libclickscope/click/interface.h	2014-06-13 16:50:42 +0000
@@ -81,6 +81,7 @@
                                               const std::string& domain);
     virtual Application load_app_from_desktop(const unity::util::IniParser& keyFile,
                                               const std::string& filename);
+    static std::vector<Application> sort_apps(const std::vector<Application>& apps);
     virtual std::vector<Application> find_installed_apps(const std::string& search_query);
 
     static bool is_non_click_app(const QString& filename);

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-ubuntuone_webapp-ubuntuone_1.0.4.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-ubuntuone_webapp-ubuntuone_1.0.4.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-ubuntuone_webapp-ubuntuone_1.0.4.desktop	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.developer.webapps.webapp-ubuntuone_webapp-ubuntuone_1.0.4 -- webbrowser-app --enable-back-forward --webappUrlPatterns=https?://one.ubuntu.com/*,https?://login.ubuntu.com/* --webapp https://one.ubuntu.com/
-Name=Ubuntu One
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ubuntuone/./ubuntuone.png
-X-Ubuntu-Touch=true
-X-Ubuntu-Single-Instance=true
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ubuntuone
-X-Ubuntu-Old-Icon=./ubuntuone.png
-X-Ubuntu-Application-ID=com.ubuntu.developer.webapps.webapp-ubuntuone_webapp-ubuntuone_1.0.4

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2014-06-09 16:42:23 +0000
+++ libclickscope/tests/test_interface.cpp	2014-06-13 16:50:42 +0000
@@ -53,7 +53,6 @@
 // Maintaining this list here will become tedious over time.
 static const std::vector<click::Application> non_desktop_applications =
 {
-    {"com.ubuntu.developer.webapps.webapp-ubuntuone", "Ubuntu One", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ubuntuone/./ubuntuone.png", "application:///com.ubuntu.developer.webapps.webapp-ubuntuone_webapp-ubuntuone_1.0.4.desktop", "", ""},
     {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", ""},
     {"", "Weather", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.weather/./weather64.png", "application:///com.ubuntu.weather_weather_1.0.168.desktop", "", ""},
     {"com.ubuntu.developer.webapps.webapp-twitter", "Twitter", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-twitter/./twitter.png", "application:///com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5.desktop", "", ""},
@@ -182,6 +181,106 @@
     EXPECT_TRUE(results.empty());
 }
 
+TEST(ClickInterface, testFindAppsInDirSorted)
+{
+    QSharedPointer<click::KeyFileLocator> keyFileLocator(
+                new click::KeyFileLocator(
+                    testing::systemApplicationsDirectoryForTesting(),
+                    testing::userApplicationsDirectoryForTesting()));
+
+    click::Interface iface(keyFileLocator);
+
+    auto results = iface.find_installed_apps("ock");
+
+    const std::vector<click::Application> expected_results = {
+        {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", ""},
+        {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "", ""},
+    };
+    EXPECT_EQ(expected_results, results);
+}
+
+TEST(ClickInterface, testSortApps)
+{
+    std::vector<click::Application> apps = {
+        {"", "Sudoku", 0.0, "", "", "", ""},
+        {"", "eBay", 0.0, "", "", "", ""},
+        {"", "Facebook", 0.0, "", "", "", ""},
+        {"", "Messaging", 0.0, "", "", "", ""},
+        {"", "Contacts", 0.0, "", "", "", ""},
+    };
+
+    std::vector<click::Application> expected = {
+        {"", "Contacts", 0.0, "", "", "", ""},
+        {"", "eBay", 0.0, "", "", "", ""},
+        {"", "Facebook", 0.0, "", "", "", ""},
+        {"", "Messaging", 0.0, "", "", "", ""},
+        {"", "Sudoku", 0.0, "", "", "", ""},
+    };
+
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US.UTF-8", 1), 0);
+    EXPECT_EQ(expected, click::Interface::sort_apps(apps));
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+}
+
+TEST(ClickInterface, testSortAppsWithDuplicates)
+{
+    std::vector<click::Application> apps = {
+        {"com.sudoku.sudoku", "Sudoku", 0.0, "", "", "", ""},
+        {"com.canonical.sudoku", "Sudoku", 0.0, "", "", "", ""},
+    };
+
+    std::vector<click::Application> expected = {
+        {"com.canonical.sudoku", "Sudoku", 0.0, "", "", "", ""},
+        {"com.sudoku.sudoku", "Sudoku", 0.0, "", "", "", ""},
+    };
+
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US.UTF-8", 1), 0);
+    EXPECT_EQ(expected, click::Interface::sort_apps(apps));
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+}
+
+TEST(ClickInterface, testSortAppsWithAccents)
+{
+    std::vector<click::Application> apps = {
+        {"", "Robots", 0.0, "", "", "", ""},
+        {"", "Æon", 0.0, "", "", "", ""},
+        {"", "Contacts", 0.0, "", "", "", ""},
+        {"", "Über", 0.0, "", "", "", ""},
+    };
+
+    std::vector<click::Application> expected = {
+        {"", "Æon", 0.0, "", "", "", ""},
+        {"", "Contacts", 0.0, "", "", "", ""},
+        {"", "Robots", 0.0, "", "", "", ""},
+        {"", "Über", 0.0, "", "", "", ""},
+    };
+
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "en_US.UTF-8", 1), 0);
+    EXPECT_EQ(expected, click::Interface::sort_apps(apps));
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+}
+
+TEST(ClickInterface, testSortAppsMixedCharsets)
+{
+    std::vector<click::Application> apps = {
+        {"", "Robots", 0.0, "", "", "", ""},
+        {"", "汉字", 0.0, "", "", "", ""},
+        {"", "漢字", 0.0, "", "", "", ""},
+        {"", "Über", 0.0, "", "", "", ""},
+    };
+
+    std::vector<click::Application> expected = {
+        {"", "汉字", 0.0, "", "", "", ""},
+        {"", "漢字", 0.0, "", "", "", ""},
+        {"", "Robots", 0.0, "", "", "", ""},
+        {"", "Über", 0.0, "", "", "", ""},
+    };
+
+    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "zh_CN.UTF-8", 1), 0);
+    EXPECT_EQ(expected, click::Interface::sort_apps(apps));
+    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
+}
+
 TEST(ClickInterface, testFindAppByKeyword)
 {
     QSharedPointer<click::KeyFileLocator> keyFileLocator(

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-06-10 20:40:33 +0000
+++ scope/clickapps/apps-query.cpp	2014-06-13 16:50:42 +0000
@@ -204,11 +204,6 @@
     auto localResults = clickInterfaceInstance().find_installed_apps(
                 query);
 
-    // Sort applications so that newest come first.
-    std::sort(localResults.begin(), localResults.end(), [](const Application& a, const Application& b) {
-                  return a.installed_time > b.installed_time;
-                });
-
     push_local_results(
         searchReply,
         localResults,