From f2871840b822a92b8ed0ecb0f1b80a036a24fb40 Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Fri, 17 Feb 2023 13:05:30 -0800 Subject: [PATCH] Replace Temporal.ZonedDateTime.timeZone getter with new API This is the replacement of the old API with the new API, .timeZoneId and .getTimeZone(). Semantics will be corrected in the following commit. Normative PR: https://github.com/tc39/proposal-temporal/pull/2482 --- .../timezone-case-insensitive.js | 4 +-- .../timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../toZonedDateTime/timezone-string.js | 2 +- .../timezone-case-insensitive.js | 4 +-- .../timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../toZonedDateTimeISO/timezone-string.js | 2 +- .../Now/zonedDateTime/time-zone-undefined.js | 4 +-- .../timezone-case-insensitive.js | 2 +- .../zonedDateTime/timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../Now/zonedDateTime/timezone-string.js | 2 +- .../Now/zonedDateTimeISO/return-value.js | 3 +- .../zonedDateTimeISO/time-zone-undefined.js | 4 +-- .../timezone-case-insensitive.js | 2 +- .../timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../Now/zonedDateTimeISO/timezone-string.js | 2 +- .../prototype/toZonedDateTime/calendar.js | 2 +- .../timezone-case-insensitive.js | 4 +-- .../timezone-getpossibleinstantsfor.js | 2 +- .../timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../toZonedDateTime/timezone-string.js | 2 +- .../prototype/toZonedDateTime/basic.js | 2 +- .../toZonedDateTime/plain-custom-timezone.js | 3 +- .../timezone-case-insensitive.js | 4 +-- .../timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../toZonedDateTime/timezone-string.js | 2 +- .../prototype/toZonedDateTime/basic.js | 6 ++-- .../timezone-case-insensitive.js | 4 +-- .../timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../toZonedDateTime/timezone-string.js | 2 +- .../Temporal/TimeZone/from/argument-object.js | 2 +- ...nt-propertybag-timezone-string-datetime.js | 20 +++++------ ...propertybag-timezone-string-leap-second.js | 4 +-- ...rtybag-timezone-string-multiple-offsets.js | 4 +-- .../argument-propertybag-timezone-string.js | 2 +- .../argument-string-date-with-utc-offset.js | 2 +- .../from/argument-string-time-separators.js | 2 +- .../argument-string-time-zone-annotation.js | 2 +- .../from/timezone-case-insensitive.js | 2 +- .../zoneddatetime-string-multiple-offsets.js | 2 +- .../from/zoneddatetime-string.js | 8 ++--- .../prototype/getISOFields/custom.js | 2 +- .../prototype/getISOFields/field-names.js | 2 +- .../prototype/getTimeZone/branding.js | 22 +++++++++++++ .../prototype/getTimeZone/builtin.js | 33 +++++++++++++++++++ .../prototype/getTimeZone/length.js | 25 ++++++++++++++ .../prototype/getTimeZone/name.js | 23 +++++++++++++ .../getTimeZone/not-a-constructor.js | 21 ++++++++++++ .../prototype/getTimeZone/prop-desc.js | 21 ++++++++++++ .../prototype/timeZone/branding.js | 22 ------------- .../prototype/timeZoneId/branding.js | 22 +++++++++++++ .../{timeZone => timeZoneId}/prop-desc.js | 6 ++-- .../withTimeZone/timezone-case-insensitive.js | 4 +-- .../withTimeZone/timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../prototype/withTimeZone/timezone-string.js | 2 +- .../timezone-case-insensitive.js | 2 +- .../ZonedDateTime/timezone-string-datetime.js | 20 +++++------ .../timezone-string-leap-second.js | 4 +-- .../timezone-string-multiple-offsets.js | 4 +-- .../Temporal/ZonedDateTime/timezone-string.js | 2 +- .../timezone-string-datetime.js | 12 +++---- .../timezone-string-datetime.js | 12 +++---- .../Now/zonedDateTime/calendar-string.js | 3 +- .../zonedDateTime/calendar-timezone-string.js | 3 +- .../zonedDateTime/timezone-string-datetime.js | 12 +++---- .../timezone-string-datetime.js | 12 +++---- .../Now/zonedDateTimeISO/timezone-string.js | 3 +- .../timezone-string-datetime.js | 12 +++---- .../timezone-string-datetime.js | 12 +++---- .../timezone-string-datetime.js | 12 +++---- .../Temporal/TimeZone/from/argument-object.js | 2 +- ...nt-propertybag-timezone-string-datetime.js | 12 +++---- .../Intl402/Temporal/old/date-time-format.js | 4 +-- .../ZonedDateTime/old/withCalendar.js | 2 +- .../ZonedDateTime/old/withTimezone.js | 2 +- 90 files changed, 416 insertions(+), 274 deletions(-) create mode 100644 test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/branding.js create mode 100644 test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/builtin.js create mode 100644 test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/length.js create mode 100644 test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/name.js create mode 100644 test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/not-a-constructor.js create mode 100644 test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/prop-desc.js delete mode 100644 test/built-ins/Temporal/ZonedDateTime/prototype/timeZone/branding.js create mode 100644 test/built-ins/Temporal/ZonedDateTime/prototype/timeZoneId/branding.js rename test/built-ins/Temporal/ZonedDateTime/prototype/{timeZone => timeZoneId}/prop-desc.js (71%) diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-case-insensitive.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-case-insensitive.js index 9dee0af7d3..c7a0dc6d56 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-case-insensitive.js @@ -7,8 +7,8 @@ description: Time zone names are case insensitive features: [Temporal] ---*/ -const instance = new Temporal.Instant(0n); +const instance = new Temporal.Instant(0n); const timeZone = 'uTc'; const result = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-datetime.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-datetime.js index d9ca41702e..1dfe55a73b 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-datetime.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-datetime.js @@ -15,30 +15,30 @@ assert.throws(RangeError, () => instance.toZonedDateTime({ timeZone: { timeZone timeZone = "2021-08-19T17:30Z"; const result1 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-leap-second.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-leap-second.js index b3a25f04a9..62a5415829 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-leap-second.js @@ -11,9 +11,9 @@ const instance = new Temporal.Instant(0n); let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => instance.toZonedDateTime({ timeZone, calendar: "iso8601" }), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-multiple-offsets.js index 793bbe8988..f3ee8e04c4 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string-multiple-offsets.js @@ -11,6 +11,6 @@ const instance = new Temporal.Instant(0n); const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string.js index 57f8c34c01..0b866b6b81 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTime/timezone-string.js @@ -11,5 +11,5 @@ const instance = new Temporal.Instant(0n); ["UTC", "+01:30"].forEach((timeZone) => { const result = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `time zone slot should store string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-case-insensitive.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-case-insensitive.js index ab37a3564c..7bda964b3f 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-case-insensitive.js @@ -7,8 +7,8 @@ description: Time zone names are case insensitive features: [Temporal] ---*/ -const instance = new Temporal.Instant(0n); +const instance = new Temporal.Instant(0n); const timeZone = 'uTc'; const result = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-datetime.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-datetime.js index 87abc33401..a20e61b2f4 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-datetime.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-datetime.js @@ -15,30 +15,30 @@ assert.throws(RangeError, () => instance.toZonedDateTimeISO({ timeZone }), "bare timeZone = "2021-08-19T17:30Z"; const result1 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-leap-second.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-leap-second.js index 46be8be647..81896caaf9 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-leap-second.js @@ -11,9 +11,9 @@ const instance = new Temporal.Instant(0n); let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => instance.toZonedDateTimeISO(timeZone), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-multiple-offsets.js index 16ce94429c..b7c8685973 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-multiple-offsets.js @@ -11,6 +11,6 @@ const instance = new Temporal.Instant(0n); const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string.js b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string.js index 2dbecc39d4..955a41e9d2 100644 --- a/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string.js +++ b/test/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string.js @@ -11,5 +11,5 @@ const instance = new Temporal.Instant(0n); ["UTC", "+01:30"].forEach((timeZone) => { const result = instance.toZonedDateTimeISO(timeZone); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `time zone slot should store string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/Now/zonedDateTime/time-zone-undefined.js b/test/built-ins/Temporal/Now/zonedDateTime/time-zone-undefined.js index 731c9c3ba1..a24867ac0f 100644 --- a/test/built-ins/Temporal/Now/zonedDateTime/time-zone-undefined.js +++ b/test/built-ins/Temporal/Now/zonedDateTime/time-zone-undefined.js @@ -21,11 +21,11 @@ Object.defineProperty(Temporal.TimeZone, "from", { const systemTimeZone = Temporal.Now.timeZoneId(); const resultExplicit = Temporal.Now.zonedDateTime('iso8601', undefined); -assert.sameValue(resultExplicit.timeZone.id, systemTimeZone); +assert.sameValue(resultExplicit.getISOFields().timeZone, systemTimeZone, "time zone slot should store a string"); assert.compareArray(actual, expected, "Temporal.TimeZone.from should not be called"); const resultImplicit = Temporal.Now.zonedDateTime('iso8601'); -assert.sameValue(resultImplicit.timeZone.id, systemTimeZone); +assert.sameValue(resultImplicit.getISOFields().timeZone, systemTimeZone, "time zone slot should store a string"); assert.compareArray(actual, expected, "Temporal.TimeZone.from should not be called"); diff --git a/test/built-ins/Temporal/Now/zonedDateTime/timezone-case-insensitive.js b/test/built-ins/Temporal/Now/zonedDateTime/timezone-case-insensitive.js index 15e596237c..87837a94f1 100644 --- a/test/built-ins/Temporal/Now/zonedDateTime/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/Now/zonedDateTime/timezone-case-insensitive.js @@ -9,4 +9,4 @@ features: [Temporal] const timeZone = 'UtC'; const result = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-datetime.js b/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-datetime.js index 8a70dd655c..28a76a7dcb 100644 --- a/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-datetime.js +++ b/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-datetime.js @@ -13,30 +13,30 @@ assert.throws(RangeError, () => Temporal.Now.zonedDateTime("iso8601", { timeZone timeZone = "2021-08-19T17:30Z"; const result1 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-leap-second.js b/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-leap-second.js index b91fd58cdf..c3db6e1f1d 100644 --- a/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-leap-second.js @@ -10,9 +10,9 @@ features: [Temporal] let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => Temporal.Now.zonedDateTime("iso8601", timeZone), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-multiple-offsets.js index a7fbcb202b..751e83c329 100644 --- a/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/Now/zonedDateTime/timezone-string-multiple-offsets.js @@ -10,6 +10,6 @@ features: [Temporal] const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/Now/zonedDateTime/timezone-string.js b/test/built-ins/Temporal/Now/zonedDateTime/timezone-string.js index 6e5e37ced6..5a60defc75 100644 --- a/test/built-ins/Temporal/Now/zonedDateTime/timezone-string.js +++ b/test/built-ins/Temporal/Now/zonedDateTime/timezone-string.js @@ -9,5 +9,5 @@ features: [Temporal] ["UTC", "+01:30"].forEach((timeZone) => { const result = Temporal.Now.zonedDateTime("iso8601", timeZone); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `Time zone created from string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/return-value.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/return-value.js index 7c5b39a660..5e8bd4ceb2 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/return-value.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/return-value.js @@ -11,5 +11,4 @@ const zdt = Temporal.Now.zonedDateTimeISO(); const tz = Temporal.Now.timeZoneId(); assert(zdt instanceof Temporal.ZonedDateTime); assert.sameValue(zdt.getISOFields().calendar, "iso8601", "calendar slot should store a string"); -assert(zdt.timeZone instanceof Temporal.TimeZone); -assert.sameValue(zdt.timeZone.id, tz); +assert.sameValue(zdt.getISOFields().timeZone, tz, "time zone slot should store a string"); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/time-zone-undefined.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/time-zone-undefined.js index 1c34551414..ed290b5c0c 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/time-zone-undefined.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/time-zone-undefined.js @@ -21,11 +21,11 @@ Object.defineProperty(Temporal.TimeZone, "from", { const systemTimeZone = Temporal.Now.timeZoneId(); const resultExplicit = Temporal.Now.zonedDateTimeISO(undefined); -assert.sameValue(resultExplicit.timeZone.id, systemTimeZone); +assert.sameValue(resultExplicit.getISOFields().timeZone, systemTimeZone, "time zone slot should store a string"); assert.compareArray(actual, expected, "Temporal.TimeZone.from should not be called"); const resultImplicit = Temporal.Now.zonedDateTimeISO(); -assert.sameValue(resultImplicit.timeZone.id, systemTimeZone); +assert.sameValue(resultImplicit.getISOFields().timeZone, systemTimeZone, "time zone slot should store a string"); assert.compareArray(actual, expected, "Temporal.TimeZone.from should not be called"); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-case-insensitive.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-case-insensitive.js index f79f5159ef..75d1d3d85e 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-case-insensitive.js @@ -9,4 +9,4 @@ features: [Temporal] const timeZone = 'UtC'; const result = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-datetime.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-datetime.js index 6247a77756..635423594b 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-datetime.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-datetime.js @@ -13,30 +13,30 @@ assert.throws(RangeError, () => Temporal.Now.zonedDateTimeISO({ timeZone }), "ba timeZone = "2021-08-19T17:30Z"; const result1 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-leap-second.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-leap-second.js index f5a1dbaf77..464911ea0d 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-leap-second.js @@ -10,9 +10,9 @@ features: [Temporal] let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => Temporal.Now.zonedDateTimeISO(timeZone), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-multiple-offsets.js index 676e54c03c..5afc9061f0 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string-multiple-offsets.js @@ -10,6 +10,6 @@ features: [Temporal] const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string.js b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string.js index f47fe6b3f7..89a99e175a 100644 --- a/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string.js +++ b/test/built-ins/Temporal/Now/zonedDateTimeISO/timezone-string.js @@ -9,5 +9,5 @@ features: [Temporal] ["UTC", "+01:30"].forEach((timeZone) => { const result = Temporal.Now.zonedDateTimeISO(timeZone); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `Time zone created from string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/calendar.js b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/calendar.js index a864baa1ae..e2a3d12d39 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/calendar.js +++ b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/calendar.js @@ -15,5 +15,5 @@ const result = plainDate.toZonedDateTime({ plainTime: { hour: 12, minute: 30, calendar: timeCalendar }, }); assert.sameValue(result.epochNanoseconds, 957270600_000_000_000n); -assert.sameValue(result.timeZone.toString(), "UTC"); +assert.sameValue(result.timeZoneId, "UTC"); assert.sameValue(result.getCalendar(), calendar); diff --git a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-case-insensitive.js b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-case-insensitive.js index a96371d4d3..31740770fd 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-case-insensitive.js @@ -7,8 +7,8 @@ description: Time zone names are case insensitive features: [Temporal] ---*/ -const instance = new Temporal.PlainDate(2000, 5, 2); +const instance = new Temporal.PlainDate(2000, 5, 2); const timeZone = 'uTc'; const result = instance.toZonedDateTime(timeZone); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-getpossibleinstantsfor.js b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-getpossibleinstantsfor.js index fb13499e76..9386d11730 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-getpossibleinstantsfor.js +++ b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-getpossibleinstantsfor.js @@ -24,5 +24,5 @@ const result = plainDate.toZonedDateTime({ plainTime: { hour: 12, minute: 30 }, }); assert.sameValue(result.epochNanoseconds, 987654321_000_000_000n); -assert.sameValue(result.timeZone, timeZone); +assert.sameValue(result.getTimeZone(), timeZone); assert.sameValue(result.getCalendar(), calendar); diff --git a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-datetime.js b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-datetime.js index d4a39fca9c..d05b8d5ed2 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-datetime.js +++ b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-datetime.js @@ -15,30 +15,30 @@ assert.throws(RangeError, () => instance.toZonedDateTime({ timeZone }), "bare da timeZone = "2021-08-19T17:30Z"; const result1 = instance.toZonedDateTime(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = instance.toZonedDateTime(timeZone); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = instance.toZonedDateTime(timeZone); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = instance.toZonedDateTime(timeZone); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = instance.toZonedDateTime(timeZone); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-leap-second.js b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-leap-second.js index 7265aca261..0574078358 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-leap-second.js @@ -11,9 +11,9 @@ const instance = new Temporal.PlainDate(2000, 5, 2); let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = instance.toZonedDateTime(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => instance.toZonedDateTime(timeZone), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-multiple-offsets.js index 5b3dcdbf3b..6a82c0d327 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-multiple-offsets.js @@ -11,6 +11,6 @@ const instance = new Temporal.PlainDate(2000, 5, 2); const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = instance.toZonedDateTime(timeZone); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string.js b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string.js index fe86a5ac07..fb5bb7f955 100644 --- a/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string.js +++ b/test/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string.js @@ -11,5 +11,5 @@ const instance = new Temporal.PlainDate(2000, 5, 2); ["UTC", "+01:30"].forEach((timeZone) => { const result = instance.toZonedDateTime(timeZone); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `time zone slot should store string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/basic.js b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/basic.js index 3de71201de..6f26fe372d 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/basic.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/basic.js @@ -12,4 +12,4 @@ const zdt = dt.toZonedDateTime("UTC"); assert.sameValue(zdt.epochNanoseconds, 1577836800000000000n, "nanoseconds"); assert.sameValue(zdt.calendarId, "iso8601", "calendar"); -assert.sameValue(zdt.timeZone.toString(), "UTC", "timezone"); +assert.sameValue(zdt.timeZoneId, "UTC", "timezone"); diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/plain-custom-timezone.js b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/plain-custom-timezone.js index 51bf0b0cc5..1c2818759e 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/plain-custom-timezone.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/plain-custom-timezone.js @@ -39,7 +39,8 @@ const timeZone = TemporalHelpers.timeZoneObserver(actual, "timeZone", { const result = dateTime.toZonedDateTime(timeZone, options); assert.sameValue(result.epochNanoseconds, instant.epochNanoseconds); -assert.sameValue(result.timeZone, timeZone); +assert.sameValue(result.getTimeZone(), timeZone); + assert.compareArray(actual, expected); assert.sameValue(result.getISOFields().calendar, dateTime.getISOFields().calendar); diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-case-insensitive.js b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-case-insensitive.js index 4d0c384981..ad2532b30e 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-case-insensitive.js @@ -7,8 +7,8 @@ description: Time zone names are case insensitive features: [Temporal] ---*/ -const instance = new Temporal.PlainDateTime(2000, 5, 2); +const instance = new Temporal.PlainDateTime(2000, 5, 2); const timeZone = 'uTc'; const result = instance.toZonedDateTime(timeZone); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-datetime.js b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-datetime.js index eb953d36f5..fbd1b335d8 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-datetime.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-datetime.js @@ -15,30 +15,30 @@ assert.throws(RangeError, () => instance.toZonedDateTime({ timeZone }), "bare da timeZone = "2021-08-19T17:30Z"; const result1 = instance.toZonedDateTime(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = instance.toZonedDateTime(timeZone); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = instance.toZonedDateTime(timeZone); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = instance.toZonedDateTime(timeZone); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = instance.toZonedDateTime(timeZone); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-leap-second.js b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-leap-second.js index 9b02984eb9..c09506215b 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-leap-second.js @@ -11,9 +11,9 @@ const instance = new Temporal.PlainDateTime(2000, 5, 2); let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = instance.toZonedDateTime(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => instance.toZonedDateTime(timeZone), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-multiple-offsets.js index 5e089b44d9..ecb9531a1a 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-multiple-offsets.js @@ -11,6 +11,6 @@ const instance = new Temporal.PlainDateTime(2000, 5, 2); const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = instance.toZonedDateTime(timeZone); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string.js b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string.js index 4447e4492e..8f5c47bc23 100644 --- a/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string.js +++ b/test/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string.js @@ -11,5 +11,5 @@ const instance = new Temporal.PlainDateTime(2000, 5, 2); ["UTC", "+01:30"].forEach((timeZone) => { const result = instance.toZonedDateTime(timeZone); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `time zone slot should store string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/basic.js b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/basic.js index 55b11b45d2..3b1afd5c8e 100644 --- a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/basic.js +++ b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/basic.js @@ -13,12 +13,12 @@ const timeZone = Temporal.TimeZone.from('-07:00'); const objects = plainTime.toZonedDateTime({ timeZone, plainDate }); assert.sameValue(objects.epochNanoseconds, 1594234800000000000n, "objects: epochNanoseconds"); -assert.sameValue(objects.timeZone, timeZone, "objects: timeZone"); +assert.sameValue(objects.getTimeZone(), timeZone, "objects: timeZone"); const timeZoneString = plainTime.toZonedDateTime({ timeZone: "-07:00", plainDate }); assert.sameValue(timeZoneString.epochNanoseconds, 1594234800000000000n, "timeZone string: epochNanoseconds"); -assert.sameValue(timeZoneString.timeZone.id, "-07:00", "timeZone string: timeZone"); +assert.sameValue(timeZoneString.timeZoneId, "-07:00", "timeZone string: timeZone"); const plainDateString = plainTime.toZonedDateTime({ timeZone, plainDate: "2020-07-08" }); assert.sameValue(plainDateString.epochNanoseconds, 1594234800000000000n, "plainDate string: epochNanoseconds"); -assert.sameValue(plainDateString.timeZone.id, "-07:00", "plainDate string: timeZone"); +assert.sameValue(plainDateString.getTimeZone(), timeZone, "plainDate string: timeZone"); diff --git a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-case-insensitive.js b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-case-insensitive.js index 9fa6c6a435..7b71990b4e 100644 --- a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-case-insensitive.js @@ -7,8 +7,8 @@ description: Time zone names are case insensitive features: [Temporal] ---*/ -const instance = new Temporal.PlainTime(); +const instance = new Temporal.PlainTime(); const timeZone = 'uTc'; const result = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-datetime.js b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-datetime.js index b0537ee431..e3c13a8268 100644 --- a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-datetime.js +++ b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-datetime.js @@ -15,30 +15,30 @@ assert.throws(RangeError, () => instance.toZonedDateTime({ plainDate: new Tempor timeZone = "2021-08-19T17:30Z"; const result1 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-leap-second.js b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-leap-second.js index 78dffeb2c9..099b350dd5 100644 --- a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-leap-second.js @@ -11,9 +11,9 @@ const instance = new Temporal.PlainTime(); let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-multiple-offsets.js index fbbad90453..10442913c3 100644 --- a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-multiple-offsets.js @@ -11,6 +11,6 @@ const instance = new Temporal.PlainTime(); const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string.js b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string.js index 0798d74080..0edaf41993 100644 --- a/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string.js +++ b/test/built-ins/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string.js @@ -11,5 +11,5 @@ const instance = new Temporal.PlainTime(); ["UTC", "+01:30"].forEach((timeZone) => { const result = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `time zone slot should store string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/TimeZone/from/argument-object.js b/test/built-ins/Temporal/TimeZone/from/argument-object.js index 499e9cc67d..95102b9fb6 100644 --- a/test/built-ins/Temporal/TimeZone/from/argument-object.js +++ b/test/built-ins/Temporal/TimeZone/from/argument-object.js @@ -34,7 +34,7 @@ for (const thisValue of thisValues) { const zdt = new Temporal.ZonedDateTime(0n, "UTC"); const fromZdt = Temporal.TimeZone.from.call(thisValue, zdt); - assert.sameValue(fromZdt, zdt.timeZone); + assert.notSameValue(fromZdt, zdt.getTimeZone(), "from() creates a new object from a string slot value"); assert.sameValue(fromZdt.id, "UTC"); const tz = new Temporal.TimeZone("UTC"); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-datetime.js b/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-datetime.js index c75c47ddda..14a5a73582 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-datetime.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-datetime.js @@ -13,30 +13,30 @@ assert.throws(RangeError, () => Temporal.ZonedDateTime.from({ year: 2000, month: timeZone = "2021-08-19T17:30Z"; const result1 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-leap-second.js b/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-leap-second.js index 2b2a9eb311..72e06899ed 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-leap-second.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-leap-second.js @@ -10,9 +10,9 @@ features: [Temporal] let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-multiple-offsets.js b/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-multiple-offsets.js index 5b6d5264c6..dc8b5cb2ca 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-multiple-offsets.js @@ -10,6 +10,6 @@ features: [Temporal] const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string.js b/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string.js index c0736cd235..1be3bbe5d6 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string.js @@ -9,5 +9,5 @@ features: [Temporal] ["UTC", "+01:30"].forEach((timeZone) => { const result = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `Time zone created from string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/argument-string-date-with-utc-offset.js b/test/built-ins/Temporal/ZonedDateTime/from/argument-string-date-with-utc-offset.js index eab1c44202..f9079bf641 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/argument-string-date-with-utc-offset.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/argument-string-date-with-utc-offset.js @@ -18,7 +18,7 @@ for (const arg of validStrings) { const result = Temporal.ZonedDateTime.from(arg); assert.sameValue( - result.timeZone.toString(), + result.timeZoneId, "UTC", `"${arg}" is a valid UTC offset with time for ZonedDateTime` ); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/argument-string-time-separators.js b/test/built-ins/Temporal/ZonedDateTime/from/argument-string-time-separators.js index f92d64127e..4225d68b9f 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/argument-string-time-separators.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/argument-string-time-separators.js @@ -17,7 +17,7 @@ tests.forEach(([arg, description]) => { const result = Temporal.ZonedDateTime.from(arg); assert.sameValue( - result.timeZone.toString(), + result.timeZoneId, "UTC", `variant time separators (${description})` ); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/argument-string-time-zone-annotation.js b/test/built-ins/Temporal/ZonedDateTime/from/argument-string-time-zone-annotation.js index 22f081061e..ccfa4a8a4f 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/argument-string-time-zone-annotation.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/argument-string-time-zone-annotation.js @@ -26,7 +26,7 @@ tests.forEach(([arg, expectedZone, description]) => { const result = Temporal.ZonedDateTime.from(arg); assert.sameValue( - result.timeZone.toString(), + result.timeZoneId, expectedZone, `time zone annotation (${description})` ); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/timezone-case-insensitive.js b/test/built-ins/Temporal/ZonedDateTime/from/timezone-case-insensitive.js index c6b4dec2e3..a90581a8cc 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/timezone-case-insensitive.js @@ -9,4 +9,4 @@ features: [Temporal] const timeZone = 'uTc'; const result = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/zoneddatetime-string-multiple-offsets.js b/test/built-ins/Temporal/ZonedDateTime/from/zoneddatetime-string-multiple-offsets.js index 06191770f6..5ceb088ed2 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/zoneddatetime-string-multiple-offsets.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/zoneddatetime-string-multiple-offsets.js @@ -10,4 +10,4 @@ features: [Temporal] const str = "1970-01-01T00:02:00.000000000+00:02[+00:01:30.987654321]"; const result = Temporal.ZonedDateTime.from(str); -assert.sameValue(result.timeZone.toString(), "+00:01:30.987654321", "Time zone determined from bracket name"); +assert.sameValue(result.timeZoneId, "+00:01:30.987654321", "Time zone determined from bracket name"); diff --git a/test/built-ins/Temporal/ZonedDateTime/from/zoneddatetime-string.js b/test/built-ins/Temporal/ZonedDateTime/from/zoneddatetime-string.js index 1002c2e669..e49bd3cc49 100644 --- a/test/built-ins/Temporal/ZonedDateTime/from/zoneddatetime-string.js +++ b/test/built-ins/Temporal/ZonedDateTime/from/zoneddatetime-string.js @@ -17,21 +17,21 @@ assert.throws(RangeError, () => Temporal.ZonedDateTime.from(str), "date-time + o str = "1970-01-01T00:00[+01:00]"; const result1 = Temporal.ZonedDateTime.from(str); assert.sameValue(result1.epochNanoseconds, -3600_000_000_000n, "date-time + IANA annotation preserves wall time in the time zone"); -assert.sameValue(result1.timeZone.toString(), "+01:00", "IANA annotation is not ignored"); +assert.sameValue(result1.timeZoneId, "+01:00", "IANA annotation is not ignored"); str = "1970-01-01T00:00Z[+01:00]"; const result2 = Temporal.ZonedDateTime.from(str); assert.sameValue(result2.epochNanoseconds, 0n, "date-time + Z + IANA annotation preserves exact time in the time zone"); -assert.sameValue(result2.timeZone.toString(), "+01:00", "IANA annotation is not ignored"); +assert.sameValue(result2.timeZoneId, "+01:00", "IANA annotation is not ignored"); str = "1970-01-01T00:00+01:00[+01:00]"; const result3 = Temporal.ZonedDateTime.from(str); assert.sameValue(result3.epochNanoseconds, -3600_000_000_000n, "date-time + offset + IANA annotation ensures both exact and wall time match"); -assert.sameValue(result3.timeZone.toString(), "+01:00", "IANA annotation is not ignored"); +assert.sameValue(result3.timeZoneId, "+01:00", "IANA annotation is not ignored"); str = "1970-01-01T00:00-04:15[+01:00]"; assert.throws(RangeError, () => Temporal.ZonedDateTime.from(str), "date-time + offset + IANA annotation throws if wall time and exact time mismatch"); assert.throws(RangeError, () => Temporal.ZonedDateTime.from(str, { offset: "reject" }), "date-time + offset + IANA annotation throws if wall time and exact time mismatch (explicit reject option)"); const result4 = Temporal.ZonedDateTime.from(str, { offset: "ignore" }); assert.sameValue(result4.epochNanoseconds, -3600_000_000_000n, "date-time + wrong offset + IANA annotation preserves wall time in the time zone (offset: ignore option)"); -assert.sameValue(result4.timeZone.toString(), "+01:00", "IANA annotation is not ignored"); +assert.sameValue(result4.timeZoneId, "+01:00", "IANA annotation is not ignored"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/getISOFields/custom.js b/test/built-ins/Temporal/ZonedDateTime/prototype/getISOFields/custom.js index 972b3fcb1d..2900a83ee0 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/getISOFields/custom.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/getISOFields/custom.js @@ -23,4 +23,4 @@ assert.sameValue(result.isoMicrosecond, 654, "isoMicrosecond result"); assert.sameValue(result.isoNanosecond, 321, "isoNanosecond result"); assert.sameValue(result.offset, "+00:00", "offset result"); assert.sameValue(result.calendar, calendar, "calendar result"); -assert.sameValue(result.timeZone.id, "UTC", "timeZone result"); +assert.sameValue(result.timeZone, "UTC", "timeZone result"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/getISOFields/field-names.js b/test/built-ins/Temporal/ZonedDateTime/prototype/getISOFields/field-names.js index 6145f65d19..10861de182 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/getISOFields/field-names.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/getISOFields/field-names.js @@ -21,4 +21,4 @@ assert.sameValue(result.isoMicrosecond, 654, "isoMicrosecond result"); assert.sameValue(result.isoNanosecond, 321, "isoNanosecond result"); assert.sameValue(result.offset, "+00:00", "offset result"); assert.sameValue(result.calendar, "iso8601", "calendar result"); -assert.sameValue(result.timeZone.id, "UTC", "timeZone result"); +assert.sameValue(result.timeZone, "UTC", "timeZone result"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/branding.js b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/branding.js new file mode 100644 index 0000000000..c76788b8c0 --- /dev/null +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/branding.js @@ -0,0 +1,22 @@ +// 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.zoneddatetime.prototype.gettimezone +description: Throw a TypeError if the receiver is invalid +features: [Symbol, Temporal] +---*/ + +const getTimeZone = Temporal.ZonedDateTime.prototype.getTimeZone; + +assert.sameValue(typeof getTimeZone, "function"); + +assert.throws(TypeError, () => getTimeZone.call(undefined), "undefined"); +assert.throws(TypeError, () => getTimeZone.call(null), "null"); +assert.throws(TypeError, () => getTimeZone.call(true), "true"); +assert.throws(TypeError, () => getTimeZone.call(""), "empty string"); +assert.throws(TypeError, () => getTimeZone.call(Symbol()), "symbol"); +assert.throws(TypeError, () => getTimeZone.call(1), "1"); +assert.throws(TypeError, () => getTimeZone.call({}), "plain object"); +assert.throws(TypeError, () => getTimeZone.call(Temporal.ZonedDateTime), "Temporal.ZonedDateTime"); +assert.throws(TypeError, () => getTimeZone.call(Temporal.ZonedDateTime.prototype), "Temporal.ZonedDateTime.prototype"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/builtin.js b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/builtin.js new file mode 100644 index 0000000000..57e6dddd75 --- /dev/null +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/builtin.js @@ -0,0 +1,33 @@ +// Copyright (C) 2021 Igalia, S.L. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +esid: sec-temporal.zoneddatetime.prototype.gettimezone +description: > + Tests that Temporal.ZonedDateTime.prototype.getTimeZone + meets the requirements for built-in objects defined by the + introduction of chapter 17 of the ECMAScript Language Specification. +info: | + Built-in functions that are not constructors do not have a "prototype" property unless + otherwise specified in the description of a particular function. + + Unless specified otherwise, a built-in object that is callable as a function is a built-in + function object with the characteristics described in 10.3. Unless specified otherwise, the + [[Extensible]] internal slot of a built-in object initially has the value true. + + Unless otherwise specified every built-in function and every built-in constructor has the + Function prototype object [...] as the value of its [[Prototype]] internal slot. +features: [Temporal] +---*/ + +assert.sameValue(Object.isExtensible(Temporal.ZonedDateTime.prototype.getTimeZone), + true, "Built-in objects must be extensible."); + +assert.sameValue(Object.prototype.toString.call(Temporal.ZonedDateTime.prototype.getTimeZone), + "[object Function]", "Object.prototype.toString"); + +assert.sameValue(Object.getPrototypeOf(Temporal.ZonedDateTime.prototype.getTimeZone), + Function.prototype, "prototype"); + +assert.sameValue(Temporal.ZonedDateTime.prototype.getTimeZone.hasOwnProperty("prototype"), + false, "prototype property"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/length.js b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/length.js new file mode 100644 index 0000000000..20da9dcdc7 --- /dev/null +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/length.js @@ -0,0 +1,25 @@ +// 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.zoneddatetime.prototype.gettimezone +description: Temporal.ZonedDateTime.prototype.getTimeZone.length is 0 +info: | + Every built-in function object, including constructors, has a "length" property whose value is + an integer. Unless otherwise specified, this value is equal to the largest number of named + arguments shown in the subclause headings for the function description. Optional parameters + (which are indicated with brackets: [ ]) or rest parameters (which are shown using the form + «...name») are not included in the default argument count. + + Unless otherwise specified, the "length" property of a built-in function object has the + attributes { [[Writable]]: false, [[Enumerable]]: false, [[Configurable]]: true }. +includes: [propertyHelper.js] +features: [Temporal] +---*/ + +verifyProperty(Temporal.ZonedDateTime.prototype.getTimeZone, "length", { + value: 0, + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/name.js b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/name.js new file mode 100644 index 0000000000..4f4af47f7b --- /dev/null +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/name.js @@ -0,0 +1,23 @@ +// Copyright (C) 2021 Igalia, S.L. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +esid: sec-temporal.zoneddatetime.prototype.gettimezone +description: Temporal.ZonedDateTime.prototype.getTimeZone.name is "getTimeZone". +info: | + Every built-in function object, including constructors, that is not identified as an anonymous + function has a "name" property whose value is a String. Unless otherwise specified, this value + is the name that is given to the function in this specification. + + Unless otherwise specified, the "name" property of a built-in function object, if it exists, + has the attributes { [[Writable]]: false, [[Enumerable]]: false, [[Configurable]]: true }. +includes: [propertyHelper.js] +features: [Temporal] +---*/ + +verifyProperty(Temporal.ZonedDateTime.prototype.getTimeZone, "name", { + value: "getTimeZone", + writable: false, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/not-a-constructor.js b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/not-a-constructor.js new file mode 100644 index 0000000000..56bea9fcd7 --- /dev/null +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/not-a-constructor.js @@ -0,0 +1,21 @@ +// Copyright (C) 2021 Igalia, S.L. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +esid: sec-temporal.zoneddatetime.prototype.gettimezone +description: > + Temporal.ZonedDateTime.prototype.getTimeZone does not implement [[Construct]], is not new-able +info: | + Built-in function objects that are not identified as constructors do not implement the + [[Construct]] internal method unless otherwise specified in the description of a particular + function. +includes: [isConstructor.js] +features: [Reflect.construct, Temporal] +---*/ + +assert.throws(TypeError, () => { + new Temporal.ZonedDateTime.prototype.getTimeZone(); +}, "Calling as constructor"); + +assert.sameValue(isConstructor(Temporal.ZonedDateTime.prototype.getTimeZone), false, + "isConstructor(Temporal.ZonedDateTime.prototype.getTimeZone)"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/prop-desc.js b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/prop-desc.js new file mode 100644 index 0000000000..074f4345aa --- /dev/null +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/getTimeZone/prop-desc.js @@ -0,0 +1,21 @@ +// 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.zoneddatetime.prototype.gettimezone +description: The "getTimeZone" property of Temporal.ZonedDateTime.prototype +includes: [propertyHelper.js] +features: [Temporal] +---*/ + +assert.sameValue( + typeof Temporal.ZonedDateTime.prototype.getTimeZone, + "function", + "`typeof ZonedDateTime.prototype.getTimeZone` is `function`" +); + +verifyProperty(Temporal.ZonedDateTime.prototype, "getTimeZone", { + writable: true, + enumerable: false, + configurable: true, +}); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/timeZone/branding.js b/test/built-ins/Temporal/ZonedDateTime/prototype/timeZone/branding.js deleted file mode 100644 index 15ac6fc049..0000000000 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/timeZone/branding.js +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (C) 2021 Igalia, S.L. All rights reserved. -// This code is governed by the BSD license found in the LICENSE file. - -/*--- -esid: sec-get-temporal.zoneddatetime.prototype.timezone -description: Throw a TypeError if the receiver is invalid -features: [Symbol, Temporal] ----*/ - -const timeZone = Object.getOwnPropertyDescriptor(Temporal.ZonedDateTime.prototype, "timeZone").get; - -assert.sameValue(typeof timeZone, "function"); - -assert.throws(TypeError, () => timeZone.call(undefined), "undefined"); -assert.throws(TypeError, () => timeZone.call(null), "null"); -assert.throws(TypeError, () => timeZone.call(true), "true"); -assert.throws(TypeError, () => timeZone.call(""), "empty string"); -assert.throws(TypeError, () => timeZone.call(Symbol()), "symbol"); -assert.throws(TypeError, () => timeZone.call(1), "1"); -assert.throws(TypeError, () => timeZone.call({}), "plain object"); -assert.throws(TypeError, () => timeZone.call(Temporal.ZonedDateTime), "Temporal.ZonedDateTime"); -assert.throws(TypeError, () => timeZone.call(Temporal.ZonedDateTime.prototype), "Temporal.ZonedDateTime.prototype"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/timeZoneId/branding.js b/test/built-ins/Temporal/ZonedDateTime/prototype/timeZoneId/branding.js new file mode 100644 index 0000000000..9db21cb80b --- /dev/null +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/timeZoneId/branding.js @@ -0,0 +1,22 @@ +// Copyright (C) 2022 Igalia, S.L. All rights reserved. +// This code is governed by the BSD license found in the LICENSE file. + +/*--- +esid: sec-get-temporal.zoneddatetime.prototype.timezoneid +description: Throw a TypeError if the receiver is invalid +features: [Symbol, Temporal] +---*/ + +const timeZoneId = Object.getOwnPropertyDescriptor(Temporal.ZonedDateTime.prototype, "timeZoneId").get; + +assert.sameValue(typeof timeZoneId, "function"); + +assert.throws(TypeError, () => timeZoneId.call(undefined), "undefined"); +assert.throws(TypeError, () => timeZoneId.call(null), "null"); +assert.throws(TypeError, () => timeZoneId.call(true), "true"); +assert.throws(TypeError, () => timeZoneId.call(""), "empty string"); +assert.throws(TypeError, () => timeZoneId.call(Symbol()), "symbol"); +assert.throws(TypeError, () => timeZoneId.call(1), "1"); +assert.throws(TypeError, () => timeZoneId.call({}), "plain object"); +assert.throws(TypeError, () => timeZoneId.call(Temporal.ZonedDateTime), "Temporal.ZonedDateTime"); +assert.throws(TypeError, () => timeZoneId.call(Temporal.ZonedDateTime.prototype), "Temporal.ZonedDateTime.prototype"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/timeZone/prop-desc.js b/test/built-ins/Temporal/ZonedDateTime/prototype/timeZoneId/prop-desc.js similarity index 71% rename from test/built-ins/Temporal/ZonedDateTime/prototype/timeZone/prop-desc.js rename to test/built-ins/Temporal/ZonedDateTime/prototype/timeZoneId/prop-desc.js index e01a0f9d65..989bfa4eeb 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/timeZone/prop-desc.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/timeZoneId/prop-desc.js @@ -2,12 +2,12 @@ // This code is governed by the BSD license found in the LICENSE file. /*--- -esid: sec-get-temporal.zoneddatetime.prototype.timezone -description: The "timeZone" property of Temporal.ZonedDateTime.prototype +esid: sec-get-temporal.zoneddatetime.prototype.timezoneid +description: The "timeZoneId" property of Temporal.ZonedDateTime.prototype features: [Temporal] ---*/ -const descriptor = Object.getOwnPropertyDescriptor(Temporal.ZonedDateTime.prototype, "timeZone"); +const descriptor = Object.getOwnPropertyDescriptor(Temporal.ZonedDateTime.prototype, "timeZoneId"); assert.sameValue(typeof descriptor.get, "function"); assert.sameValue(descriptor.set, undefined); assert.sameValue(descriptor.enumerable, false); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-case-insensitive.js b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-case-insensitive.js index d977516ea9..7a9338cfbb 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-case-insensitive.js @@ -7,8 +7,8 @@ description: Time zone names are case insensitive features: [Temporal] ---*/ -const instance = new Temporal.ZonedDateTime(0n, "UTC"); +const instance = new Temporal.ZonedDateTime(0n, "UTC"); const timeZone = 'uTc'; const result = instance.withTimeZone(timeZone); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-datetime.js b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-datetime.js index 48e72411e7..2d31855c6c 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-datetime.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-datetime.js @@ -15,30 +15,30 @@ assert.throws(RangeError, () => instance.withTimeZone({ timeZone }), "bare date- timeZone = "2021-08-19T17:30Z"; const result1 = instance.withTimeZone(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = instance.withTimeZone({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = instance.withTimeZone(timeZone); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = instance.withTimeZone({ timeZone }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = instance.withTimeZone(timeZone); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = instance.withTimeZone({ timeZone }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = instance.withTimeZone(timeZone); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = instance.withTimeZone({ timeZone }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = instance.withTimeZone(timeZone); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = instance.withTimeZone({ timeZone }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-leap-second.js b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-leap-second.js index 93fc6d9d0e..75f4634c57 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-leap-second.js @@ -11,9 +11,9 @@ const instance = new Temporal.ZonedDateTime(0n, "UTC"); let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = instance.withTimeZone(timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone"); +assert.sameValue(result1.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone"); const result2 = instance.withTimeZone({ timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "leap second is a valid ISO string for TimeZone (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => instance.withTimeZone(timeZone), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-multiple-offsets.js index e2246488f6..a4b9f7a973 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string-multiple-offsets.js @@ -11,6 +11,6 @@ const instance = new Temporal.ZonedDateTime(0n, "UTC"); const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = instance.withTimeZone(timeZone); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = instance.withTimeZone({ timeZone }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string.js b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string.js index 386dfb333d..f80b924473 100644 --- a/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string.js +++ b/test/built-ins/Temporal/ZonedDateTime/prototype/withTimeZone/timezone-string.js @@ -11,5 +11,5 @@ const instance = new Temporal.ZonedDateTime(0n, "UTC"); ["UTC", "+01:30"].forEach((timeZone) => { const result = instance.withTimeZone(timeZone); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `time zone slot should store string "${timeZone}"`); }); diff --git a/test/built-ins/Temporal/ZonedDateTime/timezone-case-insensitive.js b/test/built-ins/Temporal/ZonedDateTime/timezone-case-insensitive.js index 3c780f6a3c..a3e66dce0c 100644 --- a/test/built-ins/Temporal/ZonedDateTime/timezone-case-insensitive.js +++ b/test/built-ins/Temporal/ZonedDateTime/timezone-case-insensitive.js @@ -9,4 +9,4 @@ features: [Temporal] const timeZone = 'uTc'; const result = new Temporal.ZonedDateTime(0n, timeZone); -assert.sameValue(result.timeZone.id, 'UTC', `Time zone created from string "${timeZone}"`); +assert.sameValue(result.timeZoneId, 'UTC', `Time zone created from string "${timeZone}"`); diff --git a/test/built-ins/Temporal/ZonedDateTime/timezone-string-datetime.js b/test/built-ins/Temporal/ZonedDateTime/timezone-string-datetime.js index 3eca69186e..8efe9bc43b 100644 --- a/test/built-ins/Temporal/ZonedDateTime/timezone-string-datetime.js +++ b/test/built-ins/Temporal/ZonedDateTime/timezone-string-datetime.js @@ -13,30 +13,30 @@ assert.throws(RangeError, () => new Temporal.ZonedDateTime(0n, { timeZone }), "b timeZone = "2021-08-19T17:30Z"; const result1 = new Temporal.ZonedDateTime(0n, timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "date-time + Z is UTC time zone"); +assert.sameValue(result1.timeZoneId, "UTC", "date-time + Z is UTC time zone"); const result2 = new Temporal.ZonedDateTime(0n, { timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "date-time + Z is UTC time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "UTC", "date-time + Z is UTC time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00"; const result3 = new Temporal.ZonedDateTime(0n, timeZone); -assert.sameValue(result3.timeZone.id, "-07:00", "date-time + offset is the offset time zone"); +assert.sameValue(result3.timeZoneId, "-07:00", "date-time + offset is the offset time zone"); const result4 = new Temporal.ZonedDateTime(0n, { timeZone }); -assert.sameValue(result4.timeZone.id, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "-07:00", "date-time + offset is the offset time zone (string in property bag)"); timeZone = "2021-08-19T17:30[UTC]"; const result5 = new Temporal.ZonedDateTime(0n, timeZone); -assert.sameValue(result5.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone"); const result6 = new Temporal.ZonedDateTime(0n, { timeZone }); -assert.sameValue(result6.timeZone.id, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "UTC", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[UTC]"; const result7 = new Temporal.ZonedDateTime(0n, timeZone); -assert.sameValue(result7.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result7.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone"); const result8 = new Temporal.ZonedDateTime(0n, { timeZone }); -assert.sameValue(result8.timeZone.id, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result8.timeZoneId, "UTC", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[UTC]"; const result9 = new Temporal.ZonedDateTime(0n, timeZone); -assert.sameValue(result9.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result9.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone"); const result10 = new Temporal.ZonedDateTime(0n, { timeZone }); -assert.sameValue(result10.timeZone.id, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result10.timeZoneId, "UTC", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/built-ins/Temporal/ZonedDateTime/timezone-string-leap-second.js b/test/built-ins/Temporal/ZonedDateTime/timezone-string-leap-second.js index 966502ef8f..1c07bc2170 100644 --- a/test/built-ins/Temporal/ZonedDateTime/timezone-string-leap-second.js +++ b/test/built-ins/Temporal/ZonedDateTime/timezone-string-leap-second.js @@ -10,9 +10,9 @@ features: [Temporal] let timeZone = "2016-12-31T23:59:60+00:00[UTC]"; const result1 = new Temporal.ZonedDateTime(0n, timeZone); -assert.sameValue(result1.timeZone.id, "UTC", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "UTC", "Time zone string determined from bracket name"); const result2 = new Temporal.ZonedDateTime(0n, { timeZone }); -assert.sameValue(result2.timeZone.id, "UTC", "Time zone string determined from bracket name (nested property)"); +assert.sameValue(result2.timeZoneId, "UTC", "Time zone string determined from bracket name (nested property)"); timeZone = "2021-08-19T17:30:45.123456789+23:59[+23:59:60]"; assert.throws(RangeError, () => new Temporal.ZonedDateTime(0n, timeZone), "leap second in time zone name not valid"); diff --git a/test/built-ins/Temporal/ZonedDateTime/timezone-string-multiple-offsets.js b/test/built-ins/Temporal/ZonedDateTime/timezone-string-multiple-offsets.js index f1b9432c8f..8411057aca 100644 --- a/test/built-ins/Temporal/ZonedDateTime/timezone-string-multiple-offsets.js +++ b/test/built-ins/Temporal/ZonedDateTime/timezone-string-multiple-offsets.js @@ -10,6 +10,6 @@ features: [Temporal] const timeZone = "2021-08-19T17:30:45.123456789+01:46[+01:45:30.987654321]"; const result1 = new Temporal.ZonedDateTime(0n, timeZone); -assert.sameValue(result1.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result1.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); const result2 = new Temporal.ZonedDateTime(0n, { timeZone }); -assert.sameValue(result2.timeZone.id, "+01:45:30.987654321", "Time zone string determined from bracket name"); +assert.sameValue(result2.timeZoneId, "+01:45:30.987654321", "Time zone string determined from bracket name"); diff --git a/test/built-ins/Temporal/ZonedDateTime/timezone-string.js b/test/built-ins/Temporal/ZonedDateTime/timezone-string.js index 95d96b58d5..d83ef4c271 100644 --- a/test/built-ins/Temporal/ZonedDateTime/timezone-string.js +++ b/test/built-ins/Temporal/ZonedDateTime/timezone-string.js @@ -9,5 +9,5 @@ features: [Temporal] ["UTC", "+01:30"].forEach((timeZone) => { const result = new Temporal.ZonedDateTime(0n, timeZone); - assert.sameValue(result.timeZone.id, timeZone, `Time zone created from string "${timeZone}"`); + assert.sameValue(result.getISOFields().timeZone, timeZone, `time zone slot should store string "${timeZone}"`); }); diff --git a/test/intl402/Temporal/Instant/prototype/toZonedDateTime/timezone-string-datetime.js b/test/intl402/Temporal/Instant/prototype/toZonedDateTime/timezone-string-datetime.js index 220f9a1328..15b38c1591 100644 --- a/test/intl402/Temporal/Instant/prototype/toZonedDateTime/timezone-string-datetime.js +++ b/test/intl402/Temporal/Instant/prototype/toZonedDateTime/timezone-string-datetime.js @@ -11,18 +11,18 @@ const instance = new Temporal.Instant(0n); let timeZone = "2021-08-19T17:30[America/Vancouver]"; const result1 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result1.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result1.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); const result2 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result2.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[America/Vancouver]"; const result3 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result3.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result3.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); const result4 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result4.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[America/Vancouver]"; const result5 = instance.toZonedDateTime({ timeZone, calendar: "iso8601" }); -assert.sameValue(result5.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTime({ timeZone: { timeZone }, calendar: "iso8601" }); -assert.sameValue(result6.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/intl402/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-datetime.js b/test/intl402/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-datetime.js index 4ff2a51e97..205876ebbe 100644 --- a/test/intl402/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-datetime.js +++ b/test/intl402/Temporal/Instant/prototype/toZonedDateTimeISO/timezone-string-datetime.js @@ -11,18 +11,18 @@ const instance = new Temporal.Instant(0n); let timeZone = "2021-08-19T17:30[America/Vancouver]"; const result1 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result1.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result1.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); const result2 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result2.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[America/Vancouver]"; const result3 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result3.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result3.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); const result4 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result4.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[America/Vancouver]"; const result5 = instance.toZonedDateTimeISO(timeZone); -assert.sameValue(result5.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTimeISO({ timeZone }); -assert.sameValue(result6.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/intl402/Temporal/Now/zonedDateTime/calendar-string.js b/test/intl402/Temporal/Now/zonedDateTime/calendar-string.js index 8abce1dced..805b20764b 100644 --- a/test/intl402/Temporal/Now/zonedDateTime/calendar-string.js +++ b/test/intl402/Temporal/Now/zonedDateTime/calendar-string.js @@ -12,5 +12,4 @@ const tz = Temporal.Now.timeZoneId(); assert(zdt instanceof Temporal.ZonedDateTime); assert.sameValue(typeof zdt.getISOFields().calendar, "string", "calendar slot should store a string"); assert.sameValue(zdt.calendarId, "gregory"); -assert(zdt.timeZone instanceof Temporal.TimeZone); -assert.sameValue(zdt.timeZone.id, tz); +assert.sameValue(zdt.timeZoneId, tz); diff --git a/test/intl402/Temporal/Now/zonedDateTime/calendar-timezone-string.js b/test/intl402/Temporal/Now/zonedDateTime/calendar-timezone-string.js index fd9664d659..f973daaba4 100644 --- a/test/intl402/Temporal/Now/zonedDateTime/calendar-timezone-string.js +++ b/test/intl402/Temporal/Now/zonedDateTime/calendar-timezone-string.js @@ -11,5 +11,4 @@ const zdt = Temporal.Now.zonedDateTime("gregory", "America/Los_Angeles"); assert(zdt instanceof Temporal.ZonedDateTime); assert.sameValue(typeof zdt.getISOFields().calendar, "string", "calendar slot should store a string"); assert.sameValue(zdt.calendarId, "gregory"); -assert(zdt.timeZone instanceof Temporal.TimeZone); -assert.sameValue(zdt.timeZone.id, "America/Los_Angeles"); +assert.sameValue(zdt.timeZoneId, "America/Los_Angeles"); diff --git a/test/intl402/Temporal/Now/zonedDateTime/timezone-string-datetime.js b/test/intl402/Temporal/Now/zonedDateTime/timezone-string-datetime.js index 5c69442a01..d93a23d94c 100644 --- a/test/intl402/Temporal/Now/zonedDateTime/timezone-string-datetime.js +++ b/test/intl402/Temporal/Now/zonedDateTime/timezone-string-datetime.js @@ -9,18 +9,18 @@ features: [Temporal] let timeZone = "2021-08-19T17:30[America/Vancouver]"; const result1 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result1.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result1.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); const result2 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result2.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[America/Vancouver]"; const result3 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result3.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result3.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); const result4 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result4.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[America/Vancouver]"; const result5 = Temporal.Now.zonedDateTime("iso8601", timeZone); -assert.sameValue(result5.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); const result6 = Temporal.Now.zonedDateTime("iso8601", { timeZone }); -assert.sameValue(result6.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/intl402/Temporal/Now/zonedDateTimeISO/timezone-string-datetime.js b/test/intl402/Temporal/Now/zonedDateTimeISO/timezone-string-datetime.js index 4de19823d9..7e0c82c1d9 100644 --- a/test/intl402/Temporal/Now/zonedDateTimeISO/timezone-string-datetime.js +++ b/test/intl402/Temporal/Now/zonedDateTimeISO/timezone-string-datetime.js @@ -9,18 +9,18 @@ features: [Temporal] let timeZone = "2021-08-19T17:30[America/Vancouver]"; const result1 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result1.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result1.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); const result2 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result2.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[America/Vancouver]"; const result3 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result3.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result3.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); const result4 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result4.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[America/Vancouver]"; const result5 = Temporal.Now.zonedDateTimeISO(timeZone); -assert.sameValue(result5.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); const result6 = Temporal.Now.zonedDateTimeISO({ timeZone }); -assert.sameValue(result6.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/intl402/Temporal/Now/zonedDateTimeISO/timezone-string.js b/test/intl402/Temporal/Now/zonedDateTimeISO/timezone-string.js index ad90946d07..1d6445b448 100644 --- a/test/intl402/Temporal/Now/zonedDateTimeISO/timezone-string.js +++ b/test/intl402/Temporal/Now/zonedDateTimeISO/timezone-string.js @@ -11,5 +11,4 @@ const zdt = Temporal.Now.zonedDateTimeISO("America/Los_Angeles"); assert(zdt instanceof Temporal.ZonedDateTime); assert.sameValue(typeof zdt.getISOFields().calendar, "string", "calendar slot should store a string"); assert.sameValue(zdt.calendarId, "iso8601"); -assert(zdt.timeZone instanceof Temporal.TimeZone); -assert.sameValue(zdt.timeZone.id, "America/Los_Angeles"); +assert.sameValue(zdt.timeZoneId, "America/Los_Angeles"); diff --git a/test/intl402/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-datetime.js b/test/intl402/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-datetime.js index adc5b566e6..d75c7e914c 100644 --- a/test/intl402/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-datetime.js +++ b/test/intl402/Temporal/PlainDate/prototype/toZonedDateTime/timezone-string-datetime.js @@ -11,18 +11,18 @@ const instance = new Temporal.PlainDate(2000, 5, 2); let timeZone = "2021-08-19T17:30[America/Vancouver]"; const result1 = instance.toZonedDateTime(timeZone); -assert.sameValue(result1.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result1.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); const result2 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result2.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[America/Vancouver]"; const result3 = instance.toZonedDateTime(timeZone); -assert.sameValue(result3.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result3.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); const result4 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result4.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[America/Vancouver]"; const result5 = instance.toZonedDateTime(timeZone); -assert.sameValue(result5.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result6.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/intl402/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-datetime.js b/test/intl402/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-datetime.js index f340aa7d34..f79c383b29 100644 --- a/test/intl402/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-datetime.js +++ b/test/intl402/Temporal/PlainDateTime/prototype/toZonedDateTime/timezone-string-datetime.js @@ -11,18 +11,18 @@ const instance = new Temporal.PlainDateTime(2000, 5, 2); let timeZone = "2021-08-19T17:30[America/Vancouver]"; const result1 = instance.toZonedDateTime(timeZone); -assert.sameValue(result1.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result1.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); const result2 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result2.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[America/Vancouver]"; const result3 = instance.toZonedDateTime(timeZone); -assert.sameValue(result3.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result3.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); const result4 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result4.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[America/Vancouver]"; const result5 = instance.toZonedDateTime(timeZone); -assert.sameValue(result5.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTime({ timeZone }); -assert.sameValue(result6.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/intl402/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-datetime.js b/test/intl402/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-datetime.js index 77ce858e95..83a0689966 100644 --- a/test/intl402/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-datetime.js +++ b/test/intl402/Temporal/PlainTime/prototype/toZonedDateTime/timezone-string-datetime.js @@ -11,18 +11,18 @@ const instance = new Temporal.PlainTime(); let timeZone = "2021-08-19T17:30[America/Vancouver]"; const result1 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result1.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result1.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); const result2 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result2.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[America/Vancouver]"; const result3 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result3.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result3.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); const result4 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result4.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[America/Vancouver]"; const result5 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone }); -assert.sameValue(result5.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); const result6 = instance.toZonedDateTime({ plainDate: new Temporal.PlainDate(2000, 5, 2), timeZone: { timeZone } }); -assert.sameValue(result6.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/intl402/Temporal/TimeZone/from/argument-object.js b/test/intl402/Temporal/TimeZone/from/argument-object.js index 7991c341bd..736e491385 100644 --- a/test/intl402/Temporal/TimeZone/from/argument-object.js +++ b/test/intl402/Temporal/TimeZone/from/argument-object.js @@ -31,7 +31,7 @@ for (const thisValue of thisValues) { const zdt = new Temporal.ZonedDateTime(0n, "Africa/Cairo"); const fromZdt = Temporal.TimeZone.from.call(thisValue, zdt); - assert.sameValue(fromZdt, zdt.timeZone); + assert.notSameValue(fromZdt, zdt.getTimeZone(), "from() creates a new object for a string slot value"); assert.sameValue(fromZdt.id, "Africa/Cairo"); const tz = new Temporal.TimeZone("Africa/Cairo"); diff --git a/test/intl402/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-datetime.js b/test/intl402/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-datetime.js index 55738d2f2e..ca8bb53342 100644 --- a/test/intl402/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-datetime.js +++ b/test/intl402/Temporal/ZonedDateTime/from/argument-propertybag-timezone-string-datetime.js @@ -9,18 +9,18 @@ features: [Temporal] let timeZone = "2021-08-19T17:30[America/Vancouver]"; const result1 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result1.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); +assert.sameValue(result1.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone"); const result2 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result2.timeZone.id, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result2.timeZoneId, "America/Vancouver", "date-time + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30Z[America/Vancouver]"; const result3 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result3.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); +assert.sameValue(result3.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone"); const result4 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result4.timeZone.id, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result4.timeZoneId, "America/Vancouver", "date-time + Z + IANA annotation is the IANA time zone (string in property bag)"); timeZone = "2021-08-19T17:30-07:00[America/Vancouver]"; const result5 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone }); -assert.sameValue(result5.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); +assert.sameValue(result5.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone"); const result6 = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: { timeZone } }); -assert.sameValue(result6.timeZone.id, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); +assert.sameValue(result6.timeZoneId, "America/Vancouver", "date-time + offset + IANA annotation is the IANA time zone (string in property bag)"); diff --git a/test/staging/Intl402/Temporal/old/date-time-format.js b/test/staging/Intl402/Temporal/old/date-time-format.js index f2410131e3..e61e735175 100644 --- a/test/staging/Intl402/Temporal/old/date-time-format.js +++ b/test/staging/Intl402/Temporal/old/date-time-format.js @@ -652,7 +652,7 @@ assert.sameValue( // should work for ZonedDateTime var zdt1 = Temporal.ZonedDateTime.from(t1); -var zdt2 = Temporal.ZonedDateTime.from(t2).withTimeZone(zdt1.timeZone); +var zdt2 = Temporal.ZonedDateTime.from(t2).withTimeZone(zdt1); assert.sameValue( us2.formatRange(zdt1, zdt2), `11/18/1976, 2:23:30${usDayPeriodSpace}PM UTC${usDateRangeSeparator}2/20/2020, 8:44:56${usDayPeriodSpace}PM UTC` @@ -987,7 +987,7 @@ assert.deepEqual(at.formatRangeToParts(Temporal.Instant.from(t1), Temporal.Insta // should work for ZonedDateTime var zdt1 = Temporal.ZonedDateTime.from(t1); -var zdt2 = Temporal.ZonedDateTime.from(t2).withTimeZone(zdt1.timeZone); +var zdt2 = Temporal.ZonedDateTime.from(t2).withTimeZone(zdt1); assert.deepEqual(us2.formatRangeToParts(zdt1, zdt2), [ { type: "month", diff --git a/test/staging/Temporal/ZonedDateTime/old/withCalendar.js b/test/staging/Temporal/ZonedDateTime/old/withCalendar.js index bf14cf97aa..7a2be87bac 100644 --- a/test/staging/Temporal/ZonedDateTime/old/withCalendar.js +++ b/test/staging/Temporal/ZonedDateTime/old/withCalendar.js @@ -18,4 +18,4 @@ var zdt = Temporal.ZonedDateTime.from("2019-11-18T15:23:30.123456789+01:00[+01:0 var zdt2 = zdt.withCalendar(cal); assert.sameValue(zdt.epochNanoseconds, zdt2.epochNanoseconds); assert.sameValue(zdt2.getCalendar(), cal); -assert.sameValue(zdt2.timeZone.id, "+01:00"); +assert.sameValue(zdt2.timeZoneId, "+01:00"); diff --git a/test/staging/Temporal/ZonedDateTime/old/withTimezone.js b/test/staging/Temporal/ZonedDateTime/old/withTimezone.js index af57f3370b..fb096ca120 100644 --- a/test/staging/Temporal/ZonedDateTime/old/withTimezone.js +++ b/test/staging/Temporal/ZonedDateTime/old/withTimezone.js @@ -13,5 +13,5 @@ var zdt = Temporal.ZonedDateTime.from("2019-11-18T15:23:30.123456789+01:00[+01:0 var zdt2 = zdt.withTimeZone("-08:00"); assert.sameValue(zdt.epochNanoseconds, zdt2.epochNanoseconds); assert.sameValue(zdt2.getCalendar(), fakeGregorian); -assert.sameValue(zdt2.timeZone.id, "-08:00"); +assert.sameValue(zdt2.timeZoneId, "-08:00"); assert.notSameValue(`${ zdt.toPlainDateTime() }`, `${ zdt2.toPlainDateTime() }`);