diff options
author | Shawn Rutledge <[email protected]> | 2024-02-28 11:20:01 -0700 |
---|---|---|
committer | Shawn Rutledge <[email protected]> | 2024-02-29 10:34:16 -0700 |
commit | 2878c935b1d65ae71f8947c57319b8f547dbd43f (patch) | |
tree | 4c57b364fb80124a6a8c43e433dadfd832dc7697 | |
parent | 1ebd8ef8535466f4d0059ad7b38682407c91d96a (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 6.6 6.7
Task-number: QTBUG-78846
Change-Id: Ic0faec8b11d162fac49bd6679c0652e9760238be
Reviewed-by: Shawn Rutledge <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
-rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 20 |
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 a6404c0519..60ba1e38d8 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -2253,29 +2253,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); |