Merge lp:~saviq/unity8/fix-horizontal-list-activation into lp:unity8

[Michał Sawicz]

Fix horizontal list activation and add test for it.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
N
 * Did you make sure that your branch does not contain spurious tags?
N
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1162
http://jenkins.qa.ubuntu.com/job/unity8-ci/3930/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3605
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1024
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1024
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1024/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1024
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4852
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4852/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11556

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3930/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Looks good!

review: Approve

[Michael Terry (mterry)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 - Yes

 * Did CI run pass? If not, please explain why.
 - No, but for unrelated reasons.

=== modified file 'qml/Dash/CardHorizontalList.qml'
--- qml/Dash/CardHorizontalList.qml	2014-08-13 15:33:44 +0000
+++ qml/Dash/CardHorizontalList.qml	2014-08-15 14:27:43 +0000
@@ -54,8 +54,8 @@
             }
             Connections {
                 target: loader.item
-                onClicked: root.clicked(index, result)
-                onPressAndHold: root.pressAndHold(index)
+                onClicked: root.clicked(index, result, loader.item, model)
+                onPressAndHold: root.pressAndHold(index, model)
             }
         }
     }

=== modified file 'tests/mocks/Unity/fake_categories.cpp'
--- tests/mocks/Unity/fake_categories.cpp	2014-08-08 11:03:15 +0000
+++ tests/mocks/Unity/fake_categories.cpp	2014-08-15 14:27:43 +0000
@@ -149,6 +149,9 @@
                     map["card-size"] = "medium";
                     map["overlay"] = true;
                 }
+                if (index.row() == 18) {
+                    map["category-layout"] = "horizontal-list";
+                }
                 if (index.row() == 19) {
                     map["category-layout"] = "grid";
                     map["collapsed-rows"] = 0;

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-08-08 13:34:00 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-08-15 14:27:43 +0000
@@ -76,6 +76,20 @@
                 spy.signalName = "";
             }
 
+            function scrollToCategory(category) {
+                var categoryListView = findChild(genericScopeView, "categoryListView");
+                tryCompareFunction(function() {
+                    if (findChild(genericScopeView, category)) return true;
+                    mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
+                               genericScopeView.width/2, genericScopeView.y)
+                    tryCompare(categoryListView, "moving", false);
+                    return findChild(genericScopeView, category) !== null;
+                }, true);
+
+                tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
+                return findChild(genericScopeView, category);
+            }
+
             function test_isActive() {
                 tryCompare(genericScopeView.scope, "isActive", false)
                 genericScopeView.isCurrent = true
@@ -222,12 +236,7 @@
             }
 
             function test_forced_category_expansion() {
-                tryCompareFunction(function() {
-                    mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
-                               genericScopeView.width/2, genericScopeView.y)
-                    return findChild(genericScopeView, "dashCategory19") !== null;
-                }, true);
-                var category = findChild(genericScopeView, "dashCategory19")
+                var category = scrollToCategory("dashCategory19");
                 compare(category.expandable, false, "Category with collapsed-rows: 0 should not be expandable");
 
                 var grid = findChild(category, "19");
@@ -285,20 +294,13 @@
             }
 
             function test_showPreviewCarousel() {
-                tryCompareFunction(function() {
-                                        var dashCategory1 = findChild(genericScopeView, "dashCategory1");
-                                        if (dashCategory1 != null) {
-                                            var tile = findChild(dashCategory1, "carouselDelegate1");
-                                            return tile != null;
-                                        }
-                                        return false;
-                                    },
-                                    true);
+                var category = scrollToCategory("dashCategory1");
 
                 tryCompare(testCase.previewListView, "open", false);
 
-                var dashCategory1 = findChild(genericScopeView, "dashCategory1");
-                var tile = findChild(dashCategory1, "carouselDelegate1");
+                var tile = findChild(category, "carouselDelegate1");
+                verify(tile, "Could not find delegate");
+
                 mouseClick(tile, tile.width / 2, tile.height / 2);
                 tryCompare(tile, "explicitlyScaled", true);
                 mouseClick(tile, tile.width / 2, tile.height / 2);
@@ -306,6 +308,35 @@
                 tryCompare(testCase.previewListView, "x", 0);
 
                 closePreview();
+
+                mousePress(tile, tile.width / 2, tile.height / 2);
+                tryCompare(testCase.previewListView, "open", true);
+                tryCompare(testCase.previewListView, "x", 0);
+                mouseRelease(tile, tile.width / 2, tile.height / 2);
+
+                closePreview();
+            }
+
+            function test_showPreviewHorizontalList() {
+                var category = scrollToCategory("dashCategory18");
+
+                tryCompare(testCase.previewListView, "open", false);
+
+                var tile = findChild(category, "delegate1");
+                verify(tile, "Could not find delegate");
+
+                mouseClick(tile, tile.width / 2, tile.height / 2);
+                tryCompare(testCase.previewListView, "open", true);
+                tryCompare(testCase.previewListView, "x", 0);
+
+                closePreview();
+
+                mousePress(tile, tile.width / 2, tile.height / 2);
+                tryCompare(testCase.previewListView, "open", true);
+                tryCompare(testCase.previewListView, "x", 0);
+                mouseRelease(tile, tile.width / 2, tile.height / 2);
+
+                closePreview();
             }
 
             function test_previewCycle() {