diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-10-06 10:10:24 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 03:13:27 +0200 |
commit | 8ce0fcdd068f91353fb069d38e2ecf214015ef16 (patch) | |
tree | 13c09c702005f7fc986bc583b9360a8cb8284340 /tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp | |
parent | e29f198b2a91b30678ebeea0d4908634e7c2b5be (diff) |
Fix waiting for active window breakage
Use QTRY_COMPARE(view == qGuiApp->focusWindow());
Change-Id: If5934f4355d9eb8da343f98277e3528f56926cd9
Fixes: QTBUG-21682, QTBUG-21683, QTBUG-21687, QTBUG-21680
Reviewed-on: http://codereview.qt-project.org/6087
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp')
-rw-r--r-- | tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp index 89e5b02864..b0f8eafc1a 100644 --- a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp +++ b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp @@ -64,7 +64,6 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) #define QTBUG_21691 #define QTBUG_21691_MESSAGE "QTBUG-21691: The test needs to be rewritten to not use QInputContext" -#define QTBUG_21489_MESSAGE "Pre-condition failure because of QTBUG-21489. This can be safely ignored if there no subsequent failures" QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual) { @@ -966,8 +965,7 @@ void tst_qsgtextinput::dragMouseSelection() canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); + QTRY_COMPARE(&canvas, qGuiApp->focusWindow()); QVERIFY(canvas.rootObject() != 0); QSGTextInput *textInputObject = qobject_cast<QSGTextInput *>(canvas.rootObject()); @@ -1021,8 +1019,7 @@ void tst_qsgtextinput::mouseSelectionMode() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); + QTRY_COMPARE(&canvas, qGuiApp->focusWindow()); QVERIFY(canvas.rootObject() != 0); QSGTextInput *textInputObject = qobject_cast<QSGTextInput *>(canvas.rootObject()); @@ -1056,6 +1053,8 @@ void tst_qsgtextinput::horizontalAlignment_data() void tst_qsgtextinput::horizontalAlignment() { + QSKIP("Image comparison of text is almost guaranteed to fail during development", SkipAll); + QFETCH(int, hAlign); QFETCH(QString, expectfile); @@ -1064,8 +1063,7 @@ void tst_qsgtextinput::horizontalAlignment() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); + QTRY_COMPARE(&canvas, qGuiApp->focusWindow()); QObject *ob = canvas.rootObject(); QVERIFY(ob != 0); ob->setProperty("horizontalAlignment",hAlign); @@ -1153,8 +1151,7 @@ void tst_qsgtextinput::horizontalAlignment_RightToLeft() canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); + QTRY_COMPARE(&canvas, qGuiApp->focusWindow()); // If there is no commited text, the preedit text should determine the alignment. textInput->setText(QString()); @@ -1766,8 +1763,7 @@ void tst_qsgtextinput::cursorVisible() view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(view.windowState(), Qt::WindowActive); + QTRY_COMPARE(&view, qGuiApp->focusWindow()); QSGTextInput input; QSignalSpy spy(&input, SIGNAL(cursorVisibleChanged(bool))); @@ -1813,7 +1809,7 @@ void tst_qsgtextinput::cursorVisible() // QGuiApplication has no equivalent of setActiveWindow(0). Is this different to clearing the // active state of the window or can it be removed? // QApplication::setActiveWindow(0); -// QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(0)); +// QTRY_COMPARE(QApplication::focusWindow(), static_cast<QWidget *>(0)); // QCOMPARE(input.isCursorVisible(), false); // QCOMPARE(spy.count(), 8); @@ -1912,8 +1908,7 @@ void tst_qsgtextinput::echoMode() canvas.show(); canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); + QTRY_COMPARE(&canvas, qGuiApp->focusWindow()); QVERIFY(canvas.rootObject() != 0); @@ -1984,8 +1979,7 @@ void tst_qdeclarativetextinput::passwordEchoDelay() canvas.setFocus(); QGuiApplication::setActiveWindow(&canvas); QTest::qWaitForWindowShown(&canvas); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); + QTRY_COMPARE(&canvas, qGuiApp->focusWindow()); QVERIFY(canvas.rootObject() != 0); @@ -2093,8 +2087,7 @@ void tst_qsgtextinput::openInputPanel() view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(view.windowState(), Qt::WindowActive); + QTRY_COMPARE(&view, qGuiApp->focusWindow()); QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject()); QVERIFY(input); @@ -2297,8 +2290,7 @@ void tst_qsgtextinput::preeditAutoScroll() view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(view.windowState(), Qt::WindowActive); + QTRY_COMPARE(&view, qGuiApp->focusWindow()); QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject()); QVERIFY(input); @@ -2389,8 +2381,7 @@ void tst_qsgtextinput::preeditMicroFocus() view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(view.windowState(), Qt::WindowActive); + QTRY_COMPARE(&view, qGuiApp->focusWindow()); QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject()); QVERIFY(input); @@ -2451,8 +2442,7 @@ void tst_qsgtextinput::inputContextMouseHandler() view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(view.windowState(), Qt::WindowActive); + QTRY_COMPARE(&view, qGuiApp->focusWindow()); QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject()); QVERIFY(input); @@ -2563,8 +2553,7 @@ void tst_qsgtextinput::inputMethodComposing() view.show(); view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(view.windowState(), Qt::WindowActive); + QTRY_COMPARE(&view, qGuiApp->focusWindow()); QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject()); QVERIFY(input); QSignalSpy spy(input, SIGNAL(inputMethodComposingChanged())); @@ -2619,12 +2608,11 @@ void tst_qsgtextinput::tripleClickSelectsAll() { QString qmlfile = SRCDIR "/data/positionAt.qml"; QSGView view(QUrl::fromLocalFile(qmlfile)); - view.requestActivateWindow(); view.show(); + view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); - QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue); - QTRY_COMPARE(view.windowState(), Qt::WindowActive); + QTRY_COMPARE(&view, qGuiApp->focusWindow()); QSGTextInput* input = qobject_cast<QSGTextInput*>(view.rootObject()); QVERIFY(input); |