diff --git a/test/intl402/Temporal/Calendar/prototype/mergeFields/gregorian-mutually-exclusive-fields.js b/test/intl402/Temporal/Calendar/prototype/mergeFields/gregorian-mutually-exclusive-fields.js index b8d2893c9f..ffb5e1c067 100644 --- a/test/intl402/Temporal/Calendar/prototype/mergeFields/gregorian-mutually-exclusive-fields.js +++ b/test/intl402/Temporal/Calendar/prototype/mergeFields/gregorian-mutually-exclusive-fields.js @@ -37,34 +37,34 @@ const fullFields = { }; assertEntriesEqual(instance.mergeFields(fullFields, { era: "bce", eraYear: 1 }), [ + ["era", "bce"], + ["eraYear", 1], ["month", 12], ["monthCode", "M12"], ["day", 15], - ["era", "bce"], - ["eraYear", 1], ], "era and eraYear together exclude year"); assertEntriesEqual(instance.mergeFields(fullFields, { year: -2 }), [ + ["year", -2], ["month", 12], ["monthCode", "M12"], ["day", 15], - ["year", -2], ], "year excludes era and eraYear"); assertEntriesEqual(instance.mergeFields(fullFields, { month: 5 }), [ ["era", "ce"], ["eraYear", 1981], ["year", 1981], - ["day", 15], ["month", 5], + ["day", 15], ], "month excludes monthCode"); assertEntriesEqual(instance.mergeFields(fullFields, { monthCode: "M05" }), [ ["era", "ce"], ["eraYear", 1981], ["year", 1981], - ["day", 15], ["monthCode", "M05"], + ["day", 15], ], "monthCode excludes month"); // Specific test cases, of mergeFields on information that is not complete @@ -100,6 +100,6 @@ assertEntriesEqual(instance.mergeFields({ day: 25, monthCode: "M12", year: 1997, assertEntriesEqual(instance.mergeFields({ day: 25, monthCode: "M12", year: 1997 }, { eraYear: 1, year: 2 }), [ ["day", 25], ["monthCode", "M12"], - ["eraYear", 1], ["year", 2], + ["eraYear", 1], ], "eraYear excludes year and era, year overwritten"); diff --git a/test/intl402/Temporal/Calendar/prototype/mergeFields/japanese-mutually-exclusive-fields.js b/test/intl402/Temporal/Calendar/prototype/mergeFields/japanese-mutually-exclusive-fields.js index aeaa9f0cf3..4dcb0a30e2 100644 --- a/test/intl402/Temporal/Calendar/prototype/mergeFields/japanese-mutually-exclusive-fields.js +++ b/test/intl402/Temporal/Calendar/prototype/mergeFields/japanese-mutually-exclusive-fields.js @@ -38,40 +38,40 @@ assertEntriesEqual(instance.mergeFields(lastDayOfShowaFields, { day: 10 }), [ assertEntriesEqual(instance.mergeFields(lastDayOfShowaFields, { month: 2 }), [ ["year", 1989], - ["day", 7], ["month", 2], + ["day", 7], ], "month excludes monthCode, era, and eraYear"); assertEntriesEqual(instance.mergeFields(lastDayOfShowaFields, { monthCode: "M03" }), [ ["year", 1989], - ["day", 7], ["monthCode", "M03"], + ["day", 7], ], "monthCode excludes month, era, and eraYear"); assertEntriesEqual(instance.mergeFields(lastDayOfShowaFields, { year: 1988 }), [ + ["year", 1988], ["month", 1], ["monthCode", "M01"], ["day", 7], - ["year", 1988], ], "year excludes era and eraYear (within same era)"); assertEntriesEqual(instance.mergeFields(lastDayOfShowaFields, { year: 1990 }), [ + ["year", 1990], ["month", 1], ["monthCode", "M01"], ["day", 7], - ["year", 1990], ], "year excludes era and eraYear (in a different era)"); assertEntriesEqual(instance.mergeFields(lastDayOfShowaFields, { eraYear: 1 }), [ + ["eraYear", 1], ["month", 1], ["monthCode", "M01"], ["day", 7], - ["eraYear", 1], ], "eraYear excludes year and era"); assertEntriesEqual(instance.mergeFields(lastDayOfShowaFields, { era: "heisei" }), [ + ["era", "heisei"], ["month", 1], ["monthCode", "M01"], ["day", 7], - ["era", "heisei"], ], "era excludes year and eraYear");