[webkit-changes] [286998] trunk/JSTests

Mon, 13 Dec 2021 17:38:50 -0800

Title: [286998] trunk/JSTests
Revision
286998
Author
ysuz...@apple.com
Date
2021-12-13 17:38:11 -0800 (Mon, 13 Dec 2021)

Log Message

[JSC] Update Intl tests based on ICU 69~
https://bugs.webkit.org/show_bug.cgi?id=234276

Reviewed by Mark Lam.

Rebaseline Intl tests based on ICU 69~'s CLDR update.

* stress/array-toLocaleString.js:
* stress/date-toLocaleString.js:
* stress/intl-canonical-locale-alias-mapping.js:
(Intl.getCanonicalLocales):
* stress/intl-datetimeformat-formatrange-relevant-extensions-ja.js:
(vm.icuVersion):
* stress/intl-datetimeformat-formatrangetoparts-relevant-extensions-ja.js:
* stress/intl-datetimeformat.js:
* stress/intl-enumeration.js:
* stress/intl-locale-info.js:
(shouldBe):
* stress/intl-locale.js:

Modified Paths

Diff

Modified: trunk/JSTests/ChangeLog (286997 => 286998)


--- trunk/JSTests/ChangeLog	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/ChangeLog	2021-12-14 01:38:11 UTC (rev 286998)
@@ -1,3 +1,25 @@
+2021-12-13  Yusuke Suzuki  <ysuz...@apple.com>
+
+        [JSC] Update Intl tests based on ICU 69~
+        https://bugs.webkit.org/show_bug.cgi?id=234276
+
+        Reviewed by Mark Lam.
+
+        Rebaseline Intl tests based on ICU 69~'s CLDR update.
+
+        * stress/array-toLocaleString.js:
+        * stress/date-toLocaleString.js:
+        * stress/intl-canonical-locale-alias-mapping.js:
+        (Intl.getCanonicalLocales):
+        * stress/intl-datetimeformat-formatrange-relevant-extensions-ja.js:
+        (vm.icuVersion):
+        * stress/intl-datetimeformat-formatrangetoparts-relevant-extensions-ja.js:
+        * stress/intl-datetimeformat.js:
+        * stress/intl-enumeration.js:
+        * stress/intl-locale-info.js:
+        (shouldBe):
+        * stress/intl-locale.js:
+
 2021-12-10  Yusuke Suzuki  <ysuz...@apple.com>
 
         Unreviewed, we may not throw an stack overflow error

Modified: trunk/JSTests/stress/array-toLocaleString.js (286997 => 286998)


--- trunk/JSTests/stress/array-toLocaleString.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/array-toLocaleString.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -38,4 +38,4 @@
 
 // Test that parameters are passed through properly.
 shouldThrow(() => [ new Date ].toLocaleString('i'), RangeError);
-shouldBe([ new Date(NaN), new Date(0) ].toLocaleString('zh-Hans-CN-u-nu-hanidec', { timeZone: 'UTC' }), 'Invalid Date,一九七〇/一/一 上午一二:〇〇:〇〇');
+shouldBe([ new Date(NaN), new Date(0) ].toLocaleString('zh-Hans-CN-u-nu-hanidec', { timeZone: 'UTC' }), $vm.icuVersion() >= 69 ? 'Invalid Date,一九七〇/一/一 〇〇:〇〇:〇〇' : 'Invalid Date,一九七〇/一/一 上午一二:〇〇:〇〇');

Modified: trunk/JSTests/stress/date-toLocaleString.js (286997 => 286998)


--- trunk/JSTests/stress/date-toLocaleString.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/date-toLocaleString.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -44,8 +44,8 @@
 // Test for DateTimeFormat behavior.
 // Test that locale parameter is passed through properly.
 shouldThrow(() => new Date().toLocaleString('i'), RangeError);
-shouldBe(new Date(0).toLocaleString('zh-Hans-CN-u-nu-hanidec', { timeZone: 'UTC' }), '一九七〇/一/一 上午一二:〇〇:〇〇');
-shouldBe(new Date(0).toLocaleString('zh-Hans-CN', { timeZone: 'UTC', numberingSystem: 'hanidec' }), '一九七〇/一/一 上午一二:〇〇:〇〇');
+shouldBe(new Date(0).toLocaleString('zh-Hans-CN-u-nu-hanidec', { timeZone: 'UTC' }), $vm.icuVersion() >= 69 ? '一九七〇/一/一 〇〇:〇〇:〇〇' : '一九七〇/一/一 上午一二:〇〇:〇〇');
+shouldBe(new Date(0).toLocaleString('zh-Hans-CN', { timeZone: 'UTC', numberingSystem: 'hanidec' }), $vm.icuVersion() >= 69 ? '一九七〇/一/一 〇〇:〇〇:〇〇' : '一九七〇/一/一 上午一二:〇〇:〇〇');
 shouldBe(new Date(0).toLocaleString('en-u-ca-chinese', { timeZone: 'UTC', year: 'numeric' }), '1969(ji-you)');
 shouldBe(new Date(0).toLocaleString('en', { timeZone: 'UTC', year: 'numeric', calendar: 'chinese' }), '1969(ji-you)');
 
@@ -124,8 +124,8 @@
 // Test for DateTimeFormat behavior.
 // Test that locale parameter is passed through properly.
 shouldThrow(() => new Date().toLocaleTimeString('i'), RangeError);
-shouldBe(new Date(0).toLocaleTimeString('zh-Hans-CN-u-nu-hanidec', { timeZone: 'UTC' }), "上午一二:〇〇:〇〇");
-shouldBe(new Date(0).toLocaleTimeString('zh-Hans-CN', { timeZone: 'UTC', numberingSystem: 'hanidec' }), "上午一二:〇〇:〇〇");
+shouldBe(new Date(0).toLocaleTimeString('zh-Hans-CN-u-nu-hanidec', { timeZone: 'UTC' }), $vm.icuVersion() >= 69 ? "〇〇:〇〇:〇〇" : "上午一二:〇〇:〇〇");
+shouldBe(new Date(0).toLocaleTimeString('zh-Hans-CN', { timeZone: 'UTC', numberingSystem: 'hanidec' }), $vm.icuVersion() >= 69 ? "〇〇:〇〇:〇〇" : "上午一二:〇〇:〇〇");
 shouldBe(new Date(0).toLocaleTimeString('en-u-ca-chinese', { timeZone: 'UTC', year: 'numeric' }), '1969(ji-you), 12:00:00 AM');
 shouldBe(new Date(0).toLocaleTimeString('en', { timeZone: 'UTC', year: 'numeric', calendar: 'chinese' }), '1969(ji-you), 12:00:00 AM');

Modified: trunk/JSTests/stress/intl-canonical-locale-alias-mapping.js (286997 => 286998)


--- trunk/JSTests/stress/intl-canonical-locale-alias-mapping.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/intl-canonical-locale-alias-mapping.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -5,7 +5,7 @@
 
 if (Intl.getCanonicalLocales('tl')[0] === 'fil') {
     shouldBe(Intl.getCanonicalLocales('nb')[0], 'nb');
-    shouldBe(Intl.getCanonicalLocales('no')[0], 'nb');
+    shouldBe(Intl.getCanonicalLocales('no')[0], $vm.icuVersion() >= 69 ? 'no' : 'nb');
     shouldBe(Intl.getCanonicalLocales('iw')[0], 'he');
     shouldBe(Intl.getCanonicalLocales('prs')[0], 'fa-AF');
     shouldBe(Intl.getCanonicalLocales('swc')[0], 'sw-CD');

Modified: trunk/JSTests/stress/intl-datetimeformat-formatrange-relevant-extensions-ja.js (286997 => 286998)


--- trunk/JSTests/stress/intl-datetimeformat-formatrange-relevant-extensions-ja.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/intl-datetimeformat-formatrange-relevant-extensions-ja.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -71,7 +71,7 @@
         timeZone: 'America/Los_Angeles',
         calendar: 'chinese'
     });
-    shouldBe(fmt2.format(date1), `丙戌年11月22日 2:00`);
+    shouldBe(fmt2.format(date1), $vm.icuVersion() >= 69 ? `丙戌-11-22 2:00` : `丙戌年11月22日 2:00`);
     shouldBe(fmt2.formatRange(date1, date2), `丙戌年11月22日 2時00分～3時00分`);
     shouldBe(fmt2.formatRange(date1, date3), `丙戌年11月22日 2:00～丙戌年12月2日 2:00`);

Modified: trunk/JSTests/stress/intl-datetimeformat-formatrangetoparts-relevant-extensions-ja.js (286997 => 286998)


--- trunk/JSTests/stress/intl-datetimeformat-formatrangetoparts-relevant-extensions-ja.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/intl-datetimeformat-formatrangetoparts-relevant-extensions-ja.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -133,7 +133,7 @@
         timeZone: 'America/Los_Angeles',
         calendar: 'chinese'
     });
-    shouldBe(fmt2.format(date1), `丙戌年11月22日 2:00`);
+    shouldBe(fmt2.format(date1), $vm.icuVersion() >= 69 ? `丙戌-11-22 2:00` : `丙戌年11月22日 2:00`);
     shouldBeParts(fmt2.formatRangeToParts(date1, date2), [
         {"type":"yearName","value":"丙戌","source":"shared"},
         {"type":"literal","value":"年","source":"shared"},

Modified: trunk/JSTests/stress/intl-datetimeformat.js (286997 => 286998)


--- trunk/JSTests/stress/intl-datetimeformat.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/intl-datetimeformat.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -757,7 +757,7 @@
     shouldBe(JSON.stringify(actual), JSON.stringify(expected));
 }
 {
-    shouldBe(new Date(0).toLocaleTimeString('zh-Hans-CN', { timeZone: 'UTC', numberingSystem: 'hanidec', hour: "numeric", minute: "numeric", second: "numeric", fractionalSecondDigits: 2 }), "上午一二:〇〇:〇〇.〇〇");
+    shouldBe(new Date(0).toLocaleTimeString('zh-Hans-CN', { timeZone: 'UTC', numberingSystem: 'hanidec', hour: "numeric", minute: "numeric", second: "numeric", fractionalSecondDigits: 2 }), $vm.icuVersion() >= 69 ? "〇〇:〇〇:〇〇.〇〇" : "上午一二:〇〇:〇〇.〇〇");
 }
 {
     const dtf = new Intl.DateTimeFormat('en-AU', { timeZone: 'Australia/Melbourne', year: 'numeric' });

Modified: trunk/JSTests/stress/intl-enumeration.js (286997 => 286998)


--- trunk/JSTests/stress/intl-enumeration.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/intl-enumeration.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -26,7 +26,10 @@
 
 let numberingSystems = Intl.supportedValuesOf("numberingSystem");
 let numberingSystemsString = JSON.stringify(numberingSystems);
-shouldBe(numberingSystemsString === `["adlm","ahom","arab","arabext","bali","beng","bhks","brah","cakm","cham","deva","diak","fullwide","gong","gonm","gujr","guru","hanidec","hmng","hmnp","java","kali","khmr","knda","lana","lanatham","laoo","latn","lepc","limb","mathbold","mathdbl","mathmono","mathsanb","mathsans","mlym","modi","mong","mroo","mtei","mymr","mymrshan","mymrtlng","newa","nkoo","olck","orya","osma","rohg","saur","segment","shrd","sind",&q
 uot;sinh","sora","sund","takr","talu","tamldec","telu","thai","tibt","tirh","vaii","wara","wcho"]` || numberingSystemsString === `["adlm","ahom","arab","arabext","bali","beng","bhks","brah","cakm","cham","deva","fullwide","gong","gonm","gujr","guru","hanidec","hmng","hmnp","java","kali","khmr","knda","lana","lanatham","laoo","latn","lepc","limb","mathbold","mathdbl","mathmono","mathsanb","mathsans","mlym","modi","mong","mroo","mtei","mymr","mymrshan","m
 ymrtlng","newa","nkoo","olck","orya","osma","rohg","saur","shrd","sind","sinh","sora","sund","takr","talu","tamldec","telu","thai","tibt","tirh","vaii","wara","wcho"]`, true);
+let ns1 = `["adlm","ahom","arab","arabext","bali","beng","bhks","brah","cakm","cham","deva","diak","fullwide","gong","gonm","gujr","guru","hanidec","hmng","hmnp","java","kali","khmr","knda","lana","lanatham","laoo","latn","lepc","limb","mathbold","mathdbl","mathmono","mathsanb","mathsans","mlym","modi","mong","mroo","mtei","mymr","mymrshan","mymrtlng","newa","nkoo","olck","orya","osma","rohg","saur","segment","shrd","sind","sinh","sora&q
 uot;,"sund","takr","talu","tamldec","telu","thai","tibt","tirh","vaii","wara","wcho"]`;
+let ns2 = `["adlm","ahom","arab","arabext","bali","beng","bhks","brah","cakm","cham","deva","fullwide","gong","gonm","gujr","guru","hanidec","hmng","hmnp","java","kali","khmr","knda","lana","lanatham","laoo","latn","lepc","limb","mathbold","mathdbl","mathmono","mathsanb","mathsans","mlym","modi","mong","mroo","mtei","mymr","mymrshan","mymrtlng","newa","nkoo","olck","orya","osma","rohg","saur","shrd","sind","sinh","sora","sund","takr","tal
 u","tamldec","telu","thai","tibt","tirh","vaii","wara","wcho"]`;
+let ns3 = `["adlm","ahom","arab","arabext","bali","beng","bhks","brah","cakm","cham","deva","diak","fullwide","gong","gonm","gujr","guru","hanidec","hmng","hmnp","java","kali","khmr","knda","lana","lanatham","laoo","latn","lepc","limb","mathbold","mathdbl","mathmono","mathsanb","mathsans","mlym","modi","mong","mroo","mtei","mymr","mymrshan","mymrtlng","newa","nkoo","olck","orya","osma","rohg","saur","segment","shrd","sind","sinh","sora","
 sund","takr","talu","tamldec","telu","thai","tibt","tirh","tnsa","vaii","wara","wcho"]`; // ICU 70 adds "tnsa".
+shouldBe(numberingSystemsString === ns1 || numberingSystemsString === ns2 || numberingSystemsString === ns3, true);
 
 let timeZones = Intl.supportedValuesOf("timeZone");
 shouldBe(JSON.stringify(timeZones), `["Africa/Abidjan","Africa/Accra","Africa/Addis_Ababa","Africa/Algiers","Africa/Asmera","Africa/Bamako","Africa/Bangui","Africa/Banjul","Africa/Bissau","Africa/Blantyre","Africa/Brazzaville","Africa/Bujumbura","Africa/Cairo","Africa/Casablanca","Africa/Ceuta","Africa/Conakry","Africa/Dakar","Africa/Dar_es_Salaam","Africa/Djibouti","Africa/Douala","Africa/El_Aaiun","Africa/Freetown","Africa/Gaborone","Africa/Harare","Africa/Johannesburg","Africa/Juba","Africa/Kampala","Africa/Khartoum","Africa/Kigali","Africa/Kinshasa","Africa/Lagos","Africa/Libreville","Africa/Lome","Africa/Luanda","Af
 rica/Lubumbashi","Africa/Lusaka","Africa/Malabo","Africa/Maputo","Africa/Maseru","Africa/Mbabane","Africa/Mogadishu","Africa/Monrovia","Africa/Nairobi","Africa/Ndjamena","Africa/Niamey","Africa/Nouakchott","Africa/Ouagadougou","Africa/Porto-Novo","Africa/Sao_Tome","Africa/Tripoli","Africa/Tunis","Africa/Windhoek","America/Adak","America/Anchorage","America/Anguilla","America/Antigua","America/Araguaina","America/Argentina/La_Rioja","America/Argentina/Rio_Gallegos","America/Argentina/Salta","America/Argentina/San_Juan","America/Argentina/San_Luis","America/Argentina/Tucuman","America/Argentina/Ushuaia","America/Aruba","America/Asuncion","America/Bahia","Americ
 a/Bahia_Banderas","America/Barbados","America/Belem","America/Belize","America/Blanc-Sablon","America/Boa_Vista","America/Bogota","America/Boise","America/Buenos_Aires","America/Cambridge_Bay","America/Campo_Grande","America/Cancun","America/Caracas","America/Catamarca","America/Cayenne","America/Cayman","America/Chicago","America/Chihuahua","America/Coral_Harbour","America/Cordoba","America/Costa_Rica","America/Creston","America/Cuiaba","America/Curacao","America/Danmarkshavn","America/Dawson","America/Dawson_Creek","America/Denver","America/Detroit","America/Dominica","America/Edmonton","America/Eirunepe","America/El_Salvador","America/Fort_Nelson",&qu
 ot;America/Fortaleza","America/Glace_Bay","America/Godthab","America/Goose_Bay","America/Grand_Turk","America/Grenada","America/Guadeloupe","America/Guatemala","America/Guayaquil","America/Guyana","America/Halifax","America/Havana","America/Hermosillo","America/Indiana/Knox","America/Indiana/Marengo","America/Indiana/Petersburg","America/Indiana/Tell_City","America/Indiana/Vevay","America/Indiana/Vincennes","America/Indiana/Winamac","America/Indianapolis","America/Inuvik","America/Iqaluit","America/Jamaica","America/Jujuy","America/Juneau","America/Kentucky/Monticello","America/Kralendijk","America/La_Paz","America/Lima","America/Los_Angeles","America/Louisville","Amer
 ica/Lower_Princes","America/Maceio","America/Managua","America/Manaus","America/Marigot","America/Martinique","America/Matamoros","America/Mazatlan","America/Mendoza","America/Menominee","America/Merida","America/Metlakatla","America/Mexico_City","America/Miquelon","America/Moncton","America/Monterrey","America/Montevideo","America/Montreal","America/Montserrat","America/Nassau","America/New_York","America/Nipigon","America/Nome","America/Noronha","America/North_Dakota/Beulah","America/North_Dakota/Center","America/North_Dakota/New_Salem","America/Ojinaga","America/Panama","America/Pangnirtung","America/Paramaribo","America/Phoenix","America/Port-au-Prince","
 America/Port_of_Spain","America/Porto_Velho","America/Puerto_Rico","America/Punta_Arenas","America/Rainy_River","America/Rankin_Inlet","America/Recife","America/Regina","America/Resolute","America/Rio_Branco","America/Santa_Isabel","America/Santarem","America/Santiago","America/Santo_Domingo","America/Sao_Paulo","America/Scoresbysund","America/Sitka","America/St_Barthelemy","America/St_Johns","America/St_Kitts","America/St_Lucia","America/St_Thomas","America/St_Vincent","America/Swift_Current","America/Tegucigalpa","America/Thule","America/Thunder_Bay","America/Tijuana","America/Toronto","America/Tortola","America/Vancouver","America/Whitehorse","America/Winnipeg"
 ,"America/Yakutat","America/Yellowknife","Antarctica/Casey","Antarctica/Davis","Antarctica/DumontDUrville","Antarctica/Macquarie","Antarctica/Mawson","Antarctica/McMurdo","Antarctica/Palmer","Antarctica/Rothera","Antarctica/Syowa","Antarctica/Troll","Antarctica/Vostok","Arctic/Longyearbyen","Asia/Aden","Asia/Almaty","Asia/Amman","Asia/Anadyr","Asia/Aqtau","Asia/Aqtobe","Asia/Ashgabat","Asia/Atyrau","Asia/Baghdad","Asia/Bahrain","Asia/Baku","Asia/Bangkok","Asia/Barnaul","Asia/Beirut","Asia/Bishkek","Asia/Brunei","Asia/Calcutta","Asia/Chita","Asia/Choibalsan","Asia/Colombo","Asia/Damascus","Asia/Dhaka","Asia/Dili","A
 sia/Dubai","Asia/Dushanbe","Asia/Famagusta","Asia/Gaza","Asia/Hebron","Asia/Hong_Kong","Asia/Hovd","Asia/Irkutsk","Asia/Jakarta","Asia/Jayapura","Asia/Jerusalem","Asia/Kabul","Asia/Kamchatka","Asia/Karachi","Asia/Katmandu","Asia/Khandyga","Asia/Krasnoyarsk","Asia/Kuala_Lumpur","Asia/Kuching","Asia/Kuwait","Asia/Macau","Asia/Magadan","Asia/Makassar","Asia/Manila","Asia/Muscat","Asia/Nicosia","Asia/Novokuznetsk","Asia/Novosibirsk","Asia/Omsk","Asia/Oral","Asia/Phnom_Penh","Asia/Pontianak","Asia/Pyongyang","Asia/Qatar","Asia/Qostanay","Asia/Qyzylorda","Asia/Rangoon","Asia/Riyadh","Asia/Saigon","Asia/Sak
 halin","Asia/Samarkand","Asia/Seoul","Asia/Shanghai","Asia/Singapore","Asia/Srednekolymsk","Asia/Taipei","Asia/Tashkent","Asia/Tbilisi","Asia/Tehran","Asia/Thimphu","Asia/Tokyo","Asia/Tomsk","Asia/Ulaanbaatar","Asia/Urumqi","Asia/Ust-Nera","Asia/Vientiane","Asia/Vladivostok","Asia/Yakutsk","Asia/Yekaterinburg","Asia/Yerevan","Atlantic/Azores","Atlantic/Bermuda","Atlantic/Canary","Atlantic/Cape_Verde","Atlantic/Faeroe","Atlantic/Madeira","Atlantic/Reykjavik","Atlantic/South_Georgia","Atlantic/St_Helena","Atlantic/Stanley","Australia/Adelaide","Australia/Brisbane","Australia/Broken_Hill","Australia/Currie","Australia/Darwin","Austr
 alia/Eucla","Australia/Hobart","Australia/Lindeman","Australia/Lord_Howe","Australia/Melbourne","Australia/Perth","Australia/Sydney","Europe/Amsterdam","Europe/Andorra","Europe/Astrakhan","Europe/Athens","Europe/Belgrade","Europe/Berlin","Europe/Bratislava","Europe/Brussels","Europe/Bucharest","Europe/Budapest","Europe/Busingen","Europe/Chisinau","Europe/Copenhagen","Europe/Dublin","Europe/Gibraltar","Europe/Guernsey","Europe/Helsinki","Europe/Isle_of_Man","Europe/Istanbul","Europe/Jersey","Europe/Kaliningrad","Europe/Kiev","Europe/Kirov","Europe/Lisbon","Europe/Ljubljana","Europe/London","Europe/Luxembourg","Europe/Madrid","Europe/Malta&q
 uot;,"Europe/Mariehamn","Europe/Minsk","Europe/Monaco","Europe/Moscow","Europe/Oslo","Europe/Paris","Europe/Podgorica","Europe/Prague","Europe/Riga","Europe/Rome","Europe/Samara","Europe/San_Marino","Europe/Sarajevo","Europe/Saratov","Europe/Simferopol","Europe/Skopje","Europe/Sofia","Europe/Stockholm","Europe/Tallinn","Europe/Tirane","Europe/Ulyanovsk","Europe/Uzhgorod","Europe/Vaduz","Europe/Vatican","Europe/Vienna","Europe/Vilnius","Europe/Volgograd","Europe/Warsaw","Europe/Zagreb","Europe/Zaporozhye","Europe/Zurich","Indian/Antananarivo","Indian/Chagos","Indian/Christmas","Indian/Cocos","Indian/Comoro","Indian/Kerguelen&
 quot;,"Indian/Mahe","Indian/Maldives","Indian/Mauritius","Indian/Mayotte","Indian/Reunion","Pacific/Apia","Pacific/Auckland","Pacific/Bougainville","Pacific/Chatham","Pacific/Easter","Pacific/Efate","Pacific/Enderbury","Pacific/Fakaofo","Pacific/Fiji","Pacific/Funafuti","Pacific/Galapagos","Pacific/Gambier","Pacific/Guadalcanal","Pacific/Guam","Pacific/Honolulu","Pacific/Johnston","Pacific/Kiritimati","Pacific/Kosrae","Pacific/Kwajalein","Pacific/Majuro","Pacific/Marquesas","Pacific/Midway","Pacific/Nauru","Pacific/Niue","Pacific/Norfolk","Pacific/Noumea","Pacific/Pago_Pago","Pacific/Palau","Pacific/Pitcairn","Pacific/Ponape","Pacific
 /Port_Moresby","Pacific/Rarotonga","Pacific/Saipan","Pacific/Tahiti","Pacific/Tarawa","Pacific/Tongatapu","Pacific/Truk","Pacific/Wake","Pacific/Wallis","UTC"]`);

Modified: trunk/JSTests/stress/intl-locale-info.js (286997 => 286998)


--- trunk/JSTests/stress/intl-locale-info.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/intl-locale-info.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -80,7 +80,7 @@
     let locale = new Intl.Locale("zh")
     shouldBe(JSON.stringify(locale.calendars), `["gregory","chinese"]`);
     shouldBe(JSON.stringify(locale.collations), `["pinyin","big5han","gb2312","stroke","unihan","zhuyin","emoji","eor"]`);
-    shouldBe(JSON.stringify(locale.hourCycles), `["h12"]`);
+    shouldBe(JSON.stringify(locale.hourCycles), $vm.icuVersion() >= 69 ? `["h23"]` : `["h12"]`);
     shouldBe(JSON.stringify(locale.numberingSystems), `["latn"]`);
     shouldBe(locale.timeZones, undefined);
 }

Modified: trunk/JSTests/stress/intl-locale.js (286997 => 286998)


--- trunk/JSTests/stress/intl-locale.js	2021-12-14 01:06:05 UTC (rev 286997)
+++ trunk/JSTests/stress/intl-locale.js	2021-12-14 01:38:11 UTC (rev 286998)
@@ -152,7 +152,7 @@
         ? 'en-Latn-US-1abc-foobar-variant-a-aa-aaa-u-kn-x-reserved'
         : 'en-Latn-US-variant-foobar-1abc-a-aa-aaa-u-kn-x-reserved'
 );
-shouldBe(new Intl.Locale('cel-gaulish', { script: 'Arab', numberingSystem: 'gujr' }).toString(), 'xtg-Arab-u-nu-gujr-x-cel-gaulish');
+shouldBe(new Intl.Locale('cel-gaulish', { script: 'Arab', numberingSystem: 'gujr' }).toString(), $vm.icuVersion() >= 69 ? 'xtg-Arab-u-nu-gujr' : 'xtg-Arab-u-nu-gujr-x-cel-gaulish');
 shouldBe(new Intl.Locale('en-Latn-US-u-ca-gregory-co-phonebk-hc-h12-kf-upper-kn-false-nu-latn').toString(), 'en-Latn-US-u-ca-gregory-co-phonebk-hc-h12-kf-upper-kn-false-nu-latn');
 
 const options = {

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to