diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-06 16:25:21 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-25 11:55:34 +0000 |
commit | 0cb940b1d3b9a1ba50f2d1973fca411706da266d (patch) | |
tree | 326e6a32edef67c9e4000862a47fa49db2dd8263 /tests/auto/widgets/widgets | |
parent | 7917305aa5acdad117632bc2723d9bec85daa0e0 (diff) |
tests/auto/widgets/widgets: Avoid unconditional qWait()s
Task-number: QTBUG-63992
Change-Id: I7b0c259800082284ddae4e25d139ad3adc858467
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets')
22 files changed, 42 insertions, 141 deletions
diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp index bc7756d32f..e77faa1e75 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp @@ -473,14 +473,9 @@ void tst_QAbstractButton::setShortcut() QKeySequence seq( Qt::Key_A ); testWidget->setShortcut( seq ); QApplication::setActiveWindow(testWidget); - + testWidget->activateWindow(); // must be active to get shortcuts - for (int i = 0; !testWidget->isActiveWindow() && i < 100; ++i) { - testWidget->activateWindow(); - QApplication::instance()->processEvents(); - QTest::qWait(100); - } - QVERIFY(testWidget->isActiveWindow()); + QVERIFY(QTest::qWaitForWindowActive(testWidget)); QTest::keyClick( testWidget, 'A' ); QTest::qWait(300); // Animate click takes time @@ -508,9 +503,7 @@ void tst_QAbstractButton::animateClick() QVERIFY( testWidget->isDown() ); qApp->processEvents(); QVERIFY( testWidget->isDown() ); - QTest::qWait(200); - qApp->processEvents(); - QVERIFY( !testWidget->isDown() ); + QTRY_VERIFY( !testWidget->isDown() ); } void tst_QAbstractButton::shortcutEvents() @@ -614,7 +607,7 @@ void tst_QAbstractButton::keyNavigation() widget.show(); qApp->setActiveWindow(&widget); widget.activateWindow(); - QTest::qWait(30); + QVERIFY(QTest::qWaitForWindowActive(&widget)); buttons[1][1]->setFocus(); QTest::qWait(400); diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp index 60efcddc60..372a467ada 100644 --- a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -346,6 +346,7 @@ void tst_QAbstractScrollArea::patternBackground() widget.resize(600, 600); scrollArea.setWidget(&widget); topLevel.show(); + QVERIFY(QTest::qWaitForWindowActive(&topLevel)); QLinearGradient linearGrad(QPointF(250, 250), QPointF(300, 300)); linearGrad.setColorAt(0, Qt::yellow); @@ -354,7 +355,6 @@ void tst_QAbstractScrollArea::patternBackground() scrollArea.viewport()->setPalette(QPalette(Qt::black, bg, bg, bg, bg, bg, bg, bg, bg)); widget.setPalette(Qt::transparent); - QTest::qWait(50); QImage image(200, 200, QImage::Format_ARGB32); scrollArea.render(&image); @@ -366,7 +366,6 @@ void tst_QAbstractScrollArea::patternBackground() QScrollBar *vbar = scrollArea.verticalScrollBar(); vbar->setValue(vbar->maximum()); - QTest::qWait(50); scrollArea.render(&image); QCOMPARE(image.pixel(QPoint(20,20)) , QColor(Qt::red).rgb()); diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp index 8e4a800a75..5c0f4b1536 100644 --- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp @@ -174,12 +174,10 @@ void tst_QCalendarWidget::buttonClickCheck() QTest::mouseClick(button, Qt::LeftButton, Qt::NoModifier, button->rect().center(), 2); QVERIFY(!button->isVisible()); QSpinBox *spinbox = object.findChild<QSpinBox *>("qt_calendar_yearedit"); - QTest::qWait(500); QTest::keyClick(spinbox, '2'); QTest::keyClick(spinbox, '0'); QTest::keyClick(spinbox, '0'); QTest::keyClick(spinbox, '6'); - QTest::qWait(500); QWidget *widget = object.findChild<QWidget *>("qt_calendar_calendarview"); QTest::mouseMove(widget); QTest::mouseClick(widget, Qt::LeftButton); @@ -305,7 +303,6 @@ void tst_QCalendarWidget::showPrevNext() QCOMPARE(calWidget.monthShown(), expectedDate.month()); // QTBUG-4058 - QTest::qWait(20); QToolButton *button = calWidget.findChild<QToolButton *>("qt_calendar_prevmonth"); QTest::mouseClick(button, Qt::LeftButton); expectedDate = expectedDate.addMonths(-1); diff --git a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp index c9699bfb81..0cbab5e17c 100644 --- a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp +++ b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp @@ -83,6 +83,7 @@ void tst_QCheckBox::initTestCase() testWidget->setObjectName("testObject"); testWidget->resize( 200, 200 ); testWidget->show(); + QVERIFY(QTest::qWaitForWindowActive(testWidget)); } void tst_QCheckBox::cleanupTestCase() @@ -240,13 +241,11 @@ void tst_QCheckBox::pressed() QVERIFY( !testWidget->isChecked() ); QTest::keyPress( testWidget, Qt::Key_Space ); - QTest::qWait(100); QVERIFY( press_count == 1 ); QVERIFY( release_count == 0 ); QVERIFY( !testWidget->isChecked() ); QTest::keyRelease( testWidget, Qt::Key_Space ); - QTest::qWait(100); QVERIFY( press_count == 1 ); QVERIFY( release_count == 1 ); QVERIFY( testWidget->isChecked() ); diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 0c229c9194..7c1deb8fff 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -1995,19 +1995,16 @@ void tst_QComboBox::flaggedItems() QApplication::setActiveWindow(&comboBox); comboBox.activateWindow(); comboBox.setFocus(); + QVERIFY(QTest::qWaitForWindowActive(&comboBox)); QTRY_VERIFY(comboBox.isVisible()); QTRY_VERIFY(comboBox.hasFocus()); if (editable) comboBox.lineEdit()->selectAll(); - QSignalSpy indexChangedInt(&comboBox, SIGNAL(currentIndexChanged(int))); for (int i = 0; i < keyMovementList.count(); ++i) { Qt::Key key = keyMovementList[i]; QTest::keyClick(&comboBox, key); - if (indexChangedInt.count() != i + 1) { - QTest::qWait(400); - } } QCOMPARE(comboBox.currentIndex() , expectedIndex); @@ -2447,7 +2444,7 @@ void tst_QComboBox::task220195_keyBoardSelection2() combo.addItem( QLatin1String("foo3")); combo.show(); QApplication::setActiveWindow(&combo); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&combo)); + QVERIFY(QTest::qWaitForWindowActive(&combo)); combo.setCurrentIndex(-1); QVERIFY(combo.currentText().isNull()); diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp index 667e348945..c0f33b9c79 100644 --- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp @@ -110,6 +110,7 @@ void tst_QCommandLinkButton::initTestCase() testWidget->setObjectName("testWidget"); testWidget->resize( 200, 200 ); testWidget->show(); + QVERIFY(QTest::qWaitForWindowActive(testWidget)); connect( testWidget, SIGNAL(clicked()), this, SLOT(onClicked()) ); connect( testWidget, SIGNAL(pressed()), this, SLOT(onPressed()) ); @@ -166,12 +167,6 @@ void tst_QCommandLinkButton::onReleased() void tst_QCommandLinkButton::setAutoRepeat() { - // Give the last tests time to finish - i.e., wait for the window close - // and deactivate to avoid a race condition here. We can't add this to the - // end of the defaultAndAutoDefault test, since any failure in that test - // will return out of that function. - QTest::qWait( 1000 ); - // If this changes, this test must be completely revised. QVERIFY( !testWidget->isCheckable() ); @@ -194,8 +189,6 @@ void tst_QCommandLinkButton::setAutoRepeat() testWidget->setAutoRepeat( false ); QTest::keyPress( testWidget, Qt::Key_Space ); - QTest::qWait( 300 ); - QVERIFY( testWidget->isDown() ); QVERIFY( toggle_count == 0 ); QVERIFY( press_count == 1 ); @@ -206,18 +199,16 @@ void tst_QCommandLinkButton::setAutoRepeat() resetCounters(); // check that the button is down if we press space while in autorepeat - // we can't actually confirm how many times it is fired, more than 1 is enough. testWidget->setDown( false ); testWidget->setAutoRepeat( true ); QTest::keyPress( testWidget, Qt::Key_Space ); - QTest::qWait(900); + QTRY_VERIFY(press_count > 10); QVERIFY( testWidget->isDown() ); QVERIFY( toggle_count == 0 ); QTest::keyRelease( testWidget, Qt::Key_Space ); QCOMPARE(press_count, release_count); QCOMPARE(release_count, click_count); - QVERIFY(press_count > 1); // #### shouldn't I check here to see if multiple signals have been fired??? @@ -227,8 +218,6 @@ void tst_QCommandLinkButton::setAutoRepeat() testWidget->setAutoRepeat( false ); QTest::keyPress( testWidget, Qt::Key_Enter ); - QTest::qWait( 300 ); - QVERIFY( !testWidget->isDown() ); QVERIFY( toggle_count == 0 ); QVERIFY( press_count == 0 ); @@ -241,7 +230,6 @@ void tst_QCommandLinkButton::setAutoRepeat() testWidget->setDown( false ); testWidget->setAutoRepeat( true ); QTest::keyClick( testWidget, Qt::Key_Enter ); - QTest::qWait( 300 ); QVERIFY( !testWidget->isDown() ); QVERIFY( toggle_count == 0 ); QVERIFY( press_count == 0 ); @@ -252,23 +240,19 @@ void tst_QCommandLinkButton::setAutoRepeat() void tst_QCommandLinkButton::pressed() { QTest::keyPress( testWidget, ' ' ); -// QTest::qWait( 300 ); QCOMPARE( press_count, (uint)1 ); QCOMPARE( release_count, (uint)0 ); QTest::keyRelease( testWidget, ' ' ); -// QTest::qWait( 300 ); QCOMPARE( press_count, (uint)1 ); QCOMPARE( release_count, (uint)1 ); QTest::keyPress( testWidget,Qt::Key_Enter ); -// QTest::qWait( 300 ); QCOMPARE( press_count, (uint)1 ); QCOMPARE( release_count, (uint)1 ); testWidget->setAutoDefault(true); QTest::keyPress( testWidget,Qt::Key_Enter ); -// QTest::qWait( 300 ); QCOMPARE( press_count, (uint)2 ); QCOMPARE( release_count, (uint)2 ); testWidget->setAutoDefault(false); @@ -349,19 +333,7 @@ void tst_QCommandLinkButton::setAccel() // The shortcut will not be activated unless the button is in a active // window and has focus testWidget->setFocus(); - - // QWidget::isActiveWindow() can report window active before application - // has handled the asynchronous activation event on platforms that have - // implemented QPlatformWindow::isActive(), so process events to sync up. - QApplication::instance()->processEvents(); - - for (int i = 0; !testWidget->isActiveWindow() && i < 1000; ++i) { - testWidget->activateWindow(); - QApplication::instance()->processEvents(); - QTest::qWait(100); - } - - QVERIFY(testWidget->isActiveWindow()); + QVERIFY(QTest::qWaitForWindowActive(testWidget)); QTest::keyClick( testWidget, 'A', Qt::AltModifier ); QTest::qWait( 500 ); diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp index f127fd98f7..17b0e9ce5f 100644 --- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp +++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp @@ -838,10 +838,9 @@ void tst_QDialogButtonBox::task191642_default() bb->addButton(QDialogButtonBox::Help); dlg.show(); - QTest::qWait(10); + QVERIFY(QTest::qWaitForWindowActive(&dlg)); QVERIFY(def->isDefault()); QTest::keyPress( &dlg, Qt::Key_Enter ); - QTest::qWait(100); QCOMPARE(clicked.count(), 1); } diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index 1a1023208a..7d1e736f42 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -579,8 +579,7 @@ void tst_QDockWidget::visibilityChanged() QCOMPARE(spy.count(), 0); mw.addDockWidget(Qt::RightDockWidgetArea, &dw2); - QTest::qWait(200); - QCOMPARE(spy.count(), 1); + QTRY_COMPARE(spy.count(), 1); QCOMPARE(spy.at(0).at(0).toBool(), true); } @@ -672,8 +671,7 @@ void tst_QDockWidget::dockLocationChanged() dw.setFloating(true); QTest::qWait(100); dw.setFloating(false); - QTest::qWait(100); - QCOMPARE(spy.count(), 1); + QTRY_COMPARE(spy.count(), 1); QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)), Qt::TopDockWidgetArea); spy.clear(); @@ -936,8 +934,7 @@ void tst_QDockWidget::task248604_infiniteResize() d.setContentsMargins(2, 2, 2, 2); d.setMinimumSize(320, 240); d.showNormal(); - QTest::qWait(400); - QCOMPARE(d.size(), QSize(320, 240)); + QTRY_COMPARE(d.size(), QSize(320, 240)); } @@ -950,7 +947,7 @@ void tst_QDockWidget::task258459_visibilityChanged() QSignalSpy spy1(&dock1, SIGNAL(visibilityChanged(bool))); QSignalSpy spy2(&dock2, SIGNAL(visibilityChanged(bool))); win.show(); - QTest::qWait(200); + QVERIFY(QTest::qWaitForWindowActive(&win)); QCOMPARE(spy1.count(), 1); QCOMPARE(spy1.first().first().toBool(), false); //dock1 is invisible QCOMPARE(spy2.count(), 1); diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp index 59ddd54194..22e8097949 100644 --- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp @@ -164,6 +164,7 @@ void tst_QDoubleSpinBox::initTestCase() testFocusWidget = new QWidget(0); testFocusWidget->resize(200, 100); testFocusWidget->show(); + QVERIFY(QTest::qWaitForWindowActive(testFocusWidget)); } void tst_QDoubleSpinBox::cleanupTestCase() @@ -770,8 +771,7 @@ void tst_QDoubleSpinBox::editingFinished() testFocusWidget->show(); QApplication::setActiveWindow(testFocusWidget); - QTest::qWait(10); - QTRY_VERIFY(testFocusWidget->isActiveWindow()); + QVERIFY(QTest::qWaitForWindowActive(testFocusWidget)); box->setFocus(); QTRY_VERIFY(box->hasFocus()); @@ -997,7 +997,7 @@ void tst_QDoubleSpinBox::task224497_fltMax() dspin->setMinimum(3); dspin->setMaximum(FLT_MAX); dspin->show(); - QTest::qWait(1000); + QVERIFY(QTest::qWaitForWindowActive(dspin)); dspin->lineEdit()->selectAll(); QTest::keyClick(dspin->lineEdit(), Qt::Key_Delete); QTest::keyClick(dspin->lineEdit(), Qt::Key_1); diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index 84071962bc..34862f6810 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -398,7 +398,6 @@ void tst_QLabel::task226479_movieResize() label.paintedRegion = QRegion(); movie->setFileName(QFINDTESTDATA("green.png")); movie->start(); - QTest::qWait(50); QTRY_COMPARE(label.paintedRegion , QRegion(label.rect()) ); } diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 0be8d319c2..23e52a8bf9 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -3573,18 +3573,15 @@ void tst_QLineEdit::task174640_editingFinished() QSignalSpy editingFinishedSpy(le1, SIGNAL(editingFinished())); le1->setFocus(); - QTest::qWait(20); QTRY_VERIFY(le1->hasFocus()); QCOMPARE(editingFinishedSpy.count(), 0); le2->setFocus(); - QTest::qWait(20); QTRY_VERIFY(le2->hasFocus()); QCOMPARE(editingFinishedSpy.count(), 1); editingFinishedSpy.clear(); le1->setFocus(); - QTest::qWait(20); QTRY_VERIFY(le1->hasFocus()); QMenu *testMenu1 = new QMenu(le1); @@ -3680,7 +3677,6 @@ void tst_QLineEdit::task229938_dontEmitChangedWhenTextIsNotChanged() QVERIFY(QTest::qWaitForWindowExposed(&lineEdit)); // to be safe and avoid failing setFocus with window managers lineEdit.setFocus(); QSignalSpy changedSpy(&lineEdit, SIGNAL(textChanged(QString))); - QTest::qWait(200); QTest::keyPress(&lineEdit, 'a'); QTest::keyPress(&lineEdit, 'b'); QTest::keyPress(&lineEdit, 'c'); diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index 30dc1e6043..ae71663036 100644 --- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -1745,17 +1745,15 @@ void tst_QMainWindow::setCursor() QCOMPARE(cur.shape(), mw.cursor().shape()); mw.resize(200,200); mw.show(); - QTest::qWait(50); + QVERIFY(QTest::qWaitForWindowActive(&mw)); QCOMPARE(cur.shape(), mw.cursor().shape()); QHoverEvent enterE(QEvent::HoverEnter, QPoint(10,10), QPoint()); mw.event(&enterE); - QTest::qWait(50); QCOMPARE(cur.shape(), mw.cursor().shape()); QHoverEvent leaveE(QEvent::HoverLeave, QPoint(), QPoint()); mw.event(&leaveE); - QTest::qWait(50); QCOMPARE(cur.shape(), mw.cursor().shape()); } #endif @@ -1844,7 +1842,7 @@ void tst_QMainWindow::dockWidgetSize() mainWindow.addDockWidget(Qt::TopDockWidgetArea, &dock); mainWindow.show(); - QTest::qWait(100); + QVERIFY(QTest::qWaitForWindowActive(&mainWindow)); if (mainWindow.size() == mainWindow.sizeHint()) { QCOMPARE(widget.size(), widget.sizeHint()); QCOMPARE(dock.widget()->size(), dock.widget()->sizeHint()); diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index a9d8c48d63..360e0c93c4 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -963,8 +963,6 @@ void tst_QMdiSubWindow::setSystemMenu() mainWindow.menuBar()->setNativeMenuBar(false); mainWindow.show(); QVERIFY(QTest::qWaitForWindowExposed(&mainWindow)); - QTest::qWait(60); - QTRY_VERIFY(subWindow->isVisible()); QPoint globalPopupPos; @@ -972,7 +970,6 @@ void tst_QMdiSubWindow::setSystemMenu() // Show system menu QVERIFY(!qApp->activePopupWidget()); subWindow->showSystemMenu(); - QTest::qWait(25); QTRY_COMPARE(qApp->activePopupWidget(), qobject_cast<QWidget *>(systemMenu)); QTRY_COMPARE(systemMenu->mapToGlobal(QPoint(0, 0)), (globalPopupPos = subWindow->mapToGlobal(subWindow->contentsRect().topLeft())) ); @@ -997,7 +994,6 @@ void tst_QMdiSubWindow::setSystemMenu() // Show the new system menu QVERIFY(!qApp->activePopupWidget()); subWindow->showSystemMenu(); - QTest::qWait(25); QTRY_COMPARE(qApp->activePopupWidget(), qobject_cast<QWidget *>(systemMenu)); QTRY_COMPARE(systemMenu->mapToGlobal(QPoint(0, 0)), globalPopupPos); @@ -1011,7 +1007,6 @@ void tst_QMdiSubWindow::setSystemMenu() QWidget *menuLabel = subWindow->maximizedSystemMenuIconWidget(); QVERIFY(menuLabel); subWindow->showSystemMenu(); - QTest::qWait(25); QTRY_COMPARE(qApp->activePopupWidget(), qobject_cast<QWidget *>(systemMenu)); QCOMPARE(systemMenu->mapToGlobal(QPoint(0, 0)), (globalPopupPos = menuLabel->mapToGlobal(QPoint(0, menuLabel->y() + menuLabel->height())))); @@ -1027,7 +1022,6 @@ void tst_QMdiSubWindow::setSystemMenu() QTest::qWait(150); subWindow->showSystemMenu(); - QTest::qWait(250); QTRY_COMPARE(qApp->activePopupWidget(), qobject_cast<QWidget *>(systemMenu)); // + QPoint(1, 0) because topRight() == QPoint(left() + width() -1, top()) globalPopupPos = subWindow->mapToGlobal(subWindow->contentsRect().topRight()) + QPoint(1, 0); @@ -1044,7 +1038,6 @@ void tst_QMdiSubWindow::setSystemMenu() menuLabel = subWindow->maximizedSystemMenuIconWidget(); QVERIFY(menuLabel); subWindow->showSystemMenu(); - QTest::qWait(250); QTRY_COMPARE(qApp->activePopupWidget(), qobject_cast<QWidget *>(systemMenu)); globalPopupPos = menuLabel->mapToGlobal(QPoint(menuLabel->width(), menuLabel->y() + menuLabel->height())); globalPopupPos -= QPoint(systemMenu->sizeHint().width(), 0); @@ -1648,8 +1641,6 @@ void tst_QMdiSubWindow::resizeTimer() QMdiSubWindow *subWindow = mdiArea.addSubWindow(new QWidget); mdiArea.show(); QVERIFY(QTest::qWaitForWindowExposed(&mdiArea)); - QTest::qWait(300); - EventSpy timerEventSpy(subWindow, QEvent::Timer); QCOMPARE(timerEventSpy.count(), 0); @@ -1809,10 +1800,9 @@ void tst_QMdiSubWindow::closeOnDoubleClick() QVERIFY(QTest::qWaitForWindowExposed(&mdiArea)); subWindow->showSystemMenu(); - QTest::qWait(200); - QPointer<QMenu> systemMenu = subWindow->systemMenu(); - QVERIFY(systemMenu); + QPointer<QMenu> systemMenu; + QTRY_VERIFY( (systemMenu = subWindow->systemMenu()) ); QVERIFY(systemMenu->isVisible()); const QRect actionGeometry = systemMenu->actionGeometry(systemMenu->actions().at(actionIndex)); diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 28e8ba81d6..0dde385bdb 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -991,18 +991,14 @@ void tst_QMenu::task258920_mouseBorder() #endif menu.popup(center); QVERIFY(QTest::qWaitForWindowExposed(&menu)); - QTest::qWait(100); QRect actionRect = menu.actionGeometry(action); const QPoint actionCenter = actionRect.center(); QTest::mouseMove(&menu, actionCenter - QPoint(-10, 0)); - QTest::qWait(30); QTest::mouseMove(&menu, actionCenter); - QTest::qWait(30); QTest::mouseMove(&menu, actionCenter + QPoint(10, 0)); QTRY_COMPARE(action, menu.activeAction()); menu.painted = false; QTest::mouseMove(&menu, QPoint(actionRect.center().x(), actionRect.bottom() + 1)); - QTest::qWait(30); QTRY_COMPARE(static_cast<QAction*>(0), menu.activeAction()); QTRY_VERIFY(menu.painted); } @@ -1109,7 +1105,6 @@ void tst_QMenu::QTBUG7907_submenus_autoselect() menu.show(); QVERIFY(QTest::qWaitForWindowExposed(&menu)); QTest::mouseClick(&menu, Qt::LeftButton, Qt::NoModifier, QPoint(5,5) ); - QTest::qWait(500); QVERIFY(!subset.isVisible()); } @@ -1410,7 +1405,6 @@ void tst_QMenu::QTBUG_56917_wideMenuSize() menu.addAction(longString); QSize menuSizeHint = menu.sizeHint(); menu.popup(QPoint()); - QTest::qWait(100); QVERIFY(QTest::qWaitForWindowExposed(&menu)); QVERIFY(menu.isVisible()); QVERIFY(menu.height() <= menuSizeHint.height()); @@ -1428,7 +1422,6 @@ void tst_QMenu::QTBUG_56917_wideMenuScreenNumber() QMenu menu; menu.addAction(longString); menu.popup(QApplication::desktop()->screen(i)->geometry().center()); - QTest::qWait(100); QVERIFY(QTest::qWaitForWindowExposed(&menu)); QVERIFY(menu.isVisible()); QCOMPARE(QApplication::desktop()->screenNumber(&menu), i); diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp index 35209c2501..39989c6dbb 100644 --- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp +++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp @@ -163,12 +163,9 @@ void tst_QProgressBar::format() bar.move(300, 300); bar.show(); QVERIFY(QTest::qWaitForWindowExposed(&bar)); - QVERIFY(QTest::qWaitForWindowExposed(&bar)); - QTest::qWait(20); bar.repainted = false; bar.setFormat("%v of %m (%p%)"); - QTest::qWait(20); QTRY_VERIFY(bar.repainted); bar.repainted = false; bar.setFormat("%v of %m (%p%)"); diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 2b54008de7..625f38d8ae 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -183,9 +183,7 @@ void tst_QPushButton::autoRepeat() testWidget->setAutoRepeat( false ); QTest::keyPress( testWidget, Qt::Key_Space ); - QTest::qWait( 300 ); - - QVERIFY( testWidget->isDown() ); + QTRY_VERIFY( testWidget->isDown() ); QVERIFY( toggle_count == 0 ); QVERIFY( press_count == 1 ); QVERIFY( release_count == 0 ); @@ -200,13 +198,12 @@ void tst_QPushButton::autoRepeat() testWidget->setDown( false ); testWidget->setAutoRepeat( true ); QTest::keyPress( testWidget, Qt::Key_Space ); - QTest::qWait(900); + QTRY_VERIFY(press_count > 3); QVERIFY( testWidget->isDown() ); QVERIFY( toggle_count == 0 ); QTest::keyRelease( testWidget, Qt::Key_Space ); QCOMPARE(press_count, release_count); QCOMPARE(release_count, click_count); - QVERIFY(press_count > 1); // #### shouldn't I check here to see if multiple signals have been fired??? @@ -241,23 +238,19 @@ void tst_QPushButton::autoRepeat() void tst_QPushButton::pressed() { QTest::keyPress( testWidget, ' ' ); -// QTest::qWait( 300 ); QCOMPARE( press_count, (uint)1 ); QCOMPARE( release_count, (uint)0 ); QTest::keyRelease( testWidget, ' ' ); -// QTest::qWait( 300 ); QCOMPARE( press_count, (uint)1 ); QCOMPARE( release_count, (uint)1 ); QTest::keyPress( testWidget,Qt::Key_Enter ); -// QTest::qWait( 300 ); QCOMPARE( press_count, (uint)1 ); QCOMPARE( release_count, (uint)1 ); testWidget->setAutoDefault(true); QTest::keyPress( testWidget,Qt::Key_Enter ); -// QTest::qWait( 300 ); QCOMPARE( press_count, (uint)2 ); QCOMPARE( release_count, (uint)2 ); testWidget->setAutoDefault(false); @@ -340,14 +333,8 @@ void tst_QPushButton::setAccel() // window and has focus QApplication::setActiveWindow(testWidget); testWidget->setFocus(); - for (int i = 0; !testWidget->isActiveWindow() && i < 1000; ++i) { - testWidget->activateWindow(); - QApplication::instance()->processEvents(); - QTest::qWait(100); - } - QVERIFY(testWidget->isActiveWindow()); + QVERIFY(QTest::qWaitForWindowActive(testWidget)); QTest::keyClick( testWidget, 'A', Qt::AltModifier ); - QTest::qWait( 50 ); QTRY_VERIFY( click_count == 1 ); QVERIFY( press_count == 1 ); QVERIFY( release_count == 1 ); @@ -576,10 +563,8 @@ void tst_QPushButton::sizeHint() dialog->showNormal(); tabWidget->setCurrentWidget(tab2); tabWidget->setCurrentWidget(tab1); - QTest::qWait(100); - QApplication::processEvents(); - QCOMPARE(button1_2->size(), button2_2->size()); + QTRY_COMPARE(button1_2->size(), button2_2->size()); } } diff --git a/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp index e3752df09e..a4edea23bc 100644 --- a/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp +++ b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp @@ -70,15 +70,13 @@ void tst_QRadioButton::task190739_focus() widget.show(); widget.activateWindow(); - QApplication::setActiveWindow(&widget); - QTest::qWait(100); + QVERIFY(QTest::qWaitForWindowActive(&widget)); QVERIFY(edit.hasFocus()); QVERIFY(!radio1.isChecked()); QTest::keyClick(&edit, Qt::Key_O, Qt::ControlModifier, 20); - QTest::qWait(200); - QVERIFY(radio1.isChecked()); + QTRY_VERIFY(radio1.isChecked()); QVERIFY(edit.hasFocus()); QVERIFY(!radio1.hasFocus()); } diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp index 07a2fd859d..57816f9f70 100644 --- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp @@ -852,12 +852,11 @@ void tst_QSpinBox::editingFinished() testFocusWidget.hide(); QCOMPARE(editingFinishedSpy1.count(), 4); QCOMPARE(editingFinishedSpy2.count(), 4); - QTest::qWait(100); //task203285 editingFinishedSpy1.clear(); testFocusWidget.show(); - QTest::qWait(100); + QVERIFY(QTest::qWaitForWindowActive(&testFocusWidget)); box->setKeyboardTracking(false); qApp->setActiveWindow(&testFocusWidget); testFocusWidget.activateWindow(); diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index cad7bd69d7..77abf5e5a7 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -287,7 +287,7 @@ void tst_QSplitter::saveAndRestoreStateOfNotYetShownSplitter() QByteArray ba = spl->saveState(); spl->restoreState(ba); spl->show(); - QTest::qWait(500); + QVERIFY(QTest::qWaitForWindowActive(spl)); QCOMPARE(l1->geometry().isValid(), true); QCOMPARE(l2->geometry().isValid(), true); @@ -607,8 +607,7 @@ void tst_QSplitter::testShowHide() lay->addWidget(split); widget.setLayout(lay); topLevel.show(); - - QTest::qWait(100); + QVERIFY(QTest::qWaitForWindowActive(&topLevel)); widget.hide(); split->widget(0)->setHidden(hideWidget1); @@ -976,14 +975,13 @@ void tst_QSplitter::task169702_sizes() outerSplitter->setGeometry(100, 100, 500, 500); topLevel.show(); + QVERIFY(QTest::qWaitForWindowActive(&topLevel)); - QTest::qWait(100); testW->m_iFactor++; testW->updateGeometry(); - QTest::qWait(500); //Make sure the minimimSizeHint is respected - QCOMPARE(testW->size().height(), testW->minimumSizeHint().height()); + QTRY_COMPARE(testW->size().height(), testW->minimumSizeHint().height()); } void tst_QSplitter::taskQTBUG_4101_ensureOneNonCollapsedWidget_data() @@ -1012,8 +1010,7 @@ void tst_QSplitter::taskQTBUG_4101_ensureOneNonCollapsedWidget() l->hide(); else delete l; - QTest::qWait(100); - QVERIFY(s.sizes().at(0) > 0); + QTRY_VERIFY(s.sizes().at(0) > 0); } void tst_QSplitter::setLayout() diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp index b5ffb90e42..cd7fe3710d 100644 --- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp @@ -549,8 +549,7 @@ void tst_QTabWidget::paintEventCount() QCOMPARE(tw->currentIndex(), 0); tw->show(); - - QTest::qWait(1000); + QVERIFY(QTest::qWaitForWindowActive(tw)); // Mac, Windows and Windows CE get multiple repaints on the first show, so use those as a starting point. static const int MaxInitialPaintCount = diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp index 3525dcddd6..301801ed2e 100644 --- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp +++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp @@ -1038,11 +1038,9 @@ void tst_QToolBar::accel() mw.show(); QApplication::setActiveWindow(&mw); - QTest::qWait(100); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&mw)); + QVERIFY(QTest::qWaitForWindowActive(&mw)); QTest::keyClick(&mw, Qt::Key_T, Qt::AltModifier); - QTest::qWait(300); QTRY_COMPARE(spy.count(), 1); #ifdef Q_OS_MAC @@ -1085,19 +1083,19 @@ void tst_QToolBar::task197996_visibility() pAction->setVisible(true); mw.show(); + QVERIFY(QTest::qWaitForWindowActive(&mw)); QVERIFY(toolBar->widgetForAction(pAction)->isVisible()); toolBar->setVisible(false); pAction->setVisible(false); + QVERIFY(!toolBar->widgetForAction(pAction)->isVisible()); + toolBar->setVisible(true); pAction->setVisible(true); - QTest::qWait(100); - - QVERIFY(toolBar->widgetForAction(pAction)->isVisible()); - + QTRY_VERIFY(toolBar->widgetForAction(pAction)->isVisible()); } QTEST_MAIN(tst_QToolBar) diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp index 1775f03680..a7a62496e6 100644 --- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp +++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp @@ -141,8 +141,7 @@ void tst_QToolButton::triggered() timer->start(); QTimer::singleShot(10000, &mainWidget, SLOT(close())); // Emergency bail-out toolButton->showMenu(); - QTest::qWait(20); - QCOMPARE(spy.count(),2); + QTRY_COMPARE(spy.count(),2); QCOMPARE(qvariant_cast<QAction *>(spy.at(1).at(0)), one); } |