Temporal: Reorganize calendar and wrong-type tests

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

@@ -1,26 +1,24 @@
-// Copyright (C) 2022 Igalia, S.L. All rights reserved.
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
 esid: sec-temporal.duration.prototype.round
-description: A number as calendar in relativeTo property bag is invalid
+description: >
+  An ISO string that cannot be converted to a calendar ID should throw a RangeError
 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.round({ largestUnit: "years", relativeTo }),
-    `A number (${calendar}) is not a valid ISO string for relativeTo.calendar`
+    `${description} is not a valid calendar ID`
   );
 }

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

@@ -9,27 +9,16 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
-const timeZone = "UTC";
 const instance = new Temporal.Duration(1, 0, 0, 0, 24);
 
-const primitiveTests = [
+const wrongTypeTests = [
   [null, "null"],
   [true, "boolean"],
-  ["", "empty string"],
   [1, "number that doesn't convert to a valid ISO string"],
   [1n, "bigint"],
-];
-
-for (const [calendar, description] of primitiveTests) {
-  const relativeTo = { year: 2019, monthCode: "M11", day: 1, calendar };
-  assert.throws(
-    typeof calendar === 'string' ? RangeError : TypeError,
-    () => instance.round({ largestUnit: "years", relativeTo }),
-    `${description} does not convert to a valid ISO string`
-  );
-}
-
-const typeErrorTests = [
+  [19970327, "large number"],
+  [-19970327, "negative number"],
+  [1234567890, "very large integer"],
   [Symbol(), "symbol"],
   [{}, "object"],
   [Temporal.PlainDate, "Temporal.PlainDate, object"],
@@ -38,7 +27,11 @@ const typeErrorTests = [
   [Temporal.ZonedDateTime.prototype, "Temporal.ZonedDateTime.prototype, object"],
 ];
 
-for (const [calendar, description] of typeErrorTests) {
+for (const [calendar, description] of wrongTypeTests) {
   const relativeTo = { year: 2019, monthCode: "M11", day: 1, calendar };
-  assert.throws(TypeError, () => instance.round({ largestUnit: "years", relativeTo }), `${description} is not a valid property bag and does not convert to a string`);
+  assert.throws(
+    TypeError,
+    () => instance.round({ largestUnit: "years", relativeTo }),
+    `${description} does not convert to a valid ISO string`
+  );
 }

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

@@ -1,26 +1,23 @@
-// Copyright (C) 2022 Igalia, S.L. All rights reserved.
+// Copyright (C) 2025 Brage Hogstad, University of Bergen. 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/Duration/prototype/total/relativeto-propertybag-calendar-wrong-type.js

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

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

@@ -0,0 +1,21 @@
+// Copyright (C) 2025 Brage Hogstad, University of Bergen. 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

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

test/built-ins/Temporal/PlainDate/compare/argument-propertybag-calendar-number.js → test/built-ins/Temporal/PlainDate/compare/argument-propertybag-calendar-invalid-iso-string.js

@@ -1,29 +1,26 @@
-// Copyright (C) 2022 Igalia, S.L. All rights reserved.
+// Copyright (C) 2025 Brage Hogstad, University of Bergen. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
 esid: sec-temporal.plaindate.compare
-description: A number as calendar in a property bag is not accepted
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
-const numbers = [
-  1,
-  19970327,
-  -19970327,
-  1234567890,
+const invalidStrings = [
+  ["", "empty string"],
 ];
-
-for (const calendar of numbers) {
+  
+for (const [calendar, description] of invalidStrings) {
   const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
   assert.throws(
-    TypeError,
+    RangeError,
     () => Temporal.PlainDate.compare(arg, new Temporal.PlainDate(1976, 11, 18)),
-    "A number is not a valid ISO string for calendar (first argument)"
+    `${description} is not a valid calendar ID (first argument)`
   );
   assert.throws(
-    TypeError,
+    RangeError,
     () => Temporal.PlainDate.compare(new Temporal.PlainDate(1976, 11, 18), arg),
-    "A number is not a valid ISO string for calendar (second argument)"
+    `${description} is not a valid calendar ID (second argument)`
   );
 }

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

@@ -9,36 +9,29 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
-const primitiveTests = [
+const wrongTypeTests = [
   [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"],
+  [Symbol(), "symbol"],
+  [{}, "object"],
+  [new Temporal.Duration(), "duration instance"],
 ];
 
-for (const [calendar, description] of primitiveTests) {
+for (const [calendar, description] of wrongTypeTests) {
   const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
   assert.throws(
-    typeof calendar === "string" ? RangeError : TypeError,
+    TypeError,
     () => Temporal.PlainDate.compare(arg, new Temporal.PlainDate(1976, 11, 18)),
-    `${description} does not convert to a valid ISO string (first argument)`
+    `${description} is not a valid property bag and does not convert to a string (first argument)`
   );
   assert.throws(
-    typeof calendar === "string" ? RangeError : TypeError,
+    TypeError,
     () => Temporal.PlainDate.compare(new Temporal.PlainDate(1976, 11, 18), arg),
-    `${description} does not convert to a valid ISO string (second argument)`
+    `${description} is not a valid property bag and does not convert to a string (second argument)`
   );
 }
-
-const typeErrorTests = [
-  [Symbol(), "symbol"],
-  [{}, "object"],
-  [new Temporal.Duration(), "duration instance"],
-];
-
-for (const [calendar, description] of typeErrorTests) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
-  assert.throws(TypeError, () => Temporal.PlainDate.compare(arg, new Temporal.PlainDate(1976, 11, 18)), `${description} is not a valid property bag and does not convert to a string (first argument)`);
-  assert.throws(TypeError, () => Temporal.PlainDate.compare(new Temporal.PlainDate(1976, 11, 18), arg), `${description} is not a valid property bag and does not convert to a string (second argument)`);
-}

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

@@ -0,0 +1,21 @@
+// Copyright (C) 2025 Brage Hogstad, University of Bergen. 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`
+  );
+}