tyler.durden
/
test262
mirror of https://github.com/tc39/test262.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporal Helpers: Better formatting for assertion messages 

Adding colons in the appropriate places will make assertion failures
easier to understand.
This commit is contained in:
Philip Chimento 2024-01-17 15:26:55 -08:00 committed by Philip Chimento
parent 4087779220
commit c877132488
1 changed files with 88 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
harness/temporalHelpers.js
View File

@ -61,17 +61,18 @@ var TemporalHelpers = {
* an expected value. * an expected value.
*/ */
assertDuration(duration, years, months, weeks, days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, description = "") { assertDuration(duration, years, months, weeks, days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, description = "") {
assert(duration instanceof Temporal.Duration, `${description} instanceof`); const prefix = description ? `${description}: ` : "";
assert.sameValue(duration.years, years, `${description} years result`); assert(duration instanceof Temporal.Duration, `${prefix}instanceof`);
assert.sameValue(duration.months, months, `${description} months result`); assert.sameValue(duration.years, years, `${prefix}years result:`);
assert.sameValue(duration.weeks, weeks, `${description} weeks result`); assert.sameValue(duration.months, months, `${prefix}months result:`);
assert.sameValue(duration.days, days, `${description} days result`); assert.sameValue(duration.weeks, weeks, `${prefix}weeks result:`);
assert.sameValue(duration.hours, hours, `${description} hours result`); assert.sameValue(duration.days, days, `${prefix}days result:`);
assert.sameValue(duration.minutes, minutes, `${description} minutes result`); assert.sameValue(duration.hours, hours, `${prefix}hours result:`);
assert.sameValue(duration.seconds, seconds, `${description} seconds result`); assert.sameValue(duration.minutes, minutes, `${prefix}minutes result:`);
assert.sameValue(duration.milliseconds, milliseconds, `${description} milliseconds result`); assert.sameValue(duration.seconds, seconds, `${prefix}seconds result:`);
assert.sameValue(duration.microseconds, microseconds, `${description} microseconds result`); assert.sameValue(duration.milliseconds, milliseconds, `${prefix}milliseconds result:`);
assert.sameValue(duration.nanoseconds, nanoseconds, `${description} nanoseconds result`); assert.sameValue(duration.microseconds, microseconds, `${prefix}microseconds result:`);
assert.sameValue(duration.nanoseconds, nanoseconds, `${prefix}nanoseconds result`);
}, },
/* /*
@ -81,17 +82,18 @@ var TemporalHelpers = {
* equal to an expected value. * equal to an expected value.
*/ */
assertDateDuration(duration, years, months, weeks, days, description = "") { assertDateDuration(duration, years, months, weeks, days, description = "") {
assert(duration instanceof Temporal.Duration, `${description} instanceof`); const prefix = description ? `${description}: ` : "";
assert.sameValue(duration.years, years, `${description} years result`); assert(duration instanceof Temporal.Duration, `${prefix}instanceof`);
assert.sameValue(duration.months, months, `${description} months result`); assert.sameValue(duration.years, years, `${prefix}years result:`);
assert.sameValue(duration.weeks, weeks, `${description} weeks result`); assert.sameValue(duration.months, months, `${prefix}months result:`);
assert.sameValue(duration.days, days, `${description} days result`); assert.sameValue(duration.weeks, weeks, `${prefix}weeks result:`);
assert.sameValue(duration.hours, 0, `${description} hours result should be zero`); assert.sameValue(duration.days, days, `${prefix}days result:`);
assert.sameValue(duration.minutes, 0, `${description} minutes result should be zero`); assert.sameValue(duration.hours, 0, `${prefix}hours result should be zero:`);
assert.sameValue(duration.seconds, 0, `${description} seconds result should be zero`); assert.sameValue(duration.minutes, 0, `${prefix}minutes result should be zero:`);
assert.sameValue(duration.milliseconds, 0, `${description} milliseconds result should be zero`); assert.sameValue(duration.seconds, 0, `${prefix}seconds result should be zero:`);
assert.sameValue(duration.microseconds, 0, `${description} microseconds result should be zero`); assert.sameValue(duration.milliseconds, 0, `${prefix}milliseconds result should be zero:`);
assert.sameValue(duration.nanoseconds, 0, `${description} nanoseconds result should be zero`); assert.sameValue(duration.microseconds, 0, `${prefix}microseconds result should be zero:`);
assert.sameValue(duration.nanoseconds, 0, `${prefix}nanoseconds result should be zero:`);
}, },
/* /*
@ -101,7 +103,8 @@ var TemporalHelpers = {
* the corresponding field in another Temporal.Duration. * the corresponding field in another Temporal.Duration.
*/ */
assertDurationsEqual(actual, expected, description = "") { assertDurationsEqual(actual, expected, description = "") {
assert(expected instanceof Temporal.Duration, `${description} expected value should be a Temporal.Duration`); const prefix = description ? `${description}: ` : "";
assert(expected instanceof Temporal.Duration, `${prefix}expected value should be a Temporal.Duration`);
TemporalHelpers.assertDuration(actual, expected.years, expected.months, expected.weeks, expected.days, expected.hours, expected.minutes, expected.seconds, expected.milliseconds, expected.microseconds, expected.nanoseconds, description); TemporalHelpers.assertDuration(actual, expected.years, expected.months, expected.weeks, expected.days, expected.hours, expected.minutes, expected.seconds, expected.milliseconds, expected.microseconds, expected.nanoseconds, description);
}, },
@ -112,9 +115,10 @@ var TemporalHelpers = {
* and equal according to their equals() methods. * and equal according to their equals() methods.
*/ */
assertInstantsEqual(actual, expected, description = "") { assertInstantsEqual(actual, expected, description = "") {
assert(expected instanceof Temporal.Instant, `${description} expected value should be a Temporal.Instant`); const prefix = description ? `${description}: ` : "";
assert(actual instanceof Temporal.Instant, `${description} instanceof`); assert(expected instanceof Temporal.Instant, `${prefix}expected value should be a Temporal.Instant`);
assert(actual.equals(expected), `${description} equals method`); assert(actual instanceof Temporal.Instant, `${prefix}instanceof`);
assert(actual.equals(expected), `${prefix}equals method`);
}, },
/* /*
@ -126,13 +130,14 @@ var TemporalHelpers = {
* value of date.calendarId.) * value of date.calendarId.)
*/ */
assertPlainDate(date, year, month, monthCode, day, description = "", era = undefined, eraYear = undefined) { assertPlainDate(date, year, month, monthCode, day, description = "", era = undefined, eraYear = undefined) {
assert(date instanceof Temporal.PlainDate, `${description} instanceof`); const prefix = description ? `${description}: ` : "";
assert.sameValue(date.era, era, `${description} era result`); assert(date instanceof Temporal.PlainDate, `${prefix}instanceof`);
assert.sameValue(date.eraYear, eraYear, `${description} eraYear result`); assert.sameValue(date.era, era, `${prefix}era result:`);
assert.sameValue(date.year, year, `${description} year result`); assert.sameValue(date.eraYear, eraYear, `${prefix}eraYear result:`);
assert.sameValue(date.month, month, `${description} month result`); assert.sameValue(date.year, year, `${prefix}year result:`);
assert.sameValue(date.monthCode, monthCode, `${description} monthCode result`); assert.sameValue(date.month, month, `${prefix}month result:`);
assert.sameValue(date.day, day, `${description} day result`); assert.sameValue(date.monthCode, monthCode, `${prefix}monthCode result:`);
assert.sameValue(date.day, day, `${prefix}day result:`);
}, },
/* /*
@ -144,19 +149,20 @@ var TemporalHelpers = {
* or the value of datetime.calendarId.) * or the value of datetime.calendarId.)
*/ */
assertPlainDateTime(datetime, year, month, monthCode, day, hour, minute, second, millisecond, microsecond, nanosecond, description = "", era = undefined, eraYear = undefined) { assertPlainDateTime(datetime, year, month, monthCode, day, hour, minute, second, millisecond, microsecond, nanosecond, description = "", era = undefined, eraYear = undefined) {
assert(datetime instanceof Temporal.PlainDateTime, `${description} instanceof`); const prefix = description ? `${description}: ` : "";
assert.sameValue(datetime.era, era, `${description} era result`); assert(datetime instanceof Temporal.PlainDateTime, `${prefix}instanceof`);
assert.sameValue(datetime.eraYear, eraYear, `${description} eraYear result`); assert.sameValue(datetime.era, era, `${prefix}era result:`);
assert.sameValue(datetime.year, year, `${description} year result`); assert.sameValue(datetime.eraYear, eraYear, `${prefix}eraYear result:`);
assert.sameValue(datetime.month, month, `${description} month result`); assert.sameValue(datetime.year, year, `${prefix}year result:`);
assert.sameValue(datetime.monthCode, monthCode, `${description} monthCode result`); assert.sameValue(datetime.month, month, `${prefix}month result:`);
assert.sameValue(datetime.day, day, `${description} day result`); assert.sameValue(datetime.monthCode, monthCode, `${prefix}monthCode result:`);
assert.sameValue(datetime.hour, hour, `${description} hour result`); assert.sameValue(datetime.day, day, `${prefix}day result:`);
assert.sameValue(datetime.minute, minute, `${description} minute result`); assert.sameValue(datetime.hour, hour, `${prefix}hour result:`);
assert.sameValue(datetime.second, second, `${description} second result`); assert.sameValue(datetime.minute, minute, `${prefix}minute result:`);
assert.sameValue(datetime.millisecond, millisecond, `${description} millisecond result`); assert.sameValue(datetime.second, second, `${prefix}second result:`);
assert.sameValue(datetime.microsecond, microsecond, `${description} microsecond result`); assert.sameValue(datetime.millisecond, millisecond, `${prefix}millisecond result:`);
assert.sameValue(datetime.nanosecond, nanosecond, `${description} nanosecond result`); assert.sameValue(datetime.microsecond, microsecond, `${prefix}microsecond result:`);
assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
}, },
/* /*
@ -167,13 +173,14 @@ var TemporalHelpers = {
* their calendar internal slots are the same value. * their calendar internal slots are the same value.
*/ */
assertPlainDateTimesEqual(actual, expected, description = "") { assertPlainDateTimesEqual(actual, expected, description = "") {
assert(expected instanceof Temporal.PlainDateTime, `${description} expected value should be a Temporal.PlainDateTime`); const prefix = description ? `${description}: ` : "";
assert(actual instanceof Temporal.PlainDateTime, `${description} instanceof`); assert(expected instanceof Temporal.PlainDateTime, `${prefix}expected value should be a Temporal.PlainDateTime`);
assert(actual.equals(expected), `${description} equals method`); assert(actual instanceof Temporal.PlainDateTime, `${prefix}instanceof`);
assert(actual.equals(expected), `${prefix}equals method`);
assert.sameValue( assert.sameValue(
actual.getISOFields().calendar, actual.getISOFields().calendar,
expected.getISOFields().calendar, expected.getISOFields().calendar,
`${description} calendar same value` `${prefix}calendar same value:`
); );
}, },
@ -186,10 +193,11 @@ var TemporalHelpers = {
* or the value of monthDay.calendarId().) * or the value of monthDay.calendarId().)
*/ */
assertPlainMonthDay(monthDay, monthCode, day, description = "", referenceISOYear = 1972) { assertPlainMonthDay(monthDay, monthCode, day, description = "", referenceISOYear = 1972) {
assert(monthDay instanceof Temporal.PlainMonthDay, `${description} instanceof`); const prefix = description ? `${description}: ` : "";
assert.sameValue(monthDay.monthCode, monthCode, `${description} monthCode result`); assert(monthDay instanceof Temporal.PlainMonthDay, `${prefix}instanceof`);
assert.sameValue(monthDay.day, day, `${description} day result`); assert.sameValue(monthDay.monthCode, monthCode, `${prefix}monthCode result:`);
assert.sameValue(monthDay.getISOFields().isoYear, referenceISOYear, `${description} referenceISOYear result`); assert.sameValue(monthDay.day, day, `${prefix}day result:`);
assert.sameValue(monthDay.getISOFields().isoYear, referenceISOYear, `${prefix}referenceISOYear result:`);
}, },
/* /*
@ -199,13 +207,14 @@ var TemporalHelpers = {
* an expected value. * an expected value.
*/ */
assertPlainTime(time, hour, minute, second, millisecond, microsecond, nanosecond, description = "") { assertPlainTime(time, hour, minute, second, millisecond, microsecond, nanosecond, description = "") {
assert(time instanceof Temporal.PlainTime, `${description} instanceof`); const prefix = description ? `${description}: ` : "";
assert.sameValue(time.hour, hour, `${description} hour result`); assert(time instanceof Temporal.PlainTime, `${prefix}instanceof`);
assert.sameValue(time.minute, minute, `${description} minute result`); assert.sameValue(time.hour, hour, `${prefix}hour result:`);
assert.sameValue(time.second, second, `${description} second result`); assert.sameValue(time.minute, minute, `${prefix}minute result:`);
assert.sameValue(time.millisecond, millisecond, `${description} millisecond result`); assert.sameValue(time.second, second, `${prefix}second result:`);
assert.sameValue(time.microsecond, microsecond, `${description} microsecond result`); assert.sameValue(time.millisecond, millisecond, `${prefix}millisecond result:`);
assert.sameValue(time.nanosecond, nanosecond, `${description} nanosecond result`); assert.sameValue(time.microsecond, microsecond, `${prefix}microsecond result:`);
assert.sameValue(time.nanosecond, nanosecond, `${prefix}nanosecond result:`);
}, },
/* /*
@ -215,9 +224,10 @@ var TemporalHelpers = {
* type and equal according to their equals() methods. * type and equal according to their equals() methods.
*/ */
assertPlainTimesEqual(actual, expected, description = "") { assertPlainTimesEqual(actual, expected, description = "") {
assert(expected instanceof Temporal.PlainTime, `${description} expected value should be a Temporal.PlainTime`); const prefix = description ? `${description}: ` : "";
assert(actual instanceof Temporal.PlainTime, `${description} instanceof`); assert(expected instanceof Temporal.PlainTime, `${prefix}expected value should be a Temporal.PlainTime`);
assert(actual.equals(expected), `${description} equals method`); assert(actual instanceof Temporal.PlainTime, `${prefix}instanceof`);
assert(actual.equals(expected), `${prefix}equals method`);
}, },
/* /*
@ -229,13 +239,14 @@ var TemporalHelpers = {
* or the value of yearMonth.calendarId.) * or the value of yearMonth.calendarId.)
*/ */
assertPlainYearMonth(yearMonth, year, month, monthCode, description = "", era = undefined, eraYear = undefined, referenceISODay = 1) { assertPlainYearMonth(yearMonth, year, month, monthCode, description = "", era = undefined, eraYear = undefined, referenceISODay = 1) {
assert(yearMonth instanceof Temporal.PlainYearMonth, `${description} instanceof`); const prefix = description ? `${description}: ` : "";
assert.sameValue(yearMonth.era, era, `${description} era result`); assert(yearMonth instanceof Temporal.PlainYearMonth, `${prefix}instanceof`);
assert.sameValue(yearMonth.eraYear, eraYear, `${description} eraYear result`); assert.sameValue(yearMonth.era, era, `${prefix}era result:`);
assert.sameValue(yearMonth.year, year, `${description} year result`); assert.sameValue(yearMonth.eraYear, eraYear, `${prefix}eraYear result:`);
assert.sameValue(yearMonth.month, month, `${description} month result`); assert.sameValue(yearMonth.year, year, `${prefix}year result:`);
assert.sameValue(yearMonth.monthCode, monthCode, `${description} monthCode result`); assert.sameValue(yearMonth.month, month, `${prefix}month result:`);
assert.sameValue(yearMonth.getISOFields().isoDay, referenceISODay, `${description} referenceISODay result`); assert.sameValue(yearMonth.monthCode, monthCode, `${prefix}monthCode result:`);
assert.sameValue(yearMonth.getISOFields().isoDay, referenceISODay, `${prefix}referenceISODay result:`);
}, },
/* /*
@ -246,14 +257,15 @@ var TemporalHelpers = {
* their time zones and calendar internal slots are the same value. * their time zones and calendar internal slots are the same value.
*/ */
assertZonedDateTimesEqual(actual, expected, description = "") { assertZonedDateTimesEqual(actual, expected, description = "") {
assert(expected instanceof Temporal.ZonedDateTime, `${description} expected value should be a Temporal.ZonedDateTime`); const prefix = description ? `${description}: ` : "";
assert(actual instanceof Temporal.ZonedDateTime, `${description} instanceof`); assert(expected instanceof Temporal.ZonedDateTime, `${prefix}expected value should be a Temporal.ZonedDateTime`);
assert(actual.equals(expected), `${description} equals method`); assert(actual instanceof Temporal.ZonedDateTime, `${prefix}instanceof`);
assert.sameValue(actual.timeZone, expected.timeZone, `${description} time zone same value`); assert(actual.equals(expected), `${prefix}equals method`);
assert.sameValue(actual.timeZone, expected.timeZone, `${prefix}time zone same value:`);
assert.sameValue( assert.sameValue(
actual.getISOFields().calendar, actual.getISOFields().calendar,
expected.getISOFields().calendar, expected.getISOFields().calendar,
`${description} calendar same value` `${prefix}calendar same value:`
); );
}, },