Update documentation of StreamIterator, improve tests.

tests/lib/async/stream_iterator_test.dart

Index: tests/lib/async/stream_iterator_test.dart
diff --git a/tests/lib/async/stream_iterator_test.dart b/tests/lib/async/stream_iterator_test.dart
index 57bd6cce150f40ceb51493525d55d1d524aab06c..bbd7f719ed5b8d2eacb051a4293592918ae06a2b 100644
--- a/tests/lib/async/stream_iterator_test.dart
+++ b/tests/lib/async/stream_iterator_test.dart
@@ -6,89 +6,90 @@ import "dart:async";
 import "package:unittest/unittest.dart";
 
 main() {
-  test("stream iterator basic", () {
-    StreamController c = new StreamController();
-    Stream s = c.stream;
-    StreamIterator i = new StreamIterator(s);
-    i.moveNext().then(expectAsync((bool b) {
-      expect(b, isTrue);
-      expect(42, i.current);
-      return i.moveNext();
-    })).then(expectAsync((bool b) {
-      expect(b, isTrue);
-      expect(37, i.current);
-      return i.moveNext();
-    })).then(expectAsync((bool b) {
-      expect(b, isFalse);
-    }));
-    c.add(42);
-    c.add(37);
-    c.close();
+  test("stream iterator basic", () async {
+    var stream = createStream();
+    StreamIterator iterator = new StreamIterator(stream);
+    expect(iterator.current, isNull);
+    expect(await iterator.moveNext(), isTrue);
+    expect(iterator.current, 42);
+    expect(await iterator.moveNext(), isTrue);
+    expect(iterator.current, 37);
+    expect(await iterator.moveNext(), isFalse);
+    expect(iterator.current, isNull);
+    expect(await iterator.moveNext(), isFalse);
   });
 
-  test("stream iterator prefilled", () {
-    StreamController c = new StreamController();
-    c.add(42);
-    c.add(37);
-    c.close();
-    Stream s = c.stream;
-    StreamIterator i = new StreamIterator(s);
-    i.moveNext().then(expectAsync((bool b) {
-      expect(b, isTrue);
-      expect(42, i.current);
-      return i.moveNext();
-    })).then(expectAsync((bool b) {
-      expect(b, isTrue);
-      expect(37, i.current);
-      return i.moveNext();
-    })).then(expectAsync((bool b) {
-      expect(b, isFalse);
-    }));
+  test("stream iterator prefilled", () async {
+    Stream stream = createStream();
+    StreamIterator iterator = new StreamIterator(stream);
+    await new Future.delayed(Duration.ZERO);
+    expect(iterator.current, isNull);
+    expect(await iterator.moveNext(), isTrue);
+    expect(iterator.current, 42);
+    expect(await iterator.moveNext(), isTrue);
+    expect(iterator.current, 37);
+    expect(await iterator.moveNext(), isFalse);
+    expect(iterator.current, isNull);
+    expect(await iterator.moveNext(), isFalse);
   });
 
-  test("stream iterator error", () {
-    StreamController c = new StreamController();
-    Stream s = c.stream;
-    StreamIterator i = new StreamIterator(s);
-    i.moveNext().then(expectAsync((bool b) {
-      expect(b, isTrue);
-      expect(42, i.current);
-      return i.moveNext();
-    })).then((bool b) {
-      fail("Result not expected");
-    }, onError: expectAsync((e) {
-      expect("BAD", e);
-      return i.moveNext();
-    })).then(expectAsync((bool b) {
-      expect(b, isFalse);
-    }));
-    c.add(42);
-    c.addError("BAD");
-    c.add(37);
-    c.close();
+  test("stream iterator error", () async {
+    Stream stream = createErrorStream();
+    StreamIterator iterator = new StreamIterator(stream);
+    expect(await iterator.moveNext(), isTrue);
+    expect(iterator.current, 42);
+    var hasNext = iterator.moveNext();
+    expect(hasNext, throwsA("BAD"));  // This is an async expectation,
+    await hasNext.catchError((_){});  // so we have to wait for the future too.
+    expect(iterator.current, isNull);
+    expect(await iterator.moveNext(), isFalse);
+    expect(iterator.current, isNull);
   });
 
-  test("stream iterator current/moveNext during move", () {
-    StreamController c = new StreamController();
-    Stream s = c.stream;
-    StreamIterator i = new StreamIterator(s);
-    i.moveNext().then(expectAsync((bool b) {
-      expect(b, isTrue);
-      expect(42, i.current);
-      new Timer(const Duration(milliseconds:100), expectAsync(() {
-        expect(i.current, null);
-        expect(() { i.moveNext(); }, throws);
-        c.add(37);
-        c.close();
-      }));
-      return i.moveNext();
-    })).then(expectAsync((bool b) {
-      expect(b, isTrue);
-      expect(37, i.current);
-      return i.moveNext();
-    })).then(expectAsync((bool b) {
-      expect(b, isFalse);
-    }));
-    c.add(42);
+  test("stream iterator current/moveNext during move", () async {
+    Stream stream = createStream();
+    StreamIterator iterator = new StreamIterator(stream);
+    var hasNext = iterator.moveNext();
+    expect(iterator.moveNext, throwsA(isStateError));
+    expect(await hasNext, isTrue);
+    expect(iterator.current, 42);
+    iterator.cancel();
   });
+
+  test("stream iterator error during cancel", () async {
+    Stream stream = createCancelErrorStream();
+    StreamIterator iterator = new StreamIterator(stream);
+    for (int i = 0; i < 10; i++) {
+      expect(await iterator.moveNext(), isTrue);
+      expect(iterator.current, i);
+    }
+    var hasNext = iterator.moveNext();  // active moveNext will be completed.
+    var cancel = iterator.cancel();
+    expect(cancel, throwsA("BAD"));
+    expect(await hasNext, isFalse);
+      expect(await iterator.moveNext(), isFalse);
+  });
+
+}
+
+Stream createStream() async* {
+  yield 42;
+  yield 37;
+}
+
+Stream createErrorStream() async* {
+  yield 42;
+  // Emit an error without stopping the generator.
+  yield* (new Future.error("BAD").asStream());
+  yield 37;
+}
+
+/// Create a stream that throws when cancelled.
+Stream createCancelErrorStream() async* {
+  int i = 0;
+  try {
+    while (true) yield i++;
+  } finally {
+    throw "BAD";
+  }
 }