From 15e48b7387ae302a1b07a57b8374b097dc9c96a4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 17 Jul 2012 11:58:35 +0200 Subject: QtQuick1: Use new qWaitForWindowExposed/Active() functions. Change-Id: I020c82c465adaf6490a54871869bb6590542675f Reviewed-by: Jason McDonald --- .../tst_qdeclarativetextedit.cpp | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp') diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index b67b7101..1be84e55 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -410,8 +410,8 @@ void tst_qdeclarativetextedit::alignments() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); QObject *ob = canvas->rootObject(); QVERIFY(ob != 0); @@ -554,8 +554,8 @@ void tst_qdeclarativetextedit::hAlign_RightToLeft() QVERIFY(textEdit->positionToRectangle(0).x() < canvas->width()/2); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); textEdit->setText(QString()); { QInputMethodEvent ev(rtlText, QList()); QApplication::sendEvent(canvas, &ev); } @@ -964,8 +964,8 @@ void tst_qdeclarativetextedit::keySelection() QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml"); canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); canvas->setFocus(); QVERIFY(canvas->rootObject() != 0); @@ -1379,8 +1379,8 @@ void tst_qdeclarativetextedit::mouseSelection() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); QVERIFY(canvas->rootObject() != 0); QDeclarativeTextEdit *textEditObject = qobject_cast(canvas->rootObject()); @@ -1411,8 +1411,8 @@ void tst_qdeclarativetextedit::multilineMouseSelection() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); QVERIFY(canvas->rootObject() != 0); QDeclarativeTextEdit *textEditObject = qobject_cast(canvas->rootObject()); @@ -1457,8 +1457,8 @@ void tst_qdeclarativetextedit::deferEnableSelectByMouse() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); QVERIFY(canvas->rootObject() != 0); QDeclarativeTextEdit *textEditObject = qobject_cast(canvas->rootObject()); @@ -1497,8 +1497,8 @@ void tst_qdeclarativetextedit::deferDisableSelectByMouse() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); QVERIFY(canvas->rootObject() != 0); QDeclarativeTextEdit *textEditObject = qobject_cast(canvas->rootObject()); @@ -1528,8 +1528,8 @@ void tst_qdeclarativetextedit::dragMouseSelection() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); QVERIFY(canvas->rootObject() != 0); QDeclarativeTextEdit *textEditObject = qobject_cast(canvas->rootObject()); @@ -1589,8 +1589,8 @@ void tst_qdeclarativetextedit::mouseSelectionMode() canvas->show(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(canvas)); + QVERIFY(QTest::qWaitForWindowActive(canvas)); + QCOMPARE(QApplication::activeWindow(), static_cast(canvas)); QVERIFY(canvas->rootObject() != 0); QDeclarativeTextEdit *textEditObject = qobject_cast(canvas->rootObject()); @@ -1645,7 +1645,7 @@ void tst_qdeclarativetextedit::positionAt() canvas->show(); canvas->setFocus(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); + QVERIFY(QTest::qWaitForWindowActive(canvas)); QDeclarativeTextEdit *texteditObject = qobject_cast(canvas->rootObject()); QVERIFY(texteditObject != 0); @@ -1800,8 +1800,8 @@ void tst_qdeclarativetextedit::cursorVisible() QGraphicsView view(&scene); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast(&view)); view.setFocus(); QDeclarativeTextEdit edit; @@ -2108,8 +2108,8 @@ void tst_qdeclarativetextedit::textInput() scene.addItem(&edit); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast(&view)); edit.setFocus(true); QVERIFY(edit.hasActiveFocus() == true); @@ -2138,8 +2138,8 @@ void tst_qdeclarativetextedit::openInputPanelOnClick() view.show(); qApp->setAutoSipEnabled(true); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast(&view)); QDeclarativeItemPrivate* pri = QDeclarativeItemPrivate::get(&edit); QDeclarativeTextEditPrivate *editPrivate = static_cast(pri); @@ -2186,8 +2186,8 @@ void tst_qdeclarativetextedit::openInputPanelOnFocus() view.show(); qApp->setAutoSipEnabled(true); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast(&view)); QDeclarativeItemPrivate* pri = QDeclarativeItemPrivate::get(&edit); QDeclarativeTextEditPrivate *editPrivate = static_cast(pri); @@ -2383,8 +2383,8 @@ void tst_qdeclarativetextedit::implicitSizePreedit() scene.addItem(textObject); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast(&view)); QInputMethodEvent event(text, QList()); QCoreApplication::sendEvent(&view, &event); @@ -2461,8 +2461,8 @@ void tst_qdeclarativetextedit::preeditMicroFocus() scene.addItem(&edit); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast(&view)); QSignalSpy cursorRectangleSpy(&edit, SIGNAL(cursorRectangleChanged())); @@ -2528,8 +2528,8 @@ void tst_qdeclarativetextedit::inputContextMouseHandler() scene.addItem(&edit); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast(&view)); view.setFocus(); QFontMetricsF fm(edit.font()); @@ -2564,8 +2564,8 @@ void tst_qdeclarativetextedit::inputMethodComposing() scene.addItem(&edit); view.show(); QApplication::setActiveWindow(&view); - QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&view)); + QVERIFY(QTest::qWaitForWindowActive(&view)); + QCOMPARE(QApplication::activeWindow(), static_cast(&view)); QSignalSpy spy(&edit, SIGNAL(inputMethodComposingChanged())); @@ -2600,7 +2600,7 @@ void tst_qdeclarativetextedit::cursorRectangleSize() canvas->show(); canvas->setFocus(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); + QVERIFY(QTest::qWaitForWindowActive(canvas)); QDeclarativeTextEdit *textEdit = qobject_cast(canvas->rootObject()); QVERIFY(textEdit != 0); @@ -2620,7 +2620,7 @@ void tst_qdeclarativetextedit::deselect() canvas->show(); canvas->setFocus(); QApplication::setActiveWindow(canvas); - QTest::qWaitForWindowShown(canvas); + QVERIFY(QTest::qWaitForWindowActive(canvas)); QDeclarativeTextEdit *textEdit = qobject_cast(canvas->rootObject()); QVERIFY(textEdit != 0); -- cgit v1.2.3