From 8b5dc0b1efc883b029c64a813f7bb12c65c49980 Mon Sep 17 00:00:00 2001 From: Philip Chimento Date: Tue, 20 Sep 2022 11:22:56 -0700 Subject: [PATCH] Temporal: Consistently test that calendar is copied in X.from() We did this inconsistently in PlainDate and ZonedDateTime, and not in the other calendar-carrying types. Additionally, we don't have to create the calendar explicitly in PlainDate. --- .../Temporal/PlainDate/from/argument-plaindate.js | 9 ++------- .../PlainDateTime/from/argument-plaindatetime.js | 2 ++ .../PlainMonthDay/from/argument-plainmonthday.js | 2 ++ .../PlainYearMonth/from/argument-plainyearmonth.js | 2 ++ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/built-ins/Temporal/PlainDate/from/argument-plaindate.js b/test/built-ins/Temporal/PlainDate/from/argument-plaindate.js index 5dbdceb478..876d64eb2b 100644 --- a/test/built-ins/Temporal/PlainDate/from/argument-plaindate.js +++ b/test/built-ins/Temporal/PlainDate/from/argument-plaindate.js @@ -8,8 +8,7 @@ includes: [temporalHelpers.js] features: [Temporal] ---*/ -const calendar = new Temporal.Calendar("iso8601"); -const orig = new Temporal.PlainDate(2000, 5, 2, calendar); +const orig = new Temporal.PlainDate(2000, 5, 2); const result = Temporal.PlainDate.from(orig); TemporalHelpers.assertPlainDate( @@ -18,11 +17,7 @@ TemporalHelpers.assertPlainDate( "PlainDate is copied" ); -assert.sameValue( - result.calendar, - calendar, - "Calendar is copied" -); +assert.sameValue(result.calendar, orig.calendar, "Calendar is copied"); assert.notSameValue( result, diff --git a/test/built-ins/Temporal/PlainDateTime/from/argument-plaindatetime.js b/test/built-ins/Temporal/PlainDateTime/from/argument-plaindatetime.js index 67239ff1e3..9cefe93e65 100644 --- a/test/built-ins/Temporal/PlainDateTime/from/argument-plaindatetime.js +++ b/test/built-ins/Temporal/PlainDateTime/from/argument-plaindatetime.js @@ -17,6 +17,8 @@ TemporalHelpers.assertPlainDateTime( "PlainDateTime is copied" ); +assert.sameValue(result.calendar, orig.calendar, "Calendar is copied"); + assert.notSameValue( result, orig, diff --git a/test/built-ins/Temporal/PlainMonthDay/from/argument-plainmonthday.js b/test/built-ins/Temporal/PlainMonthDay/from/argument-plainmonthday.js index 5304f55396..214c541e45 100644 --- a/test/built-ins/Temporal/PlainMonthDay/from/argument-plainmonthday.js +++ b/test/built-ins/Temporal/PlainMonthDay/from/argument-plainmonthday.js @@ -18,6 +18,8 @@ TemporalHelpers.assertPlainMonthDay( /* isoYear = */ 2000 ); +assert.sameValue(result.calendar, orig.calendar, "Calendar is copied"); + assert.notSameValue( result, orig, diff --git a/test/built-ins/Temporal/PlainYearMonth/from/argument-plainyearmonth.js b/test/built-ins/Temporal/PlainYearMonth/from/argument-plainyearmonth.js index 577318692f..b8196919b5 100644 --- a/test/built-ins/Temporal/PlainYearMonth/from/argument-plainyearmonth.js +++ b/test/built-ins/Temporal/PlainYearMonth/from/argument-plainyearmonth.js @@ -18,6 +18,8 @@ TemporalHelpers.assertPlainYearMonth( /* era = */ undefined, /* eraYear = */ undefined, /* isoDay = */ 7 ); +assert.sameValue(result.calendar, orig.calendar, "Calendar is copied"); + assert.notSameValue( result, orig,