diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2024-02-23 01:34:10 -0700 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2024-02-27 23:33:13 -0700 |
| commit | d063437539d84c6c9d2a1fdde8184d19d2887395 (patch) | |
| tree | 4144ec57fbe837119981208aa34f6e1ec9ee01e2 /tests/auto/quick | |
| parent | c91ce0841cbb516f476819fe1c46dc0524abd6d3 (diff) | |
Add TextDocument.errorString property
In bec8df96b7615c6ce419867254027773ea7fd6b1 we added status and removed
the translated error string. But actually it's a common pattern to have
the error string available too, so as to avoid needing to generate it
from an enum value.
Also, in the textEditStatusSwitch.qml snippet, setting textFormat is
necessary after fdbacf2d5c0a04925bcb3aecd7bf47da5fb69227
Pick-to: 6.7
Change-Id: Ie880efa4bf347b70eb6cc4005283b1fc50e15508
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp b/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp index 22651f96d6..d504da555e 100644 --- a/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp +++ b/tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp @@ -265,6 +265,7 @@ void tst_qquicktextdocument::sourceAndSave() QCOMPARE(textEdit->property("sourceChangeCount").toInt(), 1); QCOMPARE(statusChangedSpy.size(), 2); // Loading, then Loaded QCOMPARE(qqdoc->status(), QQuickTextDocument::Status::Loaded); + QVERIFY(qqdoc->errorString().isEmpty()); const auto *qqdp = QQuickTextDocumentPrivate::get(qqdoc); QCOMPARE(qqdp->detectedFormat, expectedTextFormat); QCOMPARE_GE(doc->characterCount(), minCharCount); @@ -283,6 +284,7 @@ void tst_qquicktextdocument::sourceAndSave() qqdoc->save(); QCOMPARE(statusChangedSpy.size(), 4); // Saving, then Saved QCOMPARE(qqdoc->status(), QQuickTextDocument::Status::Saved); + QVERIFY(qqdoc->errorString().isEmpty()); QFile tf(tmpPath); QVERIFY(tf.open(QIODeviceBase::ReadOnly)); auto readBack = tf.readAll(); @@ -312,13 +314,15 @@ void tst_qquicktextdocument::loadErrorNoSuchFile() QCOMPARE(statusChangedSpy.size(), 0); QCOMPARE(qqdoc->status(), QQuickTextDocument::Status::Null); - QTest::ignoreMessage(QtWarningMsg, QRegularExpression(".*does not exist")); + const QRegularExpression err(".*does not exist"); + QTest::ignoreMessage(QtWarningMsg, err); qqdoc->setProperty("source", testFileUrl("nosuchfile.md")); QCOMPARE(sourceChangedSpy.size(), 1); QCOMPARE(textEdit->property("sourceChangeCount").toInt(), 1); qCDebug(lcTests) << "status history" << textEdit->property("statusHistory").toList(); QCOMPARE(statusChangedSpy.size(), 1); QCOMPARE(qqdoc->status(), QQuickTextDocument::Status::ReadError); + QVERIFY(qqdoc->errorString().contains(err)); } void tst_qquicktextdocument::loadErrorPermissionDenied() @@ -354,13 +358,15 @@ void tst_qquicktextdocument::loadErrorPermissionDenied() QCOMPARE(statusChangedSpy.size(), 0); QCOMPARE(qqdoc->status(), QQuickTextDocument::Status::Null); - QTest::ignoreMessage(QtWarningMsg, QRegularExpression(".*Failed to read: Permission denied")); + const QRegularExpression err(".*Failed to read: Permission denied"); + QTest::ignoreMessage(QtWarningMsg, err); qqdoc->setProperty("source", QUrl::fromLocalFile(tmpPath)); QCOMPARE(sourceChangedSpy.size(), 1); QCOMPARE(textEdit->property("sourceChangeCount").toInt(), 1); qCDebug(lcTests) << "status history" << textEdit->property("statusHistory").toList(); QCOMPARE(statusChangedSpy.size(), 1); QCOMPARE(qqdoc->status(), QQuickTextDocument::Status::ReadError); + QVERIFY(qqdoc->errorString().contains(err)); } void tst_qquicktextdocument::overrideTextFormat_data() |