Changeset 286998 in webkit

Timestamp:

Dec 13, 2021, 5:38:11 PM (5 years ago)

Author:

ysuzuki@apple.com

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:

Location:

trunk/JSTests

Files:

• ChangeLog (modified) (1 diff)
• stress/array-toLocaleString.js (modified) (1 diff)
• stress/date-toLocaleString.js (modified) (2 diffs)
• stress/intl-canonical-locale-alias-mapping.js (modified) (1 diff)
• stress/intl-datetimeformat-formatrange-relevant-extensions-ja.js (modified) (1 diff)
• stress/intl-datetimeformat-formatrangetoparts-relevant-extensions-ja.js (modified) (1 diff)
• stress/intl-datetimeformat.js (modified) (1 diff)
• stress/intl-enumeration.js (modified) (1 diff)
• stress/intl-locale-info.js (modified) (1 diff)
• stress/intl-locale.js (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-12-13  Yusuke Suzuki  <ysuzuki@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  <ysuzuki@apple.com>
 

trunk/JSTests/stress/array-toLocaleString.js

@@ -39 +39 @@
 // 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,一九七〇/一/一 上午一二:〇〇:〇〇');

trunk/JSTests/stress/date-toLocaleString.js

@@ -45 +45 @@
 // 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)');
@@ -125 +125 @@
 // 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');

trunk/JSTests/stress/intl-canonical-locale-alias-mapping.js

@@ -6 +6 @@
 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');

trunk/JSTests/stress/intl-datetimeformat-formatrange-relevant-extensions-ja.js

@@ -72 +72 @@
         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`);

trunk/JSTests/stress/intl-datetimeformat-formatrangetoparts-relevant-extensions-ja.js

@@ -134 +134 @@
         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"},

trunk/JSTests/stress/intl-datetimeformat.js

@@ -758 +758 @@
 }
 {
-    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 ? "〇〇:〇〇:〇〇.〇〇" : "上午一二:〇〇:〇〇.〇〇");
 }
 {

trunk/JSTests/stress/intl-enumeration.js

@@ -27 +27 @@
 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","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","mymrtlng","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","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","talu","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");

trunk/JSTests/stress/intl-locale-info.js

@@ -81 +81 @@
     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);

trunk/JSTests/stress/intl-locale.js

@@ -153 +153 @@
         : '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');