Revert "Make QtQuickTest::mouseEvent use QTest::mouseX"

It seems this is causing QTBUG-62925 and QTBUG-62926 so revert
is the best option at this point to proceed

This reverts commit 4c46dce8fd9c9dddddd1d07f56396b3eabb2efc4.

Change-Id: Ia8ea85c1ac1ada1752b29c9fbd8439f5963d46d2
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

5 files changed, 52 insertions, 151 deletions

diff --git a/tests/auto/qmltest/events/tst_drag.qml b/tests/auto/qmltest/events/tst_drag.qml
index 74affb6287..ae77247a41 100644
--- a/tests/auto/qmltest/events/tst_drag.qml
+++ b/tests/auto/qmltest/events/tst_drag.qml
@@ -72,14 +72,12 @@ Rectangle{
         height:100
         color: "red"
         property bool updatePositionWhileDragging: false
-        property double posX: 0
-        property double posY: 0
-
-        function reset(mouseX, mouseY) {
-            posX = mouseX;
-            posY = mouseY;
-            fakeHandle.x = mouseX;
-            fakeHandle.y = mouseY;
+        property var posX: 0
+        property var posY: 0
+
+        function reset() {
+            fakeHandle.x = 0
+            fakeHandle.y = 0
             spyX.clear()
             spyY.clear()
         }
@@ -118,56 +116,52 @@ Rectangle{
     TestCase {
         name:"mouserelease"
         when:windowShown
-
-        function test_mouseDrag_data() {
-            return [
-                { tag: "short", dx: 20, dy: 30 },
-                { tag: "long", dx: 70, dy: 60 },
-                { tag: "longshort", dx: 70, dy: 20 },
-                { tag: "shortlong", dx: 20, dy: 70 }
-            ];
-        }
-
-        function test_mouseDrag(data) {
-            container.x = 0;
-            container.y = 0;
-            mouseDrag(container, 10, 10, data.dx, data.dy);
-            compare(container.x, data.dx - util.dragThreshold - 1);
-            compare(container.y, data.dy - util.dragThreshold - 1);
-        }
-
-        function test_doSomethingInsteadOfDragging_data() {
-            return [
-                { tag: "short",            updatePositionWhileDragging: false, dx: 2*util.dragThreshold,   dy: 2*util.dragThreshold },
-                { tag: "long",             updatePositionWhileDragging: false, dx: 10*util.dragThreshold,  dy: 10*util.dragThreshold },
-                { tag: "nothing_short",    updatePositionWhileDragging: false, dx: 0,                      dy: 2*util.dragThreshold },
-                { tag: "long_nothing",     updatePositionWhileDragging: false, dx: 10*util.dragThreshold,  dy: 0 },
-                { tag: "short_update",     updatePositionWhileDragging: true, dx: 2*util.dragThreshold,   dy: 2*util.dragThreshold },
-                { tag: "long_update",      updatePositionWhileDragging: true, dx: 10*util.dragThreshold,  dy: 10*util.dragThreshold },
-                { tag: "nothing_short_up", updatePositionWhileDragging: true, dx: 0,                      dy: 2*util.dragThreshold },
-                { tag: "long_nothing_up",  updatePositionWhileDragging: true, dx: 10*util.dragThreshold,  dy: 0 },
-            ];
+        function test_mouseDrag() {
+            mouseDrag(container, 10, 10, util.dragThreshold * 2, util.dragThreshold * 3);
+            compare(container.x, util.dragThreshold - 1);
+            compare(container.y, util.dragThreshold * 2 - 1);
         }
 
-        function test_doSomethingInsteadOfDragging(data) {
-            var expectedSpyCountX;
-            var expectedSpyCountY;
-
-            if (!data.updatePositionWhileDragging) {
-                expectedSpyCountX = data.dx > util.dragThreshold ? 1 : 0;
-                expectedSpyCountY = data.dy > util.dragThreshold ? 1 : 0;
-            } else {
-                expectedSpyCountX = data.dx > util.dragThreshold * 3 ? 3 :
-                                        (data.dx > util.dragThreshold ? 1 : 0);
-                expectedSpyCountY = data.dy > util.dragThreshold * 3 ? 3 :
-                                        (data.dy > util.dragThreshold ? 1 : 0);
-            }
-
-            container2.updatePositionWhileDragging = data.updatePositionWhileDragging;
-            container2.reset(container2.x + 10, container2.y + 10);
-            mouseDrag(container2, container2.x + 10, container2.y + 10, data.dx, data.dy);
-            compare(spyX.count, expectedSpyCountX)
-            compare(spyY.count, expectedSpyCountY)
+        function test_doSomethingWhileDragging() {
+            container2.updatePositionWhileDragging = false
+            // dx and dy are superior to 3 times util.dragThreshold.
+            // but here the dragging does not update posX and posY
+            // posX and posY are only updated on mouseRelease
+            container2.reset()
+            mouseDrag(container2, container2.x + 10, container2.y + 10, 10*util.dragThreshold, 10*util.dragThreshold);
+            compare(spyX.count, 1)
+            compare(spyY.count, 1)
+
+            container2.updatePositionWhileDragging = true
+            // dx and dy are superior to 3 times util.dragThreshold.
+            // 3 intermediate mouseMove when dragging
+            container2.reset()
+            mouseDrag(container2, container2.x + 10, container2.y + 10, 10*util.dragThreshold, 10*util.dragThreshold);
+            compare(spyX.count, 3)
+            compare(spyY.count, 3)
+
+            // dx and dy are inferior to 3 times util.dragThreshold.
+            // No intermediate mouseMove when dragging, only one mouseMove
+            container2.reset()
+            mouseDrag(container2, container2.x + 10, container2.y + 10, 2*util.dragThreshold, 2*util.dragThreshold);
+            compare(spyX.count, 1)
+            compare(spyY.count, 1)
+
+            // dx is superior to 3 times util.dragThreshold.
+            // 3 intermediate mouseMove when dragging on x axis
+            // no move on the y axis
+            container2.reset()
+            mouseDrag(container2, container2.x + 10, container2.y + 10, 10*util.dragThreshold, 0);
+            compare(spyX.count, 3)
+            compare(spyY.count, 0)
+
+            // dy is inferior to 3 times util.dragThreshold.
+            // No intermediate mouseMove when dragging, only one mouseMove on y axis
+            // no move on the x axis
+            container2.reset()
+            mouseDrag(container2, container2.x + 10, container2.y + 10, 0, 2*util.dragThreshold);
+            compare(spyX.count, 0)
+            compare(spyY.count, 1)
         }
     }
 }
diff --git a/tests/auto/qmltest/events/tst_events.qml b/tests/auto/qmltest/events/tst_events.qml
index b3995e99c0..d9868a316c 100644
--- a/tests/auto/qmltest/events/tst_events.qml
+++ b/tests/auto/qmltest/events/tst_events.qml
@@ -59,10 +59,9 @@ Rectangle {
 
     Window {
         id: sub
-        visible: false
+        visible: true
         property bool clicked: false
         MouseArea {
-            id: subMouseArea
             anchors.fill: parent
             onClicked: sub.clicked = true
         }
@@ -102,8 +101,6 @@ Rectangle {
         }
 
         function test_mouse_click_subwindow() {
-            sub.visible = true;
-            waitForRendering(subMouseArea); // Since we don't have a waitForWindowShown
             mouseClick(sub)
             tryCompare(sub, "clicked", true, 10000)
         }
diff --git a/tests/auto/quicktest/quicktest.pro b/tests/auto/quicktest/quicktest.pro
index ee22131753..3b4ec23a64 100644
--- a/tests/auto/quicktest/quicktest.pro
+++ b/tests/auto/quicktest/quicktest.pro
@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = \
-    signalspy \
-    testevent
+    signalspy
diff --git a/tests/auto/quicktest/testevent/testevent.pro b/tests/auto/quicktest/testevent/testevent.pro
deleted file mode 100644
index bd97e13b89..0000000000
--- a/tests/auto/quicktest/testevent/testevent.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG += testcase
-TARGET = tst_testevent
-macos:CONFIG -= app_bundle
-
-SOURCES += tst_testevent.cpp
-QT += quick testlib qmltest-private
-
-include (../../shared/util.pri)
diff --git a/tests/auto/quicktest/testevent/tst_testevent.cpp b/tests/auto/quicktest/testevent/tst_testevent.cpp
deleted file mode 100644
index 8adb98f33b..0000000000
--- a/tests/auto/quicktest/testevent/tst_testevent.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-
-#include <QtQuick/qquickitem.h>
-#include <QtQuick/qquickwindow.h>
-#include "QtQuickTest/private/quicktestevent_p.h"
-
-class tst_testevent : public QObject
-{
-    Q_OBJECT
-public:
-
-private slots:
-    void moveSetsQuickItemIsUnderMouse();
-};
-
-void tst_testevent::moveSetsQuickItemIsUnderMouse()
-{
-    QQuickWindow w;
-    w.resize(400, 400);
-    w.show();
-    w.requestActivate();
-    QTest::qWaitForWindowActive(&w);
-
-    QTRY_COMPARE(QGuiApplication::focusWindow(), &w);
-
-    QQuickItem *item = new QQuickItem(w.contentItem());
-    item->setX(0);
-    item->setY(0);
-    item->setWidth(100);
-    item->setHeight(100);
-
-    QQuickItem *item2 = new QQuickItem(w.contentItem());
-    item2->setX(100);
-    item2->setY(100);
-    item2->setWidth(100);
-    item2->setHeight(100);
-
-    QuickTestEvent te;
-    te.mouseMove(w.contentItem(), 10, 10, /*delay*/ -1, Qt::NoButton);
-
-    QVERIFY(item->isUnderMouse());
-    QVERIFY(!item2->isUnderMouse());
-
-    te.mouseMove(w.contentItem(), 110, 110, /*delay*/ -1, Qt::NoButton);
-
-    QVERIFY(!item->isUnderMouse());
-    QVERIFY(item2->isUnderMouse());
-
-}
-
-QTEST_MAIN(tst_testevent)
-
-#include "tst_testevent.moc"