Merge lp:~mhr3/unity-lens-applications/fix-1056743 into lp:unity-lens-applications

[Michal Hruby]

Improve Utils.preprocess_text

Ensure that the Utils.preprocess_text() method which prepares the string for indexing by xapian (by uncamelcasing and ascii folding) returns the original text as well.

Added manual test.

[lp:~mhr3/unity-lens-applications/fix-1056743]

311. By Michal Hruby on 2012-10-01

Update manual tests

[Paweł Stołowski (stolowski)]

Nice one! +1

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-09-26 08:54:43 +0000
+++ configure.ac	2012-10-01 13:06:38 +0000
@@ -64,7 +64,7 @@
                   gee-1.0
                   dee-1.0 >= 0.5.16
                   zeitgeist-1.0 >= 0.3.8
-                  unity >= 6.5.1
+                  unity >= 6.7.0
                   libgnome-menu)
 
 AC_SUBST(LENS_DAEMON_CFLAGS)

=== modified file 'src/utils.vala'
--- src/utils.vala	2012-02-15 14:48:10 +0000
+++ src/utils.vala	2012-10-01 13:06:38 +0000
@@ -86,10 +86,15 @@
     }
 
     var uncamelcased = uncamelcase (text);
+    if (text != uncamelcased)
+    {
+      // make sure we don't discard the original completely
+      uncamelcased = "%s\n%s".printf (text, uncamelcased);
+    }
     var folded = icu_filter.apply (uncamelcased);
 
     if (uncamelcased == folded) return uncamelcased;
-    
+
     return "%s\n%s".printf (uncamelcased, folded);
   }
 

=== renamed file 'tests/manual/sort-order.txt' => 'tests/manual/apps-lens-tests.txt'
--- tests/manual/sort-order.txt	2012-03-27 10:14:37 +0000
+++ tests/manual/apps-lens-tests.txt	2012-10-01 13:06:38 +0000
@@ -1,9 +1,28 @@
-Sort order
-==========
+Application lens sort order
+---------------------------
 Tests that the sort order of the "Installed" category is alphabetical.
 
-#. Open the Dash and switch to the application lens.
-#. Make sure that the search string is empty.
-
-Outcome
-  The "Installed" category should be shown and the items within should be sorted alphabetically (respecting sorting of your locale).
+Setup:
+At least default ubuntu applications installed.
+
+Actions:
+Open the Dash and switch to the application lens.
+Make sure that the search string is empty.
+
+Expected Result:
+The "Installed" category should be shown and the items within should be sorted alphabetically (respecting sorting of your locale).
+
+Search for applications with CamelCase names
+--------------------------------------------
+Searching for applications should work by searching for the whole name of a CamelCase application as well as with any part of the Camel name.
+
+Setup:
+At least default ubuntu applications installed.
+
+Actions:
+Open the Dash and switch to the application lens.
+Search for an application with CamelCase name (for example "AisleRiot").
+
+Expected Result:
+The search has to find the application when searching both "aisleriot" as well as "aisle" or "riot".
+