More fixes to unittest

pkg/unittest/lib/src/future_matchers.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Matches a [Future] that completes successfully with a value. Note that this
  * creates an asynchronous expectation. The call to `expect()` that includes
  * this will return immediately and execution will continue. Later, when the
  * future completes, the actual expectation will run.
  *
@@ skipping 16 matching lines @@
  */
 Matcher completion(matcher) => new _Completes(wrapMatcher(matcher));
 
 class _Completes extends BaseMatcher {
   final Matcher _matcher;
 
   const _Completes(this._matcher);
 
   bool matches(item, MatchState matchState) {
     if (item is! Future) return false;
+    var done = wrapAsync((fn) => fn());
 
-    item.then(wrapAsync((value) {
-      if (_matcher != null) expect(value, _matcher);
-    }));
-
-    item.catchError((e) {
+    item.then((value) {
+      done(() { if (_matcher != null) expect(value, _matcher); });
+    }, onError: (e) {
       var reason = 'Expected future to complete successfully, but it failed '
                    'with ${e.error}';
-      if (future.stackTrace != null) {
+      if (e.stackTrace != null) {
         var stackTrace = e.stackTrace.toString();
         stackTrace = '  ${stackTrace.replaceAll('\n', '\n  ')}';
         reason = '$reason\nStack trace:\n$stackTrace';
       }
-      expect(false, isTrue, reason: reason);
+      done(() => expect(false, isTrue, reason: reason));
     });
 
     return true;
   }
 
   Description describe(Description description) {
     if (_matcher == null) {
       description.add('completes successfully');
     } else {
       description.add('completes to a value that ').addDescriptionOf(_matcher);
     }
     return description;
   }
 }