diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-18 13:12:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 09:27:28 +0200 |
| commit | 87618403976aa82450895da6196a944195980de7 (patch) | |
| tree | 906d035678d8a31e57a94c01e8756b0085b3e1e4 /tests/auto/widgets/util | |
| parent | c081107206cb1d31415539c4429f7896b997cf71 (diff) | |
Implement waitForWindowExposed and friends for widget windows.
- Implement waitForWindowExposed() for toplevel windows.
- Implement waitForWindowShown(QWidget *) and mark as
deprecated in line with waitForWindowShown(QWindow*).
- Use in tests.
- Simplify tests (collapse waitForExposed, setActive
into setActiveWindow, waitForActive), remove most
hard-coded timeouts.
- Stabilize graphicsview tests by using waitForWindowActive.
Change-Id: Ic7c061e2745b36f71a715ee4e47c0346b11a91e8
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/widgets/util')
| -rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index 61b0e04624..bd64777957 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -1384,13 +1384,8 @@ void tst_QCompleter::task253125_lineEditCompletion() edit.setCompleter(completer); edit.show(); edit.setFocus(); - -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&edit); -#endif - QTest::qWait(10); QApplication::setActiveWindow(&edit); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&edit)); + QVERIFY(QTest::qWaitForWindowActive(&edit)); QTest::keyClick(&edit, 'i'); QCOMPARE(edit.completer()->currentCompletion(), QString("iota")); @@ -1421,14 +1416,8 @@ void tst_QCompleter::task247560_keyboardNavigation() edit.setCompleter(&completer); edit.show(); edit.setFocus(); - -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&edit); -#endif - - QTest::qWait(10); QApplication::setActiveWindow(&edit); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&edit)); + QVERIFY(QTest::qWaitForWindowActive(&edit)); QTest::keyClick(&edit, 'r'); QTest::keyClick(edit.completer()->popup(), Qt::Key_Down); @@ -1469,8 +1458,8 @@ void tst_QCompleter::QTBUG_14292_filesystem() edit.show(); QApplication::setActiveWindow(&edit); - QTest::qWaitForWindowShown(&edit); - QTRY_VERIFY(QApplication::activeWindow() == &edit); + QVERIFY(QTest::qWaitForWindowActive(&edit)); + QCOMPARE(QApplication::activeWindow(), &edit); edit.setFocus(); QTRY_VERIFY(edit.hasFocus()); |