Modify reflective tests to allow setUp and tearDown to return futures.

pkg/analysis_testing/lib/reflective_tests.dart

 // Copyright (c) 2014, 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 reflective_tests;
 
 import 'dart:async';
 
 @MirrorsUsed(metaTargets: 'ReflectiveTestCase')
 import 'dart:mirrors';
@@ skipping 48 matching lines @@
       solo_test(testName, () {
         return _runTest(classMirror, symbol);
       });
     }
   });
 }
 
 
 _runTest(ClassMirror classMirror, Symbol symbol) {
   InstanceMirror instanceMirror = classMirror.newInstance(new Symbol(''), []);
-  bool shouldRunTearDown = true;
-  _invokeSymbolIfExists(instanceMirror, #setUp);
-  try {
-    var testReturn = instanceMirror.invoke(symbol, []).reflectee;
-    if (testReturn is Future) {
-      shouldRunTearDown = false;
-      return testReturn.whenComplete(() {
-        _invokeTearDown(instanceMirror);
-      });
-    } else {
-      return testReturn;
-    }
-  } finally {
-    if (shouldRunTearDown) {
-      _invokeTearDown(instanceMirror);
-    }
-  }
+  return _invokeSymbolIfExists(instanceMirror, #setUp).then(
+      (_) => instanceMirror.invoke(symbol, []).reflectee).whenComplete(
+      () => _invokeSymbolIfExists(instanceMirror, #tearDown));
 }
 
 
-void _invokeTearDown(InstanceMirror instanceMirror) {
-  _invokeSymbolIfExists(instanceMirror, #tearDown);
-}
-
-
-void _invokeSymbolIfExists(InstanceMirror instanceMirror, Symbol symbol) {
+Future _invokeSymbolIfExists(InstanceMirror instanceMirror, Symbol symbol) {
+  var invocationResult = null;
   try {
-    instanceMirror.invoke(symbol, []);
+    invocationResult = instanceMirror.invoke(symbol, []).reflectee;
   } on NoSuchMethodError catch (e) {
   }
+  if (invocationResult is Future) {
+    return invocationResult;
+  } else {
+    return new Future.value(invocationResult);
+  }
 }