diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-15 15:43:09 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-15 15:43:09 +0100 |
commit | ab027c7d786966ab87500ca609fd45b0551902c9 (patch) | |
tree | 55d496a604ae36f7ce9d8adae8160d3efab148a4 /tests/auto | |
parent | 7b33addb8d8d1c07dda9a9f39d86f7bda812da82 (diff) | |
parent | 0edce6c41e9b193c7482334e313c4886c94702f1 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quicktemplates2/qquickpopup.cpp
Change-Id: I227b071476e569d13eebd7d11ed041fe30daa389
Diffstat (limited to 'tests/auto')
23 files changed, 79 insertions, 26 deletions
diff --git a/tests/auto/accessibility/accessibility.pro b/tests/auto/accessibility/accessibility.pro index bef6eae4..e6b38828 100644 --- a/tests/auto/accessibility/accessibility.pro +++ b/tests/auto/accessibility/accessibility.pro @@ -11,5 +11,5 @@ include (../shared/util.pri) TESTDATA = data/* OTHER_FILES += \ - data/* + data/*.qml diff --git a/tests/auto/applicationwindow/applicationwindow.pro b/tests/auto/applicationwindow/applicationwindow.pro index 8eb1c933..3371a78e 100644 --- a/tests/auto/applicationwindow/applicationwindow.pro +++ b/tests/auto/applicationwindow/applicationwindow.pro @@ -11,5 +11,5 @@ include (../shared/util.pri) TESTDATA = data/* OTHER_FILES += \ - data/* + data/*.qml diff --git a/tests/auto/calendar/calendar.pro b/tests/auto/calendar/calendar.pro index e7cd6665..9fdf20ad 100644 --- a/tests/auto/calendar/calendar.pro +++ b/tests/auto/calendar/calendar.pro @@ -6,7 +6,7 @@ SOURCES += \ $$PWD/tst_calendar.cpp OTHER_FILES += \ - $$PWD/data/* + $$PWD/data/*.qml TESTDATA += \ $$PWD/data/tst_* diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/controls/data/tst_dialog.qml index 69c47fed..4cfda8ee 100644 --- a/tests/auto/controls/data/tst_dialog.qml +++ b/tests/auto/controls/data/tst_dialog.qml @@ -106,6 +106,50 @@ TestCase { tryCompare(control, "visible", false) + // Check that rejected() is emitted when CloseOnEscape is triggered. + control.x = 10 + control.y = 10 + control.width = 100 + control.height = 100 + control.closePolicy = Popup.CloseOnEscape + control.open() + verify(control.visible) + + keyPress(Qt.Key_Escape) + compare(rejectedSpy.count, 2) + tryCompare(control, "visible", false) + + keyRelease(Qt.Key_Escape) + compare(rejectedSpy.count, 2) + + // Check that rejected() is emitted when CloseOnPressOutside is triggered. + control.closePolicy = Popup.CloseOnPressOutside + control.open() + verify(control.visible) + + mousePress(testCase, 1, 1) + compare(rejectedSpy.count, 3) + tryCompare(control, "visible", false) + + mouseRelease(testCase, 1, 1) + compare(rejectedSpy.count, 3) + + // Check that rejected() is emitted when CloseOnReleaseOutside is triggered. + // For this, we need to make the dialog modal, because the overlay won't accept + // the press event because it doesn't want to block the press. + control.modal = true + control.closePolicy = Popup.CloseOnReleaseOutside + control.open() + verify(control.visible) + + mousePress(testCase, 1, 1) + compare(rejectedSpy.count, 3) + verify(control.visible) + + mouseRelease(testCase, 1, 1) + compare(rejectedSpy.count, 4) + tryCompare(control, "visible", false) + control.destroy() } diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml index bcf25f28..fa2d218f 100644 --- a/tests/auto/controls/data/tst_swipedelegate.qml +++ b/tests/auto/controls/data/tst_swipedelegate.qml @@ -40,9 +40,9 @@ import QtQuick 2.6 import QtTest 1.0 -import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 + TestCase { id: testCase width: 200 @@ -1094,22 +1094,22 @@ TestCase { property int firstClickCount: 0 property int secondClickCount: 0 - RowLayout { + Row { anchors.fill: parent anchors.margins: 5 Rectangle { id: firstAction - Layout.fillWidth: true - Layout.fillHeight: true + width: parent.width / 2 + height: parent.height color: "tomato" SwipeDelegate.onClicked: ++firstClickCount } Rectangle { id: secondAction - Layout.fillWidth: true - Layout.fillHeight: true + width: parent.width / 2 + height: parent.height color: "navajowhite" SwipeDelegate.onClicked: ++secondClickCount diff --git a/tests/auto/controls/default/default.pro b/tests/auto/controls/default/default.pro index 6ab5b5ff..290edc5f 100644 --- a/tests/auto/controls/default/default.pro +++ b/tests/auto/controls/default/default.pro @@ -8,7 +8,7 @@ SOURCES += \ $$PWD/tst_default.cpp OTHER_FILES += \ - $$PWD/../data/* + $$PWD/../data/*.qml TESTDATA += \ $$PWD/../data/tst_* diff --git a/tests/auto/controls/material/material.pro b/tests/auto/controls/material/material.pro index 1a8260f3..652dcf7f 100644 --- a/tests/auto/controls/material/material.pro +++ b/tests/auto/controls/material/material.pro @@ -9,7 +9,7 @@ SOURCES += \ $$PWD/tst_material.cpp OTHER_FILES += \ - $$PWD/../data/* + $$PWD/../data/*.qml TESTDATA += \ $$PWD/../data/tst_* diff --git a/tests/auto/controls/universal/universal.pro b/tests/auto/controls/universal/universal.pro index 7a16cc64..835798b3 100644 --- a/tests/auto/controls/universal/universal.pro +++ b/tests/auto/controls/universal/universal.pro @@ -9,7 +9,7 @@ SOURCES += \ $$PWD/tst_universal.cpp OTHER_FILES += \ - $$PWD/../data/* + $$PWD/../data/*.qml TESTDATA += \ $$PWD/../data/tst_* diff --git a/tests/auto/drawer/BLACKLIST b/tests/auto/drawer/BLACKLIST deleted file mode 100644 index 1b06b49c..00000000 --- a/tests/auto/drawer/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[touch] -windows diff --git a/tests/auto/drawer/drawer.pro b/tests/auto/drawer/drawer.pro index 95ed44e9..e1ba0ce5 100644 --- a/tests/auto/drawer/drawer.pro +++ b/tests/auto/drawer/drawer.pro @@ -11,4 +11,4 @@ include (../shared/util.pri) TESTDATA = data/* OTHER_FILES += \ - data/* + data/*.qml diff --git a/tests/auto/drawer/tst_drawer.cpp b/tests/auto/drawer/tst_drawer.cpp index a523beed..4743a8cd 100644 --- a/tests/auto/drawer/tst_drawer.cpp +++ b/tests/auto/drawer/tst_drawer.cpp @@ -723,6 +723,11 @@ void tst_Drawer::touch() QQuickDrawer *drawer = window->property("drawer").value<QQuickDrawer*>(); QVERIFY(drawer); + QSignalSpy drawerOpenedSpy(drawer, SIGNAL(opened())); + QSignalSpy drawerClosedSpy(drawer, SIGNAL(closed())); + QVERIFY(drawerOpenedSpy.isValid()); + QVERIFY(drawerClosedSpy.isValid()); + struct TouchDeviceDeleter { static inline void cleanup(QTouchDevice *device) @@ -741,7 +746,8 @@ void tst_Drawer::touch() QTest::touchEvent(window, device.data()).move(0, QPoint(100, 100)); QTRY_COMPARE(drawer->position(), 0.5); QTest::touchEvent(window, device.data()).release(0, QPoint(100, 100)); - QTRY_COMPARE(drawer->position(), 1.0); + QVERIFY(drawerOpenedSpy.wait()); + QCOMPARE(drawer->position(), 1.0); // drag to close QTest::touchEvent(window, device.data()).press(0, QPoint(300, 100)); @@ -753,7 +759,8 @@ void tst_Drawer::touch() QTest::touchEvent(window, device.data()).move(0, QPoint(100, 100)); QTRY_COMPARE(drawer->position(), 0.5); QTest::touchEvent(window, device.data()).release(0, QPoint(100, 100)); - QTRY_COMPARE(drawer->position(), 0.0); + QVERIFY(drawerClosedSpy.wait()); + QCOMPARE(drawer->position(), 0.0); } void tst_Drawer::grabber() diff --git a/tests/auto/menu/menu.pro b/tests/auto/menu/menu.pro index 649f3fd4..44cbd5ed 100644 --- a/tests/auto/menu/menu.pro +++ b/tests/auto/menu/menu.pro @@ -11,5 +11,5 @@ include (../shared/util.pri) TESTDATA = data/* OTHER_FILES += \ - data/* + data/*.qml diff --git a/tests/auto/platform/platform.pro b/tests/auto/platform/platform.pro index e8f66d13..cc537b32 100644 --- a/tests/auto/platform/platform.pro +++ b/tests/auto/platform/platform.pro @@ -6,7 +6,7 @@ SOURCES += \ $$PWD/tst_platform.cpp OTHER_FILES += \ - $$PWD/data/* + $$PWD/data/*.qml TESTDATA += \ $$PWD/data/tst_* diff --git a/tests/auto/popup/popup.pro b/tests/auto/popup/popup.pro index af4db794..9b3ee75a 100644 --- a/tests/auto/popup/popup.pro +++ b/tests/auto/popup/popup.pro @@ -11,4 +11,4 @@ include (../shared/util.pri) TESTDATA = data/* OTHER_FILES += \ - data/* + data/*.qml diff --git a/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro index e4e95ae3..dac2176a 100644 --- a/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro +++ b/tests/auto/qquickmaterialstyle/qquickmaterialstyle.pro @@ -9,7 +9,7 @@ RESOURCES += \ $$PWD/qtquickcontrols2.conf OTHER_FILES += \ - $$PWD/data/* + $$PWD/data/*.qml TESTDATA += \ $$PWD/data/tst_* diff --git a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml index a1657a69..853506bd 100644 --- a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml +++ b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml @@ -40,6 +40,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 +import QtQuick.Controls.Material 2.0 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.pro b/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.pro index fe8953e9..af4e5349 100644 --- a/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.pro +++ b/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.pro @@ -13,5 +13,5 @@ RESOURCES += qquickmaterialstyleconf.qrc TESTDATA = data/* OTHER_FILES += \ - data/* + data/*.qml diff --git a/tests/auto/qquickstyleselector/qquickstyleselector.pro b/tests/auto/qquickstyleselector/qquickstyleselector.pro index c56e5732..3ad4d516 100644 --- a/tests/auto/qquickstyleselector/qquickstyleselector.pro +++ b/tests/auto/qquickstyleselector/qquickstyleselector.pro @@ -15,5 +15,5 @@ RESOURCES += resourcestyle TESTDATA = data/* OTHER_FILES += \ - data/* + data/*.qml diff --git a/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro index dc81eb9d..f77d812f 100644 --- a/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro +++ b/tests/auto/qquickuniversalstyle/qquickuniversalstyle.pro @@ -9,7 +9,7 @@ RESOURCES += \ $$PWD/qtquickcontrols2.conf OTHER_FILES += \ - $$PWD/data/* + $$PWD/data/*.qml TESTDATA += \ $$PWD/data/tst_* diff --git a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml b/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml index a1657a69..e2023cf7 100644 --- a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml +++ b/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml @@ -40,6 +40,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 +import QtQuick.Controls.Universal 2.0 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickuniversalstyleconf/qquickuniversalstyleconf.pro b/tests/auto/qquickuniversalstyleconf/qquickuniversalstyleconf.pro index 9aaedbee..6236f075 100644 --- a/tests/auto/qquickuniversalstyleconf/qquickuniversalstyleconf.pro +++ b/tests/auto/qquickuniversalstyleconf/qquickuniversalstyleconf.pro @@ -13,5 +13,5 @@ RESOURCES += qquickuniversalstyleconf.qrc TESTDATA = data/* OTHER_FILES += \ - data/* + data/*.qml diff --git a/tests/auto/snippets/data/dependencies.qml b/tests/auto/snippets/data/dependencies.qml index ca36a407..6c897566 100644 --- a/tests/auto/snippets/data/dependencies.qml +++ b/tests/auto/snippets/data/dependencies.qml @@ -1,6 +1,8 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.1 +import QtQuick.Controls.Material 2.1 +import QtQuick.Controls.Universal 2.1 import Qt.labs.calendar 1.0 Control { } diff --git a/tests/auto/snippets/snippets.pro b/tests/auto/snippets/snippets.pro index 3147fb4b..b14ac8ea 100644 --- a/tests/auto/snippets/snippets.pro +++ b/tests/auto/snippets/snippets.pro @@ -11,7 +11,7 @@ SOURCES += \ $$PWD/tst_snippets.cpp OTHER_FILES += \ - $$PWD/data/* + $$PWD/data/*.qml TESTDATA += \ $$PWD/data/* |