Make Suite contain a single Group.

lib/src/runner/load_suite.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.load_suite;
 
 import 'dart:async';
 
 import 'package:stack_trace/stack_trace.dart';
 
 import '../../test.dart';
+import '../backend/group.dart';
 import '../backend/invoker.dart';
 import '../backend/metadata.dart';
 import '../backend/test.dart';
 import '../backend/test_platform.dart';
 import '../utils.dart';
 import 'load_exception.dart';
 import 'runner_suite.dart';
 import 'vm/environment.dart';
 
 /// A [Suite] emitted by a [Loader] that provides a test-like interface for
@@ skipping 15 matching lines @@
   /// run and completed successfully.
   ///
   /// This will return `null` if the suite is unavailable for some reason (for
   /// example if an error occurred while loading it).
   final Future<RunnerSuite> suite;
 
   /// Returns the test that loads the suite.
   ///
   /// Load suites are guaranteed to only contain one test. This is a utility
   /// method for accessing it directly.
-  Test get test => entries.single as Test;
+  Test get test => this.group.entries.single as Test;
 
   /// Creates a load suite named [name] on [platform].
   ///
   /// [body] may return either a [RunnerSuite] or a [Future] that completes to a
   /// [RunnerSuite]. Its return value is forwarded through [suite], although if
   /// it throws an error that will be forwarded through the suite's test.
   ///
   /// If the the load test is closed before [body] is complete, it will close
   /// the suite returned by [body] once it completes.
   factory LoadSuite(String name, body(), {TestPlatform platform}) {
@@ skipping 42 matching lines @@
     }, platform: platform);
   }
 
   /// A utility constructor for a load suite that just emits [suite].
   factory LoadSuite.forSuite(RunnerSuite suite) {
     return new LoadSuite("loading ${suite.path}", () => suite,
         platform: suite.platform);
   }
 
   LoadSuite._(String name, void body(), this.suite, {TestPlatform platform})
-      : super(const VMEnvironment(), [
+      : super(const VMEnvironment(), new Group.root([
         new LocalTest(name,
             new Metadata(timeout: new Timeout(new Duration(minutes: 5))),
             body)
-      ], platform: platform);
+      ]), platform: platform);
 
   /// A constructor used by [changeSuite].
   LoadSuite._changeSuite(LoadSuite old, Future<RunnerSuite> this.suite)
-      : super(const VMEnvironment(), old.entries, platform: old.platform);
+      : super(const VMEnvironment(), old.group, platform: old.platform);
 
   /// Creates a new [LoadSuite] that's identical to this one, but that
   /// transforms [suite] once it's loaded.
   ///
   /// If [suite] completes to `null`, [change] won't be run.
   LoadSuite changeSuite(RunnerSuite change(RunnerSuite suite)) {
     return new LoadSuite._changeSuite(this, suite.then((loadedSuite) {
       if (loadedSuite == null) return null;
       return change(loadedSuite);
     }));
   }
 
   /// Runs the test and returns the suite.
   ///
   /// Rather than emitting errors through a [LiveTest], this just pipes them
   /// through the return value.
   Future<RunnerSuite> getSuite() async {
     var liveTest = await test.load(this);
     liveTest.onPrint.listen(print);
     await liveTest.run();
 
     if (liveTest.errors.isEmpty) return await suite;
 
     var error = liveTest.errors.first;
     await new Future.error(error.error, error.stackTrace);
     throw 'unreachable';
   }
 }