aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2024-02-28 11:20:01 -0700
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-03-01 08:03:02 +0000
commit372a231ccfdde541331a6a3c75f79b19db6572b6 (patch)
tree895302e63c0bcf56ce95c915f2a8a7a50846fc2d
parent60113a6bf7a0a831cdb294bb54a8fd0037fef4ce (diff)
Use showView in tst_qquicktextedit::mouseSelectionMode
Not sure if this will have an impact on stability, but we have showView to standardize some boilerplate that was otherwise duplicated here. Pick-to: 6.5 Task-number: QTBUG-78846 Change-Id: Ic0faec8b11d162fac49bd6679c0652e9760238be Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 2878c935b1d65ae71f8947c57319b8f547dbd43f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 243297abd1129762783ac18b6c377637d4ff7195)
-rw-r--r--tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp20
1 files changed, 8 insertions, 12 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index 99f95cc5a6..15f538ac3c 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -2245,29 +2245,25 @@ void tst_qquicktextedit::dragMouseSelection()
void tst_qquicktextedit::mouseSelectionMode_data()
{
- QTest::addColumn<QString>("qmlfile");
+ QTest::addColumn<QUrl>("qmlfile");
QTest::addColumn<bool>("selectWords");
// import installed
- QTest::newRow("SelectWords") << testFile("mouseselectionmode_words.qml") << true;
- QTest::newRow("SelectCharacters") << testFile("mouseselectionmode_characters.qml") << false;
- QTest::newRow("default") << testFile("mouseselectionmode_default.qml") << false;
+ QTest::newRow("SelectWords") << testFileUrl("mouseselectionmode_words.qml") << true;
+ QTest::newRow("SelectCharacters") << testFileUrl("mouseselectionmode_characters.qml") << false;
+ QTest::newRow("default") << testFileUrl("mouseselectionmode_default.qml") << false;
}
void tst_qquicktextedit::mouseSelectionMode()
{
- QFETCH(QString, qmlfile);
+ QFETCH(QUrl, qmlfile);
QFETCH(bool, selectWords);
- QString text = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
- QQuickView window(QUrl::fromLocalFile(qmlfile));
+ const QString text = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- window.show();
- window.requestActivate();
- QVERIFY(QTest::qWaitForWindowActive(&window));
+ QQuickView window;
+ QVERIFY(QQuickTest::showView(window, qmlfile));
- QVERIFY(window.rootObject() != nullptr);
QQuickTextEdit *textEditObject = qobject_cast<QQuickTextEdit *>(window.rootObject());
QVERIFY(textEditObject != nullptr);
textEditObject->setSelectByMouse(true);