summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/graphicsview/qgraphicsview
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-05 13:56:21 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-07 11:07:39 +0200
commit87ca7c96880c3da48fef894987333fdaf7caac8b (patch)
tree6b783bf5e4dcc43522465a74b1815e5daf74c51f /tests/auto/widgets/graphicsview/qgraphicsview
parenta978c4828467c9244ceb7bb1a678272aae456f7a (diff)
tst_QGraphicsView::cursor2(): Prospective fix for flakyness on Windows
Use QTRY_COMPARE to fix recent fails like FAIL! : tst_QGraphicsView::cursor2() Compared values are not the same Actual (view.viewport()->cursor().shape()): IBeamCursor Expected (Qt::SizeAllCursor) : SizeAllCursor Task-number: QTBUG-76259 Change-Id: Ie9d4bbe45a3be6064ec88ee237360beb92a61481 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicsview')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 28df3a3c38..a9c1404891 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -2280,53 +2280,53 @@ void tst_QGraphicsView::cursor2()
QVERIFY(QTest::qWaitForWindowExposed(&view));
sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
sendMouseMove(view.viewport(), view.mapFromScene(-15, 0));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
view.setDragMode(QGraphicsView::ScrollHandDrag);
sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
sendMouseMove(view.viewport(), view.mapFromScene(-15, -15));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
view.setDragMode(QGraphicsView::NoDrag);
- QCOMPARE(view.viewport()->cursor().shape(), Qt::ArrowCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::ArrowCursor);
view.viewport()->setCursor(Qt::PointingHandCursor);
- QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
item2->setCursor(Qt::SizeAllCursor);
sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
sendMouseMove(view.viewport(), view.mapFromScene(-15, -15));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
sendMouseMove(view.viewport(), view.mapFromScene(-15, -15));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::PointingHandCursor);
view.setDragMode(QGraphicsView::ScrollHandDrag);
sendMouseMove(view.viewport(), view.mapFromScene(-30, -30));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::OpenHandCursor);
sendMouseMove(view.viewport(), view.mapFromScene(0, 0));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
sendMouseMove(view.viewport(), view.mapFromScene(-15, -15));
- QCOMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
+ QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::SizeAllCursor);
}
#endif