Make Suite contain a single Group.

test/runner/browser/loader_test.dart

Index: test/runner/browser/loader_test.dart
diff --git a/test/runner/browser/loader_test.dart b/test/runner/browser/loader_test.dart
index 994d76437a02cfac5b51a5018babd3f1bbfd1d89..f34b65a7e3b7a9142707fd58c1752175c6a05eab 100644
--- a/test/runner/browser/loader_test.dart
+++ b/test/runner/browser/loader_test.dart
@@ -66,14 +66,14 @@ void main() {
     });
 
     test("returns tests with the correct names", () {
-      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),
@@ -85,7 +85,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());
     });
@@ -118,10 +118,10 @@ Future main() {
     expect(suites, hasLength(1));
     var loadSuite = suites.first;
     var suite = await loadSuite.getSuite();
-    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("loads a suite both in the browser and the VM", () async {
@@ -141,10 +141,10 @@ Future main() {
       expect(suites[1].path, equals(path));
 
       for (var suite in suites) {
-        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"));
       }
     } finally {
       await loader.close();
@@ -162,7 +162,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);