aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-09-27 14:44:25 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-09-27 13:42:25 +0000
commitc5e60dbf0023acf751bd18fe660501ca4b195daf (patch)
tree9f6ce034f2fa7a4449e621dd14eb1665e730508e /tests
parent96aec78737322152fb6742a7fa516489b7ce7b50 (diff)
Rename tst_popup to tst_QQuickPopup
Change-Id: I98f7081e94672a4454c33841934158ae82e9388f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro4
-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)60
17 files changed, 34 insertions, 34 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 354d7c81..3acc4704 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -9,11 +9,11 @@ SUBDIRS += \
font \
menu \
platform \
- popup \
pressandhold \
qquickdrawer \
qquickmaterialstyle \
qquickmaterialstyleconf \
+ qquickpopup \
qquickstyle \
qquickstyleselector \
qquickuniversalstyle \
@@ -24,6 +24,6 @@ SUBDIRS += \
# QTBUG-60268
boot2qt: SUBDIRS -= applicationwindow calendar controls cursor \
- qquickdrawer focus font menu platform popup qquickmaterialstyle \
+ qquickdrawer focus font menu platform qquickpopup qquickmaterialstyle \
qquickmaterialstyleconf qquickuniversalstyle \
qquickuniversalstyleconf snippets
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 53dae0f9..53dae0f9 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 f036f0c9..3f4b2d13 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
@@ -83,20 +83,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);
@@ -130,7 +130,7 @@ void tst_popup::visible()
QVERIFY(!overlay->childItems().contains(popupItem));
}
-void tst_popup::state()
+void tst_QQuickPopup::state()
{
QQuickApplicationHelper helper(this, "applicationwindow.qml");
@@ -170,7 +170,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");
@@ -187,7 +187,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);
@@ -323,14 +323,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);
@@ -364,7 +364,7 @@ void tst_popup::zOrder()
QVERIFY(!popup->isVisible());
}
-void tst_popup::windowChange()
+void tst_QQuickPopup::windowChange()
{
QQuickPopup popup;
QSignalSpy spy(&popup, SIGNAL(windowChanged(QQuickWindow*)));
@@ -391,7 +391,7 @@ void tst_popup::windowChange()
Q_DECLARE_METATYPE(QQuickPopup::ClosePolicy)
-void tst_popup::closePolicy_data()
+void tst_QQuickPopup::closePolicy_data()
{
qRegisterMetaType<QQuickPopup::ClosePolicy>();
@@ -415,7 +415,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);
@@ -494,7 +494,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.
@@ -523,7 +523,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
@@ -558,7 +558,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.
@@ -590,7 +590,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");
@@ -601,7 +601,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);
@@ -654,7 +654,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");
@@ -673,7 +673,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);
@@ -738,7 +738,7 @@ void tst_popup::wheel()
}
}
-void tst_popup::parentDestroyed()
+void tst_QQuickPopup::parentDestroyed()
{
QQuickPopup popup;
popup.setParentItem(new QQuickItem);
@@ -746,7 +746,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;
@@ -773,7 +773,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;
@@ -823,7 +823,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.
@@ -857,10 +857,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());
@@ -877,7 +877,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.
@@ -942,7 +942,7 @@ void tst_popup::closeOnEscapeWithNestedPopups()
QCOMPARE(stackView->depth(), 1);
}
-void tst_popup::orientation_data()
+void tst_QQuickPopup::orientation_data()
{
QTest::addColumn<Qt::ScreenOrientation>("orientation");
QTest::addColumn<QPointF>("position");
@@ -953,7 +953,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);
@@ -972,6 +972,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"