diff options
author | Matthew Cattell <matthew.cattell@nokia.com> | 2011-09-09 14:50:48 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-09 15:02:36 +0200 |
commit | 4153ee1b391438d25d0860c5174039f8ad7b8fc5 (patch) | |
tree | 2ec32b5e5494c8ae63d492cb0d95c1c0c5b21643 /tests/auto/declarative/qsgtextinput | |
parent | d93cc35d4ff1643ac9c41e8b3cbcc06bbac1894f (diff) |
fixup tests to build with refactor
Change-Id: Iab4adc9e19fab67402918bb737fff2fce6c292bd
Reviewed-on: http://codereview.qt-project.org/4545
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qsgtextinput')
-rw-r--r-- | tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp | 57 |
1 files changed, 25 insertions, 32 deletions
diff --git a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp index 32e59c2a6d..7da6ee23e8 100644 --- a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp +++ b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp @@ -50,7 +50,7 @@ #include <QDir> #include <QStyle> #include <QInputContext> -#include <private/qapplication_p.h> +#include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h> #include <private/qsgdistancefieldglyphcache_p.h> #include <QtOpenGL/QGLShaderProgram> #include <math.h> @@ -151,9 +151,6 @@ private: }; void tst_qsgtextinput::initTestCase() { - QSGView canvas; - if (!QGLShaderProgram::hasOpenGLShaderPrograms(canvas.context())) - QSKIP("TextInput item needs OpenGL 2.0", SkipAll); } void tst_qsgtextinput::cleanupTestCase() @@ -959,9 +956,10 @@ void tst_qsgtextinput::dragMouseSelection() QSGView canvas(QUrl::fromLocalFile(qmlfile)); canvas.show(); - QApplication::setActiveWindow(&canvas); + canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&canvas)); + + QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); QVERIFY(canvas.rootObject() != 0); QSGTextInput *textInputObject = qobject_cast<QSGTextInput *>(canvas.rootObject()); @@ -1017,9 +1015,9 @@ void tst_qsgtextinput::mouseSelectionMode() QSGView canvas(QUrl::fromLocalFile(qmlfile)); canvas.show(); - QApplication::setActiveWindow(&canvas); + canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&canvas)); + QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); QVERIFY(canvas.rootObject() != 0); QSGTextInput *textInputObject = qobject_cast<QSGTextInput *>(canvas.rootObject()); @@ -1061,9 +1059,9 @@ void tst_qsgtextinput::horizontalAlignment() QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/horizontalAlignment.qml")); canvas.show(); - QApplication::setActiveWindow(&canvas); + canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&canvas)); + QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); QObject *ob = canvas.rootObject(); QVERIFY(ob != 0); ob->setProperty("horizontalAlignment",hAlign); @@ -1179,8 +1177,7 @@ void tst_qsgtextinput::positionAt() QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/positionAt.qml")); QVERIFY(canvas.rootObject() != 0); canvas.show(); - canvas.setFocus(); - QApplication::setActiveWindow(&canvas); + canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); QSGTextInput *textinputObject = qobject_cast<QSGTextInput *>(canvas.rootObject()); @@ -1311,8 +1308,7 @@ void tst_qsgtextinput::maxLength() QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/maxLength.qml")); QVERIFY(canvas.rootObject() != 0); canvas.show(); - canvas.setFocus(); - QApplication::setActiveWindow(&canvas); + canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); QSGTextInput *textinputObject = qobject_cast<QSGTextInput *>(canvas.rootObject()); @@ -1341,7 +1337,7 @@ void tst_qsgtextinput::masks() //QString componentStr = "import QtQuick 2.0\nTextInput { inputMask: 'HHHHhhhh'; }"; QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/masks.qml")); canvas.show(); - canvas.setFocus(); + canvas.requestActivateWindow(); QVERIFY(canvas.rootObject() != 0); QSGTextInput *textinputObject = qobject_cast<QSGTextInput *>(canvas.rootObject()); QVERIFY(textinputObject != 0); @@ -1365,7 +1361,7 @@ void tst_qsgtextinput::validators() QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/validators.qml")); canvas.show(); - canvas.setFocus(); + canvas.requestActivateWindow(); QVERIFY(canvas.rootObject() != 0); @@ -1453,8 +1449,7 @@ void tst_qsgtextinput::inputMethods() { QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/inputmethods.qml")); canvas.show(); - canvas.setFocus(); - QApplication::setActiveWindow(&canvas); + canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); // test input method hints @@ -1501,7 +1496,7 @@ void tst_qsgtextinput::navigation() { QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/navigation.qml")); canvas.show(); - canvas.setFocus(); + canvas.requestActivateWindow(); QVERIFY(canvas.rootObject() != 0); @@ -1540,7 +1535,7 @@ void tst_qsgtextinput::navigation_RTL() { QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/navigation.qml")); canvas.show(); - canvas.setFocus(); + canvas.requestActivateWindow(); QVERIFY(canvas.rootObject() != 0); @@ -1712,7 +1707,7 @@ void tst_qsgtextinput::cursorDelegate() { QSGView view(QUrl::fromLocalFile(SRCDIR "/data/cursorTest.qml")); view.show(); - view.setFocus(); + view.requestActivateWindow(); QSGTextInput *textInputObject = view.rootObject()->findChild<QSGTextInput*>("textInputObject"); QVERIFY(textInputObject != 0); QVERIFY(textInputObject->findChild<QSGItem*>("cursorInstance")); @@ -1738,10 +1733,9 @@ void tst_qsgtextinput::cursorVisible() { QSGView view(QUrl::fromLocalFile(SRCDIR "/data/cursorVisible.qml")); view.show(); - QApplication::setActiveWindow(&view); + view.requestActivateWindow(); QTest::qWaitForWindowShown(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); - view.setFocus(); + QTRY_COMPARE(view.windowState(), Qt::WindowActive); QSGTextInput input; QSignalSpy spy(&input, SIGNAL(cursorVisibleChanged(bool))); @@ -1772,11 +1766,11 @@ void tst_qsgtextinput::cursorVisible() QCOMPARE(input.isCursorVisible(), true); QCOMPARE(spy.count(), 5); - view.clearFocus(); + view.setWindowState(Qt::WindowNoState); QCOMPARE(input.isCursorVisible(), false); QCOMPARE(spy.count(), 6); - view.setFocus(); + view.requestActivateWindow(); QCOMPARE(input.isCursorVisible(), true); QCOMPARE(spy.count(), 7); @@ -1788,8 +1782,8 @@ void tst_qsgtextinput::cursorVisible() QCOMPARE(input.isCursorVisible(), false); QCOMPARE(spy.count(), 8); - QApplication::setActiveWindow(&view); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); + view.requestActivateWindow(); + QTRY_COMPARE(view.windowState(), Qt::WindowActive); QCOMPARE(input.isCursorVisible(), true); QCOMPARE(spy.count(), 9); #endif @@ -1852,7 +1846,7 @@ void tst_qsgtextinput::readOnly() { QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/readOnly.qml")); canvas.show(); - canvas.setFocus(); + canvas.requestActivateWindow(); QVERIFY(canvas.rootObject() != 0); @@ -1879,10 +1873,9 @@ void tst_qsgtextinput::echoMode() { QSGView canvas(QUrl::fromLocalFile(SRCDIR "/data/echoMode.qml")); canvas.show(); - canvas.setFocus(); - QApplication::setActiveWindow(&canvas); + canvas.requestActivateWindow(); QTest::qWaitForWindowShown(&canvas); - QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&canvas)); + QTRY_COMPARE(canvas.windowState(), Qt::WindowActive); QVERIFY(canvas.rootObject() != 0); |