From 81fbcc4dc6e71981d50a117ae4264c92c973905b Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 4 Jun 2021 17:11:59 +0200 Subject: [PATCH] Remove two QEXPECT_FAIL()s that no longer appear to be valid 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 --- tests/auto/corelib/text/qstring/tst_qstring.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index 963ab2aa1a..5b5367abcd 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -2048,11 +2048,6 @@ void tst_QString::toUpper() upper += QChar(QChar::highSurrogate(0x10428)); 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) { QString str(1, QChar(i)); QString upper = str.toUpper(); @@ -2060,7 +2055,6 @@ void tst_QString::toUpper() if (upper.length() == 1) QVERIFY(upper == QString(1, QChar(i).toUpper())); } -#endif // icu } void tst_QString::toLower() @@ -2108,11 +2102,6 @@ void tst_QString::toLower() upper += QChar(QChar::highSurrogate(0x10400)); 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) { QString str(1, QChar(i)); QString lower = str.toLower(); @@ -2120,7 +2109,6 @@ void tst_QString::toLower() if (lower.length() == 1) QVERIFY(str.toLower() == QString(1, QChar(i).toLower())); } -#endif // icu } void tst_QString::isLower_isUpper_data()