Refactor Future constructors.

tests/lib/async/future_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.
 
 library future_test;
 
 import "package:expect/expect.dart";
 import 'dart:async';
 import 'dart:isolate';
 
 const Duration MS = const Duration(milliseconds: 1);
 
-testImmediate() {
-  final future = new Future<String>.immediate("42");
+testValue() {
+  final future = new Future<String>.value("42");
   var port = new ReceivePort();
   future.then((x) {
     Expect.equals("42", x);
     port.close();
   });
 }
 
-testOf() {
+testSync() {
   compare(func) {
     // Compare the results of the following two futures.
-    Future f1 = new Future.of(func);
-    Future f2 = new Future.immediate(null).then((_) => func());
+    Future f1 = new Future.sync(func);
+    Future f2 = new Future.value().then((_) => func());
     f2.catchError((_){});  // I'll get the error later.
     f1.then((v1) { f2.then((v2) { Expect.equals(v1, v2); }); },
             onError: (e1) {
               f2.then((_) { Expect.fail("Expected error"); },
                       onError: (e2) {
                          Expect.equals(e1, e2);
                       });
             });
   }
-  Future val = new Future.immediate(42);
-  Future err1 = new Future.immediateError("Error")..catchError((_){});
+  Future val = new Future.value(42);
+  Future err1 = new Future.error("Error")..catchError((_){});
   try {
     throw new List(0);
   } catch (e, st) {
-    Future err2 = new Future.immediateError(e, st)..catchError((_){});
+    Future err2 = new Future.error(e, st)..catchError((_){});
   }
   compare(() => 42);
   compare(() => val);
   compare(() { throw "Flif"; });
   compare(() => err1);
+  bool hasExecuted = false;
+  compare(() {
+    hasExecuted = true;
+    return 499;
+  });
+  Expect.isTrue(hasExecuted);
 }
 
 testNeverComplete() {
   final completer = new Completer<int>();
   final future = completer.future;
   future.then((v) => Expect.fails("Value not expected"));
   future.catchError((e) => Expect.fails("Value not expected"));
 }
 
 testComplete() {
@@ skipping 178 matching lines @@
       },
       onDone: () {
         Expect.isTrue(gotValue);
         port.close();
       });
 }
 
 testFutureAsStreamCompleteImmediate() {
   bool gotValue = false;
   var port = new ReceivePort();
-  new Future.immediate("value").asStream().listen(
+  new Future.value("value").asStream().listen(
       (data) {
         Expect.isFalse(gotValue);
         gotValue = true;
         Expect.equals("value", data);
       },
       onDone: () {
         Expect.isTrue(gotValue);
         port.close();
       });
 }
@@ skipping 301 matching lines @@
   });
 
   completer.completeError(error);
 }
 
 testChainedFutureValue() {
   final completer = new Completer();
   final future = completer.future;
   var port = new ReceivePort();
 
-  future.then((v) => new Future.immediate(v * 2))
+  future.then((v) => new Future.value(v * 2))
         .then((v) {
           Expect.equals(42, v);
           port.close();
         });
   completer.complete(21);
 }
 
 testChainedFutureValueDelay() {
   final completer = new Completer();
   final future = completer.future;
@@ skipping 15 matching lines @@
     .then((v) {
       Expect.isNull(v);
       port.close();
     });
 }
 testChainedFutureError() {
   final completer = new Completer();
   final future = completer.future;
   var port = new ReceivePort();
 
-  future.then((v) => new Future.immediateError("Fehler"))
+  future.then((v) => new Future.error("Fehler"))
         .then((v) { Expect.fail("unreachable!"); }, onError: (error) {
           Expect.equals("Fehler", error);
           port.close();
         });
   completer.complete(21);
 }
 
 main() {
-  testImmediate();
-  testOf();
+  testValue();
+  testSync();
   testNeverComplete();
 
   testComplete();
   testCompleteWithSuccessHandlerBeforeComplete();
   testCompleteWithSuccessHandlerAfterComplete();
   testCompleteManySuccessHandlers();
   testCompleteWithError();
 
   testException();
   testExceptionHandler();
@@ skipping 21 matching lines @@
   testFutureCatchThrowsAsync();
   testFutureWhenThrowsAsync();
   testFutureCatchRethrowsAsync();
 
   testChainedFutureValue();
   testChainedFutureValueDelay();
   testChainedFutureError();
 }