diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-09-11 15:54:38 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-09-13 08:35:59 +0000 |
| commit | 321dcd297ca0fcc267977bfc29acdd2b29080181 (patch) | |
| tree | b766c374c4c7b95efe6de99245d97693df733672 /tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | |
| parent | c4c27857e0de964a57ae2b919a045f3a82206f56 (diff) | |
Stabilize nestedSliderUsingTouch:keepNeither test on Ubuntu
For whatever reason, it seems we have to be less strict about the exact
number of touchpoint movements that the TouchDragArea will see while
being dragged 8 times. Counting those is really far from the main
point of this test anyway.
Also removed blacklisting of macOS 10.10 tests since we don't
even support 10.11 anymore.
Task-number: QTBUG-36804
Task-number: QTBUG-59840
Fixes: QTBUG-68867
Change-Id: I8f856c5b29de08f55dcd0273cd99dcda77cdf2c3
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickflickable/tst_qquickflickable.cpp')
| -rw-r--r-- | tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index 965ef6987a..65a08ce87f 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -2013,21 +2013,21 @@ void tst_qquickflickable::nestedSliderUsingTouch_data() { QTest::addColumn<bool>("keepMouseGrab"); QTest::addColumn<bool>("keepTouchGrab"); - QTest::addColumn<int>("updates"); + QTest::addColumn<int>("minUpdates"); QTest::addColumn<int>("releases"); QTest::addColumn<int>("ungrabs"); QTest::newRow("keepBoth") << true << true << 8 << 1 << 0; QTest::newRow("keepMouse") << true << false << 8 << 1 << 0; QTest::newRow("keepTouch") << false << true << 8 << 1 << 0; - QTest::newRow("keepNeither") << false << false << 6 << 0 << 1; + QTest::newRow("keepNeither") << false << false << 5 << 0 << 1; } void tst_qquickflickable::nestedSliderUsingTouch() { QFETCH(bool, keepMouseGrab); QFETCH(bool, keepTouchGrab); - QFETCH(int, updates); + QFETCH(int, minUpdates); QFETCH(int, releases); QFETCH(int, ungrabs); @@ -2063,7 +2063,7 @@ void tst_qquickflickable::nestedSliderUsingTouch() QTest::touchEvent(window, touchDevice).release(0, p0, window); QQuickTouchUtils::flush(window); QTRY_COMPARE(tda->touchPointStates.first(), Qt::TouchPointPressed); - QTRY_COMPARE(tda->touchUpdates, updates); + QTRY_VERIFY(tda->touchUpdates >= minUpdates); QTRY_COMPARE(tda->touchReleases, releases); QTRY_COMPARE(tda->ungrabs, ungrabs); } |