AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove two QEXPECT_FAIL()s that no longer appear to be valid

Browse Source 
Because they were followed by a QVERIFY(false), no-one noticed until
now. Dates from 2011, when ICU support was first added. I guess
someone fixed the problem in the intervening decade.

Change-Id: I847816c297156e65397c652767f286bc4de193a2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2021-06-04 17:11:59 +02:00
parent f9469990d0
commit 81fbcc4dc6
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/corelib/text/qstring/tst_qstring.cpp
View File

@ -2048,11 +2048,6 @@ void tst_QString::toUpper()
upper += QChar(QChar::highSurrogate(0x10428)); upper += QChar(QChar::highSurrogate(0x10428));
QCOMPARE(lower.toUpper(), upper); QCOMPARE(lower.toUpper(), upper);
#if QT_CONFIG(icu)
// test doesn't work with ICU support, since QChar is unaware of any locale
QEXPECT_FAIL("", "test doesn't work with ICU support, since QChar is unaware of any locale", Continue);
QVERIFY(false);
#else
for (int i = 0; i < 65536; ++i) { for (int i = 0; i < 65536; ++i) {
QString str(1, QChar(i)); QString str(1, QChar(i));
QString upper = str.toUpper(); QString upper = str.toUpper();
@ -2060,7 +2055,6 @@ void tst_QString::toUpper()
if (upper.length() == 1) if (upper.length() == 1)
QVERIFY(upper == QString(1, QChar(i).toUpper())); QVERIFY(upper == QString(1, QChar(i).toUpper()));
} }
#endif // icu
} }
void tst_QString::toLower() void tst_QString::toLower()
@ -2108,11 +2102,6 @@ void tst_QString::toLower()
upper += QChar(QChar::highSurrogate(0x10400)); upper += QChar(QChar::highSurrogate(0x10400));
QCOMPARE( upper.toLower(), lower); QCOMPARE( upper.toLower(), lower);
#if QT_CONFIG(icu)
// test doesn't work with ICU support, since QChar is unaware of any locale
QEXPECT_FAIL("", "test doesn't work with ICU support, since QChar is unaware of any locale", Continue);
QVERIFY(false);
#else
for (int i = 0; i < 65536; ++i) { for (int i = 0; i < 65536; ++i) {
QString str(1, QChar(i)); QString str(1, QChar(i));
QString lower = str.toLower(); QString lower = str.toLower();
@ -2120,7 +2109,6 @@ void tst_QString::toLower()
if (lower.length() == 1) if (lower.length() == 1)
QVERIFY(str.toLower() == QString(1, QChar(i).toLower())); QVERIFY(str.toLower() == QString(1, QChar(i).toLower()));
} }
#endif // icu
} }
void tst_QString::isLower_isUpper_data() void tst_QString::isLower_isUpper_data()