| Index: tests/lib/async/catch_errors7_test.dart
|
| diff --git a/tests/lib/async/catch_errors7_test.dart b/tests/lib/async/catch_errors7_test.dart
|
| index b241a2c8a3af4eedcc9574b72622f664abc57ed7..11931784175a846405ab9d8fccd75729adc00af2 100644
|
| --- a/tests/lib/async/catch_errors7_test.dart
|
| +++ b/tests/lib/async/catch_errors7_test.dart
|
| @@ -9,28 +9,44 @@ import 'catch_errors.dart';
|
|
|
| main() {
|
| asyncStart();
|
| + Completer done = new Completer();
|
| +
|
| var events = [];
|
| // Test that asynchronous errors are caught.
|
| catchErrors(() {
|
| events.add("catch error entry");
|
| - new Future.error("future error");
|
| - new Future.error("future error2");
|
| - new Future.value(499).then((x) => throw x);
|
| + var futures = [
|
| + new Future.error("future error"),
|
| + new Future.error("future error2"),
|
| + new Future.value(499).then((x) => throw x),
|
| + ];
|
| + int completedCount = 0;
|
| + for (var future in futures) {
|
| + future.whenComplete(() {
|
| + completedCount++;
|
| + if (completedCount == 3) done.complete(true);
|
| + });
|
| + }
|
| throw "catch error";
|
| }).listen((x) {
|
| events.add(x);
|
| },
|
| - onDone: () {
|
| + onDone: () { Expect.fail("Unexpected callback"); });
|
| +
|
| + done.future.whenComplete(() {
|
| + // Give handlers time to execute.
|
| + Timer.run(() {
|
| Expect.listEquals(
|
| ["catch error entry",
|
| - "main exit",
|
| - "catch error",
|
| - "future error",
|
| - "future error2",
|
| - 499,
|
| + "main exit",
|
| + "catch error",
|
| + "future error",
|
| + "future error2",
|
| + 499,
|
| ],
|
| events);
|
| asyncEnd();
|
| });
|
| + });
|
| events.add("main exit");
|
| }
|
|
|