Chromium Code Reviews| Index: tests/language/await_for_test.dart |
| diff --git a/tests/language/await_for_test.dart b/tests/language/await_for_test.dart |
| index 9d224645971a79530fcbeb97378b69b393ef8beb..e3b68721e7e90132032faf0ac1cbf37d2bad81b6 100644 |
| --- a/tests/language/await_for_test.dart |
| +++ b/tests/language/await_for_test.dart |
| @@ -25,7 +25,7 @@ consumeOne() async { |
| // Equivalent to await for (x in makeMeAStream()) { ... } |
| var s = makeMeAStream(); |
| var it = new StreamIterator(s); |
| - while (await it.moveNext()) { |
| + while (await (it.moveNext())) { |
|
floitsch
2015/02/02 22:00:12
why this change?
sigurdm
2015/02/03 16:59:33
This is because of Issue 22183. Hopefully it will
|
| var x = it.current; |
| t1.record(x); |
| } |
| @@ -38,7 +38,32 @@ consumeTwo() async { |
| await for (var x in makeMeAStream()) { |
| t2.record(x); |
| } |
| - t2.record("X"); |
| + t2.record("Y"); |
| +} |
| + |
| +Trace t3 = new Trace(); |
| + |
| +consumeNested() async { |
| + await for (var x in makeMeAStream()) { |
| + t3.record(x); |
| + await for (var y in makeMeAStream()) { |
| + t3.record(y); |
| + } |
| + t3.record("|"); |
| + } |
| + t3.record("Z"); |
| +} |
| + |
| +Trace t4 = new Trace(); |
| + |
| +consumeSomeOfInfinite() async { |
| + int i = 0; |
| + await for (var x in infiniteStream()) { |
| + i++; |
| + if (i > 10) break; |
| + t4.record(x); |
| + } |
| + t4.record("U"); |
| } |
| main() { |
| @@ -47,18 +72,23 @@ main() { |
| var f2 = consumeTwo(); |
| t2.record("T2:"); |
| + |
| + var f3 = consumeNested(); |
| + t3.record("T3:"); |
| + |
| + var f4 = consumeSomeOfInfinite(); |
| + t4.record("T4:"); |
| asyncStart(); |
| - Future.wait([f1, f2]).then((_) { |
| - print("Trace 1: $t1"); |
| - print("Trace 2: $t2"); |
| + Future.wait([f1, f2, f3, f4]).then((_) { |
| Expect.equals("T1:12345X", t1.toString()); |
| - Expect.equals("T2:12345X", t2.toString()); |
| + Expect.equals("T2:12345Y", t2.toString()); |
| + Expect.equals("T3:112345|212345|312345|412345|512345|Z", t3.toString()); |
| + Expect.equals("T4:12345678910U", t4.toString()); |
| asyncEnd(); |
| }); |
| } |
| - |
| // Create a stream that produces numbers [1, 2, ... maxCount] |
| Stream timedCounter(int maxCount) { |
| StreamController controller; |
| @@ -93,3 +123,34 @@ Stream timedCounter(int maxCount) { |
| return controller.stream; |
| } |
| + |
| +// Create a stream that produces numbers [1, 2, ... ] |
| +Stream infiniteStream() { |
| + StreamController controller; |
| + Timer timer; |
| + int counter = 0; |
| + |
| + void tick(_) { |
| + counter++; |
| + controller.add(counter); // Ask stream to send counter values as event. |
| + } |
| + |
| + void startTimer() { |
| + timer = new Timer.periodic(const Duration(milliseconds: 10), tick); |
| + } |
| + |
| + void stopTimer() { |
| + if (timer != null) { |
| + timer.cancel(); |
| + timer = null; |
| + } |
| + } |
| + |
| + controller = new StreamController( |
| + onListen: startTimer, |
| + onPause: stopTimer, |
| + onResume: startTimer, |
| + onCancel: stopTimer); |
| + |
| + return controller.stream; |
| +} |