Asyncstar - exception thrown before yield or await would not get caught

tests/language/asyncstar_throw_in_catch_test.dart

Index: tests/language/asyncstar_throw_in_catch_test.dart
diff --git a/tests/language/asyncstar_throw_in_catch_test.dart b/tests/language/asyncstar_throw_in_catch_test.dart
index a6f6a337b8f1b49e968efa776946cec17ece7767..37eb183abec90c8a28859a0ba1a484bfdd9dd1f9 100644
--- a/tests/language/asyncstar_throw_in_catch_test.dart
+++ b/tests/language/asyncstar_throw_in_catch_test.dart
@@ -9,6 +9,7 @@ import "package:async_helper/async_helper.dart";
 class Tracer {
   final String expected;
   final String name;
+  String _trace = "";
   int counter = 0;
 
   Tracer(this.expected, [this.name]);
@@ -17,12 +18,12 @@ class Tracer {
     if (name != null) {
       print("Tracing $name: $msg");
     }
-    Expect.equals(expected[counter], msg);
+    _trace += msg;
     counter++;
   }
 
   void done() {
-    Expect.equals(expected.length, counter, "Received too few traces");
+    Expect.equals(expected, _trace);
   }
 }
 
@@ -33,30 +34,95 @@ foo1(Tracer tracer) async* {
     tracer.trace("b");
     throw "Error";
   } catch (e) {
+    Expect.equals("Error", e);
     tracer.trace("c");
     yield 1;
     tracer.trace("d");
     yield 2;
     tracer.trace("e");
-    await new Future.error("Error2");
+    yield 3;
+    tracer.trace("f");
   } finally {
     tracer.trace("f");
   }
   tracer.trace("g");
 }
 
-test() async {
-  Tracer tracer;
+foo2(Tracer tracer) async* {
+  try {
+    tracer.trace("a");
+    throw "Error";
+  } catch (error) {
+    Expect.equals("Error", error);
+    tracer.trace("b");
+    rethrow;
+  } finally {
+    tracer.trace("c");
+  }
+}
 
-  Completer foo1Done = new Completer();
-  tracer = new Tracer("abcdf");
+foo3(Tracer tracer) async* {
+  try {
+    tracer.trace("a");
+    throw "Error";
+  } catch (error) {
+    Expect.equals("Error", error);
+    tracer.trace("b");
+    rethrow;
+  } finally {
+    tracer.trace("c");
+    yield 1;
+  }
+}
+
+foo4(Tracer tracer) async* {
+  try {
+    tracer.trace("a");
+    await new Future.value(3);
+    tracer.trace("b");
+    throw "Error";
+  } catch (e) {
+    Expect.equals("Error", e);
+    tracer.trace("c");
+    yield 1;
+    tracer.trace("d");
+    yield 2;
+    tracer.trace("e");
+    await new Future.error("Error2");
+  } finally {
+    tracer.trace("f");
+  }
+  tracer.trace("g");
+}
+
+runTest(test, expectedTrace, expectedError, shouldCancel) {
+  Tracer tracer = new Tracer(expectedTrace, expectedTrace);
+  Completer done = new Completer();
   var subscription;
-  subscription = foo1(tracer).listen((event) async {
-    await subscription.cancel();
-    tracer.done();
-    foo1Done.complete(null);
+  subscription = test(tracer).listen((event) async {
+    tracer.trace("Y");
+    if (shouldCancel) {
+      await subscription.cancel();
+      tracer.trace("C");
+      done.complete(null);
+    }
+  }, onError: (error) {
+    Expect.equals(expectedError, error);
+    tracer.trace("X");
+  }, onDone: () {
+      tracer.done();
+      done.complete(null);
   });
-  await foo1Done.future;
+  return done.future.then((_) => tracer.done());
+}
+
+test() async {
+  // TODO(sigurdm): These tests are too dependent on scheduling, and buffering
+  // behavior.
+  await runTest(foo1, "abcdYefC", null, true);
+  await runTest(foo2, "abcX", "Error", false);
+  await runTest(foo3, "abcYX", "Error", false);
+  await runTest(foo4, "abcdYeYfX", "Error2", false);
 }