diff options
Diffstat (limited to 'tests/auto/qquickmenu')
-rw-r--r-- | tests/auto/qquickmenu/data/actions.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/addItem.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/applicationWindowScrollable.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/applicationwindow.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/menuSeparator.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/mnemonics.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/order.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/popup.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/pressAndHold.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/removeTakeItem.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/repeater.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/subMenus.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/windowScrollable.qml | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/qquickmenu.pro | 1 | ||||
-rw-r--r-- | tests/auto/qquickmenu/tst_qquickmenu.cpp | 98 |
16 files changed, 28 insertions, 127 deletions
diff --git a/tests/auto/qquickmenu/data/actions.qml b/tests/auto/qquickmenu/data/actions.qml index 0ec9f36c..6998c722 100644 --- a/tests/auto/qquickmenu/data/actions.qml +++ b/tests/auto/qquickmenu/data/actions.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/addItem.qml b/tests/auto/qquickmenu/data/addItem.qml index 0668e439..ae592432 100644 --- a/tests/auto/qquickmenu/data/addItem.qml +++ b/tests/auto/qquickmenu/data/addItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml index 1814356c..b9894aed 100644 --- a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml +++ b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickmenu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml index 265a2f1a..986853e4 100644 --- a/tests/auto/qquickmenu/data/applicationwindow.qml +++ b/tests/auto/qquickmenu/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml index 48176d37..303e9155 100644 --- a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml +++ b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 800 diff --git a/tests/auto/qquickmenu/data/menuSeparator.qml b/tests/auto/qquickmenu/data/menuSeparator.qml index 6cdf8b27..ce6bd307 100644 --- a/tests/auto/qquickmenu/data/menuSeparator.qml +++ b/tests/auto/qquickmenu/data/menuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/mnemonics.qml b/tests/auto/qquickmenu/data/mnemonics.qml index de4cd215..510d2401 100644 --- a/tests/auto/qquickmenu/data/mnemonics.qml +++ b/tests/auto/qquickmenu/data/mnemonics.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/order.qml b/tests/auto/qquickmenu/data/order.qml index db5c3c1a..e03c86d3 100644 --- a/tests/auto/qquickmenu/data/order.qml +++ b/tests/auto/qquickmenu/data/order.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/popup.qml b/tests/auto/qquickmenu/data/popup.qml index 6040e8ba..e044a527 100644 --- a/tests/auto/qquickmenu/data/popup.qml +++ b/tests/auto/qquickmenu/data/popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/pressAndHold.qml b/tests/auto/qquickmenu/data/pressAndHold.qml index 6f0acd3a..bcc46c08 100644 --- a/tests/auto/qquickmenu/data/pressAndHold.qml +++ b/tests/auto/qquickmenu/data/pressAndHold.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/removeTakeItem.qml b/tests/auto/qquickmenu/data/removeTakeItem.qml index 89090fb6..8352bffd 100644 --- a/tests/auto/qquickmenu/data/removeTakeItem.qml +++ b/tests/auto/qquickmenu/data/removeTakeItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/repeater.qml b/tests/auto/qquickmenu/data/repeater.qml index 2172f86a..40f44281 100644 --- a/tests/auto/qquickmenu/data/repeater.qml +++ b/tests/auto/qquickmenu/data/repeater.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/subMenus.qml b/tests/auto/qquickmenu/data/subMenus.qml index 49811bc2..413e442d 100644 --- a/tests/auto/qquickmenu/data/subMenus.qml +++ b/tests/auto/qquickmenu/data/subMenus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 600 diff --git a/tests/auto/qquickmenu/data/windowScrollable.qml b/tests/auto/qquickmenu/data/windowScrollable.qml index d21289d3..0d495242 100644 --- a/tests/auto/qquickmenu/data/windowScrollable.qml +++ b/tests/auto/qquickmenu/data/windowScrollable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.11 Window { diff --git a/tests/auto/qquickmenu/qquickmenu.pro b/tests/auto/qquickmenu/qquickmenu.pro index 7e1080b9..ee539842 100644 --- a/tests/auto/qquickmenu/qquickmenu.pro +++ b/tests/auto/qquickmenu/qquickmenu.pro @@ -1,6 +1,5 @@ CONFIG += testcase TARGET = tst_qquickmenu -HEADERS += ../shared/menuutil.h SOURCES += tst_qquickmenu.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 27cd8aaa..b46b8781 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -43,8 +43,6 @@ #include <QtQml/qqmlcontext.h> #include <QtQuick/qquickview.h> #include <QtQuick/private/qquickitem_p.h> -#include <QtQuick/private/qquicklistview_p.h> -#include "../shared/menuutil.h" #include "../shared/util.h" #include "../shared/visualtestutil.h" @@ -88,7 +86,6 @@ private slots: void addRemoveSubMenus(); void scrollable_data(); void scrollable(); - void delegateFromSeparateComponent(); }; void tst_QQuickMenu::defaults() @@ -148,7 +145,6 @@ void tst_QQuickMenu::mouse() menu->open(); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - waitForMenuListViewPolish(menu); QQuickItem *firstItem = menu->itemAt(0); QSignalSpy clickedSpy(firstItem, SIGNAL(clicked())); @@ -272,8 +268,6 @@ void tst_QQuickMenu::contextMenuKeyboard() QCOMPARE(visibleSpy.count(), 1); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - waitForMenuListViewPolish(menu); - QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->property("highlighted").toBool()); QCOMPARE(menu->currentIndex(), -1); @@ -940,7 +934,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(!subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(mainMenu); // open the sub-menu with mouse click QQuickMenuItem *subMenu1Item = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(1)); @@ -951,7 +944,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(subMenu1); // open the cascading sub-sub-menu with mouse hover QQuickMenuItem *subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2)); @@ -962,7 +954,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - QVERIFY(subSubMenu1Item->isHovered()); if (cascade) QTRY_VERIFY(subSubMenu1->isVisible()); @@ -982,7 +973,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - QVERIFY(subSubMenu1Item->isHovered()); if (cascade) QTRY_VERIFY(subSubMenu1->isVisible()); @@ -1209,7 +1199,6 @@ void tst_QQuickMenu::subMenuPosition() QVERIFY(!subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(mainMenu); // open the sub-menu (never flips) QQuickMenuItem *subMenu1Item = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(1)); @@ -1344,96 +1333,9 @@ void tst_QQuickMenu::scrollable() QVERIFY(menu->isVisible()); QQuickItem *contentItem = menu->contentItem(); - // Can only be scrollable if it exceeds the height of the window. - QTRY_VERIFY(contentItem->property("contentHeight").toReal() > window->height()); QCOMPARE(contentItem->property("interactive").toBool(), true); } -// QTBUG-67559 -// Test that Actions and MenuItems declared as children of a Menu have the -// correct delegate when it is declared outside of the Menu as a Component. -void tst_QQuickMenu::delegateFromSeparateComponent() -{ - QQuickApplicationHelper helper(this, QLatin1String("delegateFromSeparateComponent.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - const QColor green = QColor::fromRgb(0x00ff00); - - QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); - QVERIFY(menu); - - // "Action Item 1" - QQuickMenuItem *actionItem1 = qobject_cast<QQuickMenuItem*>(menu->itemAt(0)); - QVERIFY(actionItem1); - QCOMPARE(actionItem1->text(), QLatin1String("Action Item 1")); - - QQuickItem *actionItem1Bg = actionItem1->property("background").value<QQuickItem*>(); - QVERIFY(actionItem1Bg); - QCOMPARE(actionItem1Bg->property("color").value<QColor>(), green); - - // "Sub-menu" - QQuickMenuItem *subMenuItem = qobject_cast<QQuickMenuItem*>(menu->itemAt(1)); - QVERIFY(subMenuItem); - QCOMPARE(subMenuItem->text(), QLatin1String("Sub-menu")); - - QQuickItem *subMenuItemBg = subMenuItem->property("background").value<QQuickItem*>(); - QVERIFY(subMenuItemBg); - QCOMPARE(subMenuItemBg->property("color").value<QColor>(), green); - - QQuickMenu *subMenu = subMenuItem->subMenu(); - QVERIFY(subMenu); - - // "Sub-menu Action Item 1" - QQuickMenuItem *subMenuActionItem1 = qobject_cast<QQuickMenuItem*>(subMenu->itemAt(0)); - QVERIFY(subMenuActionItem1); - QCOMPARE(subMenuActionItem1->text(), QLatin1String("Sub-menu Action Item 1")); - - QQuickItem *subMenuActionItem1Bg = subMenuActionItem1->property("background").value<QQuickItem*>(); - QVERIFY(subMenuActionItem1Bg); - QCOMPARE(subMenuActionItem1Bg->property("color").value<QColor>(), green); - - // "Sub-sub-menu" - QQuickMenuItem *subSubMenuItem = qobject_cast<QQuickMenuItem*>(subMenu->itemAt(1)); - QVERIFY(subSubMenuItem); - QCOMPARE(subSubMenuItem->text(), QLatin1String("Sub-sub-menu")); - - QQuickItem *subSubMenuItemBg = subSubMenuItem->property("background").value<QQuickItem*>(); - QVERIFY(subSubMenuItemBg); - QCOMPARE(subSubMenuItemBg->property("color").value<QColor>(), green); - - QQuickMenu *subSubMenu = subSubMenuItem->subMenu(); - QVERIFY(subSubMenu); - - // "Sub-sub-menu Action Item 1" - QQuickMenuItem *subSubMenuActionItem1 = qobject_cast<QQuickMenuItem*>(subSubMenu->itemAt(0)); - QVERIFY(subSubMenuActionItem1); - QCOMPARE(subSubMenuActionItem1->text(), QLatin1String("Sub-sub-menu Action Item 1")); - - QQuickItem *subSubMenuActionItem1Bg = subSubMenuActionItem1->property("background").value<QQuickItem*>(); - QVERIFY(subSubMenuActionItem1Bg); - QCOMPARE(subSubMenuActionItem1Bg->property("color").value<QColor>(), green); - - // "Sub-menu Action Item 2" - QQuickMenuItem *subMenuActionItem2 = qobject_cast<QQuickMenuItem*>(subMenu->itemAt(2)); - QVERIFY(subMenuActionItem2); - QCOMPARE(subMenuActionItem2->text(), QLatin1String("Sub-menu Action Item 2")); - - QQuickItem *subMenuActionItem2Bg = subMenuActionItem2->property("background").value<QQuickItem*>(); - QVERIFY(subMenuActionItem2Bg); - QCOMPARE(subMenuActionItem2Bg->property("color").value<QColor>(), green); - - // "Action Item 2" - QQuickMenuItem *actionItem2 = qobject_cast<QQuickMenuItem*>(menu->itemAt(2)); - QVERIFY(actionItem2); - QCOMPARE(actionItem2->text(), QLatin1String("Action Item 2")); - - QQuickItem *actionItem2Bg = actionItem2->property("background").value<QQuickItem*>(); - QVERIFY(actionItem2Bg); - QCOMPARE(actionItem2Bg->property("color").value<QColor>(), green); -} - QTEST_MAIN(tst_QQuickMenu) #include "tst_qquickmenu.moc" |