whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QTRY_COMPARE in tst_qwidget::activation() (Windows only) 

Speeds up the test from approximately 770ms to 180ms.

Change-Id: I2e5479fd5190b841b44d4a66380d27b1c3b55162
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
bb10
Friedemann Kleint 2017-09-06 11:36:43 +02:00
parent d332a2d3cc
commit 3b6fb8f22e
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -1743,8 +1743,6 @@ void tst_QWidget::activation()
{
Q_CHECK_PAINTEVENTS
int waitTime = 100;
QWidget widget1;
widget1.setObjectName("activation-Widget1");
widget1.setWindowTitle(widget1.objectName());
@ -1756,25 +1754,18 @@ void tst_QWidget::activation()
widget1.show();
widget2.show();
QTest::qWait(waitTime);
QCOMPARE(QApplication::activeWindow(), &widget2);
QTRY_COMPARE(QApplication::activeWindow(), &widget2);
widget2.showMinimized();
QTest::qWait(waitTime);
QCOMPARE(QApplication::activeWindow(), &widget1);
QTRY_COMPARE(QApplication::activeWindow(), &widget1);
widget2.showMaximized();
QTest::qWait(waitTime);
QCOMPARE(QApplication::activeWindow(), &widget2);
QTRY_COMPARE(QApplication::activeWindow(), &widget2);
widget2.showMinimized();
QTest::qWait(waitTime);
QCOMPARE(QApplication::activeWindow(), &widget1);
QTRY_COMPARE(QApplication::activeWindow(), &widget1);
widget2.showNormal();
QTest::qWait(waitTime);
QTest::qWait(waitTime);
QCOMPARE(QApplication::activeWindow(), &widget2);
QTRY_COMPARE(QApplication::activeWindow(), &widget2);
widget2.hide();
QTest::qWait(waitTime);
QCOMPARE(QApplication::activeWindow(), &widget1);
QTRY_COMPARE(QApplication::activeWindow(), &widget1);
}
#endif // Q_OS_WIN