Temporal: Reorganize calendar and wrong-type tests

test/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-wrong-type.js

@@ -9,23 +9,24 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
-const timeZone = "UTC";
 const instance = new Temporal.Duration(1, 0, 0, 0, 24);
 
 const primitiveTests = [
   [null, "null"],
   [true, "boolean"],
-  ["", "empty string"],
-  [1, "number that doesn't convert to a valid ISO string"],
+  [1, "number"],
   [1n, "bigint"],
+  [19970327, "large number"],
+  [-19970327, "negative number"],
+  [1234567890, "very large integer"],
 ];
 
 for (const [calendar, description] of primitiveTests) {
   const relativeTo = { year: 2019, monthCode: "M11", day: 1, calendar };
   assert.throws(
-    typeof calendar === 'string' ? RangeError : TypeError,
+    TypeError,
     () => instance.total({ unit: "days", relativeTo }),
-    `${description} does not convert to a valid ISO string`
+    `${description} is not a valid calendar`
   );
 }
 

test/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-number.js → test/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-invalid-iso-string.js

@@ -1,26 +1,23 @@
-// Copyright (C) 2022 Igalia, S.L. All rights reserved.
+// 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.duration.prototype.total
-description: A number as calendar in relativeTo property bag is invalid
+description: Various invalid ISO string values for relativeTo.calendar
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.Duration(1, 0, 0, 0, 24);
 
-const numbers = [
-  1,
-  19970327,
-  -19970327,
-  1234567890,
+const invalidStrings = [
+  ["", "empty string"],
 ];
 
-for (const calendar of numbers) {
+for (const [calendar, description] of invalidStrings) {
   const relativeTo = { year: 2019, monthCode: "M11", day: 1, calendar };
   assert.throws(
-    TypeError,
+    RangeError,
     () => instance.total({ unit: "days", relativeTo }),
-    `A number (${calendar}) is not a valid ISO string for relativeTo.calendar`
+    `${description} is not a valid calendar ID`
   );
 }

test/built-ins/Temporal/PlainDate/calendar-invalid-iso-string.js

@@ -0,0 +1,21 @@
+// 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.plaindate.constructor
+description: Various invalid ISO string values for calendar
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=iso8601]", "ISO string with calendar annotation"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => new Temporal.PlainDate(2000, 5, 2, arg),
+    `${description} is not a valid calendar ID`
+  );
+}

test/built-ins/Temporal/PlainDate/calendar-wrong-type.js

@@ -12,16 +12,18 @@ features: [BigInt, Symbol, Temporal]
 const primitiveTests = [
   [null, "null"],
   [true, "boolean"],
-  ["", "empty string"],
-  [1, "number that doesn't convert to a valid ISO string"],
+  [1, "number"],
   [1n, "bigint"],
+  [-19761118, "negative number"],
+  [19761118, "large positive number"],
+  [1234567890, "large integer"],
 ];
 
 for (const [arg, description] of primitiveTests) {
   assert.throws(
-    typeof arg === 'string' ? RangeError : TypeError,
+    TypeError,
     () => new Temporal.PlainDate(2000, 5, 2, arg),
-    `${description} does not convert to a valid ISO string`
+    `${description} is not a valid calendar`
   );
 }
 

test/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar-invalid-iso-string.js

@@ -0,0 +1,21 @@
+// 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.plaindate.from
+description: Various invalid ISO string values for calendar in a property bag
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+    ["", "empty string"],
+  ];
+
+for (const [calendar, description] of invalidStrings) {
+    const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+    assert.throws(
+      RangeError,
+      () => Temporal.PlainDate.from(arg),
+      `${description} is not a valid calendar ID`
+    );
+}

test/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar-wrong-type.js

@@ -12,17 +12,19 @@ features: [BigInt, Symbol, Temporal]
 const primitiveTests = [
   [null, "null"],
   [true, "boolean"],
-  ["", "empty string"],
-  [1, "number that doesn't convert to a valid ISO string"],
+  [1, "number"],
   [1n, "bigint"],
+  [19970327, "large number"],
+  [-19970327, "negative number"],
+  [1234567890, "very large integer"],
 ];
 
 for (const [calendar, description] of primitiveTests) {
   const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
   assert.throws(
-    typeof calendar === 'string' ? RangeError : TypeError,
+    TypeError,
     () => Temporal.PlainDate.from(arg),
-    `${description} does not convert to a valid ISO string`
+    `${description} is not a valid calendar`
   );
 }
 

test/built-ins/Temporal/PlainDateTime/calendar-invalid-iso-string.js

@@ -0,0 +1,21 @@
+// 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.plaindatetime.constructor
+description: Various invalid ISO string values for calendar
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=iso8601]", "ISO string with calendar annotation"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => new Temporal.PlainDateTime(2000, 5, 2, 15, 23, 30, 987, 654, 321, arg),
+    `${description} is not a valid calendar ID`
+  );
+}

test/built-ins/Temporal/PlainDateTime/calendar-wrong-type.js

@@ -12,16 +12,18 @@ features: [BigInt, Symbol, Temporal]
 const primitiveTests = [
   [null, "null"],
   [true, "boolean"],
-  ["", "empty string"],
-  [1, "number that doesn't convert to a valid ISO string"],
+  [1, "number"],
   [1n, "bigint"],
+  [-19761118, "negative number"],
+  [19761118, "large positive number"],
+  [1234567890, "large integer"],
 ];
 
 for (const [arg, description] of primitiveTests) {
   assert.throws(
-    typeof arg === 'string' ? RangeError : TypeError,
+    TypeError,
     () => new Temporal.PlainDateTime(2000, 5, 2, 15, 23, 30, 987, 654, 321, arg),
-    `${description} does not convert to a valid ISO string`
+    `${description} is not a valid calendar`
   );
 }
 

test/built-ins/Temporal/PlainDateTime/from/argument-propertybag-calendar-invalid-iso-string.js

@@ -0,0 +1,21 @@
+// 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.plaindatetime.from
+description: Various invalid ISO string values for calendar in a property bag
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+    ["", "empty string"],
+  ];
+
+for (const [calendar, description] of invalidStrings) {
+    const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+    assert.throws(
+        RangeError,
+        () => Temporal.PlainDateTime.from(arg),
+        `${description} is not a valid calendar ID`
+    );
+}

test/built-ins/Temporal/PlainDateTime/from/argument-propertybag-calendar-wrong-type.js

@@ -12,17 +12,19 @@ features: [BigInt, Symbol, Temporal]
 const primitiveTests = [
   [null, "null"],
   [true, "boolean"],
-  ["", "empty string"],
-  [1, "number that doesn't convert to a valid ISO string"],
+  [1, "number"],
   [1n, "bigint"],
+  [19970327, "large number"],
+  [-19970327, "negative number"],
+  [1234567890, "very large integer"],
 ];
 
 for (const [calendar, description] of primitiveTests) {
   const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
   assert.throws(
-    typeof calendar === 'string' ? RangeError : TypeError,
+    TypeError,
     () => Temporal.PlainDateTime.from(arg),
-    `${description} does not convert to a valid ISO string`
+    `${description} is not a valid calendar`
   );
 }
 

test/built-ins/Temporal/PlainMonthDay/calendar-invalid-iso-string.js

@@ -0,0 +1,21 @@
+// 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.plainmonthday.constructor
+description: Various invalid ISO string values for calendar
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=iso8601]", "ISO string with calendar annotation"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => new Temporal.PlainMonthDay(12, 15, arg, 1972),
+    `${description} is not a valid calendar ID`
+  );
+}