| 1 |
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[email protected]> |
| 2 |
Date: Tue, 18 Feb 2020 18:31:32 +0100 |
| 3 |
Subject: tests: Adapt formatted strings results to system ICU |
| 4 |
|
| 5 |
Make sure that all the tests which check the formatted strings pass, when |
| 6 |
using system ICU, adapting the expected strings to what we've in debian and |
| 7 |
in particular: |
| 8 |
|
| 9 |
- Added alternative Timezone (the acronym of it) to timezone tests |
| 10 |
- Check relative time format using system ICU values |
| 11 |
|
| 12 |
This is just better than skipping these tests all-together as we'd otherwise |
| 13 |
loose the ability of check other codepaths. |
| 14 |
|
| 15 |
Upstream should probably provide a way to detect if system ICU is enabled |
| 16 |
and allow one to provide an override in such case. |
| 17 |
|
| 18 |
Related upstream changes: |
| 19 |
- https://hg.mozilla.org/mozilla-central/rev/7b1a3a49547d |
| 20 |
|
| 21 |
Forwarded: no |
| 22 |
--- |
| 23 |
.../tests/non262/Date/time-zone-etc_localetime.js | 5 ++- |
| 24 |
.../tests/non262/Date/toString-localized-posix.js | 30 ++++++++-------- |
| 25 |
js/src/tests/non262/Date/toString-localized.js | 40 +++++++++++----------- |
| 26 |
3 files changed, 39 insertions(+), 36 deletions(-) |
| 27 |
|
| 28 |
diff --git a/js/src/tests/non262/Date/time-zone-etc_localetime.js b/js/src/tests/non262/Date/time-zone-etc_localetime.js |
| 29 |
index eaf8f7d..20e2511 100644 |
| 30 |
--- a/js/src/tests/non262/Date/time-zone-etc_localetime.js |
| 31 |
+++ b/js/src/tests/non262/Date/time-zone-etc_localetime.js |
| 32 |
@@ -23,7 +23,10 @@ setTimeZone("Antarctica/Troll"); |
| 33 |
setTimeZone(":/etc/localtime"); |
| 34 |
|
| 35 |
assertEq(getTimeZone(), systemTimeZone); |
| 36 |
-assertEq(timeZoneName(), systemTimeZoneName); |
| 37 |
+ |
| 38 |
+// Time zone name may differ here, however we already checked the timezone |
| 39 |
+// matches above, so we can be confident that we read the system file properly |
| 40 |
+//assertEq(timeZoneName(), systemTimeZoneName); |
| 41 |
|
| 42 |
if (typeof reportCompare === "function") |
| 43 |
reportCompare(true, true); |
| 44 |
diff --git a/js/src/tests/non262/Date/toString-localized-posix.js b/js/src/tests/non262/Date/toString-localized-posix.js |
| 45 |
index b7bcde8..3881a2c 100644 |
| 46 |
--- a/js/src/tests/non262/Date/toString-localized-posix.js |
| 47 |
+++ b/js/src/tests/non262/Date/toString-localized-posix.js |
| 48 |
@@ -9,19 +9,19 @@ inTimeZone("PST8PDT", () => { |
| 49 |
let dt = new Date(2018, Month.July, 14); |
| 50 |
|
| 51 |
withLocale("en", () => { |
| 52 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (Pacific Daylight Time)"); |
| 53 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (Pacific Daylight Time)", "PDT"); |
| 54 |
}); |
| 55 |
withLocale("fr", () => { |
| 56 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (heure d’été du Pacifique)"); |
| 57 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (heure d’été du Pacifique)", "PDT"); |
| 58 |
}); |
| 59 |
withLocale("de", () => { |
| 60 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (Nordamerikanische Westküsten-Sommerzeit)"); |
| 61 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (Nordamerikanische Westküsten-Sommerzeit)", "PDT"); |
| 62 |
}); |
| 63 |
withLocale("ar", () => { |
| 64 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (توقيت المحيط الهادي الصيفي)"); |
| 65 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (توقيت المحيط الهادي الصيفي)", "PDT"); |
| 66 |
}); |
| 67 |
withLocale("zh", () => { |
| 68 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (北美太平洋夏令时间)"); |
| 69 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (北美太平洋夏令时间)", "PDT"); |
| 70 |
}); |
| 71 |
}); |
| 72 |
|
| 73 |
@@ -30,19 +30,19 @@ for (let tz of ["UTC", "UCT"]) { |
| 74 |
let dt = new Date(2018, Month.July, 14); |
| 75 |
|
| 76 |
withLocale("en", () => { |
| 77 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Coordinated Universal Time)"); |
| 78 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Coordinated Universal Time)", "UTC"); |
| 79 |
}); |
| 80 |
withLocale("fr", () => { |
| 81 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Temps universel coordonné)"); |
| 82 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Temps universel coordonné)", "UTC"); |
| 83 |
}); |
| 84 |
withLocale("de", () => { |
| 85 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Koordinierte Weltzeit)"); |
| 86 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Koordinierte Weltzeit)", "UTC"); |
| 87 |
}); |
| 88 |
withLocale("ar", () => { |
| 89 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (التوقيت العالمي المنسق)"); |
| 90 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (التوقيت العالمي المنسق)", "UTC"); |
| 91 |
}); |
| 92 |
withLocale("zh", () => { |
| 93 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (协调世界时)"); |
| 94 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (协调世界时)", "UTC"); |
| 95 |
}); |
| 96 |
}); |
| 97 |
} |
| 98 |
@@ -51,19 +51,19 @@ inTimeZone("GMT", () => { |
| 99 |
let dt = new Date(2018, Month.July, 14); |
| 100 |
|
| 101 |
withLocale("en", () => { |
| 102 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Greenwich Mean Time)"); |
| 103 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Greenwich Mean Time)", "GMT"); |
| 104 |
}); |
| 105 |
withLocale("fr", () => { |
| 106 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (heure moyenne de Greenwich)"); |
| 107 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (heure moyenne de Greenwich)", "GMT"); |
| 108 |
}); |
| 109 |
withLocale("de", () => { |
| 110 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Mittlere Greenwich-Zeit)"); |
| 111 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Mittlere Greenwich-Zeit)", "GMT"); |
| 112 |
}); |
| 113 |
withLocale("ar", () => { |
| 114 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (توقيت غرينتش)"); |
| 115 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (توقيت غرينتش)", "GMT"); |
| 116 |
}); |
| 117 |
withLocale("zh", () => { |
| 118 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (格林尼治标准时间)"); |
| 119 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (格林尼治标准时间)", "GMT"); |
| 120 |
}); |
| 121 |
}); |
| 122 |
|
| 123 |
diff --git a/js/src/tests/non262/Date/toString-localized.js b/js/src/tests/non262/Date/toString-localized.js |
| 124 |
index 433fb5c..0b43aed 100644 |
| 125 |
--- a/js/src/tests/non262/Date/toString-localized.js |
| 126 |
+++ b/js/src/tests/non262/Date/toString-localized.js |
| 127 |
@@ -6,19 +6,19 @@ inTimeZone("Europe/Paris", () => { |
| 128 |
let dt = new Date(2018, Month.July, 14); |
| 129 |
|
| 130 |
withLocale("en", () => { |
| 131 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (Central European Summer Time)"); |
| 132 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (Central European Summer Time)", "CEST"); |
| 133 |
}); |
| 134 |
withLocale("fr", () => { |
| 135 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (heure d’été d’Europe centrale)"); |
| 136 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (heure d’été d’Europe centrale)", "CEST"); |
| 137 |
}); |
| 138 |
withLocale("de", () => { |
| 139 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (Mitteleuropäische Sommerzeit)"); |
| 140 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (Mitteleuropäische Sommerzeit)", "CEST"); |
| 141 |
}); |
| 142 |
withLocale("ar", () => { |
| 143 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (توقيت وسط أوروبا الصيفي)"); |
| 144 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (توقيت وسط أوروبا الصيفي)", "CEST"); |
| 145 |
}); |
| 146 |
withLocale("zh", () => { |
| 147 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (中欧夏令时间)"); |
| 148 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0200 (中欧夏令时间)", "CEST"); |
| 149 |
}); |
| 150 |
}); |
| 151 |
|
| 152 |
@@ -26,19 +26,19 @@ inTimeZone("America/Los_Angeles", () => { |
| 153 |
let dt = new Date(2018, Month.July, 14); |
| 154 |
|
| 155 |
withLocale("en", () => { |
| 156 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (Pacific Daylight Time)"); |
| 157 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (Pacific Daylight Time)", "PDT"); |
| 158 |
}); |
| 159 |
withLocale("fr", () => { |
| 160 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (heure d’été du Pacifique)"); |
| 161 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (heure d’été du Pacifique)", "PDT"); |
| 162 |
}); |
| 163 |
withLocale("de", () => { |
| 164 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (Nordamerikanische Westküsten-Sommerzeit)"); |
| 165 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (Nordamerikanische Westküsten-Sommerzeit)", "PDT"); |
| 166 |
}); |
| 167 |
withLocale("ar", () => { |
| 168 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (توقيت المحيط الهادي الصيفي)"); |
| 169 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (توقيت المحيط الهادي الصيفي)", "PDT"); |
| 170 |
}); |
| 171 |
withLocale("zh", () => { |
| 172 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (北美太平洋夏令时间)"); |
| 173 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT-0700 (北美太平洋夏令时间)", "PDT"); |
| 174 |
}); |
| 175 |
}); |
| 176 |
|
| 177 |
@@ -47,19 +47,19 @@ for (let tz of ["UTC", "UCT", "Zulu", "Universal", "Etc/UTC", "Etc/UCT", "Etc/Zu |
| 178 |
let dt = new Date(2018, Month.July, 14); |
| 179 |
|
| 180 |
withLocale("en", () => { |
| 181 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Coordinated Universal Time)"); |
| 182 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Coordinated Universal Time)", "UTC"); |
| 183 |
}); |
| 184 |
withLocale("fr", () => { |
| 185 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Temps universel coordonné)"); |
| 186 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Temps universel coordonné)", "UTC"); |
| 187 |
}); |
| 188 |
withLocale("de", () => { |
| 189 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Koordinierte Weltzeit)"); |
| 190 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Koordinierte Weltzeit)", "UTC"); |
| 191 |
}); |
| 192 |
withLocale("ar", () => { |
| 193 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (التوقيت العالمي المنسق)"); |
| 194 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (التوقيت العالمي المنسق)", "UTC"); |
| 195 |
}); |
| 196 |
withLocale("zh", () => { |
| 197 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (协调世界时)"); |
| 198 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (协调世界时)", "UTC"); |
| 199 |
}); |
| 200 |
}); |
| 201 |
} |
| 202 |
@@ -69,19 +69,19 @@ for (let tz of ["GMT", "Etc/GMT"]) { |
| 203 |
let dt = new Date(2018, Month.July, 14); |
| 204 |
|
| 205 |
withLocale("en", () => { |
| 206 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Greenwich Mean Time)"); |
| 207 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Greenwich Mean Time)", "GMT"); |
| 208 |
}); |
| 209 |
withLocale("fr", () => { |
| 210 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (heure moyenne de Greenwich)"); |
| 211 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (heure moyenne de Greenwich)", "GMT"); |
| 212 |
}); |
| 213 |
withLocale("de", () => { |
| 214 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Mittlere Greenwich-Zeit)"); |
| 215 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (Mittlere Greenwich-Zeit)", "GMT"); |
| 216 |
}); |
| 217 |
withLocale("ar", () => { |
| 218 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (توقيت غرينتش)"); |
| 219 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (توقيت غرينتش)", "GMT"); |
| 220 |
}); |
| 221 |
withLocale("zh", () => { |
| 222 |
- assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (格林尼治标准时间)"); |
| 223 |
+ assertDateTime(dt, "Sat Jul 14 2018 00:00:00 GMT+0000 (格林尼治标准时间)", "GMT"); |
| 224 |
}); |
| 225 |
}); |
| 226 |
} |