git.iko.soy/unity8
on xenial help sign in
test for pressed, not clicked
7973e42Michael Zanetti
tests/qmltests/Launcher/tst_Launcher.qml+6−9
compare with xenial
unifiedsplit
@@ -37,6 +37,9 @@ Rectangle {
37 MouseArea {
37 MouseArea {
38 id: clickThroughTester
38 id: clickThroughTester
39 anchors.fill: parent
39 anchors.fill: parent
40+ // SignalSpy does not seem to want to connect to the pressed signal. let's count them ourselves.
41+ property int pressCount: 0
42+ onPressed: pressCount++;
40 }
43 }
41
44
42 Loader {
45 Loader {
@@ -207,12 +210,6 @@ Rectangle {
207 target: LauncherModel
210 target: LauncherModel
208 }
211 }
209
212
210− SignalSpy {
211− id: clickThroughSpy
212− target: clickThroughTester
213− signalName: "clicked"
214− }
215−
216 Item {
213 Item {
217 id: fakeDismissTimer
214 id: fakeDismissTimer
218 property bool running: false
215 property bool running: false
@@ -846,12 +843,12 @@ Rectangle {
846 function test_launcher_dismiss() {
843 function test_launcher_dismiss() {
847 dragLauncherIntoView();
844 dragLauncherIntoView();
848 verify(launcher.state == "visible");
845 verify(launcher.state == "visible");
849− clickThroughSpy.clear();
846+ clickThroughTester.pressCount = 0;
850
847
851 mouseClick(root, root.width / 2, units.gu(1));
848 mouseClick(root, root.width / 2, units.gu(1));
852 waitUntilLauncherDisappears();
849 waitUntilLauncherDisappears();
853 verify(launcher.state == "");
850 verify(launcher.state == "");
854− verify(clickThroughSpy.count, 1);
851+ verify(clickThroughTester.pressCount, 1);
855
852
856 // and repeat, as a test for regression in lpbug#1531339
853 // and repeat, as a test for regression in lpbug#1531339
857 dragLauncherIntoView();
854 dragLauncherIntoView();
@@ -859,7 +856,7 @@ Rectangle {
859 mouseClick(root, root.width / 2, units.gu(1));
856 mouseClick(root, root.width / 2, units.gu(1));
860 waitUntilLauncherDisappears();
857 waitUntilLauncherDisappears();
861 verify(launcher.state == "");
858 verify(launcher.state == "");
862− verify(clickThroughSpy.count, 2);
859+ verify(clickThroughTester.pressCount, 2);
863 }
860 }
864
861
865 function test_quicklist_positioning_data() {
862 function test_quicklist_positioning_data() {