Make Suite contain a single Group.

test/runner/loader_test.dart

Index: test/runner/loader_test.dart
diff --git a/test/runner/loader_test.dart b/test/runner/loader_test.dart
index 0defff6e0c6dbb117b82c63b6ecc90031cacd034..ab971f0889d7df3a677d9ca3e0536984730abe19 100644
--- a/test/runner/loader_test.dart
+++ b/test/runner/loader_test.dart
@@ -64,14 +64,14 @@ void main() {
     });
 
     test("returns entries with the correct names and platforms", () {
-      expect(suite.entries, hasLength(3));
-      expect(suite.entries[0].name, equals("success"));
-      expect(suite.entries[1].name, equals("failure"));
-      expect(suite.entries[2].name, equals("error"));
+      expect(suite.group.entries, hasLength(3));
+      expect(suite.group.entries[0].name, equals("success"));
+      expect(suite.group.entries[1].name, equals("failure"));
+      expect(suite.group.entries[2].name, equals("error"));
     });
 
     test("can load and run a successful test", () {
-      var liveTest = suite.entries[0].load(suite);
+      var liveTest = suite.group.entries[0].load(suite);
 
       expectStates(liveTest, [
         const State(Status.running, Result.success),
@@ -83,7 +83,7 @@ void main() {
     });
 
     test("can load and run a failing test", () {
-      var liveTest = suite.entries[1].load(suite);
+      var liveTest = suite.group.entries[1].load(suite);
       expectSingleFailure(liveTest);
       return liveTest.run().whenComplete(() => liveTest.close());
     });
@@ -134,7 +134,7 @@ void main() {
 
       test("can run tests in those suites", () {
         var suite = suites.firstWhere((suite) => suite.path.contains("a_test"));
-        var liveTest = suite.entries[1].load(suite);
+        var liveTest = suite.group.entries[1].load(suite);
         expectSingleFailure(liveTest);
         return liveTest.run().whenComplete(() => liveTest.close());
       });
@@ -152,7 +152,7 @@ void main() {
     expect(suites, hasLength(1));
     var loadSuite = suites.first;
 
-    var liveTest = await loadSuite.entries.single.load(loadSuite);
+    var liveTest = await loadSuite.group.entries.single.load(loadSuite);
     expect(liveTest.onPrint.first, completion(equals("print within test")));
     await liveTest.run();
     expectTestPassed(liveTest);