From 5e88373c188d9afc88a09ed11c635b59a92614fe Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 4 Mar 2013 14:01:02 +0100 Subject: Autotests w CONFIG+=parallel_test don't depend on activation or focus If the test does requestActivate() or relies on isFocusWindow(), the test cannot be parallel_test. Also, a lot of the tests don't actually need the window to be active, only exposed; and waiting only for exposed is likely to make them more stable. Change-Id: I0845b9b12ddf7f0c8906d9738a3e26d46ab98820 Reviewed-by: Gunnar Sletta --- .../tst_qquickanimatedimage.cpp | 3 +- .../tst_qquickanimatedsprite.cpp | 3 +- .../quick/qquickflickable/tst_qquickflickable.cpp | 26 ------------ tests/auto/quick/qquickimage/tst_qquickimage.cpp | 6 +-- .../quick/qquickitemlayer/tst_qquickitemlayer.cpp | 2 +- .../quick/qquickmousearea/tst_qquickmousearea.cpp | 49 ++++++++++------------ .../tst_qquickmultipointtoucharea.cpp | 3 +- tests/auto/quick/qquickstates/tst_qquickstates.cpp | 3 +- tests/auto/quick/qquickwindow/qquickwindow.pro | 1 - tests/auto/quick/touchmouse/tst_touchmouse.cpp | 3 +- 10 files changed, 31 insertions(+), 68 deletions(-) (limited to 'tests') diff --git a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp index aad1327e6f..201287b2a8 100644 --- a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp +++ b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp @@ -152,9 +152,8 @@ void tst_qquickanimatedimage::mirror_running() QQuickView window; window.setSource(testFileUrl("hearts.qml")); - window.requestActivate(); window.show(); - QTest::qWaitForWindowActive(&window); + QTest::qWaitForWindowExposed(&window); QQuickAnimatedImage *anim = qobject_cast(window.rootObject()); QVERIFY(anim); diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp index 7847268d94..34a1614ac5 100644 --- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp +++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp @@ -93,8 +93,7 @@ void tst_qquickanimatedsprite::test_frameChangedSignal() window->setSource(testFileUrl("frameChange.qml")); window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QTest::qWaitForWindowExposed(window)); QVERIFY(window->rootObject()); QQuickAnimatedSprite* sprite = window->rootObject()->findChild("sprite"); diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index 875ade45b8..d643f91366 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -214,8 +214,6 @@ void tst_qquickflickable::rebound() window->setSource(testFileUrl("rebound.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -355,8 +353,6 @@ void tst_qquickflickable::pressDelay() window->setSource(testFileUrl("pressDelay.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -396,8 +392,6 @@ void tst_qquickflickable::nestedPressDelay() window->setSource(testFileUrl("nestedPressDelay.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *outer = qobject_cast(window->rootObject()); @@ -554,8 +548,6 @@ void tst_qquickflickable::wheel() window->setSource(testFileUrl("wheel.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flick = window->rootObject()->findChild("flick"); @@ -622,8 +614,6 @@ void tst_qquickflickable::movingAndFlicking() window->setSource(testFileUrl("flickable03.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -781,8 +771,6 @@ void tst_qquickflickable::movingAndDragging() window->setSource(testFileUrl("flickable03.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -947,8 +935,6 @@ void tst_qquickflickable::flickOnRelease() window->setSource(testFileUrl("flickable03.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -983,8 +969,6 @@ void tst_qquickflickable::pressWhileFlicking() window->setSource(testFileUrl("flickable03.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -1035,8 +1019,6 @@ void tst_qquickflickable::disabled() window->setSource(testFileUrl("disabled.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flick = window->rootObject()->findChild("flickable"); @@ -1065,8 +1047,6 @@ void tst_qquickflickable::flickVelocity() window->setSource(testFileUrl("flickable03.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -1167,8 +1147,6 @@ void tst_qquickflickable::cancelOnMouseGrab() window->setSource(testFileUrl("cancel.qml")); window->show(); QVERIFY(QTest::qWaitForWindowExposed(window.data())); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -1204,8 +1182,6 @@ void tst_qquickflickable::clickAndDragWhenTransformed() view->setSource(testFileUrl("transformedFlickable.qml")); view->show(); QVERIFY(QTest::qWaitForWindowExposed(view.data())); - view->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(view.data())); QVERIFY(view->rootObject() != 0); QQuickFlickable *flickable = view->rootObject()->findChild("flickable"); @@ -1255,8 +1231,6 @@ void tst_qquickflickable::flickTwiceUsingTouches() QQuickView *window = new QQuickView; window->setSource(testFileUrl("longList.qml")); window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index 51ac5c640a..675c8f9350 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -315,8 +315,7 @@ void tst_qquickimage::mirror() obj->setFillMode(fillMode); obj->setProperty("mirror", true); window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QTest::qWaitForWindowExposed(window)); QImage screenshot = window->grabWindow(); screenshots[fillMode] = screenshot; @@ -500,8 +499,7 @@ void tst_qquickimage::tiling_QTBUG_6716() QQuickView view(testFileUrl(source)); view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QQuickImage *tiling = findItem(view.rootObject(), "tiling"); diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp index 9387264eb0..4f103bd1fa 100644 --- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp +++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp @@ -266,7 +266,7 @@ void tst_QQuickItemLayer::layerVisibility() view.show(); - QTest::qWaitForWindowActive(&view); + QTest::qWaitForWindowExposed(&view); QImage fb = view.grabWindow(); uint pixel = fb.pixel(0, 0); diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp index 6ee79b06a2..3c08b16168 100644 --- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp @@ -132,7 +132,7 @@ void tst_QQuickMouseArea::dragProperties() window->setSource(testFileUrl("dragproperties.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseRegion = window->rootObject()->findChild("mouseregion"); @@ -218,7 +218,7 @@ void tst_QQuickMouseArea::resetDrag() window->rootContext()->setContextProperty("haveTarget", QVariant(true)); window->setSource(testFileUrl("dragreset.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseRegion = window->rootObject()->findChild("mouseregion"); @@ -250,7 +250,7 @@ void tst_QQuickMouseArea::dragging() window->setSource(testFileUrl("dragging.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(QTest::qWaitForWindowExposed(window)); QVERIFY(window->rootObject() != 0); @@ -303,8 +303,7 @@ void tst_QQuickMouseArea::invalidDrag() window->setSource(testFileUrl("dragging.qml")); window->show(); - window->requestActivate(); - QTest::qWait(20); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseRegion = window->rootObject()->findChild("mouseregion"); @@ -355,8 +354,7 @@ void tst_QQuickMouseArea::setDragOnPressed() window->setSource(testFileUrl("setDragOnPressed.qml")); window->show(); - window->requestActivate(); - QTest::qWait(20); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseArea = qobject_cast(window->rootObject()); @@ -410,7 +408,7 @@ void tst_QQuickMouseArea::updateMouseAreaPosOnClick() QQuickView *window = createView(); window->setSource(testFileUrl("updateMousePosOnClick.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseRegion = window->rootObject()->findChild("mouseregion"); @@ -439,7 +437,7 @@ void tst_QQuickMouseArea::updateMouseAreaPosOnResize() QQuickView *window = createView(); window->setSource(testFileUrl("updateMousePosOnResize.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseRegion = window->rootObject()->findChild("mouseregion"); @@ -476,7 +474,7 @@ void tst_QQuickMouseArea::noOnClickedWithPressAndHold() QQuickView *window = createView(); window->setSource(testFileUrl("clickandhold.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseArea = qobject_cast(window->rootObject()->children().first()); QVERIFY(mouseArea); @@ -509,7 +507,7 @@ void tst_QQuickMouseArea::noOnClickedWithPressAndHold() QQuickView *window = createView(); window->setSource(testFileUrl("noclickandhold.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0); @@ -533,7 +531,7 @@ void tst_QQuickMouseArea::onMousePressRejected() QQuickView *window = createView(); window->setSource(testFileUrl("rejectEvent.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QVERIFY(window->rootObject()->property("enabled").toBool()); @@ -570,7 +568,7 @@ void tst_QQuickMouseArea::pressedCanceledOnWindowDeactivate() QQuickView *window = createView(); window->setSource(testFileUrl("pressedCanceled.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QVERIFY(!window->rootObject()->property("pressed").toBool()); QVERIFY(!window->rootObject()->property("canceled").toBool()); @@ -617,7 +615,7 @@ void tst_QQuickMouseArea::doubleClick() QQuickView *window = createView(); window->setSource(testFileUrl("doubleclick.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseArea = window->rootObject()->findChild("mousearea"); @@ -655,7 +653,7 @@ void tst_QQuickMouseArea::clickTwice() QQuickView *window = createView(); window->setSource(testFileUrl("clicktwice.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseArea = window->rootObject()->findChild("mousearea"); @@ -692,7 +690,7 @@ void tst_QQuickMouseArea::invalidClick() QQuickView *window = createView(); window->setSource(testFileUrl("doubleclick.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseArea = window->rootObject()->findChild("mousearea"); @@ -726,7 +724,7 @@ void tst_QQuickMouseArea::pressedOrdering() QQuickView *window = createView(); window->setSource(testFileUrl("pressedOrdering.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QCOMPARE(window->rootObject()->property("value").toString(), QLatin1String("base")); @@ -754,7 +752,7 @@ void tst_QQuickMouseArea::preventStealing() window->setSource(testFileUrl("preventstealing.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast(window->rootObject()); @@ -818,7 +816,7 @@ void tst_QQuickMouseArea::clickThrough() QQuickView *window = createView(); window->setSource(testFileUrl("clickThrough.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QTest::mousePress(window, Qt::LeftButton, 0, QPoint(100,100)); @@ -853,7 +851,7 @@ void tst_QQuickMouseArea::clickThrough() window = createView(); window->setSource(testFileUrl("clickThrough2.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QTest::mousePress(window, Qt::LeftButton, 0, QPoint(100,100)); @@ -1012,8 +1010,7 @@ void tst_QQuickMouseArea::disableAfterPress() QQuickView *window = createView(); window->setSource(testFileUrl("dragging.qml")); window->show(); - window->requestActivate(); - QTest::qWait(20); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseArea = window->rootObject()->findChild("mouseregion"); @@ -1162,7 +1159,7 @@ void tst_QQuickMouseArea::transformedMouseArea() QQuickView *window = createView(); window->setSource(testFileUrl("transformedMouseArea.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(window->rootObject() != 0); QQuickMouseArea *mouseArea = window->rootObject()->findChild("mouseArea"); @@ -1280,7 +1277,7 @@ void tst_QQuickMouseArea::pressedMultipleButtons() QQuickView *view = createView(); view->setSource(testFileUrl("simple.qml")); view->show(); - view->requestActivate(); + QTest::qWaitForWindowExposed(view); QVERIFY(view->rootObject() != 0); QQuickMouseArea *mouseArea = view->rootObject()->findChild("mousearea"); @@ -1317,7 +1314,7 @@ void tst_QQuickMouseArea::changeAxis() view->setSource(testFileUrl("changeAxis.qml")); view->show(); - view->requestActivate(); + QTest::qWaitForWindowExposed(view); QTRY_VERIFY(view->rootObject() != 0); QQuickMouseArea *mouseRegion = view->rootObject()->findChild("mouseregion"); @@ -1409,7 +1406,7 @@ void tst_QQuickMouseArea::moveAndReleaseWithoutPress() window->setSource(testFileUrl("moveAndReleaseWithoutPress.qml")); window->show(); - window->requestActivate(); + QTest::qWaitForWindowExposed(window); QVERIFY(QTest::qWaitForWindowExposed(window)); QObject *root = window->rootObject(); diff --git a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp index 73c2cf68dd..663d02d921 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp +++ b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp @@ -851,8 +851,7 @@ QQuickView *tst_QQuickMultiPointTouchArea::createAndShowView(const QString &file QQuickView *window = new QQuickView(0); window->setSource(testFileUrl(file)); window->show(); - window->requestActivate(); - QTest::qWaitForWindowActive(window); + QTest::qWaitForWindowExposed(window); return window; } diff --git a/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/tests/auto/quick/qquickstates/tst_qquickstates.cpp index 726d3a6e75..e165b559f7 100644 --- a/tests/auto/quick/qquickstates/tst_qquickstates.cpp +++ b/tests/auto/quick/qquickstates/tst_qquickstates.cpp @@ -1009,9 +1009,8 @@ void tst_qquickstates::anchorRewindBug() view->setSource(testFileUrl("anchorRewindBug.qml")); view->show(); - view->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(view)); + QVERIFY(QTest::qWaitForWindowExposed(view)); QQuickRectangle *rect = qobject_cast(view->rootObject()); QVERIFY(rect != 0); diff --git a/tests/auto/quick/qquickwindow/qquickwindow.pro b/tests/auto/quick/qquickwindow/qquickwindow.pro index 59d96429db..b1fc5cd4f2 100644 --- a/tests/auto/quick/qquickwindow/qquickwindow.pro +++ b/tests/auto/quick/qquickwindow/qquickwindow.pro @@ -6,7 +6,6 @@ include (../../shared/util.pri) macx:CONFIG -= app_bundle -CONFIG += parallel_test QT += core-private gui-private qml-private quick-private v8-private testlib TESTDATA = data/* diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp index caad2539be..d33bf3991c 100644 --- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp +++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp @@ -824,8 +824,7 @@ void tst_TouchMouse::mouseOnFlickableOnPinch() QQuickView *window = createView(); window->setSource(testFileUrl("mouseonflickableonpinch.qml")); window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QTest::qWaitForWindowExposed(window)); QVERIFY(window->rootObject() != 0); QRect windowRect = QRect(window->position(), window->size()); QCursor::setPos(windowRect.center()); -- cgit v1.2.3