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

Rework tst_QTimeZone::windowsId() to use initializer-lists

Browse Source 
Instead of clearing a list repeatedly to then repopulate it by
appending entries.

Change-Id: I82594d69c1cb145defff43d84f92f8410d8997aa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2024-02-01 16:03:20 +01:00
parent 83f0796192
commit 46c1936e17
1 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
View File

@ -998,46 +998,54 @@ void tst_QTimeZone::windowsId()
QByteArray("CST6CDT")); QByteArray("CST6CDT"));
QCOMPARE(QTimeZone::windowsIdToDefaultIanaId(QByteArray()), QByteArray()); QCOMPARE(QTimeZone::windowsIdToDefaultIanaId(QByteArray()), QByteArray());
// No country is sorted list of all zones {
QList<QByteArray> list; // With no country, expect sorted list of all zones for ID
list << "America/Chicago" << "America/Indiana/Knox" << "America/Indiana/Tell_City" const QList<QByteArray> list = {
<< "America/Matamoros" << "America/Menominee" << "America/North_Dakota/Beulah" "America/Chicago", "America/Indiana/Knox", "America/Indiana/Tell_City",
<< "America/North_Dakota/Center" << "America/North_Dakota/New_Salem" "America/Matamoros", "America/Menominee", "America/North_Dakota/Beulah",
<< "America/Ojinaga" << "America/Rainy_River" << "America/Rankin_Inlet" "America/North_Dakota/Center", "America/North_Dakota/New_Salem",
<< "America/Resolute" << "America/Winnipeg" << "CST6CDT"; "America/Ojinaga", "America/Rainy_River", "America/Rankin_Inlet",
"America/Resolute", "America/Winnipeg", "CST6CDT"
};
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time"), list); QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time"), list);
}
{
// Check country with no match returns empty list // Check country with no match returns empty list
list.clear(); const QList<QByteArray> empty;
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::NewZealand), QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::NewZealand),
list); empty);
}
{
// Check valid country returns list in preference order // Check valid country returns list in preference order
list.clear(); const QList<QByteArray> list = {
list << "America/Winnipeg" << "America/Rainy_River" << "America/Rankin_Inlet" "America/Winnipeg", "America/Rainy_River", "America/Rankin_Inlet", "America/Resolute"
<< "America/Resolute"; };
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Canada), list); QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Canada), list);
}
list.clear(); {
list << "America/Matamoros" << "America/Ojinaga"; const QList<QByteArray> list = { "America/Matamoros", "America/Ojinaga" };
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Mexico), list); QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Mexico), list);
}
list.clear(); {
list << "America/Chicago" << "America/Indiana/Knox" << "America/Indiana/Tell_City" const QList<QByteArray> list = {
<< "America/Menominee" << "America/North_Dakota/Beulah" << "America/North_Dakota/Center" "America/Chicago", "America/Indiana/Knox", "America/Indiana/Tell_City",
<< "America/North_Dakota/New_Salem"; "America/Menominee", "America/North_Dakota/Beulah", "America/North_Dakota/Center",
"America/North_Dakota/New_Salem"
};
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::UnitedStates), QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::UnitedStates),
list); list);
}
list.clear(); {
list << "CST6CDT"; const QList<QByteArray> list = { "CST6CDT" };
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::AnyTerritory), QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::AnyTerritory),
list); list);
}
// Check no windowsId return empty {
list.clear(); // Check empty if given no windowsId:
QCOMPARE(QTimeZone::windowsIdToIanaIds(QByteArray()), list); const QList<QByteArray> empty;
QCOMPARE(QTimeZone::windowsIdToIanaIds(QByteArray(), QLocale::AnyTerritory), list); QCOMPARE(QTimeZone::windowsIdToIanaIds(QByteArray()), empty);
QCOMPARE(QTimeZone::windowsIdToIanaIds(QByteArray(), QLocale::AnyTerritory), empty);
}
} }
void tst_QTimeZone::isValidId_data() void tst_QTimeZone::isValidId_data()