diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 20:07:23 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 20:46:48 +0200 |
commit | 7e85c09d2575a21a4e4e57eb4a275918ca10f4fd (patch) | |
tree | 4a5abe647e8f3da0bc58afc293867fc6812a2500 /tests/auto | |
parent | 5dcd4daa0dbc9cd3618744193985f81e475d311a (diff) | |
parent | 576a97774e04858adee9f2080e485a715e985820 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.gitignore
tests/auto/auto.pro
tests/auto/qquickmenu/tst_qquickmenu.cpp
tests/auto/qquickpopup/tst_qquickpopup.cpp
Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/auto.pro | 9 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/activeFocusControl.qml (renamed from tests/auto/applicationwindow/data/activeFocusControl.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/activefocusontab.qml (renamed from tests/auto/applicationwindow/data/activefocusontab.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/attachedProperties.qml (renamed from tests/auto/applicationwindow/data/attachedProperties.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml (renamed from tests/auto/applicationwindow/data/basicapplicationwindow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml (renamed from tests/auto/applicationwindow/data/clearfocusondestruction.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/defaultFocus.qml (renamed from tests/auto/applicationwindow/data/defaultFocus.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/fill.qml (renamed from tests/auto/applicationwindow/data/fill.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml (renamed from tests/auto/applicationwindow/data/focusAfterPopupClosed.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/font.qml (renamed from tests/auto/applicationwindow/data/font.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/layout.qml (renamed from tests/auto/applicationwindow/data/layout.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/data/locale.qml (renamed from tests/auto/applicationwindow/data/locale.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/qquickapplicationwindow.pro (renamed from tests/auto/applicationwindow/applicationwindow.pro) | 4 | ||||
-rw-r--r-- | tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp (renamed from tests/auto/applicationwindow/tst_applicationwindow.cpp) | 38 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/BLACKLIST (renamed from tests/auto/drawer/BLACKLIST) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/applicationwindow-button.qml (renamed from tests/auto/drawer/data/applicationwindow-button.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/applicationwindow-hover.qml (renamed from tests/auto/drawer/data/applicationwindow-hover.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/applicationwindow-wheel.qml (renamed from tests/auto/drawer/data/applicationwindow-wheel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/applicationwindow.qml (renamed from tests/auto/drawer/data/applicationwindow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/dragOverModalShadow.qml (renamed from tests/auto/drawer/data/dragOverModalShadow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/flickable.qml (renamed from tests/auto/drawer/data/flickable.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/grabber.qml (renamed from tests/auto/drawer/data/grabber.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/header.qml (renamed from tests/auto/drawer/data/header.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/multiTouch.qml (renamed from tests/auto/drawer/data/multiTouch.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/multiple.qml (renamed from tests/auto/drawer/data/multiple.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/reposition.qml (renamed from tests/auto/drawer/data/reposition.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/window-button.qml (renamed from tests/auto/drawer/data/window-button.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/window-hover.qml (renamed from tests/auto/drawer/data/window-hover.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/window-wheel.qml (renamed from tests/auto/drawer/data/window-wheel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/data/window.qml (renamed from tests/auto/drawer/data/window.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/qquickdrawer.pro (renamed from tests/auto/drawer/drawer.pro) | 4 | ||||
-rw-r--r-- | tests/auto/qquickdrawer/tst_qquickdrawer.cpp (renamed from tests/auto/drawer/tst_drawer.cpp) | 60 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/actions.qml (renamed from tests/auto/menu/data/actions.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/addItem.qml (renamed from tests/auto/menu/data/addItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/applicationwindow.qml (renamed from tests/auto/menu/data/applicationwindow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/menuSeparator.qml (renamed from tests/auto/menu/data/menuSeparator.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/mnemonics.qml (renamed from tests/auto/menu/data/mnemonics.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/order.qml (renamed from tests/auto/menu/data/order.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/popup.qml (renamed from tests/auto/menu/data/popup.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/pressAndHold.qml (renamed from tests/auto/menu/data/pressAndHold.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/removeTakeItem.qml (renamed from tests/auto/menu/data/removeTakeItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/repeater.qml (renamed from tests/auto/menu/data/repeater.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/subMenus.qml (renamed from tests/auto/menu/data/subMenus.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/qquickmenu.pro (renamed from tests/auto/menu/menu.pro) | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/tst_qquickmenu.cpp (renamed from tests/auto/menu/tst_menu.cpp) | 48 | ||||
-rw-r--r-- | tests/auto/qquickpopup/BLACKLIST (renamed from tests/auto/popup/BLACKLIST) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/activeFocusOnClose1.qml (renamed from tests/auto/popup/data/activeFocusOnClose1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/activeFocusOnClose2.qml (renamed from tests/auto/popup/data/activeFocusOnClose2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/activeFocusOnClose3.qml (renamed from tests/auto/popup/data/activeFocusOnClose3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/applicationwindow-hover.qml (renamed from tests/auto/popup/data/applicationwindow-hover.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/applicationwindow-wheel.qml (renamed from tests/auto/popup/data/applicationwindow-wheel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/applicationwindow.qml (renamed from tests/auto/popup/data/applicationwindow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml (renamed from tests/auto/popup/data/closeOnEscapeWithNestedPopups.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/cursor.qml (renamed from tests/auto/popup/data/cursor.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/grabber.qml (renamed from tests/auto/popup/data/grabber.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/nested.qml (renamed from tests/auto/popup/data/nested.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/orientation.qml (renamed from tests/auto/popup/data/orientation.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/window-hover.qml (renamed from tests/auto/popup/data/window-hover.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/window-wheel.qml (renamed from tests/auto/popup/data/window-wheel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/data/window.qml (renamed from tests/auto/popup/data/window.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickpopup/qquickpopup.pro (renamed from tests/auto/popup/popup.pro) | 4 | ||||
-rw-r--r-- | tests/auto/qquickpopup/tst_qquickpopup.cpp (renamed from tests/auto/popup/tst_popup.cpp) | 62 |
62 files changed, 116 insertions, 117 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index df6f764e..7dfd552e 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,26 +1,26 @@ TEMPLATE = subdirs SUBDIRS += \ accessibility \ - applicationwindow \ calendar \ controls \ cursor \ - drawer \ focus \ font \ - menu \ palette \ platform \ - popup \ pressandhold \ + qquickapplicationwindow \ qquickcolor \ + qquickdrawer \ qquickiconimage \ qquickiconlabel \ qquickimaginestyle \ qquickmaterialstyle \ qquickmaterialstyleconf \ + qquickmenu \ qquickmenubar \ qquickninepatchimage \ + qquickpopup \ qquickstyle \ qquickstyleselector \ qquickuniversalstyle \ @@ -28,4 +28,3 @@ SUBDIRS += \ revisions \ sanity \ snippets - diff --git a/tests/auto/applicationwindow/data/activeFocusControl.qml b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml index 940e8e08..940e8e08 100644 --- a/tests/auto/applicationwindow/data/activeFocusControl.qml +++ b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml index 357ea9a4..357ea9a4 100644 --- a/tests/auto/applicationwindow/data/activefocusontab.qml +++ b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml diff --git a/tests/auto/applicationwindow/data/attachedProperties.qml b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml index 09bc47ef..09bc47ef 100644 --- a/tests/auto/applicationwindow/data/attachedProperties.qml +++ b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml index 16182f59..16182f59 100644 --- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml diff --git a/tests/auto/applicationwindow/data/clearfocusondestruction.qml b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml index 3589439e..3589439e 100644 --- a/tests/auto/applicationwindow/data/clearfocusondestruction.qml +++ b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml diff --git a/tests/auto/applicationwindow/data/defaultFocus.qml b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml index 741ce908..741ce908 100644 --- a/tests/auto/applicationwindow/data/defaultFocus.qml +++ b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml diff --git a/tests/auto/applicationwindow/data/fill.qml b/tests/auto/qquickapplicationwindow/data/fill.qml index 27b10d34..27b10d34 100644 --- a/tests/auto/applicationwindow/data/fill.qml +++ b/tests/auto/qquickapplicationwindow/data/fill.qml diff --git a/tests/auto/applicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml index f0499a3a..f0499a3a 100644 --- a/tests/auto/applicationwindow/data/focusAfterPopupClosed.qml +++ b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml diff --git a/tests/auto/applicationwindow/data/font.qml b/tests/auto/qquickapplicationwindow/data/font.qml index a675aeab..a675aeab 100644 --- a/tests/auto/applicationwindow/data/font.qml +++ b/tests/auto/qquickapplicationwindow/data/font.qml diff --git a/tests/auto/applicationwindow/data/layout.qml b/tests/auto/qquickapplicationwindow/data/layout.qml index 5bcffdf1..5bcffdf1 100644 --- a/tests/auto/applicationwindow/data/layout.qml +++ b/tests/auto/qquickapplicationwindow/data/layout.qml diff --git a/tests/auto/applicationwindow/data/locale.qml b/tests/auto/qquickapplicationwindow/data/locale.qml index 92edb53a..92edb53a 100644 --- a/tests/auto/applicationwindow/data/locale.qml +++ b/tests/auto/qquickapplicationwindow/data/locale.qml diff --git a/tests/auto/applicationwindow/applicationwindow.pro b/tests/auto/qquickapplicationwindow/qquickapplicationwindow.pro index f94641c7..775f4c90 100644 --- a/tests/auto/applicationwindow/applicationwindow.pro +++ b/tests/auto/qquickapplicationwindow/qquickapplicationwindow.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_applicationwindow -SOURCES += tst_applicationwindow.cpp +TARGET = tst_qquickapplicationwindow +SOURCES += tst_qquickapplicationwindow.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp index 81cd9886..aeeddb10 100644 --- a/tests/auto/applicationwindow/tst_applicationwindow.cpp +++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp @@ -56,7 +56,7 @@ using namespace QQuickVisualTestUtil; -class tst_applicationwindow : public QQmlDataTest +class tst_QQuickApplicationWindow : public QQmlDataTest { Q_OBJECT public: @@ -79,7 +79,7 @@ private slots: void componentComplete(); }; -void tst_applicationwindow::qmlCreation() +void tst_QQuickApplicationWindow::qmlCreation() { QQmlEngine engine; QQmlComponent component(&engine); @@ -104,7 +104,7 @@ void tst_applicationwindow::qmlCreation() QVERIFY(!footer); } -void tst_applicationwindow::activeFocusOnTab1() +void tst_QQuickApplicationWindow::activeFocusOnTab1() { QQmlEngine engine; QQmlComponent component(&engine); @@ -156,7 +156,7 @@ void tst_applicationwindow::activeFocusOnTab1() QVERIFY(item->hasActiveFocus()); } -void tst_applicationwindow::activeFocusOnTab2() +void tst_QQuickApplicationWindow::activeFocusOnTab2() { QQmlEngine engine; QQmlComponent component(&engine); @@ -208,7 +208,7 @@ void tst_applicationwindow::activeFocusOnTab2() QVERIFY(item->hasActiveFocus()); } -void tst_applicationwindow::defaultFocus() +void tst_QQuickApplicationWindow::defaultFocus() { QQmlEngine engine; QQmlComponent component(&engine); @@ -236,7 +236,7 @@ void tst_applicationwindow::defaultFocus() QVERIFY(item->hasActiveFocus()); } -void tst_applicationwindow::implicitFill() +void tst_QQuickApplicationWindow::implicitFill() { QQmlEngine engine; QQmlComponent component(&engine); @@ -267,7 +267,7 @@ void tst_applicationwindow::implicitFill() QCOMPARE(nextItem->height(), 400.0); } -void tst_applicationwindow::attachedProperties() +void tst_QQuickApplicationWindow::attachedProperties() { QQmlEngine engine; QQmlComponent component(&engine); @@ -499,7 +499,7 @@ void tst_applicationwindow::attachedProperties() qApp->processEvents(); } -void tst_applicationwindow::font() +void tst_QQuickApplicationWindow::font() { QQmlEngine engine; QQmlComponent component(&engine); @@ -570,7 +570,7 @@ public: QFont m_font; }; -void tst_applicationwindow::defaultFont() +void tst_QQuickApplicationWindow::defaultFont() { TestTheme theme(QGuiApplicationPrivate::platform_theme); @@ -584,7 +584,7 @@ void tst_applicationwindow::defaultFont() QCOMPARE(window->font(), *theme.font()); } -void tst_applicationwindow::locale() +void tst_QQuickApplicationWindow::locale() { QQmlEngine engine; QQmlComponent component(&engine); @@ -635,7 +635,7 @@ void tst_applicationwindow::locale() QCOMPARE(item3->locale(), l); } -void tst_applicationwindow::activeFocusControl_data() +void tst_QQuickApplicationWindow::activeFocusControl_data() { QTest::addColumn<QByteArray>("containerName"); QTest::addColumn<QByteArray>("activeFocusItemName"); @@ -654,7 +654,7 @@ void tst_applicationwindow::activeFocusControl_data() QTest::newRow("Frame:SpinBox") << QByteArray("container_frame") << QByteArray("spinContent_frame") << QByteArray("spinBox_frame"); } -void tst_applicationwindow::activeFocusControl() +void tst_QQuickApplicationWindow::activeFocusControl() { QFETCH(QByteArray, containerName); QFETCH(QByteArray, activeFocusItemName); @@ -694,7 +694,7 @@ void tst_applicationwindow::activeFocusControl() QCOMPARE(window->activeFocusControl(), activeFocusControl); } -void tst_applicationwindow::focusAfterPopupClosed() +void tst_QQuickApplicationWindow::focusAfterPopupClosed() { QQmlEngine engine; QQmlComponent component(&engine); @@ -772,7 +772,7 @@ void tst_applicationwindow::focusAfterPopupClosed() QCOMPARE(focusScopeSpy.count(), 3); } -void tst_applicationwindow::clearFocusOnDestruction() +void tst_QQuickApplicationWindow::clearFocusOnDestruction() { QQmlEngine engine; QQmlComponent component(&engine); @@ -813,7 +813,7 @@ void tst_applicationwindow::clearFocusOnDestruction() QCOMPARE(spy.count(), 1); } -void tst_applicationwindow::layout() +void tst_QQuickApplicationWindow::layout() { QQmlEngine engine; QQmlComponent component(&engine); @@ -875,10 +875,10 @@ void tst_applicationwindow::layout() class FriendlyApplicationWindow : public QQuickApplicationWindow { - friend class tst_applicationwindow; + friend class tst_QQuickApplicationWindow; }; -void tst_applicationwindow::componentComplete() +void tst_QQuickApplicationWindow::componentComplete() { FriendlyApplicationWindow cppWindow; QVERIFY(cppWindow.isComponentComplete()); @@ -895,6 +895,6 @@ void tst_applicationwindow::componentComplete() QVERIFY(qmlWindow->isComponentComplete()); } -QTEST_MAIN(tst_applicationwindow) +QTEST_MAIN(tst_QQuickApplicationWindow) -#include "tst_applicationwindow.moc" +#include "tst_qquickapplicationwindow.moc" diff --git a/tests/auto/drawer/BLACKLIST b/tests/auto/qquickdrawer/BLACKLIST index b302c76b..b302c76b 100644 --- a/tests/auto/drawer/BLACKLIST +++ b/tests/auto/qquickdrawer/BLACKLIST diff --git a/tests/auto/drawer/data/applicationwindow-button.qml b/tests/auto/qquickdrawer/data/applicationwindow-button.qml index 9641351e..9641351e 100644 --- a/tests/auto/drawer/data/applicationwindow-button.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-button.qml diff --git a/tests/auto/drawer/data/applicationwindow-hover.qml b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml index 560efec3..560efec3 100644 --- a/tests/auto/drawer/data/applicationwindow-hover.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml diff --git a/tests/auto/drawer/data/applicationwindow-wheel.qml b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml index 541f08aa..541f08aa 100644 --- a/tests/auto/drawer/data/applicationwindow-wheel.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml diff --git a/tests/auto/drawer/data/applicationwindow.qml b/tests/auto/qquickdrawer/data/applicationwindow.qml index 673c4d4c..673c4d4c 100644 --- a/tests/auto/drawer/data/applicationwindow.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow.qml diff --git a/tests/auto/drawer/data/dragOverModalShadow.qml b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml index 66eb2f4b..66eb2f4b 100644 --- a/tests/auto/drawer/data/dragOverModalShadow.qml +++ b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml diff --git a/tests/auto/drawer/data/flickable.qml b/tests/auto/qquickdrawer/data/flickable.qml index 62256afd..62256afd 100644 --- a/tests/auto/drawer/data/flickable.qml +++ b/tests/auto/qquickdrawer/data/flickable.qml diff --git a/tests/auto/drawer/data/grabber.qml b/tests/auto/qquickdrawer/data/grabber.qml index e6ebe2da..e6ebe2da 100644 --- a/tests/auto/drawer/data/grabber.qml +++ b/tests/auto/qquickdrawer/data/grabber.qml diff --git a/tests/auto/drawer/data/header.qml b/tests/auto/qquickdrawer/data/header.qml index de3af106..de3af106 100644 --- a/tests/auto/drawer/data/header.qml +++ b/tests/auto/qquickdrawer/data/header.qml diff --git a/tests/auto/drawer/data/multiTouch.qml b/tests/auto/qquickdrawer/data/multiTouch.qml index 0faf3c61..0faf3c61 100644 --- a/tests/auto/drawer/data/multiTouch.qml +++ b/tests/auto/qquickdrawer/data/multiTouch.qml diff --git a/tests/auto/drawer/data/multiple.qml b/tests/auto/qquickdrawer/data/multiple.qml index 4e622fca..4e622fca 100644 --- a/tests/auto/drawer/data/multiple.qml +++ b/tests/auto/qquickdrawer/data/multiple.qml diff --git a/tests/auto/drawer/data/reposition.qml b/tests/auto/qquickdrawer/data/reposition.qml index 485da85c..485da85c 100644 --- a/tests/auto/drawer/data/reposition.qml +++ b/tests/auto/qquickdrawer/data/reposition.qml diff --git a/tests/auto/drawer/data/window-button.qml b/tests/auto/qquickdrawer/data/window-button.qml index 1b8ac7d5..1b8ac7d5 100644 --- a/tests/auto/drawer/data/window-button.qml +++ b/tests/auto/qquickdrawer/data/window-button.qml diff --git a/tests/auto/drawer/data/window-hover.qml b/tests/auto/qquickdrawer/data/window-hover.qml index b35bcd99..b35bcd99 100644 --- a/tests/auto/drawer/data/window-hover.qml +++ b/tests/auto/qquickdrawer/data/window-hover.qml diff --git a/tests/auto/drawer/data/window-wheel.qml b/tests/auto/qquickdrawer/data/window-wheel.qml index 988a541e..988a541e 100644 --- a/tests/auto/drawer/data/window-wheel.qml +++ b/tests/auto/qquickdrawer/data/window-wheel.qml diff --git a/tests/auto/drawer/data/window.qml b/tests/auto/qquickdrawer/data/window.qml index 88376ac4..88376ac4 100644 --- a/tests/auto/drawer/data/window.qml +++ b/tests/auto/qquickdrawer/data/window.qml diff --git a/tests/auto/drawer/drawer.pro b/tests/auto/qquickdrawer/qquickdrawer.pro index 7dfc3638..9df205e6 100644 --- a/tests/auto/drawer/drawer.pro +++ b/tests/auto/qquickdrawer/qquickdrawer.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_drawer -SOURCES += tst_drawer.cpp +TARGET = tst_qquickdrawer +SOURCES += tst_qquickdrawer.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/drawer/tst_drawer.cpp b/tests/auto/qquickdrawer/tst_qquickdrawer.cpp index 0bfb3fc9..9f6a556f 100644 --- a/tests/auto/drawer/tst_drawer.cpp +++ b/tests/auto/qquickdrawer/tst_qquickdrawer.cpp @@ -54,7 +54,7 @@ using namespace QQuickVisualTestUtil; -class tst_Drawer : public QQmlDataTest +class tst_QQuickDrawer : public QQmlDataTest { Q_OBJECT @@ -116,7 +116,7 @@ private: }; -void tst_Drawer::initTestCase() +void tst_QQuickDrawer::initTestCase() { QQmlDataTest::initTestCase(); qputenv("QML_NO_TOUCH_COMPRESSION", "1"); @@ -126,14 +126,14 @@ void tst_Drawer::initTestCase() QWindowSystemInterface::registerTouchDevice(touchDevice.data()); } -void tst_Drawer::visible_data() +void tst_QQuickDrawer::visible_data() { QTest::addColumn<QString>("source"); QTest::newRow("Window") << "window.qml"; QTest::newRow("ApplicationWindow") << "applicationwindow.qml"; } -void tst_Drawer::visible() +void tst_QQuickDrawer::visible() { QFETCH(QString, source); QQuickApplicationHelper helper(this, source); @@ -174,7 +174,7 @@ void tst_Drawer::visible() QTRY_VERIFY(!overlay->childItems().contains(popupItem)); } -void tst_Drawer::state() +void tst_QQuickDrawer::state() { QQuickApplicationHelper helper(this, "applicationwindow.qml"); @@ -274,7 +274,7 @@ void tst_Drawer::state() QCOMPARE(closedSpy.count(), ++closedCount); } -void tst_Drawer::position_data() +void tst_QQuickDrawer::position_data() { QTest::addColumn<Qt::Edge>("edge"); QTest::addColumn<QPoint>("press"); @@ -288,7 +288,7 @@ void tst_Drawer::position_data() QTest::newRow("bottom") << Qt::BottomEdge << QPoint(100, 399) << QPoint(100, 350) << QPoint(150, 250) << qreal(0.5); } -void tst_Drawer::position() +void tst_QQuickDrawer::position() { QFETCH(Qt::Edge, edge); QFETCH(QPoint, press); @@ -317,7 +317,7 @@ void tst_Drawer::position() QTRY_COMPARE(drawer->position(), 1.0); } -void tst_Drawer::dragMargin_data() +void tst_QQuickDrawer::dragMargin_data() { QTest::addColumn<Qt::Edge>("edge"); QTest::addColumn<qreal>("dragMargin"); @@ -335,7 +335,7 @@ void tst_Drawer::dragMargin_data() QTest::newRow("right:startDragDistance*2") << Qt::RightEdge << qreal(QGuiApplication::styleHints()->startDragDistance() * 2) << qreal(0) << qreal(0.75); } -void tst_Drawer::dragMargin() +void tst_QQuickDrawer::dragMargin() { QFETCH(Qt::Edge, edge); QFETCH(qreal, dragMargin); @@ -385,7 +385,7 @@ static QRectF geometry(const QQuickItem *item) return QRectF(item->x(), item->y(), item->width(), item->height()); } -void tst_Drawer::reposition() +void tst_QQuickDrawer::reposition() { QQuickApplicationHelper helper(this, QStringLiteral("reposition.qml")); @@ -443,7 +443,7 @@ void tst_Drawer::reposition() QTRY_COMPARE(popupItem2->x(), 0.0); } -void tst_Drawer::header() +void tst_QQuickDrawer::header() { QQuickApplicationHelper helper(this, QStringLiteral("header.qml")); @@ -483,7 +483,7 @@ void tst_Drawer::header() QCOMPARE(clickSpy.count(), 1); } -void tst_Drawer::hover_data() +void tst_QQuickDrawer::hover_data() { QTest::addColumn<QString>("source"); QTest::addColumn<bool>("modal"); @@ -494,7 +494,7 @@ void tst_Drawer::hover_data() QTest::newRow("ApplicationWindow:modeless") << "applicationwindow-hover.qml" << false; } -void tst_Drawer::hover() +void tst_QQuickDrawer::hover() { QFETCH(QString, source); QFETCH(bool, modal); @@ -556,7 +556,7 @@ void tst_Drawer::hover() QVERIFY(!drawerItem->isHovered()); } -void tst_Drawer::wheel_data() +void tst_QQuickDrawer::wheel_data() { QTest::addColumn<QString>("source"); QTest::addColumn<bool>("modal"); @@ -575,7 +575,7 @@ static bool sendWheelEvent(QQuickItem *item, const QPoint &localPos, int degrees return qGuiApp->notify(window, &wheelEvent); } -void tst_Drawer::wheel() +void tst_QQuickDrawer::wheel() { QFETCH(QString, source); QFETCH(bool, modal); @@ -640,7 +640,7 @@ void tst_Drawer::wheel() } } -void tst_Drawer::multiple() +void tst_QQuickDrawer::multiple() { QQuickApplicationHelper helper(this, QStringLiteral("multiple.qml")); QQuickWindow *window = helper.window; @@ -763,7 +763,7 @@ void tst_Drawer::multiple() QCOMPARE(leftDrawer->position(), 0.0); } -void tst_Drawer::touch_data() +void tst_QQuickDrawer::touch_data() { QTest::addColumn<QString>("source"); QTest::addColumn<QPoint>("from"); @@ -780,7 +780,7 @@ void tst_Drawer::touch_data() QTest::newRow("ApplicationWindow+Button:outside") << "applicationwindow-button.qml" << QPoint(300, 100) << QPoint(100, 100); } -void tst_Drawer::touch() +void tst_QQuickDrawer::touch() { QFETCH(QString, source); QFETCH(QPoint, from); @@ -818,7 +818,7 @@ void tst_Drawer::touch() QCOMPARE(drawer->position(), 0.0); } -void tst_Drawer::multiTouch() +void tst_QQuickDrawer::multiTouch() { QQuickApplicationHelper helper(this, QStringLiteral("multiTouch.qml")); QQuickWindow *window = helper.window; @@ -931,7 +931,7 @@ void tst_Drawer::multiTouch() QCOMPARE(overlayReleasedSpy.count(), 4); } -void tst_Drawer::grabber() +void tst_QQuickDrawer::grabber() { QQuickApplicationHelper helper(this, QStringLiteral("grabber.qml")); QQuickWindow *window = helper.window; @@ -967,14 +967,14 @@ void tst_Drawer::grabber() QTRY_COMPARE(popupClosedSpy.count(), 1); } -void tst_Drawer::interactive_data() +void tst_QQuickDrawer::interactive_data() { QTest::addColumn<QString>("source"); QTest::newRow("Window") << "window.qml"; QTest::newRow("ApplicationWindow") << "applicationwindow.qml"; } -void tst_Drawer::interactive() +void tst_QQuickDrawer::interactive() { QFETCH(QString, source); QQuickApplicationHelper helper(this, source); @@ -1021,7 +1021,7 @@ void tst_Drawer::interactive() QCOMPARE(aboutToHideSpy.count(), 0); } -void tst_Drawer::flickable_data() +void tst_QQuickDrawer::flickable_data() { QTest::addColumn<bool>("mouse"); QTest::addColumn<QPoint>("from"); @@ -1033,7 +1033,7 @@ void tst_Drawer::flickable_data() QTest::newRow("touch,diagonal") << false << QPoint(200, 200) << QPoint(250, 100); } -void tst_Drawer::flickable() +void tst_QQuickDrawer::flickable() { QFETCH(bool, mouse); QFETCH(QPoint, from); @@ -1083,7 +1083,7 @@ void tst_Drawer::flickable() QVERIFY(!flickable->isDragging()); } -void tst_Drawer::dragOverModalShadow_data() +void tst_QQuickDrawer::dragOverModalShadow_data() { QTest::addColumn<bool>("mouse"); QTest::newRow("mouse") << true; @@ -1091,7 +1091,7 @@ void tst_Drawer::dragOverModalShadow_data() } // QTBUG-60602 -void tst_Drawer::dragOverModalShadow() +void tst_QQuickDrawer::dragOverModalShadow() { QFETCH(bool, mouse); @@ -1139,7 +1139,7 @@ void tst_Drawer::dragOverModalShadow() QVERIFY(!drawer->isVisible()); } -void tst_Drawer::nonModal_data() +void tst_QQuickDrawer::nonModal_data() { QTest::addColumn<bool>("mouse"); QTest::newRow("mouse") << true; @@ -1147,7 +1147,7 @@ void tst_Drawer::nonModal_data() } // QTBUG-59652 -void tst_Drawer::nonModal() +void tst_QQuickDrawer::nonModal() { QFETCH(bool, mouse); @@ -1219,6 +1219,6 @@ void tst_Drawer::nonModal() QVERIFY(closedSpy.wait()); } -QTEST_MAIN(tst_Drawer) +QTEST_MAIN(tst_QQuickDrawer) -#include "tst_drawer.moc" +#include "tst_qquickdrawer.moc" diff --git a/tests/auto/menu/data/actions.qml b/tests/auto/qquickmenu/data/actions.qml index 0ec9f36c..0ec9f36c 100644 --- a/tests/auto/menu/data/actions.qml +++ b/tests/auto/qquickmenu/data/actions.qml diff --git a/tests/auto/menu/data/addItem.qml b/tests/auto/qquickmenu/data/addItem.qml index 0668e439..0668e439 100644 --- a/tests/auto/menu/data/addItem.qml +++ b/tests/auto/qquickmenu/data/addItem.qml diff --git a/tests/auto/menu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml index 265a2f1a..265a2f1a 100644 --- a/tests/auto/menu/data/applicationwindow.qml +++ b/tests/auto/qquickmenu/data/applicationwindow.qml diff --git a/tests/auto/menu/data/menuSeparator.qml b/tests/auto/qquickmenu/data/menuSeparator.qml index 6cdf8b27..6cdf8b27 100644 --- a/tests/auto/menu/data/menuSeparator.qml +++ b/tests/auto/qquickmenu/data/menuSeparator.qml diff --git a/tests/auto/menu/data/mnemonics.qml b/tests/auto/qquickmenu/data/mnemonics.qml index de4cd215..de4cd215 100644 --- a/tests/auto/menu/data/mnemonics.qml +++ b/tests/auto/qquickmenu/data/mnemonics.qml diff --git a/tests/auto/menu/data/order.qml b/tests/auto/qquickmenu/data/order.qml index db5c3c1a..db5c3c1a 100644 --- a/tests/auto/menu/data/order.qml +++ b/tests/auto/qquickmenu/data/order.qml diff --git a/tests/auto/menu/data/popup.qml b/tests/auto/qquickmenu/data/popup.qml index 6040e8ba..6040e8ba 100644 --- a/tests/auto/menu/data/popup.qml +++ b/tests/auto/qquickmenu/data/popup.qml diff --git a/tests/auto/menu/data/pressAndHold.qml b/tests/auto/qquickmenu/data/pressAndHold.qml index 6f0acd3a..6f0acd3a 100644 --- a/tests/auto/menu/data/pressAndHold.qml +++ b/tests/auto/qquickmenu/data/pressAndHold.qml diff --git a/tests/auto/menu/data/removeTakeItem.qml b/tests/auto/qquickmenu/data/removeTakeItem.qml index 89090fb6..89090fb6 100644 --- a/tests/auto/menu/data/removeTakeItem.qml +++ b/tests/auto/qquickmenu/data/removeTakeItem.qml diff --git a/tests/auto/menu/data/repeater.qml b/tests/auto/qquickmenu/data/repeater.qml index 2172f86a..2172f86a 100644 --- a/tests/auto/menu/data/repeater.qml +++ b/tests/auto/qquickmenu/data/repeater.qml diff --git a/tests/auto/menu/data/subMenus.qml b/tests/auto/qquickmenu/data/subMenus.qml index 49811bc2..49811bc2 100644 --- a/tests/auto/menu/data/subMenus.qml +++ b/tests/auto/qquickmenu/data/subMenus.qml diff --git a/tests/auto/menu/menu.pro b/tests/auto/qquickmenu/qquickmenu.pro index 9c9d9b48..ee539842 100644 --- a/tests/auto/menu/menu.pro +++ b/tests/auto/qquickmenu/qquickmenu.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_menu -SOURCES += tst_menu.cpp +TARGET = tst_qquickmenu +SOURCES += tst_qquickmenu.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 4497c096..1202072b 100644 --- a/tests/auto/menu/tst_menu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -56,7 +56,7 @@ using namespace QQuickVisualTestUtil; -class tst_menu : public QQmlDataTest +class tst_QQuickMenu : public QQmlDataTest { Q_OBJECT @@ -86,7 +86,7 @@ private slots: void addRemoveSubMenus(); }; -void tst_menu::defaults() +void tst_QQuickMenu::defaults() { QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); @@ -97,7 +97,7 @@ void tst_menu::defaults() QCOMPARE(emptyMenu->count(), 0); } -void tst_menu::count() +void tst_QQuickMenu::count() { QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); @@ -125,7 +125,7 @@ void tst_menu::count() QCOMPARE(countSpy.count(), 4); } -void tst_menu::mouse() +void tst_QQuickMenu::mouse() { if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) @@ -217,7 +217,7 @@ void tst_menu::mouse() // QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); } -void tst_menu::pressAndHold() +void tst_QQuickMenu::pressAndHold() { QQuickApplicationHelper helper(this, QLatin1String("pressAndHold.qml")); @@ -238,7 +238,7 @@ void tst_menu::pressAndHold() QTRY_VERIFY(!menu->isVisible()); } -void tst_menu::contextMenuKeyboard() +void tst_QQuickMenu::contextMenuKeyboard() { if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) QSKIP("This platform only allows tab focus for text controls"); @@ -388,7 +388,7 @@ void tst_menu::contextMenuKeyboard() QVERIFY(!menu->isVisible()); } -void tst_menu::mnemonics() +void tst_QQuickMenu::mnemonics() { #ifdef Q_OS_MACOS QSKIP("Mnemonics are not used on macOS"); @@ -436,7 +436,7 @@ void tst_menu::mnemonics() QCOMPARE(subMenuItemSpy.count(), 1); } -void tst_menu::menuButton() +void tst_QQuickMenu::menuButton() { if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) QSKIP("This platform only allows tab focus for text controls"); @@ -464,7 +464,7 @@ void tst_menu::menuButton() QVERIFY(firstItem->hasActiveFocus()); } -void tst_menu::addItem() +void tst_QQuickMenu::addItem() { QQuickApplicationHelper helper(this, QLatin1String("addItem.qml")); QQuickApplicationWindow *window = helper.appWindow; @@ -485,7 +485,7 @@ void tst_menu::addItem() QTRY_VERIFY(!menu->isVisible()); } -void tst_menu::menuSeparator() +void tst_QQuickMenu::menuSeparator() { QQuickApplicationHelper helper(this, QLatin1String("menuSeparator.qml")); QQuickWindow *window = helper.window; @@ -561,7 +561,7 @@ void tst_menu::menuSeparator() QCOMPARE(newMenuItem->focusReason(), Qt::BacktabFocusReason); } -void tst_menu::repeater() +void tst_QQuickMenu::repeater() { QQuickApplicationHelper helper(this, QLatin1String("repeater.qml")); QQuickWindow *window = helper.window; @@ -605,7 +605,7 @@ void tst_menu::repeater() } } -void tst_menu::order() +void tst_QQuickMenu::order() { QQuickApplicationHelper helper(this, QLatin1String("order.qml")); QQuickWindow *window = helper.window; @@ -626,7 +626,7 @@ void tst_menu::order() } } -void tst_menu::popup() +void tst_QQuickMenu::popup() { QQuickApplicationHelper helper(this, QLatin1String("popup.qml")); QQuickApplicationWindow *window = helper.appWindow; @@ -773,7 +773,7 @@ void tst_menu::popup() #endif } -void tst_menu::actions() +void tst_QQuickMenu::actions() { QQuickApplicationHelper helper(this, QLatin1String("actions.qml")); QQuickWindow *window = helper.window; @@ -841,7 +841,7 @@ void tst_menu::actions() QVERIFY(menuItem1.isNull()); } -void tst_menu::removeTakeItem() +void tst_QQuickMenu::removeTakeItem() { QQuickApplicationHelper helper(this, QLatin1String("removeTakeItem.qml")); QQuickWindow *window = helper.window; @@ -890,7 +890,7 @@ void tst_menu::removeTakeItem() QVERIFY(!menuItem3.isNull()); } -void tst_menu::subMenuMouse_data() +void tst_QQuickMenu::subMenuMouse_data() { QTest::addColumn<bool>("cascade"); @@ -898,7 +898,7 @@ void tst_menu::subMenuMouse_data() QTest::newRow("non-cascading") << false; } -void tst_menu::subMenuMouse() +void tst_QQuickMenu::subMenuMouse() { if ((QGuiApplication::platformName() == QLatin1String("offscreen")) || (QGuiApplication::platformName() == QLatin1String("minimal"))) @@ -993,7 +993,7 @@ void tst_menu::subMenuMouse() QVERIFY(!subSubMenu1->isVisible()); } -void tst_menu::subMenuKeyboard_data() +void tst_QQuickMenu::subMenuKeyboard_data() { QTest::addColumn<bool>("cascade"); QTest::addColumn<bool>("mirrored"); @@ -1004,7 +1004,7 @@ void tst_menu::subMenuKeyboard_data() QTest::newRow("non-cascading,mirrored") << false << true; } -void tst_menu::subMenuKeyboard() +void tst_QQuickMenu::subMenuKeyboard() { QFETCH(bool, cascade); QFETCH(bool, mirrored); @@ -1117,7 +1117,7 @@ void tst_menu::subMenuKeyboard() QVERIFY(!subSubMenu1->isVisible()); } -void tst_menu::subMenuPosition_data() +void tst_QQuickMenu::subMenuPosition_data() { QTest::addColumn<bool>("cascade"); QTest::addColumn<bool>("flip"); @@ -1135,7 +1135,7 @@ void tst_menu::subMenuPosition_data() QTest::newRow("non-cascading") << false << false << false << 0.0; } -void tst_menu::subMenuPosition() +void tst_QQuickMenu::subMenuPosition() { QFETCH(bool, cascade); QFETCH(bool, flip); @@ -1249,7 +1249,7 @@ void tst_menu::subMenuPosition() } } -void tst_menu::addRemoveSubMenus() +void tst_QQuickMenu::addRemoveSubMenus() { QQuickApplicationHelper helper(this, QLatin1String("subMenus.qml")); QQuickWindow *window = helper.window; @@ -1309,6 +1309,6 @@ void tst_menu::addRemoveSubMenus() QVERIFY(subSubMenu1Item.isNull()); } -QTEST_MAIN(tst_menu) +QTEST_MAIN(tst_QQuickMenu) -#include "tst_menu.moc" +#include "tst_qquickmenu.moc" diff --git a/tests/auto/popup/BLACKLIST b/tests/auto/qquickpopup/BLACKLIST index 47795a8b..47795a8b 100644 --- a/tests/auto/popup/BLACKLIST +++ b/tests/auto/qquickpopup/BLACKLIST diff --git a/tests/auto/popup/data/activeFocusOnClose1.qml b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml index ee0295c1..ee0295c1 100644 --- a/tests/auto/popup/data/activeFocusOnClose1.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml diff --git a/tests/auto/popup/data/activeFocusOnClose2.qml b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml index cb215f9b..cb215f9b 100644 --- a/tests/auto/popup/data/activeFocusOnClose2.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml diff --git a/tests/auto/popup/data/activeFocusOnClose3.qml b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml index a8137b34..a8137b34 100644 --- a/tests/auto/popup/data/activeFocusOnClose3.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml diff --git a/tests/auto/popup/data/applicationwindow-hover.qml b/tests/auto/qquickpopup/data/applicationwindow-hover.qml index 8cec6ba7..8cec6ba7 100644 --- a/tests/auto/popup/data/applicationwindow-hover.qml +++ b/tests/auto/qquickpopup/data/applicationwindow-hover.qml diff --git a/tests/auto/popup/data/applicationwindow-wheel.qml b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml index a89bd0f6..a89bd0f6 100644 --- a/tests/auto/popup/data/applicationwindow-wheel.qml +++ b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml diff --git a/tests/auto/popup/data/applicationwindow.qml b/tests/auto/qquickpopup/data/applicationwindow.qml index 659aa843..659aa843 100644 --- a/tests/auto/popup/data/applicationwindow.qml +++ b/tests/auto/qquickpopup/data/applicationwindow.qml diff --git a/tests/auto/popup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml index f41516c8..f41516c8 100644 --- a/tests/auto/popup/data/closeOnEscapeWithNestedPopups.qml +++ b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml diff --git a/tests/auto/popup/data/cursor.qml b/tests/auto/qquickpopup/data/cursor.qml index fd4475a0..fd4475a0 100644 --- a/tests/auto/popup/data/cursor.qml +++ b/tests/auto/qquickpopup/data/cursor.qml diff --git a/tests/auto/popup/data/grabber.qml b/tests/auto/qquickpopup/data/grabber.qml index b9995b54..b9995b54 100644 --- a/tests/auto/popup/data/grabber.qml +++ b/tests/auto/qquickpopup/data/grabber.qml diff --git a/tests/auto/popup/data/nested.qml b/tests/auto/qquickpopup/data/nested.qml index 48e51fc8..48e51fc8 100644 --- a/tests/auto/popup/data/nested.qml +++ b/tests/auto/qquickpopup/data/nested.qml diff --git a/tests/auto/popup/data/orientation.qml b/tests/auto/qquickpopup/data/orientation.qml index cbf69b2b..cbf69b2b 100644 --- a/tests/auto/popup/data/orientation.qml +++ b/tests/auto/qquickpopup/data/orientation.qml diff --git a/tests/auto/popup/data/window-hover.qml b/tests/auto/qquickpopup/data/window-hover.qml index 669afb08..669afb08 100644 --- a/tests/auto/popup/data/window-hover.qml +++ b/tests/auto/qquickpopup/data/window-hover.qml diff --git a/tests/auto/popup/data/window-wheel.qml b/tests/auto/qquickpopup/data/window-wheel.qml index 45c09b45..45c09b45 100644 --- a/tests/auto/popup/data/window-wheel.qml +++ b/tests/auto/qquickpopup/data/window-wheel.qml diff --git a/tests/auto/popup/data/window.qml b/tests/auto/qquickpopup/data/window.qml index 962ab573..962ab573 100644 --- a/tests/auto/popup/data/window.qml +++ b/tests/auto/qquickpopup/data/window.qml diff --git a/tests/auto/popup/popup.pro b/tests/auto/qquickpopup/qquickpopup.pro index c863ba07..935e91bd 100644 --- a/tests/auto/popup/popup.pro +++ b/tests/auto/qquickpopup/qquickpopup.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_popup -SOURCES += tst_popup.cpp +TARGET = tst_qquickpopup +SOURCES += tst_qquickpopup.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/popup/tst_popup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index 184fe3c3..a1e5e246 100644 --- a/tests/auto/popup/tst_popup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -50,7 +50,7 @@ using namespace QQuickVisualTestUtil; -class tst_popup : public QQmlDataTest +class tst_QQuickPopup : public QQmlDataTest { Q_OBJECT @@ -84,20 +84,20 @@ private slots: void orientation(); }; -void tst_popup::initTestCase() +void tst_QQuickPopup::initTestCase() { QQmlDataTest::initTestCase(); qputenv("QML_NO_TOUCH_COMPRESSION", "1"); } -void tst_popup::visible_data() +void tst_QQuickPopup::visible_data() { QTest::addColumn<QString>("source"); QTest::newRow("Window") << "window.qml"; QTest::newRow("ApplicationWindow") << "applicationwindow.qml"; } -void tst_popup::visible() +void tst_QQuickPopup::visible() { QFETCH(QString, source); QQuickApplicationHelper helper(this, source); @@ -131,7 +131,7 @@ void tst_popup::visible() QVERIFY(!overlay->childItems().contains(popupItem)); } -void tst_popup::state() +void tst_QQuickPopup::state() { QQuickApplicationHelper helper(this, "applicationwindow.qml"); @@ -171,7 +171,7 @@ void tst_popup::state() QTRY_COMPARE(closedSpy.count(), 1); } -void tst_popup::overlay_data() +void tst_QQuickPopup::overlay_data() { QTest::addColumn<QString>("source"); QTest::addColumn<bool>("modal"); @@ -188,7 +188,7 @@ void tst_popup::overlay_data() QTest::newRow("ApplicationWindow,modal,dim") << "applicationwindow.qml" << true << true; } -void tst_popup::overlay() +void tst_QQuickPopup::overlay() { QFETCH(QString, source); QFETCH(bool, modal); @@ -345,14 +345,14 @@ void tst_popup::overlay() QCOMPARE(overlayReleasedSignal.count(), overlayReleaseCount); } -void tst_popup::zOrder_data() +void tst_QQuickPopup::zOrder_data() { QTest::addColumn<QString>("source"); QTest::newRow("Window") << "window.qml"; QTest::newRow("ApplicationWindow") << "applicationwindow.qml"; } -void tst_popup::zOrder() +void tst_QQuickPopup::zOrder() { QFETCH(QString, source); QQuickApplicationHelper helper(this, source); @@ -386,7 +386,7 @@ void tst_popup::zOrder() QVERIFY(!popup->isVisible()); } -void tst_popup::windowChange() +void tst_QQuickPopup::windowChange() { QQuickPopup popup; QSignalSpy spy(&popup, SIGNAL(windowChanged(QQuickWindow*))); @@ -435,7 +435,7 @@ void tst_popup::windowChange() Q_DECLARE_METATYPE(QQuickPopup::ClosePolicy) -void tst_popup::closePolicy_data() +void tst_QQuickPopup::closePolicy_data() { qRegisterMetaType<QQuickPopup::ClosePolicy>(); @@ -459,7 +459,7 @@ void tst_popup::closePolicy_data() QTest::newRow("ApplicationWindow:CloseOnEscape") << "applicationwindow.qml"<< static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::CloseOnEscape); } -void tst_popup::closePolicy() +void tst_QQuickPopup::closePolicy() { QFETCH(QString, source); QFETCH(QQuickPopup::ClosePolicy, closePolicy); @@ -538,7 +538,7 @@ void tst_popup::closePolicy() QVERIFY(popup->isVisible()); } -void tst_popup::activeFocusOnClose1() +void tst_QQuickPopup::activeFocusOnClose1() { // Test that a popup that never sets focus: true (e.g. ToolTip) doesn't affect // the active focus item when it closes. @@ -567,7 +567,7 @@ void tst_popup::activeFocusOnClose1() QVERIFY(focusedPopup->hasActiveFocus()); } -void tst_popup::activeFocusOnClose2() +void tst_QQuickPopup::activeFocusOnClose2() { // Test that a popup that sets focus: true but relinquishes focus (e.g. by // calling forceActiveFocus() on another item) before it closes doesn't @@ -602,7 +602,7 @@ void tst_popup::activeFocusOnClose2() QVERIFY(popup1->hasActiveFocus()); } -void tst_popup::activeFocusOnClose3() +void tst_QQuickPopup::activeFocusOnClose3() { // Test that a closing popup that had focus doesn't steal focus from // another popup that the focus was transferred to. @@ -634,7 +634,7 @@ void tst_popup::activeFocusOnClose3() QTRY_VERIFY(popup2->hasActiveFocus()); } -void tst_popup::hover_data() +void tst_QQuickPopup::hover_data() { QTest::addColumn<QString>("source"); QTest::addColumn<bool>("modal"); @@ -645,7 +645,7 @@ void tst_popup::hover_data() QTest::newRow("ApplicationWindow:modeless") << "applicationwindow-hover.qml" << false; } -void tst_popup::hover() +void tst_QQuickPopup::hover() { QFETCH(QString, source); QFETCH(bool, modal); @@ -698,7 +698,7 @@ void tst_popup::hover() QVERIFY(parentButton->isHovered()); } -void tst_popup::wheel_data() +void tst_QQuickPopup::wheel_data() { QTest::addColumn<QString>("source"); QTest::addColumn<bool>("modal"); @@ -717,7 +717,7 @@ static bool sendWheelEvent(QQuickItem *item, const QPoint &localPos, int degrees return qGuiApp->notify(window, &wheelEvent); } -void tst_popup::wheel() +void tst_QQuickPopup::wheel() { QFETCH(QString, source); QFETCH(bool, modal); @@ -782,7 +782,7 @@ void tst_popup::wheel() } } -void tst_popup::parentDestroyed() +void tst_QQuickPopup::parentDestroyed() { QQuickPopup popup; popup.setParentItem(new QQuickItem); @@ -790,7 +790,7 @@ void tst_popup::parentDestroyed() QVERIFY(!popup.parentItem()); } -void tst_popup::nested() +void tst_QQuickPopup::nested() { QQuickApplicationHelper helper(this, QStringLiteral("nested.qml")); QQuickWindow *window = helper.window; @@ -817,7 +817,7 @@ void tst_popup::nested() } // QTBUG-56697 -void tst_popup::grabber() +void tst_QQuickPopup::grabber() { QQuickApplicationHelper helper(this, QStringLiteral("grabber.qml")); QQuickWindow *window = helper.window; @@ -867,7 +867,7 @@ void tst_popup::grabber() QCOMPARE(combo->isVisible(), false); } -void tst_popup::cursorShape() +void tst_QQuickPopup::cursorShape() { // Ensure that the mouse cursor has the correct shape when over a popup // which is itself over an item with a different shape. @@ -901,10 +901,10 @@ void tst_popup::cursorShape() class FriendlyPopup : public QQuickPopup { - friend class tst_popup; + friend class tst_QQuickPopup; }; -void tst_popup::componentComplete() +void tst_QQuickPopup::componentComplete() { FriendlyPopup cppPopup; QVERIFY(cppPopup.isComponentComplete()); @@ -921,7 +921,7 @@ void tst_popup::componentComplete() QVERIFY(qmlPopup->isComponentComplete()); } -void tst_popup::closeOnEscapeWithNestedPopups() +void tst_QQuickPopup::closeOnEscapeWithNestedPopups() { // Tests the scenario in the Gallery example, where there are nested popups that should // close in the correct order when the Escape key is pressed. @@ -986,7 +986,7 @@ void tst_popup::closeOnEscapeWithNestedPopups() QCOMPARE(stackView->depth(), 1); } -void tst_popup::enabled() +void tst_QQuickPopup::enabled() { QQuickPopup popup; QVERIFY(popup.isEnabled()); @@ -1006,7 +1006,7 @@ void tst_popup::enabled() QCOMPARE(enabledSpy.count(), 2); } -void tst_popup::orientation_data() +void tst_QQuickPopup::orientation_data() { QTest::addColumn<Qt::ScreenOrientation>("orientation"); QTest::addColumn<QPointF>("position"); @@ -1017,7 +1017,7 @@ void tst_popup::orientation_data() QTest::newRow("InvertedLandscape") << Qt::InvertedLandscapeOrientation << QPointF(135, 330); } -void tst_popup::orientation() +void tst_QQuickPopup::orientation() { QFETCH(Qt::ScreenOrientation, orientation); QFETCH(QPointF, position); @@ -1036,6 +1036,6 @@ void tst_popup::orientation() QCOMPARE(popup->popupItem()->position(), position); } -QTEST_MAIN(tst_popup) +QTEST_MAIN(tst_QQuickPopup) -#include "tst_popup.moc" +#include "tst_qquickpopup.moc" |