aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-07-26 13:22:33 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-07-27 12:03:59 +0000
commitf1e139b9ac02313f541ed6749f05e265f4c8bf13 (patch)
treea29df97ee1881a6c8e44e502c57c8a1972d88d81 /tests
parentb94889f49170e3d8df5b348d3f179445d892f232 (diff)
Popups: take Window::contentOrientation into account
Task-number: QTBUG-62158 Change-Id: I0bcf5b02da6a3500e4324462d5f1249a6178c9fd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/popup/data/orientation.qml76
-rw-r--r--tests/auto/popup/tst_popup.cpp32
2 files changed, 108 insertions, 0 deletions
diff --git a/tests/auto/popup/data/orientation.qml b/tests/auto/popup/data/orientation.qml
new file mode 100644
index 00000000..cbf69b2b
--- /dev/null
+++ b/tests/auto/popup/data/orientation.qml
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.0
+
+Window {
+ width: 600
+ height: 300
+
+ property alias popup: popup
+
+ Rectangle {
+ width: 60
+ height: 30
+ anchors.centerIn: parent
+ border.width: 1
+
+ Popup {
+ id: popup
+ x: parent.width
+ y: parent.height
+ width: 30
+ height: 60
+ visible: true
+ }
+ }
+}
diff --git a/tests/auto/popup/tst_popup.cpp b/tests/auto/popup/tst_popup.cpp
index 45d52517..f036f0c9 100644
--- a/tests/auto/popup/tst_popup.cpp
+++ b/tests/auto/popup/tst_popup.cpp
@@ -79,6 +79,8 @@ private slots:
void cursorShape();
void componentComplete();
void closeOnEscapeWithNestedPopups();
+ void orientation_data();
+ void orientation();
};
void tst_popup::initTestCase()
@@ -940,6 +942,36 @@ void tst_popup::closeOnEscapeWithNestedPopups()
QCOMPARE(stackView->depth(), 1);
}
+void tst_popup::orientation_data()
+{
+ QTest::addColumn<Qt::ScreenOrientation>("orientation");
+ QTest::addColumn<QPointF>("position");
+
+ QTest::newRow("Portrait") << Qt::PortraitOrientation << QPointF(330, 165);
+ QTest::newRow("Landscape") << Qt::LandscapeOrientation << QPointF(165, 270);
+ QTest::newRow("InvertedPortrait") << Qt::InvertedPortraitOrientation << QPointF(270, 135);
+ QTest::newRow("InvertedLandscape") << Qt::InvertedLandscapeOrientation << QPointF(135, 330);
+}
+
+void tst_popup::orientation()
+{
+ QFETCH(Qt::ScreenOrientation, orientation);
+ QFETCH(QPointF, position);
+
+ QQuickApplicationHelper helper(this, "orientation.qml");
+
+ QQuickWindow *window = helper.window;
+ window->reportContentOrientationChange(orientation);
+ window->show();
+ QVERIFY(QTest::qWaitForWindowActive(window));
+
+ QQuickPopup *popup = window->property("popup").value<QQuickPopup*>();
+ QVERIFY(popup);
+ popup->open();
+
+ QCOMPARE(popup->popupItem()->position(), position);
+}
+
QTEST_MAIN(tst_popup)
#include "tst_popup.moc"