1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QAnyStringView: port to QTEST_THROW_ON_FAIL

Browse Source 
Dogfooding the new QtTest 6.8 feature.

Change-Id: Ied115f33990040b92f49b319c36d20f7510e6eac
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 757e3d77ac186988a3fe8bed9706c5792caa2666)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-01-10 16:22:48 +01:00 committed by Qt Cherry-pick Bot
parent df055c0256
commit a9ebd2d64e
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/text/CMakeLists.txt
View File

@ -1,7 +1,9 @@
# Copyright (C) 2022 The Qt Company Ltd. # Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
if (NOT WASM) # QTBUG-121822
add_subdirectory(qanystringview) add_subdirectory(qanystringview)
endif()
add_subdirectory(qbytearray) add_subdirectory(qbytearray)
add_subdirectory(qbytearray_large) add_subdirectory(qbytearray_large)
add_subdirectory(qbytearrayapisymmetry) add_subdirectory(qbytearrayapisymmetry)

4
tests/auto/corelib/text/qanystringview/CMakeLists.txt
View File

@ -14,6 +14,10 @@ endif()
qt_internal_add_test(tst_qanystringview qt_internal_add_test(tst_qanystringview
SOURCES SOURCES
tst_qanystringview.cpp tst_qanystringview.cpp
NO_BATCH # QTBUG-121815
DEFINES
QTEST_THROW_ON_FAIL
QTEST_THROW_ON_SKIP
LIBRARIES LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::TestPrivate Qt::TestPrivate

28
tests/auto/corelib/text/qanystringview/tst_qanystringview.cpp
View File

@ -28,6 +28,10 @@
#include <deque> #include <deque>
#include <list> #include <list>
#ifndef QTEST_THROW_ON_FAIL
# error This test requires QTEST_THROW_ON_FAIL being active.
#endif
#ifdef __cpp_char8_t #ifdef __cpp_char8_t
# define ONLY_IF_CHAR_8_T(expr) expr # define ONLY_IF_CHAR_8_T(expr) expr
#else #else
@ -363,8 +367,6 @@ private Q_SLOTS:
void fromUShort() const { fromCharacter(ushort(0xE4), 1); } void fromUShort() const { fromCharacter(ushort(0xE4), 1); }
void fromChar32T() const { void fromChar32T() const {
fromCharacter(U'ä', 1); fromCharacter(U'ä', 1);
if (QTest::currentTestFailed())
return;
fromCharacter(U'\x1F0A0', 2); // U+1F0A0: PLAYING CARD BACK fromCharacter(U'\x1F0A0', 2); // U+1F0A0: PLAYING CARD BACK
} }
void fromWCharT() const { void fromWCharT() const {
@ -374,8 +376,6 @@ private Q_SLOTS:
void fromQLatin1Char() const { fromCharacter(QLatin1Char('\xE4'), 1); } void fromQLatin1Char() const { fromCharacter(QLatin1Char('\xE4'), 1); }
void fromQCharSpecialCharacter() const { void fromQCharSpecialCharacter() const {
fromCharacter(QChar::ReplacementCharacter, 1); fromCharacter(QChar::ReplacementCharacter, 1);
if (QTest::currentTestFailed())
return;
fromCharacter(QChar::LastValidCodePoint, 1); fromCharacter(QChar::LastValidCodePoint, 1);
} }
@ -661,20 +661,10 @@ void tst_QAnyStringView::fromQStringOrByteArray() const
QVERIFY(!QAnyStringView(empty).isNull()); QVERIFY(!QAnyStringView(empty).isNull());
conversion_tests(QStringOrByteArray(Strings::oneChar)); conversion_tests(QStringOrByteArray(Strings::oneChar));
if (QTest::currentTestFailed())
return;
conversion_tests(QStringOrByteArray(Strings::twoChars)); conversion_tests(QStringOrByteArray(Strings::twoChars));
if (QTest::currentTestFailed())
return;
conversion_tests(QStringOrByteArray(Strings::threeChars)); conversion_tests(QStringOrByteArray(Strings::threeChars));
if (QTest::currentTestFailed())
return;
conversion_tests(QStringOrByteArray(Strings::regularString)); conversion_tests(QStringOrByteArray(Strings::regularString));
if (QTest::currentTestFailed())
return;
conversion_tests(QStringOrByteArray(Strings::regularLongString)); conversion_tests(QStringOrByteArray(Strings::regularLongString));
if (QTest::currentTestFailed())
return;
conversion_tests(QStringOrByteArray(Strings::stringWithNulls, Strings::stringWithNullsLength)); conversion_tests(QStringOrByteArray(Strings::stringWithNulls, Strings::stringWithNullsLength));
} }
@ -760,18 +750,10 @@ void tst_QAnyStringView::fromRange() const
doTest(reinterpret_cast<const Char *>(std::begin(Strings::regularString)), doTest(reinterpret_cast<const Char *>(std::begin(Strings::regularString)),
reinterpret_cast<const Char *>(std::end(Strings::regularString))); reinterpret_cast<const Char *>(std::end(Strings::regularString)));
if (QTest::currentTestFailed())
return;
doTest(reinterpret_cast<const Char *>(std::begin(Strings::regularLongString)), doTest(reinterpret_cast<const Char *>(std::begin(Strings::regularLongString)),
reinterpret_cast<const Char *>(std::end(Strings::regularLongString))); reinterpret_cast<const Char *>(std::end(Strings::regularLongString)));
if (QTest::currentTestFailed())
return;
doTest(reinterpret_cast<const Char *>(std::begin(Strings::stringWithNulls)), doTest(reinterpret_cast<const Char *>(std::begin(Strings::stringWithNulls)),
reinterpret_cast<const Char *>(std::end(Strings::stringWithNulls))); reinterpret_cast<const Char *>(std::end(Strings::stringWithNulls)));
if (QTest::currentTestFailed())
return;
} }
template <typename Char, typename Container> template <typename Char, typename Container>
@ -786,8 +768,6 @@ void tst_QAnyStringView::fromContainer() const
std::copy(s.begin(), s.end(), std::back_inserter(c)); std::copy(s.begin(), s.end(), std::back_inserter(c));
conversion_tests(std::move(c)); conversion_tests(std::move(c));
if (QTest::currentTestFailed())
return;
// repeat with nulls // repeat with nulls
c = {}; c = {};