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

tst_QLocale: Use UTF-8 rather than Latin-1 for C-string-ification

Browse Source 
Test names and output need to be UTF-8 for the XML data formats to not
end up malformed - which would upset Coin's testrunner, when it
validates the XML as part of checking - and the few other uses of
toLatin1() were to ASCII content anyway, so can harmlessly (this being
test code, where the slight performance advantage of Latin-1 doesn't
matter) use toUtf8() as well, for the sake of uniformity.

Use of toLatin1() broke an imminent commit in which some territory,
script and language names depart from ASCII, leading to malformed
UTF-8 when they appear in test-data-row names.

Task-number: QTBUG-94460
Change-Id: Ifb826b1e417ba24fd862b93d24d0e7a38858a17f
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Edward Welbourne 2023-08-04 10:58:40 +02:00
parent 743ceb7cc2
commit d105c67a72
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/auto/corelib/text/qlocale/tst_qlocale.cpp
View File

@ -208,8 +208,8 @@ void tst_QLocale::ctor()
QLocale::Language default_lang = default_locale.language();
QLocale::Territory default_country = default_locale.territory();
qDebug("Default: %s/%s", QLocale::languageToString(default_lang).toLatin1().constData(),
QLocale::territoryToString(default_country).toLatin1().constData());
qDebug("Default: %s/%s", QLocale::languageToString(default_lang).toUtf8().constData(),
QLocale::territoryToString(default_country).toUtf8().constData());
{
QLocale l;
@ -313,8 +313,8 @@ void tst_QLocale::defaulted_ctor()
QLocale::Language default_lang = default_locale.language();
QLocale::Territory default_country = default_locale.territory();
qDebug("Default: %s/%s", QLocale::languageToString(default_lang).toLatin1().constData(),
QLocale::territoryToString(default_country).toLatin1().constData());
qDebug("Default: %s/%s", QLocale::languageToString(default_lang).toUtf8().constData(),
QLocale::territoryToString(default_country).toUtf8().constData());
{
QLocale l(QLocale::C, QLocale::AnyTerritory);
@ -436,7 +436,7 @@ void tst_QLocale::defaulted_ctor()
QString("requested: \"" + QString(req_lc) + "\", got: " \
+ QLocale::languageToString(l.language()) \
+ QLatin1Char('/') \
+ QLocale::territoryToString(l.territory())).toLatin1().constData()); \
+ QLocale::territoryToString(l.territory())).toUtf8().constData()); \
QCOMPARE(l, QLocale(QLocale::exp_lang, QLocale::exp_country)); \
QCOMPARE(qHash(l), qHash(QLocale(QLocale::exp_lang, QLocale::exp_country))); \
}
@ -500,7 +500,7 @@ void tst_QLocale::defaulted_ctor()
QString("requested: \"" + QString(req_lc) + "\", got: " \
+ QLocale::languageToString(l.language()) \
+ QLatin1Char('/') + QLocale::scriptToString(l.script()) \
+ QLatin1Char('/') + QLocale::territoryToString(l.territory())).toLatin1().constData()); \
+ QLatin1Char('/') + QLocale::territoryToString(l.territory())).toUtf8().constData()); \
}
TEST_CTOR("zh_CN", Chinese, SimplifiedHanScript, China)
@ -688,7 +688,7 @@ void tst_QLocale::legacyNames()
QString("requested: \"" + QString(req_lc) + "\", got: " \
+ QLocale::languageToString(l.language()) \
+ QLatin1Char('/') \
+ QLocale::territoryToString(l.territory())).toLatin1().constData()); \
+ QLocale::territoryToString(l.territory())).toUtf8().constData()); \
}
TEST_CTOR("mo_MD", Romanian, Moldova)
@ -1432,7 +1432,7 @@ void tst_QLocale::strtod()
QFETCH(int, processed);
QFETCH(bool, ok);
QByteArray numData = num_str.toLatin1();
QByteArray numData = num_str.toUtf8();
const char *end = nullptr;
bool actualOk = false;
double result = qstrtod(numData.constData(), &end, &actualOk);
@ -2992,9 +2992,9 @@ void tst_QLocale::testNames_data()
for (int i = 0; i < locale_data_count; ++i) {
const QLocaleData &item = locale_data[i];
const QByteArray lang =
QLocale::languageToString(QLocale::Language(item.m_language_id)).toLatin1();
QLocale::languageToString(QLocale::Language(item.m_language_id)).toUtf8();
const QByteArray land =
QLocale::territoryToString(QLocale::Territory(item.m_territory_id)).toLatin1();
QLocale::territoryToString(QLocale::Territory(item.m_territory_id)).toUtf8();
QTest::addRow("data_%d (%s/%s)", i, lang.constData(), land.constData())
<< QLocale::Language(item.m_language_id) << QLocale::Territory(item.m_territory_id);
@ -4045,7 +4045,7 @@ void tst_QLocale::systemLocaleDayAndMonthNames()
#if !QT_CONFIG(icu)
// setlocale() does not really change locale on Windows and macOS, we
// need to actually set the locale manually to run the test
if (!locale.startsWith(sys.name().toLatin1()))
if (!locale.startsWith(sys.name().toUtf8()))
QSKIP(("Set locale to " + locale + " manually to run this test.").constData());
#endif