iterator helpers: assert .return() not called when .next() throws

test/built-ins/Iterator/concat/next-method-returns-non-object.js

@@ -18,9 +18,15 @@ info: |
 features: [iterator-sequencing]
 ---*/
 
+var returnMethodCalled = false;
+
 let nonObjectIterator = {
   next() {
     return null;
+  },
+  get return() {
+    returnMethodCalled = true;
+    throw new Test262Error();
   }
 };
 
@@ -35,3 +41,5 @@ let iterator = Iterator.concat(iterable);
 assert.throws(TypeError, function() {
   iterator.next();
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns a non-object");

test/built-ins/Iterator/concat/next-method-throws.js

@@ -18,9 +18,15 @@ info: |
 features: [iterator-sequencing]
 ---*/
 
+var returnMethodCalled = false;
+
 let throwingIterator = {
   next() {
     throw new Test262Error();
+  },
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
   }
 };
 
@@ -35,3 +41,5 @@ let iterator = Iterator.concat(iterable);
 assert.throws(Test262Error, function() {
   iterator.next();
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method throws");

test/built-ins/Iterator/from/get-next-method-throws.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class ThrowingIterator {
   get next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new ThrowingIterator();
 
 assert.throws(Test262Error, function () {
   Iterator.from(iterator);
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when getting its next method throws");

test/built-ins/Iterator/prototype/drop/get-next-method-throws.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class ThrowingIterator extends Iterator {
   get next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new ThrowingIterator();
 
 assert.throws(Test262Error, function () {
   iterator.drop(0);
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when getting its next method throws");

test/built-ins/Iterator/prototype/drop/next-method-returns-non-object.js

@@ -14,10 +14,16 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class NonObjectIterator extends Iterator {
   next() {
     return null;
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new Test262Error();
+  }
 }
 
 let iterator = new NonObjectIterator().drop(0);
@@ -31,3 +37,5 @@ iterator = new NonObjectIterator().drop(2);
 assert.throws(TypeError, function () {
   iterator.next();
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns a non-object");

test/built-ins/Iterator/prototype/drop/next-method-throws.js

@@ -14,10 +14,16 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class ThrowingIterator extends Iterator {
   next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new ThrowingIterator().drop(0);
@@ -31,3 +37,5 @@ iterator = new ThrowingIterator().drop(1);
 assert.throws(Test262Error, function () {
   iterator.next();
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method throws");

test/built-ins/Iterator/prototype/every/get-next-method-throws.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class IteratorThrows extends Iterator {
   get next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new IteratorThrows();
 
 assert.throws(Test262Error, function () {
   iterator.every(() => {});
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when getting its next method throws");

test/built-ins/Iterator/prototype/every/next-method-returns-non-object.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class NonObjectIterator extends Iterator {
   next() {
     return null;
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new Test262Error();
+  }
 }
 
 let iterator = new NonObjectIterator();
 
 assert.throws(TypeError, function () {
   iterator.every(() => {});
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns a non-object");

test/built-ins/Iterator/prototype/every/next-method-throws.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class ThrowingIterator extends Iterator {
   next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new ThrowingIterator();
 
 assert.throws(Test262Error, function () {
   iterator.every(() => {});
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method throws");

test/built-ins/Iterator/prototype/filter/get-next-method-throws.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class ThrowingIterator extends Iterator {
   get next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new ThrowingIterator();
 
 assert.throws(Test262Error, function () {
   iterator.filter(() => false);
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when getting its next method throws");

test/built-ins/Iterator/prototype/filter/next-method-returns-non-object.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class NonObjectIterator extends Iterator {
   next() {
     return null;
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new Test262Error();
+  }
 }
 
 let iterator = new NonObjectIterator().filter(() => true);
 
 assert.throws(TypeError, function () {
   iterator.next();
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns a non-object");

test/built-ins/Iterator/prototype/filter/next-method-throws.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class ThrowingIterator extends Iterator {
   next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new ThrowingIterator().filter(() => true);
 
 assert.throws(Test262Error, function () {
   iterator.next();
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method throws");

test/built-ins/Iterator/prototype/find/get-next-method-throws.js

@@ -10,14 +10,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class IteratorThrows extends Iterator {
   get next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new IteratorThrows();
 
 assert.throws(Test262Error, function () {
   iterator.find(() => {});
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when getting its next method throws");

test/built-ins/Iterator/prototype/find/next-method-returns-non-object.js

@@ -10,14 +10,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class NonObjectIterator extends Iterator {
   next() {
     return null;
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new Test262Error();
+  }
 }
 
 let iterator = new NonObjectIterator();
 
 assert.throws(TypeError, function () {
   iterator.find(() => {});
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns a non-object");

test/built-ins/Iterator/prototype/find/next-method-throws.js

@@ -10,14 +10,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class ThrowingIterator extends Iterator {
   next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new ThrowingIterator();
 
 assert.throws(Test262Error, function () {
   iterator.find(() => {});
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method throws");

test/built-ins/Iterator/prototype/flatMap/get-next-method-throws.js

@@ -12,14 +12,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class ThrowingIterator extends Iterator {
   get next() {
     throw new Test262Error();
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new TypeError();
+  }
 }
 
 let iterator = new ThrowingIterator();
 
 assert.throws(Test262Error, function () {
   iterator.flatMap(() => []);
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when getting its next method throws");

test/built-ins/Iterator/prototype/flatMap/next-method-returns-non-object.js

@@ -10,14 +10,22 @@ info: |
 features: [iterator-helpers]
 flags: []
 ---*/
+
+var returnMethodCalled = false;
 class NonObjectIterator extends Iterator {
   next() {
     return null;
   }
+  get return() {
+    returnMethodCalled = true;
+    throw new Test262Error();
+  }
 }
 
 let iterator = new NonObjectIterator().flatMap(x => [x]);
 
 assert.throws(TypeError, function () {
   iterator.next();
 });
+
+assert.sameValue(returnMethodCalled, false, "an iterator's return method is not called when its next method returns a non-object");