Added ability for test cases to return Futures.

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()) {
-  // Exploit isolate ports as a platform-independent mechanism to queue a
-  // message at the end of the event loop. Stolen from unittest.dart.
-  final port = new ReceivePort();
-  port.receive((msg, reply) {
-    fn();
-    port.close();
-  });
-  port.toSendPort().send(null, null);
+  return (new Future.immediate(null)).then((_)=>guardAsync(fn));

[Siggi Cherem (dart-lang), 2013/02/26 00:25:29]

style nit: add spaces around =>

[gram, 2013/03/04 19:51:52]

Done.

 }
 
 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 186 matching lines @@
             completer.completeError(
                 new AsyncError("Failed to complete tearDown"));
           });
           return completer.future;
         });
         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);
+        });
+      });
+      // We repeat the fail and error tests, because during development
+      // I had a situation where either worked fine on their own, and
+      // error/fail worked, but fail/error would time out.
+      test("error1", () {
+        var callback = expectAsync0((){});
+        var excesscallback = expectAsync0((){});
+        return _defer(() {
+          excesscallback();
+          excesscallback();
+          excesscallback();
+          callback();
+        });
+      });
+      test("fail1", () {
+        return _defer(() {
+          expect(true, false);
+        });
+      });
+      test("error2", () {
+        var callback = expectAsync0((){});
+        var excesscallback = expectAsync0((){});
+        return _defer(() {
+          excesscallback();
+          excesscallback();
+          callback();
+        });
+      });
+      test("fail2", () {
+        return _defer(() {
+          expect(false, true);
+        });
+      });
+      test('foo5', () {
+      });
+    } else if (testName == 'test returning future using isolate (Timer)') {

[Siggi Cherem (dart-lang), 2013/02/26 00:25:29]

nit: I'd just say '... future using Timer'?

[gram, 2013/03/04 19:51:52]

Done.

+      test("successful", () {
+        return _defer(() {
+          Timer.run(() {
+            guardAsync(() {
+              expect(true, true);
+            });
+          });
+        });
+      });
+      test("fail1", () {
+        var callback = expectAsync0((){});
+        return _defer(() {
+          Timer.run(() {
+            guardAsync(() {
+              expect(true, false);
+              callback();
+            });
+          });
+        });
+      });
+      test('error1', () {
+        var callback = expectAsync0((){});
+        var excesscallback = expectAsync0((){});
+        return _defer(() {
+          Timer.run(() {
+            guardAsync(() {
+              excesscallback();
+              excesscallback();
+              excesscallback();
+              callback();
+            });
+          });
+        });
+      });
+      test("fail2", () {
+        var callback = expectAsync0((){});
+        return _defer(() {
+          Timer.run(() {
+            guardAsync(() {
+              expect(false, true);
+              callback();
+            });
+          });
+        });
+      });
+      test('error2', () {
+        var callback = expectAsync0((){});
+        var excesscallback = expectAsync0((){});
+        return _defer(() {
+          Timer.run(() {
+            guardAsync(() {
+              excesscallback();
+              excesscallback();
+              callback();
+            });
+          });
+        });
+      });
+      test('foo6', () {
+      });
     }
   });
 }
 
 void nextTest(int testNum) {
   SendPort sport = spawnFunction(runTest);
   sport.call(tests[testNum]).then((msg) {
     actual.add(msg);
     if (actual.length == expected.length) {
       for (var i = 0; i < tests.length; i++) {
@@ skipping 13 matching lines @@
     'group name test',
     'setup test',
     'teardown test',
     'setup and teardown test',
     'correct callback test',
     'excess callback test',
     'completion test',
     'async exception test',
     'late exception test',
     'middle exception test',
-    'async setup/teardown test'
+    'async setup/teardown test',
+    'test returning future',
+    'test returning future using isolate (Timer)'
   ];
 
   expected = [
     buildStatusString(1, 0, 0, tests[0]),
     buildStatusString(0, 1, 0, tests[1],
         message: 'Expected: <5> but: was <4>.'),
     buildStatusString(0, 1, 0, tests[2], message: 'Caught Exception: Fail.'),
     buildStatusString(2, 0, 0, 'a a::a b b'),
     buildStatusString(1, 0, 0, 'a ${tests[4]}', count: 0, setup: 'setup'),
     buildStatusString(1, 0, 0, 'a ${tests[5]}', count: 0, setup: '',
@@ skipping 11 matching lines @@
     buildStatusString(2, 1, 0,
         'testOne::testTwo:Expected: false but: was <true>.:testThree'),
     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')
+        'post groups'),
+    buildStatusString(2, 2, 2,
+        'successful::'
+        'error1:Callback called more times than expected (3 > 1).:'
+        'fail1:Expected: <false> but: was <true>.:'
+        'error2:Callback called more times than expected (2 > 1).:'
+        'fail2:Expected: <true> but: was <false>.:'
+        'foo5'),
+    buildStatusString(2, 2, 2,
+        'successful::'
+        'fail1:Expected: <false> but: was <true>.:'
+        'error1:Callback called more times than expected (3 > 1).:'
+        'fail2:Expected: <true> but: was <false>.:'
+        'error2:Callback called more times than expected (2 > 1).:'
+        'foo6'),
   ];
 
   actual = [];
 
   nextTest(0);
 }