Make Suite contain a single Group.

test/runner/load_suite_test.dart

Index: test/runner/load_suite_test.dart
diff --git a/test/runner/load_suite_test.dart b/test/runner/load_suite_test.dart
index d37b83eaa684945d75579f55570b902a6cdec7e1..9f3257b5af4f2368e21e62bddab7a5e406bd0579 100644
--- a/test/runner/load_suite_test.dart
+++ b/test/runner/load_suite_test.dart
@@ -6,6 +6,7 @@
 
 import 'dart:async';
 
+import 'package:test/src/backend/group.dart';
 import 'package:test/src/backend/state.dart';
 import 'package:test/src/backend/test_platform.dart';
 import 'package:test/src/runner/load_exception.dart';
@@ -18,24 +19,26 @@ import '../utils.dart';
 
 void main() {
   var innerSuite;
-  setUp(() => innerSuite = new RunnerSuite(const VMEnvironment(), []));
+  setUp(() {
+    innerSuite = new RunnerSuite(const VMEnvironment(), new Group.root([]));
+  });
 
   test("running a load test causes LoadSuite.suite to emit a suite", () async {
     var suite = new LoadSuite("name", () => new Future.value(innerSuite));
-    expect(suite.entries, hasLength(1));
+    expect(suite.group.entries, hasLength(1));
 
     expect(suite.suite, completion(equals(innerSuite)));
-    var liveTest = await suite.entries.single.load(suite);
+    var liveTest = await suite.group.entries.single.load(suite);
     await liveTest.run();
     expectTestPassed(liveTest);
   });
 
   test("running a load suite's body may be synchronous", () async {
     var suite = new LoadSuite("name", () => innerSuite);
-    expect(suite.entries, hasLength(1));
+    expect(suite.group.entries, hasLength(1));
 
     expect(suite.suite, completion(equals(innerSuite)));
-    var liveTest = await suite.entries.single.load(suite);
+    var liveTest = await suite.group.entries.single.load(suite);
     await liveTest.run();
     expectTestPassed(liveTest);
   });
@@ -43,9 +46,9 @@ void main() {
   test("a load test doesn't complete until the body returns", () async {
     var completer = new Completer();
     var suite = new LoadSuite("name", () => completer.future);
-    expect(suite.entries, hasLength(1));
+    expect(suite.group.entries, hasLength(1));
 
-    var liveTest = await suite.entries.single.load(suite);
+    var liveTest = await suite.group.entries.single.load(suite);
     expect(liveTest.run(), completes);
     await new Future.delayed(Duration.ZERO);
     expect(liveTest.state.status, equals(Status.running));
@@ -58,20 +61,20 @@ void main() {
   test("a load test forwards errors and completes LoadSuite.suite to null",
       () async {
     var suite = new LoadSuite("name", () => fail("error"));
-    expect(suite.entries, hasLength(1));
+    expect(suite.group.entries, hasLength(1));
 
     expect(suite.suite, completion(isNull));
 
-    var liveTest = await suite.entries.single.load(suite);
+    var liveTest = await suite.group.entries.single.load(suite);
     await liveTest.run();
     expectTestFailed(liveTest, "error");
   });
 
   test("a load test completes early if it's closed", () async {
     var suite = new LoadSuite("name", () => new Completer().future);
-    expect(suite.entries, hasLength(1));
+    expect(suite.group.entries, hasLength(1));
 
-    var liveTest = await suite.entries.single.load(suite);
+    var liveTest = await suite.group.entries.single.load(suite);
     expect(liveTest.run(), completes);
     await new Future.delayed(Duration.ZERO);
     expect(liveTest.state.status, equals(Status.running));
@@ -83,11 +86,11 @@ void main() {
       () async {
     var exception = new LoadException("path", "error");
     var suite = new LoadSuite.forLoadException(exception);
-    expect(suite.entries, hasLength(1));
+    expect(suite.group.entries, hasLength(1));
 
     expect(suite.suite, completion(isNull));
 
-    var liveTest = await suite.entries.single.load(suite);
+    var liveTest = await suite.group.entries.single.load(suite);
     await liveTest.run();
     expect(liveTest.state.status, equals(Status.complete));
     expect(liveTest.state.result, equals(Result.error));
@@ -98,10 +101,10 @@ void main() {
   test("forSuite() creates a load suite that completes to a test suite",
       () async {
     var suite = new LoadSuite.forSuite(innerSuite);
-    expect(suite.entries, hasLength(1));
+    expect(suite.group.entries, hasLength(1));
 
     expect(suite.suite, completion(equals(innerSuite)));
-    var liveTest = await suite.entries.single.load(suite);
+    var liveTest = await suite.group.entries.single.load(suite);
     await liveTest.run();
     expectTestPassed(liveTest);
   });
@@ -110,34 +113,35 @@ void main() {
     test("returns a new load suite with the same properties", () {
       var suite = new LoadSuite("name", () => innerSuite,
           platform: TestPlatform.vm);
-      expect(suite.entries, hasLength(1));
+      expect(suite.group.entries, hasLength(1));
 
       var newSuite = suite.changeSuite((suite) => suite);
       expect(newSuite.platform, equals(TestPlatform.vm));
-      expect(newSuite.entries.single.name, equals(suite.entries.single.name));
+      expect(newSuite.group.entries.single.name, equals(suite.group.entries.single.name));
     });
 
     test("changes the inner suite", () async {
       var suite = new LoadSuite("name", () => innerSuite);
-      expect(suite.entries, hasLength(1));
+      expect(suite.group.entries, hasLength(1));
 
-      var newInnerSuite = new RunnerSuite(const VMEnvironment(), []);
+      var newInnerSuite = new RunnerSuite(
+          const VMEnvironment(), new Group.root([]));
       var newSuite = suite.changeSuite((suite) => newInnerSuite);
       expect(newSuite.suite, completion(equals(newInnerSuite)));
 
-      var liveTest = await suite.entries.single.load(suite);
+      var liveTest = await suite.group.entries.single.load(suite);
       await liveTest.run();
       expectTestPassed(liveTest);
     });
 
     test("doesn't run change() if the suite is null", () async {
       var suite = new LoadSuite("name", () => null);
-      expect(suite.entries, hasLength(1));
+      expect(suite.group.entries, hasLength(1));
 
       var newSuite = suite.changeSuite(expectAsync((_) {}, count: 0));
       expect(newSuite.suite, completion(isNull));
 
-      var liveTest = await suite.entries.single.load(suite);
+      var liveTest = await suite.group.entries.single.load(suite);
       await liveTest.run();
       expectTestPassed(liveTest);
     });
@@ -146,14 +150,14 @@ void main() {
   group("getSuite()", () {
     test("runs the test and returns the suite", () {
       var suite = new LoadSuite.forSuite(innerSuite);
-      expect(suite.entries, hasLength(1));
+      expect(suite.group.entries, hasLength(1));
 
       expect(suite.getSuite(), completion(equals(innerSuite)));
     });
 
     test("forwards errors to the future", () {
       var suite = new LoadSuite("name", () => throw "error");
-      expect(suite.entries, hasLength(1));
+      expect(suite.group.entries, hasLength(1));
 
       expect(suite.getSuite(), throwsA("error"));
     });