Merge lp:~unity-team/unity/phablet.test_responsiveflowview into lp:unity/phablet

[Andrea Cimitan]

Add tests for ResponsiveFlowView

Adds tests for ResponsiveFlowView, adapting from ResponsiveGridView

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:538
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/286/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/287
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/162
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/654

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/286/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Change ResponsiveGridView -> Change ResponsiveFlowView

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:539
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/323
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/323/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/198
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/718

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/322/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:539
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/323/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/55/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/324
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/323
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/199
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/722

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/323/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:539
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/350/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/73/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/351
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/351/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/226
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/226/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/755

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/350/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:539
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/351/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/75/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/352
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/227
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/227/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/758

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/351/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:540
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/357/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/358
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/358/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/767

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/357/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good to me, let's wait for CI before merging

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:541
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/~unity-team/unity/phablet.test_responsiveflowview/+merge/157830/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/360/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/84/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/361
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/361/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/360
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/236
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/768

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/360/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:541
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/361/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/362
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/362/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/237
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/771

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/361/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/142/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/94
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/76/console

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Makes sense

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~unity-team/unity/phablet.test_responsiveflowview/+merge/157901/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:542
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/375/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/376
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/251
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/788

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/375/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:542
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/376/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/377
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/252
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/252/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/256
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/791/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/376/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Components/ResponsiveFlowView.qml'
--- Components/ResponsiveFlowView.qml	2013-04-09 12:30:58 +0000
+++ Components/ResponsiveFlowView.qml	2013-04-09 15:54:23 +0000
@@ -30,6 +30,8 @@
     property alias firstModel: repeater1.model
     property alias secondModel: repeater2.model
     property alias delegate: repeater1.delegate
+    readonly property int cellWidth: referenceDelegateWidth + horizontalSpacing
+    readonly property int cellHeight: referenceDelegateWidth + verticalSpacing
 
     height: flow.height + flow.anchors.topMargin
 

=== modified file 'tests/qmluitests/Components/CMakeLists.txt'
--- tests/qmluitests/Components/CMakeLists.txt	2013-04-08 17:08:40 +0000
+++ tests/qmluitests/Components/CMakeLists.txt	2013-04-09 15:54:23 +0000
@@ -1,5 +1,6 @@
 add_qml_test(DraggingArea)
 add_qml_test(FilterGrid IMPORT_PATH ${CMAKE_BINARY_DIR}/plugins)
+add_qml_test(ResponsiveFlowView)
 add_qml_test(ResponsiveGridView)
 add_qml_test(Revealer)
 add_qml_test(Showable)

=== added file 'tests/qmluitests/Components/tst_ResponsiveFlowView.qml'
--- tests/qmluitests/Components/tst_ResponsiveFlowView.qml	1970-01-01 00:00:00 +0000
+++ tests/qmluitests/Components/tst_ResponsiveFlowView.qml	2013-04-09 15:54:23 +0000
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import ".."
+import "../../../Components"
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 0.1
+
+Item {
+    width: flowRect.width + controls.width
+    height: units.gu(80)
+
+    Column {
+        id: controls
+        width: units.gu(40)
+        height: parent.height
+        anchors.top: parent.top
+        anchors.right: parent.right
+        ListItem.ValueSelector {
+            id: maxColumnsSelector
+            text: "maximumNumberOfColumns"
+            values: [2,4,8,13,1000]
+            selectedIndex: 1
+        }
+        ListItem.ValueSelector {
+            id: minHSpacingSelector
+            text: "minHorizontalSpacing"
+            values: [0,units.gu(2),units.gu(8),units.gu(25)]
+            selectedIndex: 0
+        }
+    }
+
+    ListModel {
+        id: fakeModel
+        ListElement { name: "A" }
+        ListElement { name: "B" }
+        ListElement { name: "C" }
+        ListElement { name: "D" }
+        ListElement { name: "E" }
+        ListElement { name: "F" }
+        ListElement { name: "G" }
+        ListElement { name: "H" }
+        ListElement { name: "I" }
+        ListElement { name: "J" }
+        ListElement { name: "K" }
+        ListElement { name: "L" }
+        ListElement { name: "M" }
+        ListElement { name: "N" }
+        ListElement { name: "O" }
+        ListElement { name: "P" }
+        ListElement { name: "Q" }
+        ListElement { name: "R" }
+        ListElement { name: "S" }
+        ListElement { name: "T" }
+        ListElement { name: "U" }
+    }
+
+    Rectangle {
+        id: flowRect
+        width: units.gu(80)
+        height: parent.height
+        color: "grey"
+        anchors.top: parent.top
+        anchors.left: parent.left
+
+        ResponsiveFlowView {
+            id: flow
+            anchors.fill: parent
+            firstModel: fakeModel
+            secondModel: fakeModel
+            minimumHorizontalSpacing:
+                minHSpacingSelector.values[minHSpacingSelector.selectedIndex]
+            verticalSpacing: units.gu(2)
+            maximumNumberOfColumns:
+                maxColumnsSelector.values[maxColumnsSelector.selectedIndex]
+            referenceDelegateWidth: units.gu(6)
+
+            delegate: Rectangle {
+                // So that it can be identified by test code
+                property bool isFlowDelegate: true
+                color: "grey"
+                border.color: "red"
+                border.width: 1
+
+                // IMPORTANT: always use flow's cellWidth and cellHeight here to get
+                // ResponsiveFlowView's intended result
+                width: flow.cellWidth
+                height: flow.cellHeight
+
+                Rectangle {
+                    color: "green"
+                    anchors.centerIn: parent
+                    width: units.gu(6)
+                    height: units.gu(6)
+                    Text {
+                        anchors.centerIn: parent
+                        text: name
+                    }
+                }
+
+                Text { x:0; y:0; text:"(" + parent.x + ", " + parent.y + ")"}
+            }
+        }
+    }
+
+    UnityTestCase {
+        name: "ResponsiveFlowView"
+        when: windowShown
+
+        function test_maximumNumberOfColumns_data() {
+            var data = new Array()
+
+            data.push({selectedIndex: 0, maxColumnCount:2, columnCount: 2})
+            data.push({selectedIndex: 1, maxColumnCount:4, columnCount: 4})
+            data.push({selectedIndex: 2, maxColumnCount:8, columnCount: 8})
+            data.push({selectedIndex: 4, maxColumnCount:1000, columnCount: 13})
+
+            return data
+        }
+
+        /* Change ResponsiveFlowView's maximumNumberOfColumns property and check
+           that the resulting number of columns matches expectations */
+        function test_maximumNumberOfColumns(data) {
+            minHSpacingSelector.selectedIndex = 0
+
+            // sanity checks
+            compare(maxColumnsSelector.values[data.selectedIndex], data.maxColumnCount)
+            compare(minHSpacingSelector.values[0], 0)
+
+            maxColumnsSelector.selectedIndex = data.selectedIndex
+            tryCompareFunction(countFlowDelegatesOnFirstRow, data.columnCount);
+            compare(flow.columns, data.columnCount)
+        }
+
+        function test_minimumHorizontalSpacing_data() {
+            var data = new Array()
+
+            data.push({selectedIndex: 0, minHSpacing:0, columnCount: 13})
+            data.push({selectedIndex: 1, minHSpacing:units.gu(2), columnCount: 9})
+            data.push({selectedIndex: 2, minHSpacing:units.gu(8), columnCount: 5})
+            data.push({selectedIndex: 3, minHSpacing:units.gu(25), columnCount: 2})
+
+            return data
+        }
+
+        /* Change ResponsiveFlowView's minimumHorizontalSpacing property and check
+           that the resulting number of columns matches expectations */
+        function test_minimumHorizontalSpacing(data) {
+            maxColumnsSelector.selectedIndex = 4
+
+            // sanity checks
+            compare(maxColumnsSelector.values[4], 1000)
+            compare(minHSpacingSelector.values[data.selectedIndex], data.minHSpacing)
+
+            minHSpacingSelector.selectedIndex = data.selectedIndex
+            tryCompareFunction(countFlowDelegatesOnFirstRow, data.columnCount);
+            compare(flow.columns, data.columnCount)
+        }
+
+        function countFlowDelegatesOnFirstRow() {
+            return __countFlowDelegatesOnFirstRow(flow.visibleChildren, 0)
+        }
+
+        function __countFlowDelegatesOnFirstRow(objList, total) {
+            for (var i = 0; i < objList.length; ++i) {
+                var child = objList[i];
+                if (child.isFlowDelegate !== undefined && child.y === 0) {
+                    ++total;
+                } else {
+                    total = __countFlowDelegatesOnFirstRow(child.visibleChildren, total)
+                }
+            }
+            return total
+        }
+    }
+}