Merge lp:~tpeeters/ubuntu-ui-toolkit/landing16-fix1099455 into lp:ubuntu-ui-toolkit

[Tim Peeters]

Fix issue with trigger() for ListItems.Standard.

[lp:~tpeeters/ubuntu-ui-toolkit/landing16-fix1099455]

1276. By Tim Peeters on 2015-12-21

duplicate tests

1277. By Tim Peeters on 2015-12-21

revert original test

[Zsombor Egri (zsombi)]

Nice, looks great! This proves that the AbstractButton works as was planned, not triggering when the __acceptEvents is set to false.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1275
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2247/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/71/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2247/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/ListItems/1.3/Standard.qml'
--- src/Ubuntu/Components/ListItems/1.3/Standard.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/ListItems/1.3/Standard.qml	2015-12-21 19:44:15 +0000
@@ -273,7 +273,10 @@
 
         Connections {
             target: listItem.__mouseArea
-            onClicked: listItem.clicked()
+            onClicked: {
+                listItem.trigger();
+                listItem.clicked();
+            }
             onPressAndHold: listItem.pressAndHold()
         }
     }

=== added file 'tests/unit_x11/tst_components/tst_listitems13_standard.qml'
--- tests/unit_x11/tst_components/tst_listitems13_standard.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_listitems13_standard.qml	2015-12-21 19:44:15 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+
+Item {
+    width: 400
+    height: 400
+
+    Rectangle {
+        id: testItem
+    }
+
+    AbstractButton {
+        id: testControl
+        visible: false
+    }
+
+    ListItem.Standard {
+        id: listItemStandard
+        anchors.fill: parent
+    }
+
+    TestCase {
+        name: "ListItemsStandardAPI"
+        when: windowShown
+
+        function test_clickToTrigger_bug1527811() {
+            compare(listItemTriggeredSpy.valid, true, "triggered signal exists")
+            var listItemTriggeredCount = listItemTriggeredSpy.count
+            mouseMove(listItemStandard, 10, 10)
+            mouseClick(listItemStandard, 10, 10, Qt.LeftButton)
+            compare(listItemTriggeredSpy.count, listItemTriggeredCount + 1,
+                    "Clicking the list item triggers it")
+        }
+
+        function test_fallbackIconSource() {
+            expectFail("","https://bugs.launchpad.net/tavastia/+bug/1076762")
+            compare(listItemStandard.fallbackIconSource,undefined,"fallbackIconSource is not set by default")
+        }
+
+        function test_control() {
+            listItemStandard.control = testControl
+            compare(listItemStandard.control,testControl,"set/get")
+            listItemStandard.control = null
+            compare(listItemStandard.control, null, "unset")
+        }
+
+        function test_clicked() {
+            compare(listItemClickedSpy.valid, true, "clicked signal exists")
+            compare(controlClickedSpy.valid, true, "control has clicked signal")
+            var listItemClickedCount = listItemClickedSpy.count
+            var controlClickedCount = controlClickedSpy.count
+            mouseMove(listItemStandard, 10, 10)
+            mouseClick(listItemStandard, 10, 10, Qt.LeftButton)
+            listItemClickedCount++;
+            compare(listItemClickedSpy.count, listItemClickedCount, "List item clicked triggered")
+            listItemStandard.control = testControl;
+            mouseMove(listItemStandard, 10, 10)
+            mouseClick(listItemStandard, 10, 10, Qt.LeftButton)
+            compare(listItemStandard.control, testControl, "control can be set")
+            listItemClickedCount++;
+            compare(controlClickedSpy.count, controlClickedCount, "Control clicked triggered")
+            compare(listItemClickedSpy.count, listItemClickedCount, "List item clicked not triggered when there is a control")
+            listItemStandard.control = null;
+        }
+
+        function test_bug1166982_disabled_control_clicked() {
+            var controlClickedCount = controlClickedSpy.count
+            listItemStandard.control = testControl
+            testControl.enabled = false
+            mouseMove(listItemStandard, 10, 10)
+            mouseClick(listItemStandard, 10, 10, Qt.LeftButton)
+            compare(controlClickedSpy.count, controlClickedCount, "Control clicked not triggered with disabled control")
+            testControl.enabled = true
+            listItemStandard.control = null
+        }
+
+        function test_icon() {
+            ignoreWarning("WARNING: ListItems.Standard.icon is DEPRECATED. Use iconName and iconSource instead.")
+            compare(listItemStandard.icon,undefined,"icon is not set by default")
+
+            // test with url
+            var newIcon = Qt.resolvedUrl("../../../examples/ubuntu-ui-toolkit-gallery/small_avatar.png")
+            listItemStandard.icon = newIcon
+            compare(listItemStandard.icon,newIcon,"set/get from url")
+        }
+
+        function test_iconFrame() {
+            compare(listItemStandard.iconFrame,true,"iconFrame is true by default")
+        }
+
+        function test_progression() {
+            compare(listItemStandard.progression,false,"progression is false by default")
+        }
+
+        function test_text() {
+            compare(listItemStandard.text,"","text is '' by default")
+            var newText = "Hello World!"
+            listItemStandard.text = newText
+            compare(listItemStandard.text,newText,"set/get")
+        }
+
+        SignalSpy {
+            id: listItemClickedSpy
+            target: listItemStandard
+            signalName: "clicked"
+        }
+
+        SignalSpy {
+            id: controlClickedSpy
+            target: testControl
+            signalName: "clicked"
+        }
+
+        SignalSpy {
+            id: listItemTriggeredSpy
+            target: listItemStandard
+            signalName: "triggered"
+        }
+    }
+}

=== modified file 'tests/unit_x11/tst_components/tst_listitems_standard.qml'
--- tests/unit_x11/tst_components/tst_listitems_standard.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_listitems_standard.qml	2015-12-21 19:44:15 +0000
@@ -41,6 +41,15 @@
         name: "ListItemsStandardAPI"
         when: windowShown
 
+        function test_clickToTrigger_bug1527811() {
+            compare(listItemTriggeredSpy.valid, true, "triggered signal exists")
+            var listItemTriggeredCount = listItemTriggeredSpy.count
+            mouseMove(listItemStandard, 10, 10)
+            mouseClick(listItemStandard, 10, 10, Qt.LeftButton)
+            compare(listItemTriggeredSpy.count, listItemTriggeredCount + 1,
+                    "Clicking the list item triggers it")
+        }
+
         function test_fallbackIconSource() {
             expectFail("","https://bugs.launchpad.net/tavastia/+bug/1076762")
             compare(listItemStandard.fallbackIconSource,undefined,"fallbackIconSource is not set by default")
@@ -119,5 +128,11 @@
             target: testControl
             signalName: "clicked"
         }
+
+        SignalSpy {
+            id: listItemTriggeredSpy
+            target: listItemStandard
+            signalName: "triggered"
+        }
     }
 }