From 627de835b1b87280741eb96ae77ea42b1f6ef5dc Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Tue, 10 Apr 2018 15:43:07 +0300 Subject: tests/auto/widgets/graphicsview: Avoid unconditional qWait()s Task-number: QTBUG-63992 Change-Id: Ibbcf5bf968fcf1b1c3a043c805bdcc23a4005f00 Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint Reviewed-by: Gatis Paeglis --- .../qgraphicsview/tst_qgraphicsview.cpp | 41 +++++++--------------- 1 file changed, 12 insertions(+), 29 deletions(-) (limited to 'tests/auto/widgets/graphicsview/qgraphicsview') diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 10129eb10c..f52bbce53a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -507,10 +507,8 @@ void tst_QGraphicsView::setScene() view.setScene(0); - QTest::qWait(25); - - QVERIFY(!view.horizontalScrollBar()->isVisible()); - QVERIFY(!view.verticalScrollBar()->isVisible()); + QTRY_VERIFY(!view.horizontalScrollBar()->isVisible()); + QTRY_VERIFY(!view.verticalScrollBar()->isVisible()); QVERIFY(!view.horizontalScrollBar()->isHidden()); QVERIFY(!view.verticalScrollBar()->isHidden()); @@ -572,13 +570,12 @@ void tst_QGraphicsView::sceneRect_growing() QGraphicsView view(&scene, &toplevel); view.setFixedSize(200, 200); toplevel.show(); + QVERIFY(QTest::qWaitForWindowActive(&toplevel)); int size = 200; scene.setSceneRect(-size, -size, size * 2, size * 2); QCOMPARE(view.sceneRect(), scene.sceneRect()); - QTest::qWait(25); - QPointF topLeft = view.mapToScene(0, 0); for (int i = 0; i < 5; ++i) { @@ -641,14 +638,14 @@ void tst_QGraphicsView::viewport() QVERIFY(view.viewport() != 0); view.show(); - QTest::qWait(25); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QPointer widget = new QWidget; view.setViewport(widget); QCOMPARE(view.viewport(), (QWidget *)widget); view.show(); - QTest::qWait(25); + QVERIFY(QTest::qWaitForWindowExposed(&view)); view.setViewport(0); QVERIFY(widget.isNull()); @@ -656,7 +653,7 @@ void tst_QGraphicsView::viewport() QVERIFY(view.viewport() != widget); view.show(); - QTest::qWait(25); + QVERIFY(QTest::qWaitForWindowExposed(&view)); } #ifndef QT_NO_OPENGL @@ -888,8 +885,6 @@ void tst_QGraphicsView::dragMode_rubberBand() // We don't use QRubberBand as of 4.3; the band is drawn internally. QVERIFY(!view.findChild()); - QTest::qWait(25); - { // Move QMouseEvent event(QEvent::MouseMove, @@ -902,8 +897,6 @@ void tst_QGraphicsView::dragMode_rubberBand() QCOMPARE(view.horizontalScrollBar()->value(), horizontalScrollBarValue); QCOMPARE(view.verticalScrollBar()->value(), verticalScrollBarValue); - QTest::qWait(25); - { // Release QMouseEvent event(QEvent::MouseButtonRelease, @@ -919,8 +912,6 @@ void tst_QGraphicsView::dragMode_rubberBand() QCOMPARE(view.viewport()->cursor().shape(), cursorShape); #endif - QTest::qWait(25); - if (view.scene()) QCOMPARE(scene.selectedItems().size(), 1); @@ -1074,7 +1065,7 @@ void tst_QGraphicsView::backgroundBrush() QCOMPARE(scene.backgroundBrush(), QBrush(Qt::blue)); view.show(); - QTest::qWait(25); + QVERIFY(QTest::qWaitForWindowExposed(&view)); scene.setBackgroundBrush(QBrush()); QCOMPARE(scene.backgroundBrush(), QBrush()); @@ -1096,7 +1087,7 @@ void tst_QGraphicsView::foregroundBrush() QCOMPARE(scene.foregroundBrush(), QBrush(Qt::blue)); view.show(); - QTest::qWait(25); + QVERIFY(QTest::qWaitForWindowExposed(&view)); scene.setForegroundBrush(QBrush()); QCOMPARE(scene.foregroundBrush(), QBrush()); @@ -2052,7 +2043,7 @@ void tst_QGraphicsView::mapFromSceneRect() view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); topLevel.show(); - QTest::qWait(25); + QVERIFY(QTest::qWaitForWindowActive(&view)); QPolygon polygon; polygon << QPoint(98, 98); @@ -2459,7 +2450,6 @@ void tst_QGraphicsView::viewportUpdateMode() // Issue two scene updates. scene.update(QRectF(0, 0, 10, 10)); scene.update(QRectF(20, 0, 10, 10)); - QTest::qWait(50); // The view gets two updates for the update scene updates. QTRY_VERIFY(!view.lastUpdateRegions.isEmpty()); @@ -2565,8 +2555,7 @@ void tst_QGraphicsView::viewportUpdateMode2() view.lastUpdateRegions.clear(); viewPrivate->processPendingUpdates(); - QTest::qWait(50); - QCOMPARE(view.lastUpdateRegions.size(), 1); + QTRY_COMPARE(view.lastUpdateRegions.size(), 1); // Note that we adjust by 2 for antialiasing. QCOMPARE(view.lastUpdateRegions.at(0), QRegion(boundingRect.adjusted(-2, -2, 2, 2) & viewportRect)); #endif @@ -2763,8 +2752,7 @@ void tst_QGraphicsView::optimizationFlags_dontSavePainterState2() // Make sure the view is repainted; otherwise the tests below will fail. view.viewport()->repaint(); - QTest::qWait(200); - QVERIFY(view.painted); + QTRY_VERIFY(view.painted); // Make sure the painter's world transform is preserved after drawItems. QTransform expectedTransform = view.viewportTransform(); @@ -3676,7 +3664,6 @@ void tst_QGraphicsView::centerOnDirtyItem() toplevel.show(); QVERIFY(QTest::qWaitForWindowExposed(&toplevel)); - QTest::qWait(50); QImage before(view.viewport()->size(), QImage::Format_ARGB32); view.viewport()->render(&before); @@ -3684,8 +3671,6 @@ void tst_QGraphicsView::centerOnDirtyItem() item->setPos(20, 0); view.centerOn(item); - QTest::qWait(50); - QImage after(view.viewport()->size(), QImage::Format_ARGB32); view.viewport()->render(&after); @@ -4279,8 +4264,6 @@ void tst_QGraphicsView::update_ancestorClipsChildrenToShape2() QCOMPARE(view.lastUpdateRegions.at(0), QRegion(expected.toAlignedRect())); #endif - QTest::qWait(50); - view.lastUpdateRegions.clear(); view.painted = false; @@ -4478,7 +4461,7 @@ void tst_QGraphicsView::indirectPainting() view.setOptimizationFlag(QGraphicsView::IndirectPainting); view.show(); QVERIFY(QTest::qWaitForWindowExposed(&view)); - QTest::qWait(100); + QTRY_VERIFY(scene.drawCount > 0); scene.drawCount = 0; item->setPos(20, 20); -- cgit v1.2.3