diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-09-09 14:12:53 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-12 01:45:23 +0200 |
| commit | 181e8800cfcaebbdea82ae677c327735082327a1 (patch) | |
| tree | a4aba2be1ad9700ab647c0d715f7740013a7a260 /tests | |
| parent | c08f82a5c847255dcbc49efd66972bf4d79cb636 (diff) | |
Restructure test to use QTRY_ macro for instability.
Restructure test to use QTRY_ for asynchronous gui functions. Remove
reference to specific X11 and generalise event queue processing for
all platforms.
Change-Id: I38d8b7419d644ea1d8558f88b48f8b4004804c32
Reviewed-on: http://codereview.qt-project.org/4495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp | 62 |
1 files changed, 15 insertions, 47 deletions
diff --git a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp index 2c8f59cb64..c7dea4c222 100644 --- a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp +++ b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp @@ -128,14 +128,10 @@ void tst_qsgfocusscope::basic() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QTest::qWaitForWindowShown(view); - QVERIFY(view->hasFocus()); + QTRY_VERIFY(view->hasFocus()); QVERIFY(item0->hasActiveFocus() == true); QVERIFY(item1->hasActiveFocus() == true); QVERIFY(item2->hasActiveFocus() == false); @@ -174,14 +170,10 @@ void tst_qsgfocusscope::nested() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QTest::qWaitForWindowShown(view); - QVERIFY(view->hasFocus()); + QTRY_VERIFY(view->hasFocus()); QVERIFY(item1->hasActiveFocus() == true); QVERIFY(item2->hasActiveFocus() == true); @@ -207,14 +199,10 @@ void tst_qsgfocusscope::noFocus() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QTest::qWaitForWindowShown(view); - QVERIFY(view->hasFocus()); + QTRY_VERIFY(view->hasFocus()); QVERIFY(item0->hasActiveFocus() == false); QVERIFY(item1->hasActiveFocus() == false); QVERIFY(item2->hasActiveFocus() == false); @@ -251,14 +239,10 @@ void tst_qsgfocusscope::textEdit() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QTest::qWaitForWindowShown(view); - QVERIFY(view->hasFocus()); + QTRY_VERIFY(view->hasFocus()); QVERIFY(item0->hasActiveFocus() == true); QVERIFY(item1->hasActiveFocus() == true); QVERIFY(item2->hasActiveFocus() == false); @@ -309,14 +293,10 @@ void tst_qsgfocusscope::forceFocus() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QTest::qWaitForWindowShown(view); - QVERIFY(view->hasFocus()); + QTRY_VERIFY(view->hasFocus()); QVERIFY(item0->hasActiveFocus() == true); QVERIFY(item1->hasActiveFocus() == true); QVERIFY(item2->hasActiveFocus() == false); @@ -383,17 +363,13 @@ void tst_qsgfocusscope::signalEmission() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QTest::qWaitForWindowShown(view); QVariant blue(QColor("blue")); QVariant red(QColor("red")); - QVERIFY(view->hasFocus()); + QTRY_VERIFY(view->hasFocus()); item1->setFocus(true); QCOMPARE(item1->property("color"), red); QCOMPARE(item2->property("color"), blue); @@ -435,14 +411,10 @@ void tst_qsgfocusscope::qtBug13380() view->show(); QVERIFY(view->rootObject()); qApp->setActiveWindow(view); - qApp->processEvents(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QTest::qWaitForWindowShown(view); - QVERIFY(view->hasFocus()); + QTRY_VERIFY(view->hasFocus()); QVERIFY(view->rootObject()->property("noFocus").toBool()); view->rootObject()->setProperty("showRect", true); @@ -614,12 +586,8 @@ void tst_qsgfocusscope::canvasFocus() view->show(); qApp->setActiveWindow(view); - qApp->processEvents(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(view); -#endif + QTest::qWaitForWindowShown(view); // Now the canvas has focus, active focus given to item1 QTRY_COMPARE(view->hasFocus(), true); |