Merge lp:~aacid/unity8/testFor1316660 into lp:unity8

[Albert Astals Cid]

Test for bug #1316660

preview combo should autoscroll to make sure its child buttons are on screen

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No, it's test only

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * 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:1596
http://jenkins.qa.ubuntu.com/job/unity8-ci/5273/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1277
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1275
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1275/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17939

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/testFor1316660]

1597. By Albert Astals Cid on 2015-02-11

Verify to tryCompare

Doesn't really belong to this MR but i had it failing in CI so let's make it more resilient here

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1597
http://jenkins.qa.ubuntu.com/job/unity8-ci/5277/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1280
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1280/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17948

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

 * 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.
It did!
 * Did you make sure that the branch does not contain spurious tags?
yes

review: Approve

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/Previews/Preview.qml	2015-02-11 08:35:33 +0000
@@ -65,6 +65,7 @@
 
             delegate: ListView {
                 id: column
+                objectName: "previewListRow" + index
                 anchors { top: parent.top; bottom: parent.bottom }
                 width: row.columnWidth
                 spacing: row.spacing
 
=== modified file 'tests/mocks/Unity/fake_previewwidgetmodel.cpp'
--- tests/mocks/Unity/fake_previewwidgetmodel.cpp	2014-05-14 08:36:42 +0000
+++ tests/mocks/Unity/fake_previewwidgetmodel.cpp	2015-02-11 08:35:33 +0000
@@ -53,6 +53,16 @@
         PreviewData* preview_data = new PreviewData(QString("widget-%1").arg(i), QString("text"), attributes);
         m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
     }
+
+    QVariantMap attributes;
+    QVariantMap buttonData;
+    buttonData["label"] = "Button";
+    QVariantList buttons;
+    buttons << buttonData << buttonData << buttonData;
+    attributes["actions"] = QVariant::fromValue(buttons);
+    PreviewData* preview_data = new PreviewData(QString("widget-21"), QString("actions"), attributes);
+    m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
+
     endResetModel();
 
 }
 
=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2014-07-04 16:20:48 +0000
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2015-02-11 08:35:33 +0000
@@ -54,6 +54,11 @@
         name: "Preview"
         when: windowShown
 
+        function init() {
+            var widget = findChild(preview, "previewListRow0");
+            widget.positionViewAtBeginning();
+        }
+
         function test_triggered() {
             waitForRendering(preview);
             var widget = findChild(preview, "widget-3");
@@ -102,5 +107,31 @@
                 return bottomLeft.y <= preview.height
             }, true);
         }
+
+        function test_comboEnsureVisible() {
+            waitForRendering(preview);
+
+            // Scroll down
+            var previewListRow0 = findChild(preview, "previewListRow0");
+            touchFlick(preview, preview.width / 2, units.gu(20), preview.width / 2, units.gu(1));
+            tryCompare(previewListRow0, "atYEnd", true);
+            tryCompare(previewListRow0, "moving", false);
+
+            // Click on the combo
+            var widget = findChild(preview, "widget-21");
+            var initialWidgetHeight = widget.height;
+            var moreLessButton = findChild(widget, "moreLessButton");
+            mouseClick(moreLessButton);
+
+            // Make sure the combo is growing
+            tryCompareFunction(function () { return widget.height > 2 * initialWidgetHeight; }, true);
+
+            // Wait for the combo to stop growing
+            tryCompareFunction(function () { var currentWidgetHeight = widget.height; wait(200); return currentWidgetHeight === widget.height;}, true);
+
+            // Make sure the combo bottom is on the viewport
+            var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
+            verify(bottomLeft.y <= preview.height);
+        }
     }
 }
 
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2015-02-11 08:35:33 +0000
@@ -380,8 +380,8 @@
 
                 tryCompare(testCase.subPageLoader, "open", false);
 
+                tryCompareFunction(function() { return findChild(category, "delegate1") != null; }, true);
                 var tile = findChild(category, "delegate1");
-                verify(tile, "Could not find delegate");
 
                 mouseClick(tile);
                 tryCompare(testCase.subPageLoader, "open", true);