Address review

- Remove unused `flags - Do not use `deepEqual.js` - Assert `return` never got when `this` value is invalid - Use `TemporalHelpers` to observer get / call
tc39 · Sep 13, 2024 · 64326e8 · 64326e8
1 parent 73a33a9
commit 64326e8
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 39 deletions.
diff --git a/test/built-ins/Iterator/from/get-return-method-when-call-return.js b/test/built-ins/Iterator/from/get-return-method-when-call-return.js
@@ -10,20 +10,26 @@ info: |
     5. Let returnMethod be ? GetMethod(iterator, "return").
 
 features: [iterator-helpers]
-flags: []
+includes: [temporalHelpers.js, compareArray.js]
 ---*/
 
-let returnGetCount = 0;
-const iter = {
-    get return() {
-        returnGetCount++;
-        return function () {
-            return { value: 5, done: true };
-        };
-    },
-};
+const calls = [];
+
+const iter = TemporalHelpers.propertyBagObserver(calls, {
+  return () {
+    return { value: 5, done: true };
+  },
+}, "originalIter");
+
 const wrapper = Iterator.from(iter);
-assert.sameValue(returnGetCount, 0);
+assert.compareArray(calls, [
+  "get originalIter[Symbol.iterator]",
+  "get originalIter.next",
+]);
 
 wrapper.return();
-assert.sameValue(returnGetCount, 1);
+assert.compareArray(calls, [
+  "get originalIter[Symbol.iterator]",
+  "get originalIter.next",
+  "get originalIter.return"
+]);
diff --git a/test/built-ins/Iterator/from/return-method-calls-base-return-method.js b/test/built-ins/Iterator/from/return-method-calls-base-return-method.js
@@ -11,19 +11,31 @@ info: |
       ...
     7. Return ? Call(returnMethod, iterator).
 
-includes: [deepEqual.js]
 features: [iterator-helpers]
-flags: []
+includes: [temporalHelpers.js, compareArray.js]
 ---*/
 
-let returnCallCount = 0;
-const iter = {
+const calls = [];
+
+const expectedIteratorResult = { value: 5, done: true };
+const originalIter = {
     return () {
-        returnCallCount++;
-        return { value: 5, done: true };
+        return expectedIteratorResult;
     },
 };
+TemporalHelpers.observeMethod(calls, originalIter, "return", "originalIter");
+const iter = TemporalHelpers.propertyBagObserver(calls, originalIter, "originalIter");
+
 const wrapper = Iterator.from(iter);
+assert.compareArray(calls, [
+  "get originalIter[Symbol.iterator]",
+  "get originalIter.next",
+]);
 
-assert.deepEqual(wrapper.return(), { value: 5, done: true });
-assert.sameValue(returnCallCount, 1);
+assert.sameValue(wrapper.return(), expectedIteratorResult);
+assert.compareArray(calls, [
+  "get originalIter[Symbol.iterator]",
+  "get originalIter.next",
+  "get originalIter.return",
+  "call originalIter.return",
+]);
diff --git a/test/built-ins/Iterator/from/return-method-returns-iterator-result.js b/test/built-ins/Iterator/from/return-method-returns-iterator-result.js
@@ -11,12 +11,13 @@ info: |
     6. If returnMethod is undefined, then
       a. Return CreateIterResultObject(undefined, true).
 
-includes: [deepEqual.js]
 features: [iterator-helpers]
-flags: []
 ---*/
 
 const iter = {};
 const wrapper = Iterator.from(iter);
 
-assert.deepEqual(wrapper.return(), { value: undefined, done: true });
+const result = wrapper.return();
+assert(result.hasOwnProperty("value"));
+assert.sameValue(result.value, undefined);
+assert.sameValue(result.done, true);
diff --git a/test/built-ins/Iterator/from/return-method-throws-for-invalid-this.js b/test/built-ins/Iterator/from/return-method-throws-for-invalid-this.js
@@ -10,23 +10,30 @@ info: |
     2. Perform ? RequireInternalSlot(O, [[Iterated]]).
 
 features: [iterator-helpers]
-flags: []
+includes: [temporalHelpers.js, compareArray.js]
 ---*/
 
-const iter = {};
-const WrapForValidIteratorPrototype = Object.getPrototypeOf(Iterator.from(iter));
+const WrapForValidIteratorPrototype = Object.getPrototypeOf(Iterator.from({}));
 
-assert.throws(TypeError, function() {
-    WrapForValidIteratorPrototype.return.call({});
-});
+{
+  assert.throws(TypeError, function() {
+      WrapForValidIteratorPrototype.return.call({});
+  });
+}
 
-let returnCallCount = 0;
-assert.throws(TypeError, function() {
-    WrapForValidIteratorPrototype.return.call({
-      return () {
-        returnCallCount++;
-        return { value: 5, done: true };
-      }
-    });
-});
-assert.sameValue(returnCallCount, 0);
+{
+  const originalIter = {
+    return() {
+      return { value: 5, done: true };
+    },
+  };
+
+  const calls = [];
+  TemporalHelpers.observeMethod(calls, originalIter, "return", "originalIter");
+  const iter = TemporalHelpers.propertyBagObserver(calls, originalIter, "originalIter");
+
+  assert.throws(TypeError, function() {
+      WrapForValidIteratorPrototype.return.call(iter);
+  });
+  assert.compareArray(calls, []);
+}