Fix behavior when listening multiple times to a broadcast take/skip stream.

tests/lib/async/stream_transformation_broadcast_test.dart

Index: tests/lib/async/stream_transformation_broadcast_test.dart
diff --git a/tests/lib/async/stream_transformation_broadcast_test.dart b/tests/lib/async/stream_transformation_broadcast_test.dart
index 11928fef2e1fd03263c7aca36555a9df1ff62e26..ce9c882e4fcb11ec3a0eec6904bdce9e6304098c 100644
--- a/tests/lib/async/stream_transformation_broadcast_test.dart
+++ b/tests/lib/async/stream_transformation_broadcast_test.dart
@@ -10,6 +10,16 @@ import 'event_helper.dart';
 import 'package:unittest/unittest.dart';
 import "package:expect/expect.dart";
 
+main() {
+  testStream("singlesub", () => new StreamController(), (c) => c.stream);
+  testStream("broadcast", () => new StreamController.broadcast(),
+                          (c) => c.stream);
+  testStream("asBroadcast", () => new StreamController(),
+                            (c) => c.stream.asBroadcastStream());
+  testStream("broadcast.asBroadcast", () => new StreamController.broadcast(),
+                                      (c) => c.stream.asBroadcastStream());
+}
+
 void testStream(String name,
                 StreamController create(),
                 Stream getStream(controller)) {
@@ -171,14 +181,182 @@ void testStream(String name,
     c.add(42);
     c.close();
   });
-}
 
-main() {
-  testStream("singlesub", () => new StreamController(), (c) => c.stream);
-  testStream("broadcast", () => new StreamController.broadcast(),
-                          (c) => c.stream);
-  testStream("asBroadcast", () => new StreamController(),
-                            (c) => c.stream.asBroadcastStream());
-  testStream("broadcast.asBroadcast", () => new StreamController.broadcast(),
-                                      (c) => c.stream.asBroadcastStream());
+  // The following tests are only on broadcast streams, they require listening
+  // more than once.
+  if (name.startsWith("singlesub")) return;
+
+  test("$name-skip-multilisten", () {
+    if (name.startsWith("singlesub") ||
+        name.startsWith("asBroadcast")) return;
+    var c = create();
+    var s = getStream(c);
+    Stream newStream = s.skip(5);
+    // Listen immediately, to ensure that an asBroadcast stream is started.
+    var sub = newStream.listen((_){});
+    int i = 0;
+    var expect1 = 11;
+    var expect2 = 21;
+    var handler2 = expectAsync((v) {
+      expect(v, expect2);
+      expect2++;
+    }, count: 5);
+    var handler1 = expectAsync((v) {
+      expect(v, expect1);
+      expect1++;
+    }, count: 15);
+    var loop;
+    loop = expectAsync(() {
+      i++;
+      c.add(i);
+      if (i == 5) {
+        scheduleMicrotask(() {
+          newStream.listen(handler1);
+        });
+      }
+      if (i == 15) {
+        scheduleMicrotask(() {
+          newStream.listen(handler2);
+        });
+      }
+      if (i < 25) {
+        scheduleMicrotask(loop);
+      } else {
+        sub.cancel();
+        c.close();
+      }
+    }, count: 25);
+    scheduleMicrotask(loop);
+  });
+
+  test("$name-take-multilisten", () {
+    var c = create();
+    var s = getStream(c);
+    Stream newStream = s.take(10);
+    // Listen immediately, to ensure that an asBroadcast stream is started.
+    var sub = newStream.listen((_){});
+    int i = 0;
+    var expect1 = 6;
+    var expect2 = 11;
+    var handler2 = expectAsync((v) {
+      expect(v, expect2);
+      expect(v <= 20, isTrue);
+      expect2++;
+    }, count: 10);
+    var handler1 = expectAsync((v) {
+      expect(v, expect1);
+      expect(v <= 15, isTrue);
+      expect1++;
+    }, count: 10);
+    var loop;
+    loop = expectAsync(() {
+      i++;
+      c.add(i);
+      if (i == 5) {
+        scheduleMicrotask(() {
+          newStream.listen(handler1);
+        });
+      }
+      if (i == 10) {
+        scheduleMicrotask(() {
+          newStream.listen(handler2);
+        });
+      }
+      if (i < 25) {
+        scheduleMicrotask(loop);
+      } else {
+        sub.cancel();
+        c.close();
+      }
+    }, count: 25);
+    scheduleMicrotask(loop);
+  });
+
+  test("$name-skipWhile-multilisten", () {
+    if (name.startsWith("singlesub") ||
+        name.startsWith("asBroadcast")) return;
+    var c = create();
+    var s = getStream(c);
+    Stream newStream = s.skipWhile((x) => (x % 10) != 1);
+    // Listen immediately, to ensure that an asBroadcast stream is started.
+    var sub = newStream.listen((_){});
+    int i = 0;
+    var expect1 = 11;
+    var expect2 = 21;
+    var handler2 = expectAsync((v) {
+      expect(v, expect2);
+      expect2++;
+    }, count: 5);
+    var handler1 = expectAsync((v) {
+      expect(v, expect1);
+      expect1++;
+    }, count: 15);
+    var loop;
+    loop = expectAsync(() {
+      i++;
+      c.add(i);
+      if (i == 5) {
+        scheduleMicrotask(() {
+          newStream.listen(handler1);
+        });
+      }
+      if (i == 15) {
+        scheduleMicrotask(() {
+          newStream.listen(handler2);
+        });
+      }
+      if (i < 25) {
+        scheduleMicrotask(loop);
+      } else {
+        sub.cancel();
+        c.close();
+      }
+    }, count: 25);
+    scheduleMicrotask(loop);
+  });
+
+  test("$name-takeWhile-multilisten", () {
+    var c = create();
+    var s = getStream(c);
+    Stream newStream = s.takeWhile((x) => (x % 10) != 5);
+    // Listen immediately, to ensure that an asBroadcast stream is started.
+    var sub = newStream.listen((_){});
+    int i = 0;
+    // Non-overlapping ranges means the test must not remember its first 
+    // failure.
+    var expect1 = 6;
+    var expect2 = 16;
+    var handler2 = expectAsync((v) {
+      expect(v, expect2);
+      expect(v <= 25, isTrue);
+      expect2++;
+    }, count: 9);
+    var handler1 = expectAsync((v) {
+      expect(v, expect1);
+      expect(v <= 15, isTrue);
+      expect1++;
+    }, count: 9);
+    var loop;
+    loop = expectAsync(() {
+      i++;
+      c.add(i);
+      if (i == 5) {
+        scheduleMicrotask(() {
+          newStream.listen(handler1);
+        });
+      }
+      if (i == 15) {
+        scheduleMicrotask(() {
+          newStream.listen(handler2);
+        });
+      }
+      if (i < 25) {
+        scheduleMicrotask(loop);
+      } else {
+        sub.cancel();
+        c.close();
+      }
+    }, count: 25);
+    scheduleMicrotask(loop);
+  });
 }