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

pkg/analysis_testing/lib/reflective_tests.dart

Index: pkg/analysis_testing/lib/reflective_tests.dart
diff --git a/pkg/analysis_testing/lib/reflective_tests.dart b/pkg/analysis_testing/lib/reflective_tests.dart
index cdb617c82a5c94afdb709f178c90ff4954e7a8f7..2c737f7910d74df36c85d58208c30837eccd80af 100644
--- a/pkg/analysis_testing/lib/reflective_tests.dart
+++ b/pkg/analysis_testing/lib/reflective_tests.dart
@@ -66,34 +66,21 @@ void runReflectiveTests(Type type) {
 
 _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);
+  }
 }