Stabilize tst_touchmouse

Change-Id: I6d34571b85f99f780b03f7871f39dbf3be546006
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
index 15a4f0c..4779942 100644 (file)
--- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp
+++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
@@ -195,8 +195,9 @@ void tst_TouchMouse::simpleTouchEvent()
 
     window->setSource(testFileUrl("singleitem.qml"));
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowExposed(window));
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     EventItem *eventItem1 = window->rootObject()->findChild<EventItem*>("eventItem1");
@@ -344,7 +345,9 @@ void tst_TouchMouse::mouse()
 
     window->setSource(testFileUrl("twoitems.qml"));
     window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
     window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     EventItem *eventItem1 = window->rootObject()->findChild<EventItem*>("eventItem1");
@@ -376,7 +379,9 @@ void tst_TouchMouse::touchOverMouse()
 
     window->setSource(testFileUrl("twoitems.qml"));
     window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
     window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     EventItem *eventItem1 = window->rootObject()->findChild<EventItem*>("eventItem1");
@@ -417,7 +422,9 @@ void tst_TouchMouse::mouseOverTouch()
 
     window->setSource(testFileUrl("twoitems.qml"));
     window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
     window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     EventItem *eventItem1 = window->rootObject()->findChild<EventItem*>("eventItem1");
@@ -461,7 +468,9 @@ void tst_TouchMouse::buttonOnFlickable()
 
     window->setSource(testFileUrl("buttononflickable.qml"));
     window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
     window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     QQuickFlickable *flickable = window->rootObject()->findChild<QQuickFlickable*>("flickable");
@@ -569,7 +578,9 @@ void tst_TouchMouse::buttonOnTouch()
     QQuickView *window = createView();
     window->setSource(testFileUrl("buttonontouch.qml"));
     window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
     window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     QQuickPinchArea *pinchArea = window->rootObject()->findChild<QQuickPinchArea*>("pincharea");
@@ -691,7 +702,9 @@ void tst_TouchMouse::pinchOnFlickable()
     QQuickView *window = createView();
     window->setSource(testFileUrl("pinchonflickable.qml"));
     window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
     window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     QQuickPinchArea *pinchArea = window->rootObject()->findChild<QQuickPinchArea*>("pincharea");
@@ -758,7 +771,9 @@ void tst_TouchMouse::flickableOnPinch()
     QQuickView *window = createView();
     window->setSource(testFileUrl("flickableonpinch.qml"));
     window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
     window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     QQuickPinchArea *pinchArea = window->rootObject()->findChild<QQuickPinchArea*>("pincharea");
@@ -935,8 +950,9 @@ void tst_TouchMouse::tapOnDismissiveTopMouseAreaClicksBottomOne()
 
     window->setSource(testFileUrl("twoMouseAreas.qml"));
     window->show();
-    window->requestActivate();
     QVERIFY(QTest::qWaitForWindowExposed(window));
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window));
     QVERIFY(window->rootObject() != 0);
 
     QQuickMouseArea *bottomMouseArea =