Make Suite contain a single Group.

lib/src/runner/engine.dart

 // Copyright (c) 2015, 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 test.runner.engine;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:async/async.dart' hide Result;
 import 'package:collection/collection.dart';
 import 'package:pool/pool.dart';
 
 import '../backend/group.dart';
 import '../backend/invoker.dart';
 import '../backend/live_test.dart';
 import '../backend/live_test_controller.dart';
 import '../backend/state.dart';
-import '../backend/suite_entry.dart';
+import '../backend/group_entry.dart';
 import '../backend/test.dart';
 import 'load_suite.dart';
 import 'runner_suite.dart';
 
 /// An [Engine] manages a run that encompasses multiple test suites.
 ///
 /// Test suites are provided by passing them into [suiteSink]. Once all suites
 /// have been provided, the user should close [suiteSink] to indicate this.
 /// [run] won't terminate until [suiteSink] is closed. Suites will be run in the
 /// order they're provided to [suiteSink]. Tests within those suites will
@@ skipping 162 matching lines @@
         if (suite is LoadSuite) {
           suite = await _addLoadSuite(suite);
           if (suite == null) {
             loadResource.release();
             return;
           }
         }
 
         await _runPool.withResource(() async {
           if (_closed) return;
-          await _runEntries(suite, suite.entries);
+          await _runGroup(suite, suite.group);
           loadResource.allowRelease(() => suite.close());
         });
       }));
     }, onDone: _group.close);
 
     return success;
   }
 
   /// Runs all the entries in [entries] in sequence.
-  Future _runEntries(RunnerSuite suite, List<SuiteEntry> entries) async {
-    for (var entry in entries) {
+  Future _runGroup(RunnerSuite suite, Group group) async {
+    if (group.metadata.skip) {
+      await _runLiveTest(_skippedTest(suite, group));
+      return;
+    }
+
+    for (var entry in group.entries) {
       if (_closed) return;
 
-      if (entry.metadata.skip) {
+      if (entry is Group) {
+        await _runGroup(suite, entry);
+      } else if (entry.metadata.skip) {
         await _runLiveTest(_skippedTest(suite, entry));
-      } else if (entry is Test) {
-        await _runLiveTest(entry.load(suite));
       } else {
-        var group = entry as Group;
-        await _runEntries(suite, group.entries);
+        var test = entry as Test;
+        await _runLiveTest(test.load(suite));
       }
     }
   }
 
   /// Returns a dummy [LiveTest] for a test or group marked as "skip".
-  LiveTest _skippedTest(RunnerSuite suite, SuiteEntry entry) {
-    var test = new LocalTest(entry.name, entry.metadata, () {});
+  LiveTest _skippedTest(RunnerSuite suite, GroupEntry entry) {
+    // The netry name will be `null` for the root group.
+    var test = new LocalTest(entry.name ?? "(suite)", entry.metadata, () {});
+
     var controller;
     controller = new LiveTestController(suite, test, () {
       controller.setState(const State(Status.running, Result.success));
       controller.setState(const State(Status.complete, Result.success));
       controller.completer.complete();
     }, () {});
     return controller.liveTest;
   }
 
   /// Runs [liveTest].
@@ skipping 100 matching lines @@
 
     // Close the running tests first so that we're sure to wait for them to
     // finish before we close their suites and cause them to become unloaded.
     var allLiveTests = liveTests.toSet()..addAll(_activeLoadTests);
     await Future.wait(allLiveTests.map((liveTest) => liveTest.close()));
 
     var allSuites = allLiveTests.map((liveTest) => liveTest.suite).toSet();
     await Future.wait(allSuites.map((suite) => suite.close()));
   }
 }