Make Suite contain a single Group.

lib/src/backend/declarer.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.backend.declarer;
 
 import 'dart:async';
 
 import '../frontend/timeout.dart';
 import '../utils.dart';
 import 'group.dart';
 import 'invoker.dart';
 import 'metadata.dart';
-import 'suite_entry.dart';
+import 'group_entry.dart';
 
 /// A class that manages the state of tests as they're declared.
 ///
 /// A nested tree of Declarers tracks the current group, set-up, and tear-down
 /// functions. Each Declarer in the tree corresponds to a group. This tree is
 /// tracked by a zone-scoped "current" Declarer; the current declarer can be set
 /// for a block using [Declarer.declare], and it can be accessed using
 /// [Declarer.current].
 class Declarer {
   /// The parent declarer, or `null` if this corresponds to the root group.
   final Declarer _parent;
 
   /// The name of the current test group, including the name of any parent
   /// groups.
   ///
   /// This is `null` if this is the root group.
   final String _name;
 
   /// The metadata for this group, including the metadata of any parent groups
   /// and of the test suite.
   final Metadata _metadata;
 
   /// The set-up functions for this group.
   final _setUps = new List<AsyncFunction>();
 
   /// The tear-down functions for this group.
   final _tearDowns = new List<AsyncFunction>();
 
   /// The children of this group, either tests or sub-groups.
-  final _entries = new List<SuiteEntry>();
+  final _entries = new List<GroupEntry>();
 
   /// Whether [build] has been called for this declarer.
   bool _built = false;
 
   /// The current zone-scoped declarer.
   static Declarer get current => Zone.current[#test.declarer];
 
   /// Creates a new declarer for the root group.
   ///
   /// This is the implicit group that exists outside of any calls to `group()`.
-  /// [metadata] should be the suite's metadata, if available.
+  /// If [metadata] is passed, it's used as the metadata for the implicit root
+  /// group.
   Declarer([Metadata metadata])
       : this._(null, null, metadata == null ? new Metadata() : metadata);
 
   Declarer._(this._parent, this._name, this._metadata);
 
   /// Runs [body] with this declarer as [Declarer.current].
   ///
   /// Returns the return value of [body].
   declare(body()) => runZoned(body, zoneValues: {#test.declarer: this});
 
@@ skipping 25 matching lines @@
       Map<String, dynamic> onPlatform}) {
     if (_built) {
       throw new StateError("Can't call group() once tests have begun running.");
     }
 
     var metadata = _metadata.merge(new Metadata.parse(
         testOn: testOn, timeout: timeout, skip: skip, onPlatform: onPlatform));
 
     // Don't load the tests for a skipped group.
     if (metadata.skip) {
-      _entries.add(new Group(name, metadata, []));
+      _entries.add(new Group(name, [], metadata: metadata));
       return;
     }
 
     var declarer = new Declarer._(this, _prefix(name), metadata);
     declarer.declare(body);
-    _entries.add(new Group(declarer._name, metadata, declarer.build()));
+    _entries.add(declarer.build());
   }
 
   /// Returns [name] prefixed with this declarer's group name.
   String _prefix(String name) => _name == null ? name : "$_name $name";
 
   /// Registers a function to be run before each test in this group.
   void setUp(callback()) {
     if (_built) {
       throw new StateError("Can't call setUp() once tests have begun running.");
     }
 
     _setUps.add(callback);
   }
 
   /// Registers a function to be run after each test in this group.
   void tearDown(callback()) {
     if (_built) {
       throw new StateError(
           "Can't call tearDown() once tests have begun running.");
     }
 
     _tearDowns.add(callback);
   }
 
-  /// Finalizes and returns the tests and groups being declared.
-  List<SuiteEntry> build() {
+  /// Finalizes and returns the group being declared.
+  Group build() {
     if (_built) {
       throw new StateError("Can't call Declarer.build() more than once.");
     }
 
     _built = true;
-    return _entries.toList();
+    return new Group(_name, _entries.toList(), metadata: _metadata);
   }
 
   /// Run the set-up functions for this and any parent groups.
   ///
   /// If no set-up functions are declared, this returns a [Future] that
   /// completes immediately.
   Future _runSetUps() {
     // TODO(nweiz): Use async/await here once issue 23497 has been fixed in two
     // stable versions.
     if (_parent != null) {
@@ skipping 31 matching lines @@
     var completer = new Completer();
 
     Invoker.current.addOutstandingCallback();
     Invoker.current.waitForOutstandingCallbacks(() {
       new Future.sync(body).whenComplete(completer.complete);
     }).then((_) => Invoker.current.removeOutstandingCallback());
 
     return completer.future;
   }
 }