Merge lp:~zsombi/ubuntu-ui-toolkit/switchFixTrunk into lp:ubuntu-ui-toolkit

[Zsombor Egri]

Switch and CheckBox fix when checked is not toggled when clicked() signal is emitted.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-09-30 18:55:20 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-10-30 13:30:25 +0000
@@ -81,7 +81,7 @@
 {
     UCActionItem::componentComplete();
     // connect to the right slot, using macros so we get the proper slot
-    connect(this, SIGNAL(clicked()), this, SLOT(trigger()));
+    connect(m_mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), this, SLOT(trigger()));
 
     // bind mouse area
     connect(m_mouseArea, &QQuickMouseArea::pressedChanged, this, &UCAbstractButton::pressedChanged);

=== modified file 'tests/unit_x11/tst_components/tst_abstractbutton13.qml'
--- tests/unit_x11/tst_components/tst_abstractbutton13.qml	2015-09-30 18:55:20 +0000
+++ tests/unit_x11/tst_components/tst_abstractbutton13.qml	2015-10-30 13:30:25 +0000
@@ -97,7 +97,9 @@
             absButton.action = action1
             compare(absButton.action, action1, "Action can be set")
             var numTriggers = action1.triggerCount
-            absButton.clicked()
+            triggeredSpy.target = absButton.action;
+            mouseClick(absButton, centerOf(absButton).x, centerOf(absButton).y);
+            triggeredSpy.wait(500);
             compare(action1.triggerCount, numTriggers+1, "Button clicked triggers action")
             absButton.action = null
         }

=== added file 'tests/unit_x11/tst_components/tst_bug1510919.qml'
--- tests/unit_x11/tst_components/tst_bug1510919.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_bug1510919.qml	2015-10-30 13:30:25 +0000
@@ -0,0 +1,75 @@
+/*
+ * 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 Ubuntu.Components 1.3
+import QtTest 1.0
+import Ubuntu.Test 1.0
+
+MainView {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Column {
+        CheckBox {
+            id: checkBox
+        }
+        Switch {
+            id: switchBox
+        }
+    }
+
+    UbuntuTestCase {
+        name: "CheckAndSwitch"
+        when: windowShown
+
+        SignalSpy {
+            id: clickSpy
+            signalName: "clicked"
+        }
+
+        function cleanup() {
+            clickSpy.target = null;
+            clickSpy.clear();
+            checkBox.checked = false;
+            switchBox.checked = false;
+        }
+
+        function initTestCase() {
+            TestExtras.registerTouchDevice();
+        }
+
+        function test_checked_in_sync_with_clicked_data() {
+            return [
+                {tag: "CheckBox with touch", item: checkBox, touch: true},
+                {tag: "CheckBox with mouse", item: checkBox, touch: false},
+                {tag: "Switch with touch", item: switchBox, touch: true},
+                {tag: "Switch with mouse", item: switchBox, touch: false},
+            ];
+        }
+        function test_checked_in_sync_with_clicked(data) {
+            var checked = data.item.checked;
+            clickSpy.target = data.item;
+            if (data.touch) {
+                TestExtras.touchClick(0, data.item, centerOf(data.item));
+            } else {
+                mouseClick(data.item, centerOf(data.item).x, centerOf(data.item).y);
+            }
+            clickSpy.wait(500);
+            compare(data.item.checked, !checked, "checked property shoudl be altered!");
+        }
+    }
+}