| 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 that errors are not traversing zone boundaries. | 17 // Test that errors are not traversing zone boundaries. |
| 18 // Note that the first listener of `asBroadcastStream` determines in which | 18 // Note that the first listener of `asBroadcastStream` determines in which |
| 19 // zone the subscription lives. | 19 // zone the subscription lives. |
| 20 catchErrors(() { | 20 catchErrors(() { |
| 21 catchErrors(() { | 21 catchErrors(() { |
| 22 controller = new StreamController(); | 22 controller = new StreamController(); |
| 23 |
| 24 // Assign to "global" `stream`. |
| 23 stream = controller.stream | 25 stream = controller.stream |
| 24 .map((x) { | 26 .map((x) { |
| 25 events.add("map $x"); | 27 events.add("map $x"); |
| 26 return x + 100; | 28 return x + 100; |
| 27 }) | 29 }) |
| 28 .transform(new StreamTransformer.fromHandlers( | 30 .transform(new StreamTransformer.fromHandlers( |
| 29 handleError: (e, st, sink) { sink.add("error $e"); })) | 31 handleError: (e, st, sink) { sink.add("error $e"); })) |
| 30 .asBroadcastStream(); | 32 .asBroadcastStream(); |
| 33 |
| 34 // Listen to `stream` in the inner zone. |
| 31 stream.listen((x) { events.add("stream $x"); }); | 35 stream.listen((x) { events.add("stream $x"); }); |
| 32 }).listen((x) { events.add(x); }) | 36 }).listen((x) { events.add(x); }) |
| 33 .asFuture().then((_) { Expect.fail("Unexpected callback"); }); | 37 .asFuture().then((_) { Expect.fail("Unexpected callback"); }); |
| 38 |
| 39 // Listen to `stream` in the outer zone. |
| 34 stream.listen((x) { events.add("stream2 $x"); }); | 40 stream.listen((x) { events.add("stream2 $x"); }); |
| 41 |
| 42 // Feed the controller from the outer zone. |
| 35 controller.add(1); | 43 controller.add(1); |
| 36 // Errors are not allowed to traverse boundaries. This error should be | 44 // `addError` does not count as zone-traversal. It should be caught by |
| 37 // caught by the outer catchErrors. | 45 // the inner error handler. |
| 38 controller.addError(2); | 46 controller.addError("inner error"); |
| 47 new Future.error("caught by outer"); |
| 39 controller.close(); | 48 controller.close(); |
| 40 }).listen((x) { | 49 }).listen((x) { |
| 41 events.add("outer: $x"); | 50 events.add("outer: $x"); |
| 42 if (x == 2) done.complete(true); | 51 if (x == "caught by outer") done.complete(true); |
| 43 }, | 52 }, |
| 44 onDone: () { Expect.fail("Unexpected callback"); }); | 53 onDone: () { Expect.fail("Unexpected callback"); }); |
| 45 | 54 |
| 46 done.future.whenComplete(() { | 55 done.future.whenComplete(() { |
| 47 // Give handlers time to run. | 56 // Give handlers time to run. |
| 48 Timer.run(() { | 57 Timer.run(() { |
| 49 Expect.listEquals(["map 1", | 58 Expect.listEquals(["map 1", |
| 50 "stream 101", | 59 "stream 101", |
| 51 "stream2 101", | 60 "stream2 101", |
| 52 "outer: 2", | 61 "stream error inner error", |
| 62 "stream2 error inner error", |
| 63 "outer: caught by outer", |
| 53 ], | 64 ], |
| 54 events); | 65 events); |
| 55 asyncEnd(); | 66 asyncEnd(); |
| 56 }); | 67 }); |
| 57 }); | 68 }); |
| 58 } | 69 } |
| OLD | NEW |