diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-06 14:10:38 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 17:36:35 +0200 |
commit | 02675dc0208d46e6e10880a3003bcca27ac9caeb (patch) | |
tree | 6ac2b0d5189e14fbc4b81e974eda0436fc4ab083 /tests/auto/quick/qquicktextedit | |
parent | e1d6b323d474acc5cd70fd9a0b283326316f55a0 (diff) |
Use qWaitForWindowActive() where it is required.
Prepare a change in qtbase in which the implementation
of qWaitForWindowShown() will be changed to
qWaitForWindowExposed() instead of qWaitForWindowActive().
Try to stabilize further tests by introduing
wait functions instead of calls to qApp->processEvents().
Change-Id: I9825885430d78be1610a3fe20023fad24aaacba9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquicktextedit')
-rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index c911715b44..61c2df2e27 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -1810,7 +1810,7 @@ void tst_qquicktextedit::mouseSelection() canvas.show(); canvas.requestActivateWindow(); - QTest::qWaitForWindowShown(&canvas); + QTest::qWaitForWindowActive(&canvas); QTRY_COMPARE(&canvas, qGuiApp->focusWindow()); QVERIFY(canvas.rootObject() != 0); @@ -1957,8 +1957,7 @@ void tst_qquicktextedit::positionAt() QVERIFY(canvas.rootObject() != 0); canvas.show(); canvas.requestActivateWindow(); - canvas.requestActivateWindow(); - QTest::qWaitForWindowShown(&canvas); + QTest::qWaitForWindowActive(&canvas); QQuickTextEdit *texteditObject = qobject_cast<QQuickTextEdit *>(canvas.rootObject()); QVERIFY(texteditObject != 0); @@ -2209,7 +2208,7 @@ void tst_qquicktextedit::cursorVisible() QCOMPARE(spy.count(), 6); view.requestActivateWindow(); - QTest::qWaitForWindowShown(&view); + QTest::qWaitForWindowActive(&view); QCOMPARE(edit.isCursorVisible(), true); QCOMPARE(spy.count(), 7); @@ -4169,7 +4168,7 @@ void tst_qquicktextedit::undo() textEdit->setParentItem(canvas.rootItem()); canvas.show(); canvas.requestActivateWindow(); - QTest::qWaitForWindowShown(&canvas); + QTest::qWaitForWindowActive(&canvas); QTRY_COMPARE(QGuiApplication::focusWindow(), &canvas); QVERIFY(!textEdit->canUndo()); |