Merge lp:~aacid/unity/phablet_hud_results_test into lp:unity/phablet

[Albert Astals Cid]

Test that the HUD results show correctly

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:475
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~aacid/unity/phablet_hud_results_test/+merge/153816/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/60/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/59/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/59/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:476
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/63/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/62/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/62/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

review: Approve

=== modified file 'Hud/Hud.qml'
--- Hud/Hud.qml	2013-03-14 14:39:26 +0000
+++ Hud/Hud.qml	2013-03-18 14:50:26 +0000
@@ -33,6 +33,7 @@
     property alias shown: hudShowable.shown
     property alias toolBar: toolBar
     property alias appStack: appStack
+    property alias resultList: resultList
     property alias handleHeight: handle.height
 
     readonly property variant outEasing: Easing.OutQuad

=== modified file 'Hud/ResultList.qml'
--- Hud/ResultList.qml	2013-02-25 03:37:00 +0000
+++ Hud/ResultList.qml	2013-03-18 14:50:26 +0000
@@ -19,6 +19,7 @@
 
 Column {
     property var model: undefined
+    property alias __repeater: repeater
 
     // Hud gives lots of results, make sure we have 5 at most
     // FIXME This should use SortFilterProxyModel
@@ -37,6 +38,8 @@
         onCountChanged: updateModelTimer.restart()
     }
 
+    onModelChanged: updateModelTimer.restart()
+
     Timer {
         id: updateModelTimer
         interval: 30

=== modified file 'tests/qmluitests/qml/HudClient/fake_libhud_client.cpp'
--- tests/qmluitests/qml/HudClient/fake_libhud_client.cpp	2013-03-15 16:57:11 +0000
+++ tests/qmluitests/qml/HudClient/fake_libhud_client.cpp	2013-03-18 14:50:26 +0000
@@ -19,6 +19,19 @@
 #include "libhud_client_stub.h"
 
 /* Schema that is used in the DeeModel representing
+   the results */
+static const gchar * results_model_schema[] = {
+    "v", /* Command ID */
+    "s", /* Command Name */
+    "a(ii)", /* Highlights in command name */
+    "s", /* Description */
+    "a(ii)", /* Highlights in description */
+    "s", /* Shortcut */
+    "u", /* Distance */
+    "b", /* Parameterized */
+};
+
+/* Schema that is used in the DeeModel representing
    the appstack */
 static const gchar * appstack_model_schema[] = {
     "s", /* Application ID */
@@ -26,6 +39,7 @@
     "i", /* Item Type */
 };
 
+DeeModel *resultsModel = 0;
 DeeModel *appStackModel = 0;
 
 HudClientQuery *hud_client_query_new(const gchar *query)
@@ -37,7 +51,48 @@
 DeeModel *hud_client_query_get_results_model(HudClientQuery *cquery)
 {
     Q_UNUSED(cquery);
-    return 0;
+    if (!resultsModel) {
+        resultsModel = dee_sequence_model_new();
+        dee_model_set_schema_full(resultsModel, results_model_schema, G_N_ELEMENTS(results_model_schema));
+
+        GVariant * columns[G_N_ELEMENTS(results_model_schema) + 1];
+        columns[0] = g_variant_new_variant(g_variant_new_uint64(0));
+        columns[1] = g_variant_new_string("Help");
+        columns[2] = g_variant_new_array(G_VARIANT_TYPE("(ii)"), NULL, 0);
+        columns[3] = g_variant_new_string("Get Help");
+        columns[4] = g_variant_new_array(G_VARIANT_TYPE("(ii)"), NULL, 0);
+        columns[5] = g_variant_new_string("");
+        columns[6] = g_variant_new_uint32(3);
+        columns[7] = g_variant_new_boolean(false);
+        columns[8] = NULL;
+        dee_model_append_row(resultsModel, columns);
+
+        columns[0] = g_variant_new_variant(g_variant_new_uint64(1));
+        columns[1] = g_variant_new_string("About");
+        columns[3] = g_variant_new_string("Show About");
+        dee_model_append_row(resultsModel, columns);
+
+        columns[0] = g_variant_new_variant(g_variant_new_uint64(2));
+        columns[1] = g_variant_new_string("Foo");
+        columns[3] = g_variant_new_string("Show Foo");
+        dee_model_append_row(resultsModel, columns);
+
+        columns[0] = g_variant_new_variant(g_variant_new_uint64(3));
+        columns[1] = g_variant_new_string("Bar");
+        columns[3] = g_variant_new_string("Show Bar");
+        dee_model_append_row(resultsModel, columns);
+
+        columns[0] = g_variant_new_variant(g_variant_new_uint64(4));
+        columns[1] = g_variant_new_string("FooBar");
+        columns[3] = g_variant_new_string("Show FooBar");
+        dee_model_append_row(resultsModel, columns);
+
+        columns[0] = g_variant_new_variant(g_variant_new_uint64(5));
+        columns[1] = g_variant_new_string("UltraFooBar");
+        columns[3] = g_variant_new_string("Show UltraFooBar");
+        dee_model_append_row(resultsModel, columns);
+    }
+    return resultsModel;
 }
 
 DeeModel *hud_client_query_get_appstack_model(HudClientQuery *cquery)

=== modified file 'tests/qmluitests/tst_Hud.qml'
--- tests/qmluitests/tst_Hud.qml	2013-03-15 11:12:20 +0000
+++ tests/qmluitests/tst_Hud.qml	2013-03-18 14:50:26 +0000
@@ -22,7 +22,7 @@
 
 Hud {
     id: hud
-    height: units.gu(50)
+    height: units.gu(80)
     width: units.gu(50)
 
     HudClientStub {
@@ -96,5 +96,24 @@
             mouseRelease(hud.appStack.__flickable, stop_x, 0)
             tryCompare(hud.appStack.__specialItem, "visible", false)
         }
+
+        function test_hud_results() {
+            tryCompare(hud.resultList.__repeater, "count", 5)
+
+            compare(hud.resultList.__repeater.itemAt(0).children[1].nameText, "Help", "First result name")
+            compare(hud.resultList.__repeater.itemAt(0).children[1].contextSnippetText, "Get Help", "First result description")
+
+            compare(hud.resultList.__repeater.itemAt(1).children[1].nameText, "About", "Second result name")
+            compare(hud.resultList.__repeater.itemAt(1).children[1].contextSnippetText, "Show About", "Second result description")
+
+            compare(hud.resultList.__repeater.itemAt(2).children[1].nameText, "Foo", "Third result name")
+            compare(hud.resultList.__repeater.itemAt(2).children[1].contextSnippetText, "Show Foo", "Third result description")
+
+            compare(hud.resultList.__repeater.itemAt(3).children[1].nameText, "Bar", "Fourth result name")
+            compare(hud.resultList.__repeater.itemAt(3).children[1].contextSnippetText, "Show Bar", "Fourth result description")
+
+            compare(hud.resultList.__repeater.itemAt(4).children[1].nameText, "FooBar", "Fifth result name")
+            compare(hud.resultList.__repeater.itemAt(4).children[1].contextSnippetText, "Show FooBar", "Fifth result description")
+        }
     }
 }