diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-26 21:34:02 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-10-29 20:29:00 +0100 |
| commit | f128b5dee8a2a03ebc55ed0cd1e749a6599282c3 (patch) | |
| tree | cd16b82ace97922f99a7c777ed851f08ced62e04 /tests/auto/qmltest | |
| parent | cbb49ad30b5b5c1cc30531c6bd6c9fbcc4142da0 (diff) | |
Fix qmltest::event tests
- Stationary points are delivered like updated points after
05dc0a387ae324f2d6f3d7e633a0a49473f6957a
- QQuickItemPrivate::localizedTouchEvent() seems to need to
detach QEventPoint instances with Released state, to avoid
losing the localization during delivery
- calling stationary() or release() without position causes
the event to occur at the middle of the item, not at the
last-known position as the test was expecting
Task-number: QTBUG-86729
Change-Id: I6bdcebc04a11d93d1d006f8269c1df2e9206a393
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/events/BLACKLIST | 8 | ||||
| -rw-r--r-- | tests/auto/qmltest/events/tst_touch.qml | 14 |
2 files changed, 7 insertions, 15 deletions
diff --git a/tests/auto/qmltest/events/BLACKLIST b/tests/auto/qmltest/events/BLACKLIST deleted file mode 100644 index e43b7a94d7..0000000000 --- a/tests/auto/qmltest/events/BLACKLIST +++ /dev/null @@ -1,8 +0,0 @@ -[touch::test_childMapping] -* -[touch::test_simpleChain] -* -[touch::test_fullSequence] -* -[touch::test_secondWindow] -* diff --git a/tests/auto/qmltest/events/tst_touch.qml b/tests/auto/qmltest/events/tst_touch.qml index b7fa701429..ab54eb9e09 100644 --- a/tests/auto/qmltest/events/tst_touch.qml +++ b/tests/auto/qmltest/events/tst_touch.qml @@ -157,27 +157,27 @@ MultiPointTouchArea { compare(touchPoints.length, 1); verify(comparePoint(touchPoints[0], first, 0, 0)); - sequence.stationary(first); + sequence.stationary(first, null, 0, 0); sequence.press(second, null, 1, 0); sequence.commit(); - compare(touchUpdatedSpy.count, 2); + compare(touchUpdatedSpy.count, 3); touchPoints = touchUpdatedSpy.signalArguments[1][0]; compare(touchPoints.length, 2); verify(comparePoint(touchPoints[0], first, 0, 0)); verify(comparePoint(touchPoints[1], second, 1, 0)); - sequence.release(first); + sequence.release(first, null, 0, 0); sequence.move(second, null, 1, 1); sequence.commit(); - compare(touchUpdatedSpy.count, 3); - touchPoints = touchUpdatedSpy.signalArguments[2][0]; + compare(touchUpdatedSpy.count, 4); + touchPoints = touchUpdatedSpy.signalArguments[3][0]; compare(touchPoints.length, 1); verify(comparePoint(touchPoints[0], second, 1, 1)); sequence.release(second, null, 0, 1); sequence.commit(); - compare(touchUpdatedSpy.count, 4); - touchPoints = touchUpdatedSpy.signalArguments[3][0]; + compare(touchUpdatedSpy.count, 5); + touchPoints = touchUpdatedSpy.signalArguments[4][0]; compare(touchPoints.length, 0); } |