diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2021-06-04 17:05:12 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-06-15 16:58:46 +0200 |
commit | cea662550ea12aa9e3e4c8b632d9ca85c7f249ee (patch) | |
tree | 979712419bf0ef53b1809af873ad78153cc249cc /tests | |
parent | a57f3b44bfc73e998980f96fb1b4452be1be1a74 (diff) |
Turn tst_QString::setRawData()'s QSKIP into QEXPECT_FAIL()s
In commit 287ace562ee5ddff22f7dbf4e49ae5f0520f2308, part of this test
was suppressed without filing a Jira ticket (or, at least, without
recording it in the QSKIP message). Since it's a known failure, it
should at least be a QEXPECT_FAIL, not a QSKIP. Since only some of the
subsequent parts of the test fail, I used QEXPECT_FAIL(,,Continue) on
each of the failing tests.
Task-number: QTBUG-94450
Change-Id: Iebc6801210c289b4502e59116e71d5901b71aa46
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/text/qstring/tst_qstring.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index dcc3c1ef82..75d14fb8e1 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -4106,13 +4106,14 @@ void tst_QString::setRawData() QVERIFY(cstr.constData() == ptr); QVERIFY(cstr == QString(ptr, 1)); - QSKIP("This is currently not working."); // This actually tests the recycling of the shared data object QString::DataPointer csd = cstr.data_ptr(); cstr.setRawData(ptr2, 1); + QEXPECT_FAIL("", "This is currently not working: QTBUG-94450.", Continue); QVERIFY(cstr.isDetached()); QVERIFY(cstr.constData() == ptr2); QVERIFY(cstr == QString(ptr2, 1)); + QEXPECT_FAIL("", "This is currently not working: QTBUG-94450.", Continue); QVERIFY(cstr.data_ptr() == csd); // This tests the discarding of the shared data object @@ -4123,6 +4124,7 @@ void tst_QString::setRawData() // Another test of the fallback csd = cstr.data_ptr(); cstr.setRawData(ptr2, 1); + QEXPECT_FAIL("", "This is currently not working: QTBUG-94450.", Continue); QVERIFY(cstr.isDetached()); QVERIFY(cstr.constData() == ptr2); QVERIFY(cstr == QString(ptr2, 1)); |