| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:async_helper/async_helper.dart'; | 5 import 'package:async_helper/async_helper.dart'; |
| 6 import "package:expect/expect.dart"; | 6 import "package:expect/expect.dart"; |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'catch_errors.dart'; | 8 import 'catch_errors.dart'; |
| 9 | 9 |
| 10 main() { | 10 main() { |
| 11 asyncStart(); | 11 asyncStart(); |
| 12 Completer done = new Completer(); | 12 Completer done = new Completer(); |
| 13 | 13 |
| 14 var events = []; | 14 var events = []; |
| 15 StreamController controller; | 15 StreamController controller; |
| 16 Stream stream; | 16 Stream stream; |
| 17 // Test `StreamController.broadcast` streams. Note that the nested listener | 17 // Test `StreamController.broadcast` streams. |
| 18 // doesn't see the error, but the outer one does. | |
| 19 catchErrors(() { | 18 catchErrors(() { |
| 20 catchErrors(() { | 19 catchErrors(() { |
| 21 controller = new StreamController.broadcast(); | 20 controller = new StreamController.broadcast(); |
| 22 controller.stream | 21 controller.stream |
| 23 .map((x) { | 22 .map((x) { |
| 24 events.add("map $x"); | 23 events.add("map $x"); |
| 25 return x + 100; | 24 return x + 100; |
| 26 }) | 25 }) |
| 27 .transform(new StreamTransformer.fromHandlers( | 26 .transform(new StreamTransformer.fromHandlers( |
| 28 handleError: (e, st, sink) { sink.add("error $e"); })) | 27 handleError: (e, st, sink) { sink.add("error $e"); })) |
| 29 .listen((x) { events.add("stream $x"); }); | 28 .listen((x) { events.add("stream $x"); }); |
| 30 }).listen((x) { events.add(x); }) | 29 }).listen((x) { events.add(x); }) |
| 31 .asFuture().then((_) { Expect.fail("Unexpected callback"); }); | 30 .asFuture().then((_) { Expect.fail("Unexpected callback"); }); |
| 32 controller.stream.listen((x) { events.add("stream2 $x"); }, | 31 controller.stream.listen((x) { events.add("stream2 $x"); }, |
| 33 onError: (x) { events.add("stream2 error $x"); }); | 32 onError: (x) { events.add("stream2 error $x"); }); |
| 34 controller.add(1); | 33 controller.add(1); |
| 35 // Errors are not allowed to traverse boundaries, but in this case the | 34 controller.addError("inner stream"); |
| 36 // first listener of the broadcast stream is in the same error-zone. So | 35 new Future.error("outer error"); |
| 37 // this should work. | |
| 38 controller.addError(2); | |
| 39 controller.close(); | 36 controller.close(); |
| 40 }).listen((x) { | 37 }).listen((x) { |
| 41 events.add("outer: $x"); | 38 events.add("outer: $x"); |
| 42 if (x == 2) done.complete(true); | 39 if (x == "outer error") done.complete(true); |
| 43 }, | 40 }, |
| 44 onDone: () { Expect.fail("Unexpected callback"); }); | 41 onDone: () { Expect.fail("Unexpected callback"); }); |
| 45 | 42 |
| 46 done.future.whenComplete(() { | 43 done.future.whenComplete(() { |
| 47 // Give handlers time to run. | 44 // Give handlers time to run. |
| 48 Timer.run(() { | 45 Timer.run(() { |
| 49 Expect.listEquals(["map 1", | 46 Expect.listEquals(["map 1", |
| 50 "stream 101", | 47 "stream 101", |
| 51 "stream2 1", | 48 "stream2 1", |
| 52 "stream2 error 2", | 49 "stream error inner stream", |
| 53 "outer: 2", | 50 "stream2 error inner stream", |
| 51 "outer: outer error", |
| 54 ], | 52 ], |
| 55 events); | 53 events); |
| 56 asyncEnd(); | 54 asyncEnd(); |
| 57 }); | 55 }); |
| 58 }); | 56 }); |
| 59 } | 57 } |
| OLD | NEW |