Update charted to 0.4.8 and roll

packages/async/test/utils.dart

Index: packages/async/test/utils.dart
diff --git a/packages/async/test/utils.dart b/packages/async/test/utils.dart
index b2ea885adcf34f30f1a422145069d85feafd3578..92708868ec4aee68e07f4377ab1150bbdb0ccf33 100644
--- a/packages/async/test/utils.dart
+++ b/packages/async/test/utils.dart
@@ -3,18 +3,45 @@
 // BSD-style license that can be found in the LICENSE file.
 
 /// Helper utilities for testing.
-library async.test.util;
-
 import "dart:async";
+
+import "package:async/async.dart";
 import "package:test/test.dart";
 
 /// A zero-millisecond timer should wait until after all microtasks.
 Future flushMicrotasks() => new Future.delayed(Duration.ZERO);
 
+typedef void OptionalArgAction([a, b]);
+
 /// A generic unreachable callback function.
 ///
 /// Returns a function that fails the test if it is ever called.
-unreachable(String name) => ([a, b]) => fail("Unreachable: $name");
+OptionalArgAction unreachable(String name) =>
+    ([a, b]) => fail("Unreachable: $name");
+
+// TODO(nweiz): Use the version of this in test when test#418 is fixed.
+/// A matcher that runs a callback in its own zone and asserts that that zone
+/// emits an error that matches [matcher].
+Matcher throwsZoned(matcher) => predicate((callback) {
+      var firstError = true;
+      runZoned(callback,
+          onError: expectAsync2((error, stackTrace) {
+            if (firstError) {
+              expect(error, matcher);
+              firstError = false;
+            } else {
+              registerException(error, stackTrace);
+            }
+          }, max: -1));
+      return true;
+    });
+
+/// A matcher that runs a callback in its own zone and asserts that that zone
+/// emits a [CastError].
+final throwsZonedCastError = throwsZoned(new isInstanceOf<CastError>());
+
+/// A matcher that matches a callback or future that throws a [CastError].
+final throwsCastError = throwsA(new isInstanceOf<CastError>());
 
 /// A badly behaved stream which throws if it's ever listened to.
 ///
@@ -24,3 +51,62 @@ class UnusableStream extends Stream {
     throw new UnimplementedError("Gotcha!");
   }
 }
+
+/// A dummy [StreamSink] for testing the routing of the [done] and [close]
+/// futures.
+///
+/// The [completer] field allows the user to control the future returned by
+/// [done] and [close].
+class CompleterStreamSink<T> implements StreamSink<T> {
+  final completer = new Completer();
+
+  Future get done => completer.future;
+
+  void add(T event) {}
+  void addError(error, [StackTrace stackTrace]) {}
+  Future addStream(Stream<T> stream) async {}
+  Future close() => completer.future;
+}
+
+/// A [StreamSink] that collects all events added to it as results.
+///
+/// This is used for testing code that interacts with sinks.
+class TestSink<T> implements StreamSink<T> {
+  /// The results corresponding to events that have been added to the sink.
+  final results = <Result<T>>[];
+
+  /// Whether [close] has been called.
+  bool get isClosed => _isClosed;
+  var _isClosed = false;
+
+  Future get done => _doneCompleter.future;
+  final _doneCompleter = new Completer();
+
+  final Function _onDone;
+
+  /// Creates a new sink.
+  ///
+  /// If [onDone] is passed, it's called when the user calls [close]. Its result
+  /// is piped to the [done] future.
+  TestSink({onDone()}) : _onDone = onDone ?? (() {});
+
+  void add(T event) {
+    results.add(new Result<T>.value(event));
+  }
+
+  void addError(error, [StackTrace stackTrace]) {
+    results.add(new Result<T>.error(error, stackTrace));
+  }
+
+  Future addStream(Stream<T> stream) {
+    var completer = new Completer.sync();
+    stream.listen(add, onError: addError, onDone: completer.complete);
+    return completer.future;
+  }
+
+  Future close() {
+    _isClosed = true;
+    _doneCompleter.complete(new Future.microtask(_onDone));
+    return done;
+  }
+}