Avoid qWaitForWindowActivated() in tst_qquickpathview

There are platforms that don't support window activation. On such
platforms the test would needlessly fail.

Pick-to: 6.2 6.3 6.4
Change-Id: I0dfcba892643cd254ce4987b1a09e494063035ed
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 19 insertions, 53 deletions

diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 3c979f6815..0d894c8581 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -1366,8 +1366,7 @@ void tst_QQuickPathView::package()
     QVERIFY(window);
     window->setSource(testFileUrl("pathview_package.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("photoPathView");
     QVERIFY(pathView);
@@ -1495,9 +1494,7 @@ void tst_QQuickPathView::mouseDrag()
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("dragpath.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -1567,10 +1564,7 @@ void tst_QQuickPathView::nestedMouseAreaDrag()
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("nestedmousearea.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
-
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -1590,9 +1584,7 @@ void tst_QQuickPathView::flickNClick() // QTBUG-77173
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("nestedmousearea2.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -1681,9 +1673,7 @@ void tst_QQuickPathView::changePreferredHighlight()
     window->setGeometry(0,0,400,200);
     window->setSource(testFileUrl("dragpath.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -1884,9 +1874,7 @@ void tst_QQuickPathView::cancelDrag()
     window->setSource(testFileUrl("dragpath.qml"));
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -1932,9 +1920,7 @@ void tst_QQuickPathView::maximumFlickVelocity()
     window->setSource(testFileUrl("dragpath.qml"));
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -1979,9 +1965,7 @@ void tst_QQuickPathView::snapToItem()
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("panels.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = window->rootObject()->findChild<QQuickPathView*>("view");
     QVERIFY(pathview != nullptr);
@@ -2023,9 +2007,7 @@ void tst_QQuickPathView::snapOneItem()
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("panels.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = window->rootObject()->findChild<QQuickPathView*>("view");
     QVERIFY(pathview != nullptr);
@@ -2076,9 +2058,7 @@ void tst_QQuickPathView::positionViewAtIndex()
     QScopedPointer<QQuickView> window(createView());
     window->setSource(testFileUrl("pathview3.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -2139,9 +2119,7 @@ void tst_QQuickPathView::indexAt_itemAt()
     QScopedPointer<QQuickView> window(createView());
     window->setSource(testFileUrl("pathview3.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -2265,8 +2243,7 @@ void tst_QQuickPathView::changePathDuringRefill()
 
     window->setSource(testFileUrl("changePathDuringRefill.qml"));
     window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathView = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathView != nullptr);
@@ -2292,9 +2269,7 @@ void tst_QQuickPathView::nestedinFlickable()
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("nestedInFlickable.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "pathView");
     QVERIFY(pathview != nullptr);
@@ -2400,9 +2375,7 @@ void tst_QQuickPathView::ungrabNestedinFlickable()
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("ungrabNestedinFlickable.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = findItem<QQuickPathView>(window->rootObject(), "pathView");
     QVERIFY(pathview != nullptr);
@@ -2434,9 +2407,7 @@ void tst_QQuickPathView::flickableDelegate()
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("flickableDelegate.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
     QVERIFY(pathview != nullptr);
@@ -2516,8 +2487,7 @@ void tst_QQuickPathView::qtbug37815()
 
     window->setSource(testFileUrl("qtbug37815.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     // cache items will be created async. Let's wait...
     QTest::qWait(1000);
@@ -2547,8 +2517,7 @@ void tst_QQuickPathView::qtbug42716()
 
     window->setSource(testFileUrl("qtbug42716.qml"));
     window->show();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathView = findItem<QQuickPathView>(window->rootObject(), "pathView");
     QVERIFY(pathView != nullptr);
@@ -2589,8 +2558,7 @@ void tst_QQuickPathView::qtbug53464()
 
     window->setSource(testFileUrl("qtbug53464.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathView = findItem<QQuickPathView>(window->rootObject(), "pathView");
     QVERIFY(pathView != nullptr);
@@ -2667,9 +2635,7 @@ void tst_QQuickPathView::movementDirection()
     QQuickVisualTestUtils::moveMouseAway(window.data());
     window->setSource(testFileUrl("movementDirection.qml"));
     window->show();
-    window->requestActivate();
-    QVERIFY(QTest::qWaitForWindowActive(window.data()));
-    QCOMPARE(window.data(), qGuiApp->focusWindow());
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
 
     QQuickPathView *pathview = window->rootObject()->findChild<QQuickPathView*>("view");
     QVERIFY(pathview != nullptr);