tst_QQuickPopup: run with all styles

Change-Id: I0f48ef8bbf0cb7567796dc67f1030d274f684d67
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 51 insertions, 37 deletions

diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index 550655ef..9230116b 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -38,6 +38,7 @@
 #include <QtTest/qsignalspy.h>
 #include "../shared/util.h"
 #include "../shared/visualtestutil.h"
+#include "../shared/qtest_quickcontrols.h"
 
 #include <QtGui/qpa/qwindowsysteminterface.h>
 #include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
@@ -119,7 +120,7 @@ void tst_QQuickPopup::visible()
     QVERIFY(overlay->childItems().contains(popupItem));
 
     popup->close();
-    QVERIFY(!popup->isVisible());
+    QTRY_VERIFY(!popup->isVisible());
     QVERIFY(!overlay->childItems().contains(popupItem));
 
     popup->setVisible(true);
@@ -127,7 +128,7 @@ void tst_QQuickPopup::visible()
     QVERIFY(overlay->childItems().contains(popupItem));
 
     popup->setVisible(false);
-    QVERIFY(!popup->isVisible());
+    QTRY_VERIFY(!popup->isVisible());
     QVERIFY(!overlay->childItems().contains(popupItem));
 }
 
@@ -164,7 +165,7 @@ void tst_QQuickPopup::state()
     QCOMPARE(closedSpy.count(), 0);
 
     popup->close();
-    QCOMPARE(visibleChangedSpy.count(), 2);
+    QTRY_COMPARE(visibleChangedSpy.count(), 2);
     QCOMPARE(aboutToShowSpy.count(), 1);
     QCOMPARE(aboutToHideSpy.count(), 1);
     QCOMPARE(openedSpy.count(), 1);
@@ -236,6 +237,7 @@ void tst_QQuickPopup::overlay()
     popup->open();
     QVERIFY(popup->isVisible());
     QVERIFY(overlay->isVisible());
+    QTRY_VERIFY(popup->isOpened());
 
     QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
     QCOMPARE(overlayPressedSignal.count(), ++overlayPressCount);
@@ -243,16 +245,15 @@ void tst_QQuickPopup::overlay()
     QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount);
     QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount);
 
+    QTRY_VERIFY(!popup->isVisible());
+    QVERIFY(!overlay->isVisible());
+
     QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
     QCOMPARE(overlayPressedSignal.count(), overlayPressCount);
     QCOMPARE(overlayReleasedSignal.count(), overlayReleaseCount); // no modal-popups open
     QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount);
     QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount);
 
-    popup->close();
-    QVERIFY(!popup->isVisible());
-    QVERIFY(!overlay->isVisible());
-
     popup->setDim(dim);
     popup->setModal(modal);
     popup->setClosePolicy(QQuickPopup::CloseOnReleaseOutside);
@@ -261,6 +262,7 @@ void tst_QQuickPopup::overlay()
     popup->open();
     QVERIFY(popup->isVisible());
     QVERIFY(overlay->isVisible());
+    QTRY_VERIFY(popup->isOpened());
 
     QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
     QCOMPARE(overlayPressedSignal.count(), ++overlayPressCount);
@@ -274,8 +276,8 @@ void tst_QQuickPopup::overlay()
     QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount);
     QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount);
 
-    QVERIFY(!popup->isVisible());
-    QCOMPARE(overlay->isVisible(), popup->isVisible());
+    QTRY_VERIFY(!popup->isVisible());
+    QVERIFY(!overlay->isVisible());
 
     // touch
     popup->open();
@@ -307,8 +309,8 @@ void tst_QQuickPopup::overlay()
     QCOMPARE(overlayAttachedPressedSignal.count(), overlayPressCount);
     QCOMPARE(overlayAttachedReleasedSignal.count(), overlayReleaseCount);
 
-    QVERIFY(!popup->isVisible());
-    QCOMPARE(overlay->isVisible(), popup->isVisible());
+    QTRY_VERIFY(!popup->isVisible());
+    QVERIFY(!overlay->isVisible());
 
     // multi-touch
     popup->open();
@@ -331,7 +333,7 @@ void tst_QQuickPopup::overlay()
     QCOMPARE(overlayReleasedSignal.count(), overlayReleaseCount);
 
     QTest::touchEvent(window, device.data()).release(0, button->mapToScene(QPointF(1, 1)).toPoint()).stationary(1);
-    QVERIFY(!popup->isVisible());
+    QTRY_VERIFY(!popup->isVisible());
     QVERIFY(!overlay->isVisible());
     QVERIFY(!button->isPressed());
     QCOMPARE(overlayPressedSignal.count(), overlayPressCount);
@@ -378,12 +380,12 @@ void tst_QQuickPopup::zOrder()
     QVERIFY(popup->isVisible());
 
     QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
-    QVERIFY(!popup2->isVisible());
+    QTRY_VERIFY(!popup2->isVisible());
     QVERIFY(popup->isVisible());
 
     QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
     QVERIFY(!popup2->isVisible());
-    QVERIFY(!popup->isVisible());
+    QTRY_VERIFY(!popup->isVisible());
 }
 
 void tst_QQuickPopup::windowChange()
@@ -483,49 +485,55 @@ void tst_QQuickPopup::closePolicy()
 
     popup->open();
     QVERIFY(popup->isVisible());
+    QTRY_VERIFY(popup->isOpened());
 
     // press outside popup and its parent
     QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
     if (closePolicy.testFlag(QQuickPopup::CloseOnPressOutside) || closePolicy.testFlag(QQuickPopup::CloseOnPressOutsideParent))
-        QVERIFY(!popup->isVisible());
+        QTRY_VERIFY(!popup->isVisible());
     else
         QVERIFY(popup->isVisible());
 
     popup->open();
     QVERIFY(popup->isVisible());
+    QTRY_VERIFY(popup->isOpened());
 
     // release outside popup and its parent
     QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
     if (closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutside))
-        QVERIFY(!popup->isVisible());
+        QTRY_VERIFY(!popup->isVisible());
     else
         QVERIFY(popup->isVisible());
 
     popup->open();
     QVERIFY(popup->isVisible());
+    QTRY_VERIFY(popup->isOpened());
 
     // press outside popup but inside its parent
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x(), button->y()));
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + 1, button->y() + 1));
     if (closePolicy.testFlag(QQuickPopup::CloseOnPressOutside) && !closePolicy.testFlag(QQuickPopup::CloseOnPressOutsideParent))
-        QVERIFY(!popup->isVisible());
+        QTRY_VERIFY(!popup->isVisible());
     else
         QVERIFY(popup->isVisible());
 
     popup->open();
     QVERIFY(popup->isVisible());
+    QTRY_VERIFY(popup->isOpened());
 
     // release outside popup but inside its parent
-    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x(), button->y()));
+    QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + 1, button->y() + 1));
     if (closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutside) && !closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutsideParent))
-        QVERIFY(!popup->isVisible());
+        QTRY_VERIFY(!popup->isVisible());
     else
         QVERIFY(popup->isVisible());
 
     popup->open();
     QVERIFY(popup->isVisible());
+    QTRY_VERIFY(popup->isOpened());
 
     // press inside and release outside
-    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + popup->x(), button->y() + popup->y()));
+    QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x() + popup->x() + 1,
+                                                                     button->y() + popup->y() + 1));
     QVERIFY(popup->isVisible());
     QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
     QVERIFY(popup->isVisible());
@@ -533,7 +541,7 @@ void tst_QQuickPopup::closePolicy()
     // escape
     QTest::keyClick(window, Qt::Key_Escape);
     if (closePolicy.testFlag(QQuickPopup::CloseOnEscape))
-        QVERIFY(!popup->isVisible());
+        QTRY_VERIFY(!popup->isVisible());
     else
         QVERIFY(popup->isVisible());
 }
@@ -556,24 +564,27 @@ void tst_QQuickPopup::activeFocusOnClose1()
 
     focusedPopup->open();
     QVERIFY(focusedPopup->isVisible());
+    QTRY_VERIFY(focusedPopup->isOpened());
     QVERIFY(focusedPopup->hasActiveFocus());
 
     nonFocusedPopup->open();
     QVERIFY(nonFocusedPopup->isVisible());
+    QTRY_VERIFY(nonFocusedPopup->isOpened());
     QVERIFY(focusedPopup->hasActiveFocus());
 
     nonFocusedPopup->close();
-    QVERIFY(!nonFocusedPopup->isVisible());
+    QTRY_VERIFY(!nonFocusedPopup->isVisible());
     QVERIFY(focusedPopup->hasActiveFocus());
 
     // QTBUG-66113: force active focus on a popup that did not request focus
     nonFocusedPopup->open();
     nonFocusedPopup->forceActiveFocus();
     QVERIFY(nonFocusedPopup->isVisible());
+    QTRY_VERIFY(nonFocusedPopup->isOpened());
     QVERIFY(nonFocusedPopup->hasActiveFocus());
 
     nonFocusedPopup->close();
-    QVERIFY(!nonFocusedPopup->isVisible());
+    QTRY_VERIFY(!nonFocusedPopup->isVisible());
     QVERIFY(focusedPopup->hasActiveFocus());
 }
 
@@ -599,16 +610,18 @@ void tst_QQuickPopup::activeFocusOnClose2()
 
     popup1->open();
     QVERIFY(popup1->isVisible());
+    QTRY_VERIFY(popup1->isOpened());
     QVERIFY(popup1->hasActiveFocus());
 
     popup2->open();
     QVERIFY(popup2->isVisible());
+    QTRY_VERIFY(popup2->isOpened());
     QVERIFY(popup2->hasActiveFocus());
 
     // Causes popup1.contentItem.forceActiveFocus() to be called, then closes popup2.
     QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
         closePopup2Button->mapToScene(QPointF(closePopup2Button->width() / 2, closePopup2Button->height() / 2)).toPoint());
-    QVERIFY(!popup2->isVisible());
+    QTRY_VERIFY(!popup2->isVisible());
     QVERIFY(popup1->hasActiveFocus());
 }
 
@@ -694,7 +707,7 @@ void tst_QQuickPopup::hover()
     QVERIFY(!childButton->isHovered());
 
     // hover the child button in a popup
-    QTest::mouseMove(window, QPoint(2, 2));
+    QTest::mouseMove(window, QPoint(popup->x() + popup->width() / 2, popup->y() + popup->height() / 2));
     QVERIFY(!parentButton->isHovered());
     QVERIFY(childButton->isHovered());
 
@@ -844,35 +857,35 @@ void tst_QQuickPopup::grabber()
     QVERIFY(combo);
 
     menu->open();
-    QCOMPARE(menu->isVisible(), true);
+    QTRY_COMPARE(menu->isOpened(), true);
     QCOMPARE(popup->isVisible(), false);
     QCOMPARE(combo->isVisible(), false);
 
     // click a menu item to open the popup
     QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(menu->width() / 2, menu->height() / 2));
-    QCOMPARE(menu->isVisible(), false);
-    QCOMPARE(popup->isVisible(), true);
+    QTRY_COMPARE(menu->isVisible(), false);
+    QTRY_COMPARE(popup->isOpened(), true);
     QCOMPARE(combo->isVisible(), false);
 
     combo->open();
     QCOMPARE(menu->isVisible(), false);
     QCOMPARE(popup->isVisible(), true);
-    QCOMPARE(combo->isVisible(), true);
+    QTRY_COMPARE(combo->isOpened(), true);
 
     // click outside to close both the combo popup and the parent popup
     QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, window->height() - 1));
     QCOMPARE(menu->isVisible(), false);
-    QCOMPARE(popup->isVisible(), false);
-    QCOMPARE(combo->isVisible(), false);
+    QTRY_COMPARE(popup->isVisible(), false);
+    QTRY_COMPARE(combo->isVisible(), false);
 
     menu->open();
-    QCOMPARE(menu->isVisible(), true);
+    QTRY_COMPARE(menu->isOpened(), true);
     QCOMPARE(popup->isVisible(), false);
     QCOMPARE(combo->isVisible(), false);
 
     // click outside the menu to close it (QTBUG-56697)
     QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, QPoint(window->width() - 1, window->height() - 1));
-    QCOMPARE(menu->isVisible(), false);
+    QTRY_COMPARE(menu->isVisible(), false);
     QCOMPARE(popup->isVisible(), false);
     QCOMPARE(combo->isVisible(), false);
 }
@@ -891,17 +904,18 @@ void tst_QQuickPopup::cursorShape()
 
     popup->open();
     QVERIFY(popup->isVisible());
+    QTRY_VERIFY(popup->isOpened());
 
     QQuickItem *textField = helper.appWindow->property("textField").value<QQuickItem*>();
     QVERIFY(textField);
 
     // Move the mouse over the text field.
-    const QPoint textFieldPos(popup->x() - 10, popup->y() + popup->height() / 2);
+    const QPoint textFieldPos(popup->x() - 10, textField->height() / 2);
     QTest::mouseMove(window, textFieldPos);
     QCOMPARE(window->cursor().shape(), textField->cursor().shape());
 
     // Move the mouse over the popup where it overlaps with the text field.
-    const QPoint textFieldOverlapPos(popup->x() + 10, popup->y() + popup->height() / 2);
+    const QPoint textFieldOverlapPos(popup->x() + 10, textField->height() / 2);
     QTest::mouseMove(window, textFieldOverlapPos);
     QCOMPARE(window->cursor().shape(), popup->popupItem()->cursor().shape());
 
@@ -1046,6 +1060,6 @@ void tst_QQuickPopup::orientation()
     QCOMPARE(popup->popupItem()->position(), position);
 }
 
-QTEST_MAIN(tst_QQuickPopup)
+QTEST_QUICKCONTROLS_MAIN(tst_QQuickPopup)
 
 #include "tst_qquickpopup.moc"