Tests for Temporal PR #2574

Edits Temporal tests to account for changes in
tc39/proposal-temporal#2574.

This PR stops coercing non-string primitive inputs to strings
in Temporal methods, to avoid cases where numbers
are coerced to syntactically valid but often unexpected
string results.

Author: justingrant

test/built-ins/Temporal/Calendar/argument-wrong-type.js

@@ -0,0 +1,30 @@
+// Copyright (C) 2023 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.calendar
+description: RangeError thrown when constructor invoked with the wrong type
+features: [Temporal]
+---*/
+
+const tests = [
+  [null, "null"],
+  [true, "boolean"],
+  ["", "empty string"],
+  [1, "number that doesn't convert to a valid ISO string"],
+  [19761118, "number that would convert to a valid ISO string in other contexts"],
+  [1n, "bigint"],
+  [Symbol(), "symbol"],
+  [{}, "object not implementing any protocol"],
+  [new Temporal.Calendar("iso8601"), "calendar instance"],
+  [new Temporal.TimeZone("UTC"), "time zone instance"],
+  [Temporal.ZonedDateTime.from("2020-01-01T00:00Z[UTC]"), "ZonedDateTime instance"],
+];
+
+for (const [arg, description] of tests) {
+  assert.throws(
+    typeof (arg) === "string" ? RangeError : TypeError,
+    () => new Temporal.Calendar(arg),
+    `${description} is not accepted by this constructor`
+  );
+}

test/built-ins/Temporal/Calendar/from/calendar-number.js

@@ -3,25 +3,21 @@
 
 /*---
 esid: sec-temporal.calendar.from
-description: A number is converted to a string, then to Temporal.Calendar
+description: A number is not allowed to be a calendar
 features: [Temporal]
 ---*/
 
-const arg = 19761118;
-
-const result = Temporal.Calendar.from(arg);
-assert.sameValue(result.id, "iso8601", "19761118 is a valid ISO string for Calendar");
-
 const numbers = [
   1,
   -19761118,
+  19761118,
   1234567890,
 ];
 
 for (const arg of numbers) {
   assert.throws(
-    RangeError,
+    TypeError,
     () => Temporal.Calendar.from(arg),
-    `Number ${arg} does not convert to a valid ISO string for Calendar`
+    "A number is not a valid ISO string for Calendar"
   );
 }

test/built-ins/Temporal/Calendar/from/calendar-wrong-type.js

@@ -9,16 +9,20 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
-const rangeErrorTests = [
+const primitiveTests = [
   [null, "null"],
   [true, "boolean"],
   ["", "empty string"],
   [1, "number that doesn't convert to a valid ISO string"],
   [1n, "bigint"],
 ];
 
-for (const [arg, description] of rangeErrorTests) {
-  assert.throws(RangeError, () => Temporal.Calendar.from(arg), `${description} does not convert to a valid ISO string`);
+for (const [arg, description] of primitiveTests) {
+  assert.throws(
+    typeof arg === 'string' ? RangeError : TypeError,
+    () => Temporal.Calendar.from(arg),
+    `${description} does not convert to a valid ISO string`
+  );
 }
 
 const typeErrorTests = [

test/built-ins/Temporal/Calendar/missing-arguments.js

@@ -7,5 +7,5 @@ description: RangeError thrown when constructor invoked with no argument
 features: [Temporal]
 ---*/
 
-assert.throws(RangeError, () => new Temporal.Calendar());
-assert.throws(RangeError, () => new Temporal.Calendar(undefined));
+assert.throws(TypeError, () => new Temporal.Calendar());
+assert.throws(TypeError, () => new Temporal.Calendar(undefined));

test/built-ins/Temporal/Calendar/prototype/dateAdd/argument-number.js

@@ -3,28 +3,23 @@
 
 /*---
 esid: sec-temporal.calendar.prototype.dateadd
-description: A number is converted to a string, then to Temporal.PlainDate
-includes: [temporalHelpers.js]
+description: A number cannot be used in place of a Temporal.PlainDate
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.Calendar("iso8601");
 
-const arg = 19761118;
-
-const result = instance.dateAdd(arg, new Temporal.Duration());
-TemporalHelpers.assertPlainDate(result, 1976, 11, "M11", 18, "19761118 is a valid ISO string for PlainDate");
-
 const numbers = [
   1,
+  19761118,
   -19761118,
   1234567890,
 ];
 
 for (const arg of numbers) {
   assert.throws(
-    RangeError,
+    TypeError,
     () => instance.dateAdd(arg, new Temporal.Duration()),
-    `Number ${arg} does not convert to a valid ISO string for PlainDate`
+    'Numbers cannot be used in place of an ISO string for PlainDate'
   );
 }

test/built-ins/Temporal/Calendar/prototype/dateAdd/argument-propertybag-calendar-number.js

@@ -3,30 +3,23 @@
 
 /*---
 esid: sec-temporal.calendar.prototype.dateadd
-description: A number as calendar in a property bag is converted to a string, then to a calendar
-includes: [temporalHelpers.js]
+description: A number as calendar in a property bag is not accepted
 features: [Temporal]
 ---*/
 
-const instance = new Temporal.Calendar("iso8601");
-
-const calendar = 19970327;
-
-const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
-const result = instance.dateAdd(arg, new Temporal.Duration());
-TemporalHelpers.assertPlainDate(result, 1976, 11, "M11", 18, "19970327 is a valid ISO string for calendar");
+const instance = new Temporal.PlainDate(1976, 11, 18);
 
 const numbers = [
   1,
+  19970327,
   -19970327,
   1234567890,
 ];
-
 for (const calendar of numbers) {
   const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
   assert.throws(
-    RangeError,
+    TypeError,
     () => instance.dateAdd(arg, new Temporal.Duration()),
-    `Number ${calendar} does not convert to a valid ISO string for calendar`
+    "Numbers cannot be used as a calendar"
   );
 }

test/built-ins/Temporal/Calendar/prototype/dateAdd/argument-propertybag-calendar-wrong-type.js

@@ -12,17 +12,21 @@ features: [BigInt, Symbol, Temporal]
 const timeZone = new Temporal.TimeZone("UTC");
 const instance = new Temporal.Calendar("iso8601");
 
-const rangeErrorTests = [
+const primitiveTests = [
   [null, "null"],
   [true, "boolean"],
   ["", "empty string"],
   [1, "number that doesn't convert to a valid ISO string"],
   [1n, "bigint"],
 ];
 
-for (const [calendar, description] of rangeErrorTests) {
+for (const [calendar, description] of primitiveTests) {
   const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
-  assert.throws(RangeError, () => instance.dateAdd(arg, new Temporal.Duration()), `${description} does not convert to a valid ISO string`);
+  assert.throws(
+    typeof calendar === 'string' ? RangeError : TypeError,
+    () => instance.dateAdd(arg, new Temporal.Duration()),
+    `${description} does not convert to a valid ISO string`
+  );
 }
 
 const typeErrorTests = [

test/built-ins/Temporal/Calendar/prototype/dateAdd/argument-wrong-type.js

@@ -11,7 +11,7 @@ features: [BigInt, Symbol, Temporal]
 
 const instance = new Temporal.Calendar("iso8601");
 
-const rangeErrorTests = [
+const primitiveTests = [
   [undefined, "undefined"],
   [null, "null"],
   [true, "boolean"],
@@ -20,8 +20,12 @@ const rangeErrorTests = [
   [1n, "bigint"],
 ];
 
-for (const [arg, description] of rangeErrorTests) {
-  assert.throws(RangeError, () => instance.dateAdd(arg, new Temporal.Duration()), `${description} does not convert to a valid ISO string`);
+for (const [arg, description] of primitiveTests) {
+  assert.throws(
+    typeof arg === 'string' ? RangeError : TypeError,
+    () => instance.dateAdd(arg, new Temporal.Duration()),
+    `${description} does not convert to a valid ISO string`
+  );
 }
 
 const typeErrorTests = [

test/built-ins/Temporal/Calendar/prototype/dateUntil/argument-number.js

@@ -3,35 +3,28 @@
 
 /*---
 esid: sec-temporal.calendar.prototype.dateuntil
-description: A number is converted to a string, then to Temporal.PlainDate
-includes: [temporalHelpers.js]
+description: A number cannot be used in place of a Temporal.PlainDate
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.Calendar("iso8601");
 
-const arg = 19761118;
-
-const result1 = instance.dateUntil(arg, new Temporal.PlainDate(1976, 11, 19));
-TemporalHelpers.assertDuration(result1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "19761118 is a valid ISO string for PlainDate (first argument)");
-const result2 = instance.dateUntil(new Temporal.PlainDate(1976, 11, 19), arg);
-TemporalHelpers.assertDuration(result2, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, "19761118 is a valid ISO string for PlainDate (second argument)");
-
 const numbers = [
   1,
+  19761118,
   -19761118,
   1234567890,
 ];
 
 for (const arg of numbers) {
   assert.throws(
-    RangeError,
+    TypeError,
     () => instance.dateUntil(arg, new Temporal.PlainDate(1977, 11, 18)),
-    `Number ${arg} does not convert to a valid ISO string for PlainDate (first argument)`
+    "A number is not a valid ISO string for PlainDate (first argument)"
   );
   assert.throws(
-    RangeError,
+    TypeError,
     () => instance.dateUntil(new Temporal.PlainDate(1977, 11, 18), arg),
-    `Number ${arg} does not convert to a valid ISO string for PlainDate (second argument)`
+    "A number is not a valid ISO string for PlainDate (second argument)"
   );
 }

test/built-ins/Temporal/Calendar/prototype/dateUntil/argument-propertybag-calendar-number.js

@@ -3,37 +3,29 @@
 
 /*---
 esid: sec-temporal.calendar.prototype.dateuntil
-description: A number as calendar in a property bag is converted to a string, then to a calendar
-includes: [temporalHelpers.js]
+description: A number as calendar in a property bag is not accepted
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.Calendar("iso8601");
 
-const calendar = 19970327;
-
-const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
-const result1 = instance.dateUntil(arg, new Temporal.PlainDate(1976, 11, 19));
-TemporalHelpers.assertDuration(result1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "19970327 is a valid ISO string for calendar (first argument)");
-const result2 = instance.dateUntil(new Temporal.PlainDate(1976, 11, 19), arg);
-TemporalHelpers.assertDuration(result2, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, "19970327 is a valid ISO string for calendar (second argument)");
-
 const numbers = [
   1,
+  19970327,
   -19970327,
   1234567890,
 ];
 
 for (const calendar of numbers) {
   const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
   assert.throws(
-    RangeError,
+    TypeError,
     () => instance.dateUntil(arg, new Temporal.PlainDate(1977, 11, 19)),
-    `Number ${calendar} does not convert to a valid ISO string for calendar (first argument)`
+    "A number is not a valid ISO string for calendar (first argument)"
   );
   assert.throws(
-    RangeError,
+    TypeError,
     () => instance.dateUntil(new Temporal.PlainDate(1977, 11, 19), arg),
-    `Number ${calendar} does not convert to a valid ISO string for calendar (second argument)`
+    "A number is not a valid ISO string for calendar (second argument)"
   );
 }