Changeset 292481 in webkit

Timestamp:

Apr 6, 2022 11:21:47 AM (2 years ago)

Author:

Alexey Shvayka

Message:

ICU was recently updated to use type="long" format if there is {month: "long"}
​https://bugs.webkit.org/show_bug.cgi?id=238852
<rdar://90462186>

Reviewed by Saam Barati.

Since this update [1] is not yet released, we can't set expectations based on major / minor
ICU version, this patch loosens the tests to accept either of the format types.

[1]: ​https://github.com/unicode-org/icu/commit/23081486ffec0973b01e66e2cbad93a1a7dec267

• stress/date-toLocaleString.js:
• stress/intl-datetimeformat.js:

Location:

trunk/JSTests

Files:

• ChangeLog (modified) (1 diff)
• stress/date-toLocaleString.js (modified) (1 diff)
• stress/intl-datetimeformat.js (modified) (4 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2022-04-06  Alexey Shvayka  <ashvayka@apple.com>
+
+        ICU was recently updated to use type="long" format if there is {month: "long"}
+        https://bugs.webkit.org/show_bug.cgi?id=238852
+        <rdar://90462186>
+
+        Reviewed by Saam Barati.
+
+        Since this update [1] is not yet released, we can't set expectations based on major / minor
+        ICU version, this patch loosens the tests to accept either of the format types.
+
+        [1]: https://github.com/unicode-org/icu/commit/23081486ffec0973b01e66e2cbad93a1a7dec267
+
+        * stress/date-toLocaleString.js:
+        * stress/intl-datetimeformat.js:
+
 2022-04-01  Angelos Oikonomopoulos  <angelos@igalia.com>
 

trunk/JSTests/stress/date-toLocaleString.js

@@ -138 +138 @@
 shouldBe(new Date(0).toLocaleTimeString('en', { timeZone: 'UTC', hour: 'numeric', minute: '2-digit' }), '12:00 AM');
 // Adds hms if no time formats specified.
-shouldBe(new Date(0).toLocaleTimeString('en', { timeZone: 'UTC', year: 'numeric', month: 'long' }), 'January 1970, 12:00:00 AM');
+// See https://bugs.webkit.org/show_bug.cgi?id=238852
+const monthLongTimeString = new Date(0).toLocaleTimeString('en', { timeZone: 'UTC', year: 'numeric', month: 'long' });
+if (monthLongTimeString !== 'January 1970, 12:00:00 AM' &&
+    monthLongTimeString !== 'January 1970 at 12:00:00 AM')
+    throw new Error(`Unexpected time string for {month: 'long'}: ${monthLongTimeString}`);

trunk/JSTests/stress/intl-datetimeformat.js

@@ -637 +637 @@
 
 // Exceed the 32 character default buffer size
-shouldBe(
+const actualMonthLongParts =
     JSON.stringify(
         Intl.DateTimeFormat('en-US', {
@@ -644 +644 @@
             timeZoneName: 'long', era: 'long', timeZone: 'America/Los_Angeles'
         }).formatToParts(0)
-    ),
+    );
+
+const getExpectedMonthLongParts = separator => (
     JSON.stringify([
         { type: 'weekday', value: 'Wednesday' },
@@ -655 +657 @@
         { type: 'literal', value: ' ' },
         { type: 'era', value: 'Anno Domini' },
-        { type: 'literal', value: ', ' },
+        { type: 'literal', value: separator },
         { type: 'hour', value: '4' },
         { type: 'literal', value: ':' },
@@ -667 +669 @@
     ])
 );
+
+// See https://bugs.webkit.org/show_bug.cgi?id=238852
+if (actualMonthLongParts !== getExpectedMonthLongParts(', ') && actualMonthLongParts !== getExpectedMonthLongParts(' at '))
+    throw new Error(`Unexpected format parts for {month: 'long'}: ${actualMonthLongParts}`);
 
 // Tests for relativeYear and yearName