Chromium Code Reviews| Index: tests/language/await_for_cancel_test.dart |
| diff --git a/tests/language/await_for_cancel_test.dart b/tests/language/await_for_cancel_test.dart |
| index 42690e5d2d359191a47e5a00c1a8a30dadc00a0a..3c760831408e817544660313f14f14d74a155ab4 100644 |
| --- a/tests/language/await_for_cancel_test.dart |
| +++ b/tests/language/await_for_cancel_test.dart |
| @@ -6,10 +6,10 @@ import "dart:async"; |
| import "package:expect/expect.dart"; |
| import "package:async_helper/async_helper.dart"; |
| -bool cancelled; |
| +bool canceled; |
| test1() async { |
| - cancelled = false; |
| + canceled = false; |
| try { |
| StreamController controller = infiniteStreamController(); |
| outer: while(true) { |
| @@ -20,12 +20,12 @@ test1() async { |
| } |
| } |
| } finally { |
| - Expect.isTrue(cancelled); |
| + Expect.isTrue(canceled); |
| } |
| } |
| test2() async { |
| - cancelled = false; |
| + canceled = false; |
| try { |
| StreamController controller = infiniteStreamController(); |
| bool first = true; |
| @@ -42,7 +42,7 @@ test2() async { |
| } |
| } |
| } finally { |
| - Expect.isTrue(cancelled); |
| + Expect.isTrue(canceled); |
| } |
| } |
| @@ -65,29 +65,27 @@ StreamController infiniteStreamController() { |
| Timer timer; |
| int counter = 0; |
| - void tick(_) { |
| + void tick() { |
| + if (controller.isPaused) { |
| + return; |
| + } |
| + if (canceled) { |
| + return; |
| + } |
| counter++; |
| controller.add(counter); // Ask stream to send counter values as event. |
| + new Timer(const Duration(milliseconds: 0), tick); |
|
floitsch
2015/02/10 15:01:09
Timer.run(tick)
sigurdm
2015/02/10 15:09:46
Done.
|
| } |
| void startTimer() { |
| - timer = new Timer.periodic(const Duration(milliseconds: 10), tick); |
| - } |
| - |
| - void stopTimer() { |
| - if (timer != null) { |
| - timer.cancel(); |
| - timer = null; |
| - } |
| + new Timer(const Duration(milliseconds: 0), tick); |
|
floitsch
2015/02/10 15:01:09
ditto.
sigurdm
2015/02/10 15:09:46
Done.
|
| } |
| controller = new StreamController( |
| onListen: startTimer, |
| - onPause: stopTimer, |
| onResume: startTimer, |
| onCancel: () { |
| - cancelled = true; |
| - stopTimer(); |
| + canceled = true; |
| }); |
| return controller; |