Retrying the setUp/tearDown chaining change. This is the same as r21819 but with a change to schedu…

pkg/scheduled_test/lib/scheduled_test.dart

 // Copyright (c) 2013, 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(nweiz): Add support for calling [schedule] while the schedule is already
 // running.
 // TODO(nweiz): Port the non-Pub-specific scheduled test libraries from Pub.
 /// A package for writing readable tests of asynchronous behavior.
 ///
 /// ## Installing ##
@@ skipping 240 matching lines @@
   });
 }
 
 /// Whether or not the tests currently being defined are in a group. This is
 /// only true when defining tests, not when executing them.
 bool _inGroup = false;
 
 /// Creates a new named group of tests. This has the same semantics as
 /// [unittest.group].
 void group(String description, void body()) {
+  _ensureInitialized();
+  _ensureSetUpForTopLevel();
   unittest.group(description, () {
     var wasInGroup = _inGroup;
     _inGroup = true;
-    _setUpScheduledTest();
     body();
     _inGroup = wasInGroup;
   });
 }
 
 /// Schedules a task, [fn], to run asynchronously as part of the main task queue
 /// of [currentSchedule]. Tasks will be run in the order they're scheduled. If
 /// [fn] returns a [Future], tasks after it won't be run until that [Future]
 /// completes.
 ///
@@ skipping 29 matching lines @@
 /// If we're in the top-level scope (that is, not in any [group]s) and
 /// [unittest.setUp] hasn't been called yet, call it.
 void _ensureSetUpForTopLevel() {
   if (_inGroup || _setUpForTopLevel) return;
   _setUpScheduledTest();
 }
 
 /// Registers callbacks for [unittest.setUp] and [unittest.tearDown] that set up
 /// and tear down the scheduled test infrastructure.
 void _setUpScheduledTest([void setUpFn()]) {
-  if (!_inGroup) _setUpForTopLevel = true;
-
-  unittest.setUp(() {
-    if (currentSchedule != null) {
-      throw new StateError('There seems to be another scheduled test '
-          'still running.');
-    }
-    _currentSchedule = new Schedule();
-    _setUpFn = setUpFn;
-  });
-
-  unittest.tearDown(() {
-    _currentSchedule = null;
-  });
+  if (!_inGroup) {
+    _setUpForTopLevel = true;
+    unittest.setUp(() {
+      if (currentSchedule != null) {
+        throw new StateError('There seems to be another scheduled test '
+            'still running.');
+      }
+      _currentSchedule = new Schedule();
+      if (_setUpFn != null) {
+        var parentFn = _setUpFn;
+        _setUpFn = () { parentFn(); setUpFn(); };
+      } else {
+        _setUpFn = setUpFn;
+      }
+    });
+ 
+    unittest.tearDown(() {
+      _currentSchedule = null;
+      _setUpFn = null;
+    });
+  } else {
+    unittest.setUp(() {
+      if (currentSchedule == null) {
+        throw new StateError('No schedule allocated.');
+      } else if (_setUpFn != null) {
+        var parentFn = _setUpFn;
+        _setUpFn = () { parentFn(); setUpFn(); };
+      } else {
+        _setUpFn = setUpFn;
+      }
+    });
+  }
 }
 
 /// Ensures that the global configuration for `scheduled_test` has been
 /// initialized.
 void _ensureInitialized() {
   unittest.ensureInitialized();
   unittest.wrapAsync = (f, [description]) {
     if (currentSchedule == null) {
       throw new StateError("Unexpected call to wrapAsync with no current "
           "schedule.");
@@ skipping 20 matching lines @@
 
   return currentSchedule.wrapFuture(future, description);
 }
 
 // TODO(nweiz): re-export these once issue 9535 is fixed.
 unittest.Configuration get unittestConfiguration =>
   unittest.unittestConfiguration;
 void set unittestConfiguration(unittest.Configuration value) {
   unittest.unittestConfiguration = value;
 }