Make Suite contain a single Group.

lib/src/runner/browser/browser_manager.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.browser.browser_manager;
 
 import 'dart:async';
 import 'dart:convert';
 
 import 'package:async/async.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:pool/pool.dart';
 
 import '../../backend/group.dart';
 import '../../backend/metadata.dart';
-import '../../backend/suite_entry.dart';
 import '../../backend/test_platform.dart';
 import '../../util/cancelable_future.dart';
 import '../../util/multi_channel.dart';
 import '../../util/remote_exception.dart';
 import '../../util/stack_trace_mapper.dart';
 import '../../utils.dart';
 import '../application_exception.dart';
 import '../environment.dart';
 import '../load_exception.dart';
 import '../runner_suite.dart';
@@ skipping 211 matching lines @@
     if (response["type"] == "error") {
       closeIframe();
       var asyncError = RemoteException.deserialize(response["error"]);
       await new Future.error(
           new LoadException(path, asyncError.error),
           asyncError.stackTrace);
     }
 
     return new RunnerSuite(
         await _environment,
-        _deserializeEntries(suiteChannel, mapper, response["entries"]),
+        _deserializeGroup(suiteChannel, mapper, response["root"]),
         platform: _platform,
-        metadata: metadata,
         path: path,
         onClose: () => closeIframe());
   }
 
-  /// Deserializes [entries] into concrete [SuiteEntry] subclasses.
-  Iterable<SuiteEntry> _deserializeEntries(MultiChannel suiteChannel,
-      StackTraceMapper mapper, List<Map> entries) {
-    return entries.map((entry) {
-      var metadata = new Metadata.deserialize(entry['metadata']);
+  /// Deserializes [group] into a concrete [Group] class.
+  Group _deserializeGroup(MultiChannel suiteChannel,
+      StackTraceMapper mapper, Map group) {
+    var metadata = new Metadata.deserialize(group['metadata']);
+    return new Group(group['name'], group['entries'].map((entry) {
       if (entry['type'] == 'group') {
-        return new Group(
-            entry['name'],
-            metadata,
-            _deserializeEntries(suiteChannel, mapper, entry['entries']));
-      } else {
-        var testChannel = suiteChannel.virtualChannel(entry['channel']);
-        return new IframeTest(entry['name'], metadata, testChannel,
-            mapper: mapper);
+        return _deserializeGroup(suiteChannel, mapper, entry);
       }
-    });
+
+      var testMetadata = new Metadata.deserialize(entry['metadata']);
+      var testChannel = suiteChannel.virtualChannel(entry['channel']);
+      return new IframeTest(entry['name'], testMetadata, testChannel,
+          mapper: mapper);
+    }), metadata: metadata);
   }
 
   /// An implementation of [Environment.displayPause].
   CancelableFuture _displayPause() {
     if (_pauseCompleter != null) return _pauseCompleter.future;
 
     _pauseCompleter = new CancelableCompleter(() {
       _channel.sink.add({"command": "resume"});
       _pauseCompleter = null;
     });
@@ skipping 30 matching lines @@
 
   final Uri observatoryUrl;
 
   final Uri remoteDebuggerUrl;
 
   _BrowserEnvironment(this._manager, this.observatoryUrl,
       this.remoteDebuggerUrl);
 
   CancelableFuture displayPause() => _manager._displayPause();
 }