diff options
Diffstat (limited to 'tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp')
| -rw-r--r-- | tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp index 144d01fc7a..32c23152fc 100644 --- a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp +++ b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp @@ -232,10 +232,7 @@ void tst_qsgfocusscope::textEdit() QTest::qWaitForWindowShown(view); -#ifdef QT_BUILD_INTERNAL - QEXPECT_FAIL("", "QTBUG-21683 - Waiting for active window/focus fails for developer build", Abort); -#endif - QVERIFY(view->windowState() == Qt::WindowActive); + QTRY_VERIFY(view == qGuiApp->focusWindow()); QVERIFY(item0->hasActiveFocus() == true); QVERIFY(item1->hasActiveFocus() == true); QVERIFY(item2->hasActiveFocus() == false); @@ -304,9 +301,6 @@ void tst_qsgfocusscope::forceFocus() QVERIFY(item5->hasActiveFocus() == false); QTest::keyClick(view, Qt::Key_5); -#ifdef QT_BUILD_INTERNAL - QEXPECT_FAIL("", "QTBUG-216823- Waiting for active window/focus fails for developer build", Abort); -#endif QVERIFY(item0->hasActiveFocus() == false); QVERIFY(item1->hasActiveFocus() == false); QVERIFY(item2->hasActiveFocus() == false); @@ -408,10 +402,7 @@ void tst_qsgfocusscope::qtBug13380() QTest::qWaitForWindowShown(view); -#ifdef QT_BUILD_INTERNAL - QEXPECT_FAIL("", "QTBUG-21683 - Waiting for active window fails for developer build", Abort); -#endif - QVERIFY(view->windowState() == Qt::WindowActive); + QTRY_VERIFY(view == qGuiApp->focusWindow()); QVERIFY(view->rootObject()->property("noFocus").toBool()); view->rootObject()->setProperty("showRect", true); @@ -568,11 +559,8 @@ void tst_qsgfocusscope::canvasFocus() QSignalSpy scope2ActiveFocusSpy(scope2, SIGNAL(activeFocusChanged(bool))); QSignalSpy item2ActiveFocusSpy(item2, SIGNAL(activeFocusChanged(bool))); - // until the canvas widget has gained focus, no one should have active focus - QCOMPARE((view->windowState() == Qt::WindowActive), false); -#ifdef QT_BUILD_INTERNAL - QEXPECT_FAIL("", "QTBUG-21683 - Waiting for active window/focus fails for developer build", Abort); -#endif + QEXPECT_FAIL("", "Root item hasFocus returns true already", Abort); + QCOMPARE(rootItem->hasFocus(), false); QCOMPARE(rootItem->hasActiveFocus(), false); QCOMPARE(scope1->hasFocus(), true); @@ -608,7 +596,7 @@ void tst_qsgfocusscope::canvasFocus() QCOMPARE(item1ActiveFocusSpy.count(), 1); - view->setWindowState(Qt::WindowNoState); + view->hide(); QCOMPARE(rootItem->hasFocus(), false); QCOMPARE(rootItem->hasActiveFocus(), false); QCOMPARE(scope1->hasFocus(), true); @@ -648,7 +636,7 @@ void tst_qsgfocusscope::canvasFocus() QCOMPARE(item2ActiveFocusSpy.count(), 0); // give the canvas focus, and item2 will get active focus - view->setWindowState(Qt::WindowActive); + view->show(); QCOMPARE(rootItem->hasFocus(), true); QCOMPARE(rootItem->hasActiveFocus(), true); |