From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:43:14 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../argument-propertybag-calendar-iso-string.js    | 28 ++++++++++++++++++++++
 .../argument-propertybag-calendar-year-zero.js     |  3 ++-
 ...ument-string-calendar-annotation-invalid-key.js | 25 +++++++++++++++++++
 .../Temporal/Calendar/prototype/eraYear/shell.js   |  8 +++++++
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-propertybag-calendar-iso-string.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-string-calendar-annotation-invalid-key.js

(limited to 'js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear')

diff --git a/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-propertybag-calendar-iso-string.js b/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-propertybag-calendar-iso-string.js
new file mode 100644
index 0000000000..2899ea877c
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-propertybag-calendar-iso-string.js
@@ -0,0 +1,28 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2024 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.calendar.prototype.erayear
+description: An ISO 8601 string can be converted to a calendar ID in Calendar
+features: [Temporal]
+---*/
+
+const instance = new Temporal.Calendar("iso8601");
+
+for (const calendar of [
+  "2020-01-01",
+  "2020-01-01[u-ca=iso8601]",
+  "2020-01-01T00:00:00.000000000",
+  "2020-01-01T00:00:00.000000000[u-ca=iso8601]",
+  "01-01",
+  "01-01[u-ca=iso8601]",
+  "2020-01",
+  "2020-01[u-ca=iso8601]",
+]) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+  const result = instance.eraYear(arg);
+  assert.sameValue(result, undefined, `Calendar created from string "${calendar}"`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-propertybag-calendar-year-zero.js b/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-propertybag-calendar-year-zero.js
index 65675a5894..eaa93d916a 100644
--- a/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-propertybag-calendar-year-zero.js
+++ b/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-propertybag-calendar-year-zero.js
@@ -16,7 +16,8 @@ const invalidStrings = [
   "-000000-10-31T17:45+00:00[UTC]",
 ];
 const instance = new Temporal.Calendar("iso8601");
-invalidStrings.forEach((arg) => {
+invalidStrings.forEach((str) => {
+  const arg = { year: 1976, month: 11, day: 18, calendar: str };
   assert.throws(
     RangeError,
     () => instance.eraYear(arg),
diff --git a/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-string-calendar-annotation-invalid-key.js b/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-string-calendar-annotation-invalid-key.js
new file mode 100644
index 0000000000..7bec3d6a54
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/argument-string-calendar-annotation-invalid-key.js
@@ -0,0 +1,25 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2024 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.calendar.prototype.erayear
+description: Annotation keys are lowercase-only
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["1970-01-01[U-CA=iso8601]", "invalid capitalized key"],
+  ["1970-01-01[u-CA=iso8601]", "invalid partially-capitalized key"],
+  ["1970-01-01[FOO=bar]", "invalid capitalized unrecognized key"],
+];
+const instance = new Temporal.Calendar("iso8601");
+invalidStrings.forEach(([arg, descr]) => {
+  assert.throws(
+    RangeError,
+    () => instance.eraYear(arg),
+    `annotation keys must be lowercase: ${arg} - ${descr}`
+  );
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/shell.js b/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/shell.js
index 32df7c4217..63bc783738 100644
--- a/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/Calendar/prototype/eraYear/shell.js
@@ -2046,6 +2046,9 @@ var TemporalHelpers = {
         "11-18junk",
         "11-18[u-ca=gregory]",
         "11-18[u-ca=hebrew]",
+        "11-18[U-CA=iso8601]",
+        "11-18[u-CA=iso8601]",
+        "11-18[FOO=bar]",
       ];
     },
 
@@ -2133,6 +2136,11 @@ var TemporalHelpers = {
     plainYearMonthStringsInvalid() {
       return [
         "2020-13",
+        "1976-11[u-ca=gregory]",
+        "1976-11[u-ca=hebrew]",
+        "1976-11[U-CA=iso8601]",
+        "1976-11[u-CA=iso8601]",
+        "1976-11[FOO=bar]",
       ];
     },
 
-- 
cgit v1.2.3