Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 35 insertions, 0 deletions

diff --git a/js/src/tests/non262/Intl/DateTimeFormat/calendar-aliases.js b/js/src/tests/non262/Intl/DateTimeFormat/calendar-aliases.js
new file mode 100644
index 0000000000..901adcb45f
--- /dev/null
+++ b/js/src/tests/non262/Intl/DateTimeFormat/calendar-aliases.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty("Intl"))
+
+// Ensure ethiopic-amete-alem is resolved to ethioaa instead of ethiopic.
+function testEthiopicAmeteAlem() {
+    var locale = "am-ET-u-nu-latn";
+    var opts = {timeZone: "Africa/Addis_Ababa"};
+    var dtfEthiopicAmeteAlem = new Intl.DateTimeFormat(`${locale}-ca-ethiopic-amete-alem`, opts);
+    var dtfEthioaa = new Intl.DateTimeFormat(`${locale}-ca-ethioaa`, opts);
+    var dtfEthiopic = new Intl.DateTimeFormat(`${locale}-ca-ethiopic`, opts);
+
+    var date = new Date(2016, 1 - 1, 1);
+
+    assertEq(dtfEthiopicAmeteAlem.format(date), dtfEthioaa.format(date));
+    assertEq(dtfEthiopicAmeteAlem.format(date) === dtfEthiopic.format(date), false);
+}
+
+// Ensure islamicc is resolved to islamic-civil.
+function testIslamicCivil() {
+    var locale = "ar-SA-u-nu-latn";
+    var opts = {timeZone: "Asia/Riyadh"};
+    var dtfIslamicCivil = new Intl.DateTimeFormat(`${locale}-ca-islamic-civil`, opts);
+    var dtfIslamicc = new Intl.DateTimeFormat(`${locale}-ca-islamicc`, opts);
+    var dtfIslamic = new Intl.DateTimeFormat(`${locale}-ca-islamic`, opts);
+
+    var date = new Date(2016, 1 - 1, 1);
+
+    assertEq(dtfIslamicCivil.format(date), dtfIslamicc.format(date));
+    assertEq(dtfIslamicCivil.format(date) === dtfIslamic.format(date), false);
+}
+
+testEthiopicAmeteAlem();
+testIslamicCivil();
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0, "ok");