Attachment 361191 Details for Bug 193620 – Patch

[patch] Patch

bug-193620-20190205091759.patch (text/plain), 11.93 KB, created by Andy VanWagoner on 2019-02-05 08:18:00 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Andy VanWagoner

Created: 2019-02-05 08:18:00 PST

Size: 11.93 KB

patch

obsolete

>Subversion Revision: 240936
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c48cbd51a1ff7868fc8500a2ae1438369be2cff5..5d5168d554be4e9940757cac91d2e5901ac11bd2 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-04  Andy VanWagoner  <andy@vanwagoner.family>
>+
>+        REGRESSION(r238848): ICU upgrade broke jsc-layout-tests.yaml/js/script-tests/intl-numberformat.js.layout
>+        https://bugs.webkit.org/show_bug.cgi?id=193620
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update NumberFormat tests to be more tolerant of ICU version differences.
>+
>+        * js/intl-numberformat-expected.txt:
>+        * js/script-tests/intl-numberformat.js:
>+        * platform/gtk/TestExpectations:
>+
> 2019-02-04  Frederic Wang  <fwang@igalia.com>
> 
>         [css-scroll-snap] scroll-snap-align not honored on child with non-visible overflow
>diff --git a/LayoutTests/js/intl-numberformat-expected.txt b/LayoutTests/js/intl-numberformat-expected.txt
>index a6163969727f8e9d40a05bbc92e79d8b66f16973..62b5da7a2396faa711d61e6c2100bfa93e4f79a8 100644
>--- a/LayoutTests/js/intl-numberformat-expected.txt
>+++ b/LayoutTests/js/intl-numberformat-expected.txt
>@@ -203,10 +203,10 @@ PASS Intl.NumberFormat('en').format(-Infinity) is '-â'
> PASS Intl.NumberFormat('en').format(0) is '0'
> PASS Intl.NumberFormat('en').format(-0) is '0'
> PASS Intl.NumberFormat('en').format(Number.MIN_VALUE) is '0'
>-PASS Intl.NumberFormat('en').format(Number.MAX_VALUE) is '179,769,313,486,232,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000'
>+PASS Intl.NumberFormat('en', { maximumSignificantDigits: 15 }).format(Number.MAX_VALUE) is '179,769,313,486,232,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000'
> PASS Intl.NumberFormat('en').format(1234.567) is '1,234.567'
> PASS Intl.NumberFormat('es').format(1234.567) is '1.234,567'
>-PASS Intl.NumberFormat('fr').format(1234.567) is '1\xA0234,567'
>+PASS Intl.NumberFormat('de').format(1234.567) is '1.234,567'
> PASS Intl.NumberFormat('en-u-nu-latn').format(1234.567) is '1,234.567'
> PASS Intl.NumberFormat('en-u-nu-fullwide').format(1234.567) is 'ï¼,ï¼ï¼ï¼.ï¼ï¼ï¼'
> PASS Intl.NumberFormat('th-u-nu-thai').format(1234.567) is 'à¹,à¹à¹à¹.à¹à¹à¹'
>@@ -217,14 +217,14 @@ PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(4.2) i
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(4) is '$4.00'
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(4.2) is '$4.20'
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(-4.2) is '-$4.20'
>-PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(NaN) is 'NaN'
>+PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(NaN).includes('NaN') is true
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(Infinity) is '$â'
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'JPY'}).format(4.2) is 'Â¥4'
>-PASS Intl.NumberFormat('en', {style: 'currency', currency: 'xXx'}).format(4.2) is 'XXX4.20'
>-PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD', currencyDisplay: 'code'}).format(4) is 'USD4.00'
>+PASS Intl.NumberFormat('en', {style: 'currency', currency: 'xXx', currencyDisplay: 'code'}).format(4.2).includes('XXX') is true
>+PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD', currencyDisplay: 'code'}).format(4).includes('USD') is true
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD', currencyDisplay: 'symbol'}).format(4) is '$4.00'
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'USD', currencyDisplay: 'name'}).format(4) is '4.00 US dollars'
>-PASS Intl.NumberFormat('en', {style: 'currency', currency: 'JPY', currencyDisplay: 'code'}).format(-4.2) is '-JPY4'
>+PASS Intl.NumberFormat('en', {style: 'currency', currency: 'JPY', currencyDisplay: 'code'}).format(-4.2).includes('JPY') is true
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'JPY', currencyDisplay: 'symbol'}).format(-4.2) is '-Â¥4'
> PASS Intl.NumberFormat('en', {style: 'currency', currency: 'JPY', currencyDisplay: 'name'}).format(-4.2) is '-4 Japanese yen'
> PASS Intl.NumberFormat('fr', {style: 'currency', currency: 'USD', currencyDisplay: 'name'}).format(4) is '4,00 dollars des Ãtats-Unis'
>@@ -250,10 +250,10 @@ PASS Intl.NumberFormat('en', {maximumSignificantDigits: 4}).format(0.1234567) is
> PASS Intl.NumberFormat('en', {maximumSignificantDigits: 4}).format(1234567) is '1,235,000'
> PASS Intl.NumberFormat('en', {useGrouping: true}).format(1234567.123) is '1,234,567.123'
> PASS Intl.NumberFormat('es', {useGrouping: true}).format(1234567.123) is '1.234.567,123'
>-PASS Intl.NumberFormat('fr', {useGrouping: true}).format(1234567.123) is '1\xA0234\xA0567,123'
>+PASS Intl.NumberFormat('de', {useGrouping: true}).format(1234567.123) is '1.234.567,123'
> PASS Intl.NumberFormat('en', {useGrouping: false}).format(1234567.123) is '1234567.123'
> PASS Intl.NumberFormat('es', {useGrouping: false}).format(1234567.123) is '1234567,123'
>-PASS Intl.NumberFormat('fr', {useGrouping: false}).format(1234567.123) is '1234567,123'
>+PASS Intl.NumberFormat('de', {useGrouping: false}).format(1234567.123) is '1234567,123'
> PASS Intl.NumberFormat.prototype.resolvedOptions.length is 0
> PASS defaultNFormat.resolvedOptions() is an instance of Object
> PASS defaultNFormat.resolvedOptions() === defaultNFormat.resolvedOptions() is false
>diff --git a/LayoutTests/js/script-tests/intl-numberformat.js b/LayoutTests/js/script-tests/intl-numberformat.js
>index 52890e8b33af74864b668878404c4b9a507ac839..ebd32a8c29f2f330b2df35478b9c16e4dcf1f3ea 100644
>--- a/LayoutTests/js/script-tests/intl-numberformat.js
>+++ b/LayoutTests/js/script-tests/intl-numberformat.js
>@@ -318,12 +318,12 @@ shouldBe("Intl.NumberFormat('en').format(-Infinity)", "'-â'");
> shouldBe("Intl.NumberFormat('en').format(0)", "'0'");
> shouldBe("Intl.NumberFormat('en').format(-0)", "'0'");
> shouldBe("Intl.NumberFormat('en').format(Number.MIN_VALUE)", "'0'");
>-shouldBe("Intl.NumberFormat('en').format(Number.MAX_VALUE)", "'179,769,313,486,232,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000'");
>+shouldBe("Intl.NumberFormat('en', { maximumSignificantDigits: 15 }).format(Number.MAX_VALUE)", "'179,769,313,486,232,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000'");
> 
> // Test locales.
> shouldBe("Intl.NumberFormat('en').format(1234.567)", "'1,234.567'");
> shouldBe("Intl.NumberFormat('es').format(1234.567)", "'1.234,567'");
>-shouldBe("Intl.NumberFormat('fr').format(1234.567)", "'1\\xA0234,567'");
>+shouldBe("Intl.NumberFormat('de').format(1234.567)", "'1.234,567'");
> 
> // Test numbering systems.
> shouldBe("Intl.NumberFormat('en-u-nu-latn').format(1234.567)", "'1,234.567'");
>@@ -340,16 +340,16 @@ shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(4
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(4)", "'$4.00'");
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(4.2)", "'$4.20'");
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(-4.2)", "'-$4.20'");
>-shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(NaN)", "'NaN'");
>+shouldBeTrue("Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(NaN).includes('NaN')");
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD'}).format(Infinity)", "'$â'");
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'JPY'}).format(4.2)", "'Â¥4'");
>-shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'xXx'}).format(4.2)", "'XXX4.20'");
> 
> // Test the currencyDisplay option.
>-shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD', currencyDisplay: 'code'}).format(4)", "'USD4.00'");
>+shouldBeTrue("Intl.NumberFormat('en', {style: 'currency', currency: 'xXx', currencyDisplay: 'code'}).format(4.2).includes('XXX')");
>+shouldBeTrue("Intl.NumberFormat('en', {style: 'currency', currency: 'USD', currencyDisplay: 'code'}).format(4).includes('USD')");
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD', currencyDisplay: 'symbol'}).format(4)", "'$4.00'");
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'USD', currencyDisplay: 'name'}).format(4)", "'4.00 US dollars'");
>-shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'JPY', currencyDisplay: 'code'}).format(-4.2)", "'-JPY4'");
>+shouldBeTrue("Intl.NumberFormat('en', {style: 'currency', currency: 'JPY', currencyDisplay: 'code'}).format(-4.2).includes('JPY')");
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'JPY', currencyDisplay: 'symbol'}).format(-4.2)", "'-Â¥4'");
> shouldBe("Intl.NumberFormat('en', {style: 'currency', currency: 'JPY', currencyDisplay: 'name'}).format(-4.2)", "'-4 Japanese yen'");
> shouldBe("Intl.NumberFormat('fr', {style: 'currency', currency: 'USD', currencyDisplay: 'name'}).format(4)", "'4,00 dollars des Ãtats-Unis'");
>@@ -387,10 +387,10 @@ shouldBe("Intl.NumberFormat('en', {maximumSignificantDigits: 4}).format(1234567)
> // Test the useGrouping option.
> shouldBe("Intl.NumberFormat('en', {useGrouping: true}).format(1234567.123)", "'1,234,567.123'");
> shouldBe("Intl.NumberFormat('es', {useGrouping: true}).format(1234567.123)", "'1.234.567,123'");
>-shouldBe("Intl.NumberFormat('fr', {useGrouping: true}).format(1234567.123)", "'1\\xA0234\\xA0567,123'");
>+shouldBe("Intl.NumberFormat('de', {useGrouping: true}).format(1234567.123)", "'1.234.567,123'");
> shouldBe("Intl.NumberFormat('en', {useGrouping: false}).format(1234567.123)", "'1234567.123'");
> shouldBe("Intl.NumberFormat('es', {useGrouping: false}).format(1234567.123)", "'1234567,123'");
>-shouldBe("Intl.NumberFormat('fr', {useGrouping: false}).format(1234567.123)", "'1234567,123'");
>+shouldBe("Intl.NumberFormat('de', {useGrouping: false}).format(1234567.123)", "'1234567,123'");
> 
> // 11.3.5 Intl.NumberFormat.prototype.resolvedOptions ()
> 
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index eb9863b4f39ea081e9344be37f49ec168bf45051..9f9f1007f70b70d5cd9846c3067ef82c97baffc2 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -1205,9 +1205,6 @@ webkit.org/b/190738 imported/w3c/web-platform-tests/encrypted-media/resources/cl
> http/wpt/mediarecorder [ Skip ]
> imported/w3c/web-platform-tests/mediacapture-record [ Skip ]
> 
>-# This test requires an older version of ICU than we use
>-webkit.org/b/193620 js/intl-numberformat.html [ Failure ]
>-
> # This tests were moved on r187990 from platform/ios-simulator/ios/fast/events/touch
> webkit.org/b/148940 fast/events/touch/document-create-touch-list-ios.html [ Skip ]
> webkit.org/b/148940 fast/events/touch/gesture-event-basic.html [ Skip ]

Actions: View | Formatted Diff | Diff

Attachments on bug 193620: 361093 | 361191