Fix for returned Futures in unittest

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';
 
 var tests; // array of test names
 var expected; // array of test expected results (from buildStatusString)
 var actual; // actual test results (from buildStatusString in config.onDone)
 var _testconfig; // test configuration to capture onDone
 
-_defer(void fn()) {
-  return (new Future.immediate(null)).then((_) => guardAsync(fn));
+Future _defer(void fn()) {
+  return new Future.of(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;
   String testDetails = '';
@@ skipping 109 matching lines @@
         _defer(expectAsync0(() { f(); }));
       });
     } else if (testName == 'middle exception test') {
       test('testOne', () { expect(true, isTrue); });
       test('testTwo', () { expect(true, isFalse); });
       test('testThree', () {
         var done = expectAsync0((){});
         _defer(() {
           expect(true, isTrue);
           done();
         });

[gram, 2013/03/21 17:55:24]

Can you explain why you added the defer here? And if it was for a good reason,
can you add the explanation as a comment, as it isn't clear to me.

[kevmoo-old, 2013/03/21 18:19:57]

It ends up being a nice little verification of expectAsync0.

Might be slightly redundant to other tests, but it's not hurting anything. The
simplified version tests less, so I vote we keep it.

       });
     } else if (testName == 'async setup/teardown test') {
       group('good setup/good teardown', () {
-        setUp(() { 
-          var completer = new Completer();
-          _defer(() {
-            completer.complete(0);
-          });
-          return completer.future;
+        setUp(() {
+          return new Future.immediate(0);
         });
         tearDown(() {
-          var completer = new Completer();
-          _defer(() {
-            completer.complete(0);
-          });
-          return completer.future;
+          return new Future.immediate(0);
         });
         test('foo1', (){});
       });
       group('good setup/bad teardown', () {
-        setUp(() { 
-          var completer = new Completer();
-          _defer(() {
-            completer.complete(0);
-          });
-          return completer.future;
+        setUp(() {
+          return new Future.immediate(0);
         });
         tearDown(() {
-          var completer = new Completer();
-          _defer(() {
-            //throw "Failed to complete tearDown";
-            completer.completeError(
-                new AsyncError("Failed to complete tearDown"));
-          });
-          return completer.future;
+          return new Future.immediateError("Failed to complete tearDown");
         });
         test('foo2', (){});
       });
       group('bad setup/good teardown', () {
-        setUp(() { 
-          var completer = new Completer();
-          _defer(() {
-            //throw "Failed to complete setUp";
-            completer.completeError(new AsyncError("Failed to complete setUp"));
-          });
-          return completer.future;
+        setUp(() {
+          return new Future.immediateError("Failed to complete setUp");
         });
         tearDown(() {
-          var completer = new Completer();
-          _defer(() {
-            completer.complete(0);
-          });
-          return completer.future;
+          return new Future.immediate(0);
         });
         test('foo3', (){});
       });
       group('bad setup/bad teardown', () {
-        setUp(() { 
-          var completer = new Completer();
-          _defer(() {
-            //throw "Failed to complete setUp";
-            completer.completeError(new AsyncError("Failed to complete setUp"));
-          });
-          return completer.future;
+        setUp(() {
+          return new Future.immediateError("Failed to complete setUp");
         });
         tearDown(() {
-          var completer = new Completer();
-          _defer(() {
-            //throw "Failed to complete tearDown";
-            completer.completeError(
-                new AsyncError("Failed to complete tearDown"));
-          });
-          return completer.future;
+          return new Future.immediateError("Failed to complete tearDown");
         });
         test('foo4', (){});
       });
-      // The next test is just to make sure we make steady progress 
+      // 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);
         });
       });
       // We repeat the fail and error tests, because during development
       // I had a situation where either worked fine on their own, and
@@ skipping 142 matching lines @@
     buildStatusString(1, 0, 0, tests[7], count: 1),
     buildStatusString(0, 1, 0, tests[8], count: 1,
         message: 'Callback called more times than expected (1).'),
     buildStatusString(1, 0, 0, tests[9], count: 10),
     buildStatusString(0, 1, 0, tests[10], message: 'Caught error!'),
     buildStatusString(1, 0, 1, 'testOne',
         message: 'Callback called (2) after test case testOne has already '
                  'been marked as pass.:testTwo:'),
     buildStatusString(2, 1, 0,
         'testOne::testTwo:Expected: false but: was <true>.:testThree'),
-    buildStatusString(2, 0, 3, 
+    buildStatusString(2, 0, 3,
         'good setup/good teardown foo1::'
         'good setup/bad teardown foo2:good setup/bad teardown '
         'foo2: Test teardown failed: Failed to complete tearDown:'
         'bad setup/good teardown foo3:bad setup/good teardown '
         'foo3: Test setup failed: Failed to complete setUp:'
         'bad setup/bad teardown foo4:bad setup/bad teardown '
         'foo4: Test teardown failed: Failed to complete tearDown:'
         'post groups'),
     buildStatusString(2, 4, 0,
         'successful::'
         'error1:Callback called more times than expected (1).:'
         'fail1:Expected: <false> but: was <true>.:'
         'error2:Callback called more times than expected (1).:'
         'fail2:failure:'
         'foo5'),
     buildStatusString(2, 4, 0,
         'successful::'
         'fail1:Expected: <false> but: was <true>.:'
         'error1:Callback called more times than expected (1).:'
         'fail2:failure:'
         'error2:Callback called more times than expected (1).:'
         'foo6'),
   ];
 
   actual = [];
 
   nextTest(0);
 }