diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-16 13:34:01 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-16 13:46:09 (GMT) |
| commit | c80529584a955bea1b9e49cde0775c9ce53ce1c8 (patch) | |
| tree | d801eefab2d5e9d420f5612301a1060b361ca972 /tests/auto/qgraphicsproxywidget | |
| parent | 51d2e7756e33ee510fdcf53d5e2ae6f96f2b1c70 (diff) | |
| download | Qt-c80529584a955bea1b9e49cde0775c9ce53ce1c8.zip Qt-c80529584a955bea1b9e49cde0775c9ce53ce1c8.tar.gz Qt-c80529584a955bea1b9e49cde0775c9ce53ce1c8.tar.bz2 | |
Stabilize tests
Diffstat (limited to 'tests/auto/qgraphicsproxywidget')
| -rw-r--r-- | tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index c86d9e3..32b4420 100644 --- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -1316,6 +1316,7 @@ void tst_QGraphicsProxyWidget::paintEvent() //make sure we flush all the paint events QTest::qWait(250); + QTRY_VERIFY(proxy.paintCount > 1); proxy.paintCount = 0; w->update(); @@ -2071,6 +2072,7 @@ void tst_QGraphicsProxyWidget::tabFocus_complexTwoWidgets() QApplication::setActiveWindow(&window); window.activateWindow(); QTest::qWait(125); + QTRY_COMPARE(QApplication::activeWindow(), &window); leftDial->setFocus(); QTest::qWait(125); @@ -2207,6 +2209,7 @@ void tst_QGraphicsProxyWidget::setFocus_simpleWidget() QApplication::setActiveWindow(&window); window.activateWindow(); QTest::qWait(125); + QTRY_COMPARE(QApplication::activeWindow(), &window); leftDial->setFocus(); QTest::qWait(125); @@ -2279,6 +2282,7 @@ void tst_QGraphicsProxyWidget::setFocus_simpleTwoWidgets() QApplication::setActiveWindow(&window); window.activateWindow(); QTest::qWait(125); + QTRY_COMPARE(QApplication::activeWindow(), &window); leftDial->setFocus(); QTest::qWait(125); @@ -2358,6 +2362,7 @@ void tst_QGraphicsProxyWidget::setFocus_complexTwoWidgets() QApplication::setActiveWindow(&window); window.activateWindow(); QTest::qWait(125); + QTRY_COMPARE(QApplication::activeWindow(), &window); leftDial->setFocus(); QTest::qWait(125); @@ -3350,7 +3355,9 @@ void tst_QGraphicsProxyWidget::clickFocus() #ifdef Q_WS_X11 qt_x11_wait_for_window_manager(&view); #endif - QTest::qWait(250); + QApplication::setActiveWindow(&view); + QTest::qWait(25); + QTRY_COMPARE(QApplication::activeWindow(), &view); QVERIFY(!proxy->hasFocus()); QVERIFY(!proxy->widget()->hasFocus()); |