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

[Albert Astals Cid]

Add a test that checks that items in an expandable are the correct size after expanding the expandable

 * 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?
Yes

 * 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

[lp:~aacid/unity8/testExpandableHeights]

1903. By Albert Astals Cid on 2015-08-04

even -> event

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1903
http://jenkins.qa.ubuntu.com/job/unity8-ci/6140/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/170/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/379/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/380/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/485/console

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
unrelated
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

=== modified file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml	2015-02-12 10:44:27 +0000
+++ qml/Dash/Previews/PreviewActions.qml	2015-08-04 14:01:54 +0000
@@ -25,7 +25,7 @@
 PreviewWidget {
     id: root
 
-    height: row.height + units.gu(1)
+    implicitHeight: row.height + units.gu(1)
 
     Row {
         id: row

=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
--- qml/Dash/Previews/PreviewHeader.qml	2015-05-06 15:05:06 +0000
+++ qml/Dash/Previews/PreviewHeader.qml	2015-08-04 14:01:54 +0000
@@ -30,7 +30,7 @@
 PreviewWidget {
     id: root
 
-    height: childrenRect.height
+    implicitHeight: childrenRect.height
 
     Item {
         id: headerRoot

=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
--- qml/Dash/Previews/PreviewRatingDisplay.qml	2015-05-11 07:33:41 +0000
+++ qml/Dash/Previews/PreviewRatingDisplay.qml	2015-08-04 14:01:54 +0000
@@ -38,7 +38,7 @@
 
 PreviewWidget {
     id: root
-    height: childrenRect.height
+    implicitHeight: childrenRect.height
 
     Column {
         anchors { left: parent.left; right: parent.right; }

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-08-04 14:01:54 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-08-04 14:01:54 +0000
@@ -34,21 +34,122 @@
         "values": [ [ "Long Label 1", "Value 1"],  [ "Label 2", "Long Value 2"],  [ "Label 3", "Value 3"],  [ "Label 4", "Value 4"],  [ "Label 5", "Value 5"] ]
     }
 
+    property var actionsData: {
+        "actions": [ {"label": "Some Label", "id": "someid"} ]
+    }
+
+    property var audioData: {
+        "tracks": [ { title: "Some track name", length: "30", source: "/not/existing/path/testsound1" } ]
+    }
+
+    property var commentData: {
+        "author": "Claire Thompson",
+        "comment": "C.",
+        "source": "../../graphics/avatars/[e-mail]"
+    }
+
+    property var commentInputData: {
+        "submit-label": "TestSubmitLabel"
+    }
+
+    property var galleryData: {
+        "sources": [
+                    "../../graphics/phone_background.jpg",
+                    "../../graphics/tablet_background.jpg",
+                    "../../graphics/[e-mail]",
+                    "../../graphics/borked"
+                   ]
+    }
+
+    property var headerData: {
+        "title": "THE TITLE",
+        "subtitle": "Something catchy"
+    }
+
+    property var iconActionsData: {
+        "actions": [ {"label": "10", "id": "s", "icon": Qt.resolvedUrl("../artwork/[e-mail]") } ]
+    }
+
+    property var imageData: {
+        "source": "../../graphics/phone_background.jpg",
+        "zoomable": false
+    }
+
+    property var paymentsData: {
+        "source": { "price" : 0.99, "currency": "USD", "store_item_id": "com.example.package" }
+    }
+
+    property var progressData: {
+        "type": "progress",
+        "source": { "dbus-name" : "somename", "dbus-object": "somestring" }
+    }
+
+    property var ratingInputData: {
+        "visible": "both",
+        "required": "both"
+    }
+
+    property var ratingEditData: {
+        "visible": "both",
+        "required": "both",
+        author: "Some dude",
+        rating: 4.5,
+        review: "Very cool app"
+    }
+
+    property var reviewsData: {
+        "reviews": [ { author: "Some dude", rating: 4.5, review: "Very cool app" } ]
+    }
+
+    property var videoData: {
+        "source": "",
+        "screenshot": "../../../tests/qmltests/Components/tst_LazyImage/square.png"
+    }
+
     ListModel {
         id: widgetsModel
     }
 
+    ListModel {
+        id: allWidgetsModel
+    }
+
     property var widgetData: {
         "title": "Title here",
         "collapsed-widgets": 2,
         "widgets": widgetsModel
     }
 
+    property var allWidgetsData: {
+        "title": "Title here",
+        "collapsed-widgets": 0,
+        "widgets": allWidgetsModel
+    }
+
+
     Component.onCompleted: {
         widgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});
         widgetsModel.append({"type": "table", "widgetId": "table1", "properties": tableData });
         widgetsModel.append({"type": "text", "widgetId": "text3", "properties": { "text": shortText }});
         widgetsModel.append({"type": "text", "widgetId": "text4", "properties": { "text": longText2 }});
+
+        allWidgetsModel.append({"type": "actions", "widgetId": "actions1", "properties": actionsData });
+        allWidgetsModel.append({"type": "audio", "widgetId": "audio1", "properties": audioData });
+        allWidgetsModel.append({"type": "comment", "widgetId": "comment1", "properties": commentData });
+        allWidgetsModel.append({"type": "comment-input", "widgetId": "comment-input1", "properties": commentInputData });
+        // "expandable" For now we're not testing inception of expandables
+        allWidgetsModel.append({"type": "gallery", "widgetId": "gallery1", "properties": galleryData });
+        allWidgetsModel.append({"type": "header", "widgetId": "header1", "properties": headerData });
+        allWidgetsModel.append({"type": "icon-actions", "widgetId": "icon-actions1", "properties": iconActionsData } );
+        allWidgetsModel.append({"type": "image", "widgetId": "image1", "properties": imageData });
+        allWidgetsModel.append({"type": "payments", "widgetId": "payments1", "properties": paymentsData });
+        allWidgetsModel.append({"type": "progress", "widgetId": "progress1", "properties": progressData });
+        allWidgetsModel.append({"type": "rating-input", "widgetId": "rating-input1", "properties": ratingInputData });
+        allWidgetsModel.append({"type": "rating-edit", "widgetId": "rating-edit1", "properties": ratingEditData });
+        allWidgetsModel.append({"type": "reviews", "widgetId": "reviews1", "properties": reviewsData });
+        allWidgetsModel.append({"type": "table", "widgetId": "table1", "properties": tableData });
+        allWidgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});
+        allWidgetsModel.append({"type": "video", "widgetId": "video1", "properties": videoData });
     }
 
     PreviewWidgetFactory {
@@ -58,6 +159,12 @@
         widgetData: root.widgetData
     }
 
+    PreviewWidgetFactory {
+        id: previewWidgetFactory
+        anchors { left: parent.left; right: parent.right; top: previewExpandable.bottom  }
+        opacity: 0
+    }
+
     UT.UnityTestCase {
         name: "PreviewExpandableTest"
         when: windowShown
@@ -78,13 +185,10 @@
         }
 
         function init() {
+            previewExpandable.widgetData = widgetData;
             checkInitialState();
         }
 
-        function test_collapsed_by_default() {
-            // Nothing init does this already
-        }
-
         function test_expand_collapse() {
             var expandButton = findChild(previewExpandable, "expandButton")
             mouseClick(expandButton);
@@ -105,5 +209,42 @@
 
             checkInitialState();
         }
+
+        function test_all_widgets_height() {
+            previewExpandable.widgetData = allWidgetsData;
+
+            var repeater = findChild(previewExpandable, "repeater")
+            for (var i = 0; i < repeater.count; ++i) {
+                tryCompare(repeater.itemAt(i), "height", 0);
+            }
+
+            var expandButton = findChild(previewExpandable, "expandButton")
+            mouseClick(expandButton);
+
+            var repeater = findChild(previewExpandable, "repeater")
+            for (var i = 0; i < repeater.count; ++i) {
+                previewWidgetFactory.active = false;
+                wait(0); // spin the event loop otherwise we get warnings because the previous item from the
+                         // widget factory has still not been deleted and we change the widgetData
+                previewWidgetFactory.widgetData = allWidgetsModel.get(i).properties;
+                previewWidgetFactory.widgetType = allWidgetsModel.get(i).type;
+                previewWidgetFactory.active = true;
+
+                // Wait for the height ot settle by waiting twice the time of the
+                // longest of the height behaviour animations
+                wait(UbuntuAnimation.SnapDuration * 2);
+
+                // Check the item inside the expandable has the same height
+                // as the one straight from the factory
+                verify(repeater.itemAt(i).height > 0);
+                tryCompare(repeater.itemAt(i), "height", previewWidgetFactory.height);
+            }
+
+            mouseClick(expandButton);
+            compare(previewExpandable.expanded, false);
+            for (var i = 0; i < repeater.count; ++i) {
+                tryCompare(repeater.itemAt(i), "height", 0);
+            }
+        }
     }
 }