Refactor Future constructors.

pkg/unittest/test/unittest_test.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.
 
 // TODO(gram):
 // Unfortunately I can't seem to test anything that involves timeouts, e.g.
 // insufficient callbacks, because the timeout is controlled externally
 // (test.dart?), and we would need to use a shorter timeout for the inner tests
 // so the outer timeout doesn't fire. So I removed all such tests.
 // I'd like to revisit this at some point.
 
 library unittestTest;
 import 'dart:isolate';
 import 'dart:async';
 import 'package:unittest/unittest.dart';
 
 Future _defer(void fn()) {
-  return new Future.of(fn);
+  return new Future.sync(fn);
 }
 
 String buildStatusString(int passed, int failed, int errors,
                          var results,
                          {int count: 0,
                          String setup: '', String teardown: '',
                          String uncaughtError: null,
                          String message: ''}) {
   var totalTests = 0;
   var testDetails = new StringBuffer();
@@ skipping 118 matching lines @@
       test('testThree', () {
         var done = expectAsync0((){});
         _defer(() {
           expect(true, isTrue);
           done();
         });
       });
     } else if (testName == 'async setup/teardown test') {
       group('good setup/good teardown', () {
         setUp(() {
-          return new Future.immediate(0);
+          return new Future.value(0);
         });
         tearDown(() {
-          return new Future.immediate(0);
+          return new Future.value(0);
         });
         test('foo1', (){});
       });
       group('good setup/bad teardown', () {
         setUp(() {
-          return new Future.immediate(0);
+          return new Future.value(0);
         });
         tearDown(() {
-          return new Future.immediateError("Failed to complete tearDown");
+          return new Future.error("Failed to complete tearDown");
         });
         test('foo2', (){});
       });
       group('bad setup/good teardown', () {
         setUp(() {
-          return new Future.immediateError("Failed to complete setUp");
+          return new Future.error("Failed to complete setUp");
         });
         tearDown(() {
-          return new Future.immediate(0);
+          return new Future.value(0);
         });
         test('foo3', (){});
       });
       group('bad setup/bad teardown', () {
         setUp(() {
-          return new Future.immediateError("Failed to complete setUp");
+          return new Future.error("Failed to complete setUp");
         });
         tearDown(() {
-          return new Future.immediateError("Failed to complete tearDown");
+          return new Future.error("Failed to complete tearDown");
         });
         test('foo4', (){});
       });
       // The next test is just to make sure we make steady progress
       // through the tests.
       test('post groups', () {});
     } else if (testName == 'test returning future') {
       test("successful", () {
         return _defer(() {
           expect(true, true);
@@ skipping 160 matching lines @@
     'runTests without tests': buildStatusString(0, 0, 0, null)
   };
 
   tests.forEach((String name, String expected) {
     test(name, () => spawnFunction(runTest)
         .call(name)
         .then((String msg) => expect(msg.trim(), equals(expected))));
     });
 }