diff options
| author | Matthew Cattell <matthew.cattell@nokia.com> | 2011-09-13 11:09:31 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-14 10:13:39 +0200 |
| commit | 6824441666063f015e265f34f87a67c625898df5 (patch) | |
| tree | 5d39a6201ae09b078528c3f227525423a9b47afc /tests | |
| parent | f902ecfe6a99aa733cb18b0c435825546f1d18d5 (diff) | |
Fixed failing test in QSGFocusScope.
added some waits and removed unnecessary lines from autotest
Change-Id: I847bde6db5222b12d0f0b88a8c323fd09aad9d7c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp index a5e998d1fa..e2ac4c9e54 100644 --- a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp +++ b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp @@ -125,7 +125,6 @@ void tst_qsgfocusscope::basic() view->show(); view->requestActivateWindow(); - qApp->processEvents(); QTest::qWaitForWindowShown(view); @@ -136,12 +135,14 @@ void tst_qsgfocusscope::basic() QVERIFY(item3->hasActiveFocus() == false); QTest::keyClick(view, Qt::Key_Right); + QTest::qWait(50); QVERIFY(item0->hasActiveFocus() == true); QVERIFY(item1->hasActiveFocus() == false); QVERIFY(item2->hasActiveFocus() == true); QVERIFY(item3->hasActiveFocus() == false); QTest::keyClick(view, Qt::Key_Down); + QTest::qWait(50); QVERIFY(item0->hasActiveFocus() == false); QVERIFY(item1->hasActiveFocus() == false); QVERIFY(item2->hasActiveFocus() == false); @@ -168,12 +169,9 @@ void tst_qsgfocusscope::nested() view->show(); view->requestActivateWindow(); - qApp->processEvents(); QTest::qWaitForWindowShown(view); - QVERIFY(view->windowState() == Qt::WindowActive); - QVERIFY(item1->hasActiveFocus() == true); QVERIFY(item2->hasActiveFocus() == true); QVERIFY(item3->hasActiveFocus() == true); @@ -198,11 +196,8 @@ void tst_qsgfocusscope::noFocus() view->show(); view->requestActivateWindow(); - qApp->processEvents(); - QTest::qWaitForWindowShown(view); - QVERIFY(view->windowState() == Qt::WindowActive); QVERIFY(item0->hasActiveFocus() == false); QVERIFY(item1->hasActiveFocus() == false); QVERIFY(item2->hasActiveFocus() == false); @@ -239,7 +234,6 @@ void tst_qsgfocusscope::textEdit() view->show(); view->requestActivateWindow(); - qApp->processEvents(); QTest::qWaitForWindowShown(view); @@ -294,11 +288,8 @@ void tst_qsgfocusscope::forceFocus() view->show(); view->requestActivateWindow(); - qApp->processEvents(); - QTest::qWaitForWindowShown(view); - QVERIFY(view->windowState() == Qt::WindowActive); QVERIFY(item0->hasActiveFocus() == true); QVERIFY(item1->hasActiveFocus() == true); QVERIFY(item2->hasActiveFocus() == false); @@ -365,14 +356,12 @@ void tst_qsgfocusscope::signalEmission() view->show(); view->requestActivateWindow(); - qApp->processEvents(); QTest::qWaitForWindowShown(view); QVariant blue(QColor("blue")); QVariant red(QColor("red")); - QVERIFY(view->windowState() == Qt::WindowActive); item1->setFocus(true); QCOMPARE(item1->property("color"), red); QCOMPARE(item2->property("color"), blue); @@ -590,12 +579,10 @@ void tst_qsgfocusscope::canvasFocus() view->show(); view->requestActivateWindow(); - qApp->processEvents(); QTest::qWaitForWindowShown(view); // Now the canvas has focus, active focus given to item1 - QTRY_COMPARE((view->windowState() == Qt::WindowActive), true); QCOMPARE(rootItem->hasFocus(), true); QCOMPARE(rootItem->hasActiveFocus(), true); QCOMPARE(scope1->hasFocus(), true); |