Reduce duplication in order-of-operations tests

Build expected AO calls for expectedOpsForPrimitiveOptions and reuse
property bag observers after clearing state.

Thanks to @ptomato for the suggestions.

Author: jessealama

test/built-ins/Temporal/Duration/compare/order-of-operations.js

@@ -8,7 +8,7 @@ includes: [compareArray.js, temporalHelpers.js]
 features: [Temporal]
 ---*/
 
-const expected = [
+const expectedOpsForPrimitiveOptions = [
   // ToTemporalDuration on first argument
   "get one.days",
   "get one.days.valueOf",
@@ -71,9 +71,11 @@ const expected = [
   "get two.years",
   "get two.years.valueOf",
   "call two.years.valueOf",
+];
+const expected = expectedOpsForPrimitiveOptions.concat([
   // ToRelativeTemporalObject
   "get options.relativeTo",
-];
+]);
 const actual = [];
 
 // basic order of observable operations with no relativeTo
@@ -85,71 +87,6 @@ Temporal.Duration.compare(
 assert.compareArray(actual, expected, "order of operations");
 actual.splice(0); // clear
 
-const expectedOpsForPrimitiveOptions = [
-  // ToTemporalDuration on first argument
-  "get one.days",
-  "get one.days.valueOf",
-  "call one.days.valueOf",
-  "get one.hours",
-  "get one.hours.valueOf",
-  "call one.hours.valueOf",
-  "get one.microseconds",
-  "get one.microseconds.valueOf",
-  "call one.microseconds.valueOf",
-  "get one.milliseconds",
-  "get one.milliseconds.valueOf",
-  "call one.milliseconds.valueOf",
-  "get one.minutes",
-  "get one.minutes.valueOf",
-  "call one.minutes.valueOf",
-  "get one.months",
-  "get one.months.valueOf",
-  "call one.months.valueOf",
-  "get one.nanoseconds",
-  "get one.nanoseconds.valueOf",
-  "call one.nanoseconds.valueOf",
-  "get one.seconds",
-  "get one.seconds.valueOf",
-  "call one.seconds.valueOf",
-  "get one.weeks",
-  "get one.weeks.valueOf",
-  "call one.weeks.valueOf",
-  "get one.years",
-  "get one.years.valueOf",
-  "call one.years.valueOf",
-  // ToTemporalDuration on second argument
-  "get two.days",
-  "get two.days.valueOf",
-  "call two.days.valueOf",
-  "get two.hours",
-  "get two.hours.valueOf",
-  "call two.hours.valueOf",
-  "get two.microseconds",
-  "get two.microseconds.valueOf",
-  "call two.microseconds.valueOf",
-  "get two.milliseconds",
-  "get two.milliseconds.valueOf",
-  "call two.milliseconds.valueOf",
-  "get two.minutes",
-  "get two.minutes.valueOf",
-  "call two.minutes.valueOf",
-  "get two.months",
-  "get two.months.valueOf",
-  "call two.months.valueOf",
-  "get two.nanoseconds",
-  "get two.nanoseconds.valueOf",
-  "call two.nanoseconds.valueOf",
-  "get two.seconds",
-  "get two.seconds.valueOf",
-  "call two.seconds.valueOf",
-  "get two.weeks",
-  "get two.weeks.valueOf",
-  "call two.weeks.valueOf",
-  "get two.years",
-  "get two.years.valueOf",
-  "call two.years.valueOf",
-];
-
 assert.throws(TypeError, () => Temporal.Duration.compare(
   createDurationPropertyBagObserver("one", 0, 0, 0, 7),
   createDurationPropertyBagObserver("two", 0, 0, 0, 6),

test/built-ins/Temporal/Instant/prototype/since/order-of-operations.js

@@ -8,9 +8,11 @@ includes: [compareArray.js, temporalHelpers.js]
 features: [Temporal]
 ---*/
 
-const expected = [
+const expectedOpsForPrimitiveOptions = [
   "get other.toString",
   "call other.toString",
+];
+const expected = expectedOpsForPrimitiveOptions.concat([
   "get options.largestUnit",
   "get options.largestUnit.toString",
   "call options.largestUnit.toString",
@@ -23,7 +25,7 @@ const expected = [
   "get options.smallestUnit",
   "get options.smallestUnit.toString",
   "call options.smallestUnit.toString",
-];
+]);
 const actual = [];
 
 const instance = new Temporal.Instant(1_000_000_000_000_000_000n);
@@ -46,11 +48,6 @@ assert.compareArray(actual, expected, "order of operations with identical instan
 
 actual.splice(0); // clear
 
-const expectedOpsForPrimitiveOptions = [
-  "get other.toString",
-  "call other.toString",
-];
-
 assert.throws(TypeError, () => instance.since(TemporalHelpers.toPrimitiveObserver(actual, "1970-01-01T00:00Z", "other"), null));
 assert.compareArray(actual, expectedOpsForPrimitiveOptions,
   "other instant is converted before TypeError is thrown for primitive options");

test/built-ins/Temporal/Instant/prototype/until/order-of-operations.js

@@ -8,9 +8,11 @@ includes: [compareArray.js, temporalHelpers.js]
 features: [Temporal]
 ---*/
 
-const expected = [
+const expectedOpsForPrimitiveOptions = [
   "get other.toString",
   "call other.toString",
+];
+const expected = expectedOpsForPrimitiveOptions.concat([
   "get options.largestUnit",
   "get options.largestUnit.toString",
   "call options.largestUnit.toString",
@@ -23,7 +25,7 @@ const expected = [
   "get options.smallestUnit",
   "get options.smallestUnit.toString",
   "call options.smallestUnit.toString",
-];
+]);
 const actual = [];
 
 const instance = new Temporal.Instant(1_000_000_000_000_000_000n);
@@ -46,11 +48,6 @@ assert.compareArray(actual, expected, "order of operations with identical instan
 
 actual.splice(0); // clear
 
-const expectedOpsForPrimitiveOptions = [
-  "get other.toString",
-  "call other.toString",
-];
-
 assert.throws(TypeError, () => instance.until(TemporalHelpers.toPrimitiveObserver(actual, "1970-01-01T00:00Z", "other"), null));
 assert.compareArray(actual, expectedOpsForPrimitiveOptions,
   "other instant is converted before TypeError is thrown for primitive options");

test/built-ins/Temporal/PlainDate/from/order-of-operations.js

@@ -14,7 +14,7 @@ const expectedOptionsReading = [
   "call options.overflow.toString",
 ];
 
-const expected = [
+const expectedOpsForPrimitiveOptions = [
   "get fields.calendar",
   "get fields.day",
   "get fields.day.valueOf",
@@ -28,7 +28,8 @@ const expected = [
   "get fields.year",
   "get fields.year.valueOf",
   "call fields.year.valueOf",
-].concat(expectedOptionsReading);
+];
+const expected = expectedOpsForPrimitiveOptions.concat(expectedOptionsReading);
 const actual = [];
 
 const fields = TemporalHelpers.propertyBagObserver(actual, {
@@ -69,32 +70,7 @@ assert.compareArray(actual, expectedOptionsReading, "order of operations when pa
 
 actual.splice(0);
 
-const expectedOpsForPrimitiveOptions = [
-  "get fields.calendar",
-  "get fields.day",
-  "get fields.day.valueOf",
-  "call fields.day.valueOf",
-  "get fields.month",
-  "get fields.month.valueOf",
-  "call fields.month.valueOf",
-  "get fields.monthCode",
-  "get fields.monthCode.toString",
-  "call fields.monthCode.toString",
-  "get fields.year",
-  "get fields.year.valueOf",
-  "call fields.year.valueOf",
-];
-
-// Non-integer values to ensure valueOf is called
-const fields2 = TemporalHelpers.propertyBagObserver(actual, {
-  year: 1.7,
-  month: 1.7,
-  monthCode: "M01",
-  day: 1.7,
-  calendar: "iso8601",
-}, "fields", ["calendar"]);
-
-assert.throws(TypeError, () => Temporal.PlainDate.from(fields2, null));
+assert.throws(TypeError, () => Temporal.PlainDate.from(fields, null));
 assert.compareArray(actual, expectedOpsForPrimitiveOptions,
   "item fields are read before TypeError is thrown for primitive options");
 

test/built-ins/Temporal/PlainDate/prototype/add/order-of-operations.js

@@ -8,7 +8,7 @@ includes: [compareArray.js, temporalHelpers.js]
 features: [Temporal]
 ---*/
 
-const expected = [
+const expectedOpsForPrimitiveOptions = [
   // ToTemporalDurationRecord
   "get fields.days",
   "get fields.days.valueOf",
@@ -40,10 +40,12 @@ const expected = [
   "get fields.years",
   "get fields.years.valueOf",
   "call fields.years.valueOf",
+];
+const expected = expectedOpsForPrimitiveOptions.concat([
   "get options.overflow",
   "get options.overflow.toString",
   "call options.overflow.toString",
-];
+]);
 const actual = [];
 
 const instance = new Temporal.PlainDate(2000, 5, 2, "iso8601");
@@ -70,54 +72,7 @@ assert.compareArray(actual, expected, "order of operations");
 
 actual.splice(0); // clear
 
-const expectedOpsForPrimitiveOptions = [
-  // ToTemporalDurationRecord
-  "get fields.days",
-  "get fields.days.valueOf",
-  "call fields.days.valueOf",
-  "get fields.hours",
-  "get fields.hours.valueOf",
-  "call fields.hours.valueOf",
-  "get fields.microseconds",
-  "get fields.microseconds.valueOf",
-  "call fields.microseconds.valueOf",
-  "get fields.milliseconds",
-  "get fields.milliseconds.valueOf",
-  "call fields.milliseconds.valueOf",
-  "get fields.minutes",
-  "get fields.minutes.valueOf",
-  "call fields.minutes.valueOf",
-  "get fields.months",
-  "get fields.months.valueOf",
-  "call fields.months.valueOf",
-  "get fields.nanoseconds",
-  "get fields.nanoseconds.valueOf",
-  "call fields.nanoseconds.valueOf",
-  "get fields.seconds",
-  "get fields.seconds.valueOf",
-  "call fields.seconds.valueOf",
-  "get fields.weeks",
-  "get fields.weeks.valueOf",
-  "call fields.weeks.valueOf",
-  "get fields.years",
-  "get fields.years.valueOf",
-  "call fields.years.valueOf",
-];
-
-const fields2 = TemporalHelpers.propertyBagObserver(actual, {
-  years: 1,
-  months: 1,
-  weeks: 1,
-  days: 1,
-  hours: 1,
-  minutes: 1,
-  seconds: 1,
-  milliseconds: 1,
-  microseconds: 1,
-  nanoseconds: 1,
-}, "fields");
-
-assert.throws(TypeError, () => instance.add(fields2, null));
+assert.throws(TypeError, () => instance.add(fields, null));
 assert.compareArray(actual, expectedOpsForPrimitiveOptions,
   "duration fields are read before TypeError is thrown for primitive options");
 

test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js

@@ -8,7 +8,7 @@ includes: [compareArray.js, temporalHelpers.js]
 features: [Temporal]
 ---*/
 
-const expected = [
+const expectedOpsForPrimitiveOptions = [
   // ToTemporalDate
   "get other.calendar",
   "get other.day",
@@ -23,6 +23,8 @@ const expected = [
   "get other.year",
   "get other.year.valueOf",
   "call other.year.valueOf",
+];
+const expected = expectedOpsForPrimitiveOptions.concat([
   // GetDifferenceSettings
   "get options.largestUnit",
   "get options.largestUnit.toString",
@@ -36,7 +38,7 @@ const expected = [
   "get options.smallestUnit",
   "get options.smallestUnit.toString",
   "call options.smallestUnit.toString",
-];
+]);
 const actual = [];
 
 const instance = new Temporal.PlainDate(2000, 5, 2, "iso8601");
@@ -66,32 +68,7 @@ instance.since(otherDatePropertyBag, createOptionsObserver({ largestUnit: "years
 assert.compareArray(actual, expected, "order of operations");
 actual.splice(0); // clear
 
-const expectedOpsForPrimitiveOptions = [
-  // ToTemporalDate
-  "get other.calendar",
-  "get other.day",
-  "get other.day.valueOf",
-  "call other.day.valueOf",
-  "get other.month",
-  "get other.month.valueOf",
-  "call other.month.valueOf",
-  "get other.monthCode",
-  "get other.monthCode.toString",
-  "call other.monthCode.toString",
-  "get other.year",
-  "get other.year.valueOf",
-  "call other.year.valueOf",
-];
-
-const otherDatePropertyBag2 = TemporalHelpers.propertyBagObserver(actual, {
-  year: 2001,
-  month: 6,
-  monthCode: "M06",
-  day: 2,
-  calendar: "iso8601",
-}, "other", ["calendar"]);
-
-assert.throws(TypeError, () => instance.since(otherDatePropertyBag2, null));
+assert.throws(TypeError, () => instance.since(otherDatePropertyBag, null));
 assert.compareArray(actual, expectedOpsForPrimitiveOptions,
   "other date fields are read before TypeError is thrown for primitive options");
 actual.splice(0); // clear