Diff
Modified: trunk/LayoutTests/ChangeLog (225058 => 225059)
--- trunk/LayoutTests/ChangeLog 2017-11-21 00:58:14 UTC (rev 225058)
+++ trunk/LayoutTests/ChangeLog 2017-11-21 01:24:37 UTC (rev 225059)
@@ -1,3 +1,16 @@
+2017-11-20 Andy VanWagoner <[email protected]>
+
+ Layout Test js/intl-datetimeformat.html is failing on High Sierra (GMT vs. UTC)
+ https://bugs.webkit.org/show_bug.cgi?id=179208
+
+ Reviewed by Darin Adler.
+
+ Use time zones that are unambiguous in datetimeformat tests.
+
+ * js/intl-datetimeformat-expected.txt:
+ * js/script-tests/intl-datetimeformat.js:
+ * platform/mac/TestExpectations:
+
2017-11-20 Michael Catanzaro <[email protected]>
Unreviewed GTK test gardening
Modified: trunk/LayoutTests/js/intl-datetimeformat-expected.txt (225058 => 225059)
--- trunk/LayoutTests/js/intl-datetimeformat-expected.txt 2017-11-21 00:58:14 UTC (rev 225058)
+++ trunk/LayoutTests/js/intl-datetimeformat-expected.txt 2017-11-21 01:24:37 UTC (rev 225059)
@@ -375,9 +375,9 @@
PASS Intl.DateTimeFormat('en', { timeZoneName:'name' }) threw exception RangeError: timeZoneName must be "short" or "long".
PASS Intl.DateTimeFormat('en').resolvedOptions().timeZoneName is undefined
PASS Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short' }).resolvedOptions().timeZoneName is 'short'
-PASS Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short', timeZone: 'UTC' }).format(0) is '12:00 AM GMT'
+PASS Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short', timeZone: 'America/Los_Angeles' }).format(0) is '4:00 PM PST'
PASS Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long' }).resolvedOptions().timeZoneName is 'long'
-PASS ['00:00 GMT','00:00 Horário do Meridiano de Greenwich'].includes(Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long', timeZone: 'UTC' }).format(0)) is true
+PASS Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long', timeZone: 'america/sao_paulo' }).format(0) is '21:00 Horário Padrão de Brasília'
PASS
var options = { weekday: "short", year: "numeric", month: "short", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric" };
var resolved = Intl.DateTimeFormat("ar", options).resolvedOptions();
@@ -2182,17 +2182,17 @@
Intl.DateTimeFormat("pt-BR", {
hour: "numeric", minute: "numeric", second: "numeric",
year: "numeric", month: "numeric", day: "numeric",
- timeZoneName: "short", era: "short", timeZone: "UTC"
+ timeZoneName: "short", era: "short", timeZone: "America/Sao_Paulo"
}).formatToParts(0).filter((part) => (part.type !== "literal"))
) is JSON.stringify([
- {"type":"day","value":"1"},
- {"type":"month","value":"1"},
- {"type":"year","value":"1970"},
+ {"type":"day","value":"31"},
+ {"type":"month","value":"12"},
+ {"type":"year","value":"1969"},
{"type":"era","value":"d.C."},
- {"type":"hour","value":"00"},
+ {"type":"hour","value":"21"},
{"type":"minute","value":"00"},
{"type":"second","value":"00"},
- {"type":"timeZoneName","value":"GMT"}
+ {"type":"timeZoneName","value":"BRT"}
])
PASS Intl.DateTimeFormat("ar", { weekday: "short", year: "numeric", month: "short", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric" }).formatToParts() is an instance of Array
PASS Intl.DateTimeFormat("ar", { weekday: "short", year: "numeric", month: "short", day: "numeric" }).formatToParts() is an instance of Array
@@ -2555,28 +2555,28 @@
Intl.DateTimeFormat('en-US', {
hour: "numeric", minute: "numeric", second: "numeric",
year: "numeric", month: "long", day: "numeric", weekday: "long",
- timeZoneName: "short", era: "long", timeZone: "UTC"
+ timeZoneName: "long", era: "long", timeZone: "America/Los_Angeles"
}).formatToParts(0)
) is JSON.stringify([
- {"type":"weekday","value":"Thursday"},
+ {"type":"weekday","value":"Wednesday"},
{"type":"literal","value":", "},
- {"type":"month","value":"January"},
+ {"type":"month","value":"December"},
{"type":"literal","value":" "},
- {"type":"day","value":"1"},
+ {"type":"day","value":"31"},
{"type":"literal","value":", "},
- {"type":"year","value":"1970"},
+ {"type":"year","value":"1969"},
{"type":"literal","value":" "},
{"type":"era","value":"Anno Domini"},
{"type":"literal","value":", "},
- {"type":"hour","value":"12"},
+ {"type":"hour","value":"4"},
{"type":"literal","value":":"},
{"type":"minute","value":"00"},
{"type":"literal","value":":"},
{"type":"second","value":"00"},
{"type":"literal","value":" "},
- {"type":"dayPeriod","value":"AM"},
+ {"type":"dayPeriod","value":"PM"},
{"type":"literal","value":" "},
- {"type":"timeZoneName","value":"GMT"}
+ {"type":"timeZoneName","value":"Pacific Standard Time"}
])
PASS successfullyParsed is true
Modified: trunk/LayoutTests/js/script-tests/intl-datetimeformat.js (225058 => 225059)
--- trunk/LayoutTests/js/script-tests/intl-datetimeformat.js 2017-11-21 00:58:14 UTC (rev 225058)
+++ trunk/LayoutTests/js/script-tests/intl-datetimeformat.js 2017-11-21 01:24:37 UTC (rev 225059)
@@ -459,9 +459,9 @@
shouldThrow("Intl.DateTimeFormat('en', { timeZoneName:'name' })", '\'RangeError: timeZoneName must be "short" or "long"\'');
shouldBe("Intl.DateTimeFormat('en').resolvedOptions().timeZoneName", "undefined");
shouldBe("Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short' }).resolvedOptions().timeZoneName", "'short'");
-shouldBe("Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short', timeZone: 'UTC' }).format(0)", "'12:00 AM GMT'");
+shouldBe("Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short', timeZone: 'America/Los_Angeles' }).format(0)", "'4:00 PM PST'");
shouldBe("Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long' }).resolvedOptions().timeZoneName", "'long'");
-shouldBeTrue("['00:00 GMT','00:00 Horário do Meridiano de Greenwich'].includes(Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long', timeZone: 'UTC' }).format(0))");
+shouldBe("Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long', timeZone: 'america/sao_paulo' }).format(0)", "'21:00 Horário Padrão de Brasília'");
let localesSample = [
"ar", "ar-SA", "be", "ca", "cs", "da", "de", "de-CH", "en", "en-AU", "en-GB",
@@ -542,17 +542,17 @@
Intl.DateTimeFormat("pt-BR", {
hour: "numeric", minute: "numeric", second: "numeric",
year: "numeric", month: "numeric", day: "numeric",
- timeZoneName: "short", era: "short", timeZone: "UTC"
+ timeZoneName: "short", era: "short", timeZone: "America/Sao_Paulo"
}).formatToParts(0).filter((part) => (part.type !== "literal"))
)`, `JSON.stringify([
- {"type":"day","value":"1"},
- {"type":"month","value":"1"},
- {"type":"year","value":"1970"},
+ {"type":"day","value":"31"},
+ {"type":"month","value":"12"},
+ {"type":"year","value":"1969"},
{"type":"era","value":"d.C."},
- {"type":"hour","value":"00"},
+ {"type":"hour","value":"21"},
{"type":"minute","value":"00"},
{"type":"second","value":"00"},
- {"type":"timeZoneName","value":"GMT"}
+ {"type":"timeZoneName","value":"BRT"}
])`);
for (let locale of localesSample) {
@@ -578,27 +578,27 @@
Intl.DateTimeFormat('en-US', {
hour: "numeric", minute: "numeric", second: "numeric",
year: "numeric", month: "long", day: "numeric", weekday: "long",
- timeZoneName: "short", era: "long", timeZone: "UTC"
+ timeZoneName: "long", era: "long", timeZone: "America/Los_Angeles"
}).formatToParts(0)
)`, `JSON.stringify([
- {"type":"weekday","value":"Thursday"},
+ {"type":"weekday","value":"Wednesday"},
{"type":"literal","value":", "},
- {"type":"month","value":"January"},
+ {"type":"month","value":"December"},
{"type":"literal","value":" "},
- {"type":"day","value":"1"},
+ {"type":"day","value":"31"},
{"type":"literal","value":", "},
- {"type":"year","value":"1970"},
+ {"type":"year","value":"1969"},
{"type":"literal","value":" "},
{"type":"era","value":"Anno Domini"},
{"type":"literal","value":", "},
- {"type":"hour","value":"12"},
+ {"type":"hour","value":"4"},
{"type":"literal","value":":"},
{"type":"minute","value":"00"},
{"type":"literal","value":":"},
{"type":"second","value":"00"},
{"type":"literal","value":" "},
- {"type":"dayPeriod","value":"AM"},
+ {"type":"dayPeriod","value":"PM"},
{"type":"literal","value":" "},
- {"type":"timeZoneName","value":"GMT"}
+ {"type":"timeZoneName","value":"Pacific Standard Time"}
])`)
Modified: trunk/LayoutTests/platform/mac/TestExpectations (225058 => 225059)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-11-21 00:58:14 UTC (rev 225058)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-11-21 01:24:37 UTC (rev 225059)
@@ -1745,8 +1745,6 @@
[ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-createMediaKeys.html [ Skip ]
[ ElCapitan Sierra ] platform/mac/media/encrypted-media/fps-requestMediaKeySystemAccess.html [ Skip ]
-webkit.org/b/179208 [ HighSierra+ ] js/intl-datetimeformat.html [ Failure ]
-
# rdar://problem/35395437
[ HighSierra+ ] imported/w3c/web-platform-tests/media-source/mediasource-play.html [ Failure ]
[ HighSierra+ ] imported/w3c/web-platform-tests/media-source/mediasource-redundant-seek.html [ Failure ]