aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-09-17 13:41:33 +0200
committerJ-P Nurmi <jpnurmi@digia.com>2014-09-18 15:58:29 +0200
commitf99573677aa0242f398bb9b0f79c35a8d0e16422 (patch)
treefd1995c77c44ba8a96ee9807fa2bb6fe1384cf4f /tests/auto/quick
parent72eef1da9e34aace7b0e2bc601d88f6b5363c075 (diff)
Remove tst_dialogs - moved to qtquickcontrols
QtQuick.Dialogs were moved from qtdeclarative to qtquickcontrols already in Qt 5.3, but the auto test was forgotten. Change-Id: I5c74e45b9ee2302f1d20fb476af6a93879913a28 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'tests/auto/quick')
-rw-r--r--tests/auto/quick/dialogs/data/RectWithFileDialog.qml33
-rw-r--r--tests/auto/quick/dialogs/dialogs.pro20
-rw-r--r--tests/auto/quick/dialogs/tst_dialogs.cpp152
-rw-r--r--tests/auto/quick/quick.pro3
4 files changed, 1 insertions, 207 deletions
diff --git a/tests/auto/quick/dialogs/data/RectWithFileDialog.qml b/tests/auto/quick/dialogs/data/RectWithFileDialog.qml
deleted file mode 100644
index ca7ecc948a..0000000000
--- a/tests/auto/quick/dialogs/data/RectWithFileDialog.qml
+++ /dev/null
@@ -1,33 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Dialogs 1.0
-
-Rectangle {
- width: 1024
- height: 320
- property alias fileDialog: fileDialog
- property alias label: label
- property alias mouseArea: mouseArea
-
- FileDialog {
- id: fileDialog
- title: "Choose some files"
- selectMultiple: true
- nameFilters: [ "QML files (*.qml)", "All files (*)" ]
- selectedNameFilter: "QML files (*.qml)"
- onAccepted: label.text = fileDialog.filePaths
- }
-
- MouseArea {
- id: mouseArea
- anchors.fill: parent
- onClicked: fileDialog.visible = !fileDialog.visible
- }
-
- Text {
- id: label
- text: "Click to open a file dialog"
- wrapMode: Text.Wrap
- anchors.fill: parent
- anchors.margins: 10
- }
-}
diff --git a/tests/auto/quick/dialogs/dialogs.pro b/tests/auto/quick/dialogs/dialogs.pro
deleted file mode 100644
index 4069ad4c68..0000000000
--- a/tests/auto/quick/dialogs/dialogs.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG += testcase
-TARGET = tst_dialogs
-SOURCES += tst_dialogs.cpp
-
-include (../../shared/util.pri)
-
-macx:CONFIG -= app_bundle
-macx:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable
-linux-*:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable
-win32:CONFIG+=insignificant_test # QTBUG-30513 - test is unstable
-
-CONFIG += parallel_test
-QT += core-private gui-private qml-private quick-private testlib
-
-TESTDATA = data/*
-
-OTHER_FILES += \
- data/FileDialog.qml \
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp
deleted file mode 100644
index 01fe6c3722..0000000000
--- a/tests/auto/quick/dialogs/tst_dialogs.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include "../../shared/util.h"
-#include <QtQuick/QQuickItem>
-#include <QtQuick/QQuickView>
-#include <QSignalSpy>
-
-class tst_dialogs : public QQmlDataTest
-{
- Q_OBJECT
-public:
-
-private slots:
- void initTestCase()
- {
- QQmlDataTest::initTestCase();
- }
-
- // FileDialog
- void fileDialogDefaultModality();
- void fileDialogNonModal();
- void fileDialogNameFilters();
-
-private:
-};
-
-void tst_dialogs::fileDialogDefaultModality()
-{
- QQuickView *window = new QQuickView;
- QScopedPointer<QQuickWindow> cleanup(window);
-
- window->setSource(testFileUrl("RectWithFileDialog.qml"));
- window->setGeometry(240,240,1024,320);
- window->show();
- QVERIFY(QTest::qWaitForWindowExposed(window));
- QVERIFY(window->rootObject());
-
- // Click to show
- QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
- QSignalSpy spyVisibilityChanged(dlg, SIGNAL(visibilityChanged()));
- QTest::mouseClick(window, Qt::LeftButton, 0, QPoint(1000, 100)); // show
- QTRY_VERIFY(spyVisibilityChanged.count() > 0);
- int visibilityChangedCount = spyVisibilityChanged.count();
- // Can't hide by clicking the main window, because dialog is modal.
- QTest::mouseClick(window, Qt::LeftButton, 0, QPoint(1000, 100));
- /*
- On the Mac, if you send an event directly to a window, the modal dialog
- doesn't block the event, so the window will process it normally. This
- is a different code path compared to having a user click the mouse and
- generate a native event; in that case the OS does the filtering itself,
- and Qt will not even see the event. But simulating real events in the
- test framework is generally unstable. So there isn't a good way to test
- modality on the mac.
- This test sometimes fails on other platforms too. Maybe it's not reliable
- to try to click the main window in a location which is outside the
- dialog, without checking or guaranteeing it somehow.
- */
- QSKIP("Modality test is flaky in general and doesn't work at all on MacOS");
- // So we expect no change in visibility.
- QCOMPARE(spyVisibilityChanged.count(), visibilityChangedCount);
-
- QCOMPARE(dlg->property("visible").toBool(), true);
- QMetaObject::invokeMethod(dlg, "close");
- QTRY_VERIFY(spyVisibilityChanged.count() > visibilityChangedCount);
- visibilityChangedCount = spyVisibilityChanged.count();
- QCOMPARE(dlg->property("visible").toBool(), false);
- QMetaObject::invokeMethod(dlg, "open");
- QTRY_VERIFY(spyVisibilityChanged.count() > visibilityChangedCount);
- QCOMPARE(dlg->property("visible").toBool(), true);
- QCOMPARE(dlg->property("modality").toInt(), (int)Qt::WindowModal);
-}
-
-void tst_dialogs::fileDialogNonModal()
-{
- QQuickView *window = new QQuickView;
- QScopedPointer<QQuickWindow> cleanup(window);
-
- window->setSource(testFileUrl("RectWithFileDialog.qml"));
- window->setGeometry(240,240,1024,320);
- window->show();
- QVERIFY(QTest::qWaitForWindowExposed(window));
- QVERIFY(window->rootObject());
-
- // Click to toggle visibility
- QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
- dlg->setProperty("modality", QVariant((int)Qt::NonModal));
- QSignalSpy spyVisibilityChanged(dlg, SIGNAL(visibilityChanged()));
- QTest::mouseClick(window, Qt::LeftButton, 0, QPoint(1000, 100)); // show
- QTRY_VERIFY(spyVisibilityChanged.count() > 0);
- int visibilityChangedCount = spyVisibilityChanged.count();
- QCOMPARE(dlg->property("visible").toBool(), true);
- QTest::mouseClick(window, Qt::LeftButton, 0, QPoint(1000, 100)); // hide
- QTRY_VERIFY(spyVisibilityChanged.count() > visibilityChangedCount);
- QCOMPARE(dlg->property("visible").toBool(), false);
- QCOMPARE(dlg->property("modality").toInt(), (int)Qt::NonModal);
-}
-
-void tst_dialogs::fileDialogNameFilters()
-{
- QQuickView *window = new QQuickView;
- QScopedPointer<QQuickWindow> cleanup(window);
-
- window->setSource(testFileUrl("RectWithFileDialog.qml"));
- window->setGeometry(240,240,1024,320);
- window->show();
- QVERIFY(QTest::qWaitForWindowExposed(window));
- QVERIFY(window->rootObject());
-
- QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
- QStringList filters;
- filters << "QML files (*.qml)";
- filters << "Image files (*.jpg, *.png, *.gif)";
- filters << "All files (*)";
- dlg->setProperty("nameFilters", QVariant(filters));
- QCOMPARE(dlg->property("selectedNameFilter").toString(), filters.first());
-}
-
-QTEST_MAIN(tst_dialogs)
-
-#include "tst_dialogs.moc"
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 0a887534bd..e400556b67 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -73,8 +73,7 @@ QUICKTESTS = \
qquickview \
qquickcanvasitem \
qquickscreen \
- touchmouse \
- dialogs \
+ touchmouse
SUBDIRS += $$PUBLICTESTS