Make Suite contain a single Group.

lib/src/runner/loader.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.loader;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 
 import 'package:analyzer/analyzer.dart';
 import 'package:async/async.dart';
 import 'package:path/path.dart' as p;
 import 'package:stack_trace/stack_trace.dart';
 
-import '../backend/invoker.dart';
 import '../backend/group.dart';
 import '../backend/metadata.dart';
-import '../backend/suite_entry.dart';
 import '../backend/test_platform.dart';
 import '../util/dart.dart' as dart;
 import '../util/io.dart';
 import '../util/remote_exception.dart';
 import '../utils.dart';
 import 'browser/server.dart';
 import 'configuration.dart';
 import 'hack_load_vm_file_hook.dart';
 import 'load_exception.dart';
 import 'load_suite.dart';
@@ skipping 84 matching lines @@
       return;
     }
 
     for (var platform in _config.platforms) {
       if (!suiteMetadata.testOn.evaluate(platform, os: currentOS)) continue;
 
       var metadata = suiteMetadata.forPlatform(platform, os: currentOS);
 
       // Don't load a skipped suite.
       if (metadata.skip) {
-        yield new LoadSuite.forSuite(new RunnerSuite(const VMEnvironment(), [
-          new LocalTest(path, metadata, () {})
-        ], path: path, platform: platform, metadata: metadata));
+        yield new LoadSuite.forSuite(new RunnerSuite(
+            const VMEnvironment(),
+            new Group.root([], metadata: metadata),
+            path: path, platform: platform));
         continue;
       }
 
       var name = (platform.isJS ? "compiling " : "loading ") + path;
       yield new LoadSuite(name, () {
         return platform == TestPlatform.vm
             ? _loadVmFile(path, metadata)
             : _loadBrowserFile(path, platform, metadata);
       }, platform: platform);
     }
@@ skipping 77 matching lines @@
             new LoadException(path, response["message"]),
             new Trace.current());
       } else if (response["type"] == "error") {
         isolate.kill();
         var asyncError = RemoteException.deserialize(response["error"]);
         completer.completeError(
             new LoadException(path, asyncError.error),
             asyncError.stackTrace);
       } else {
         assert(response["type"] == "success");
-        completer.complete(response["entries"]);
+        completer.complete(response["root"]);
       }
     });
 
     try {
       var suite = new RunnerSuite(
           const VMEnvironment(),
-          _deserializeEntries(await completer.future),
-          metadata: metadata,
+          _deserializeGroup(await completer.future),
           path: path,
           platform: TestPlatform.vm,
           os: currentOS,
           onClose: isolate.kill);
       _suites.add(suite);
       return suite;
     } finally {
       subscription.cancel();
     }
   }
 
-  /// Deserializes [entries] into concrete [SuiteEntry] subclasses.
-  Iterable<SuiteEntry> _deserializeEntries(List<Map> entries) {
-    return entries.map((entry) {
-      var metadata = new Metadata.deserialize(entry['metadata']);
-      if (entry['type'] == 'group') {
-        return new Group(
-            entry['name'], metadata, _deserializeEntries(entry['entries']));
-      } else {
-        return new IsolateTest(entry['name'], metadata, entry['sendPort']);
-      }
-    });
+  /// Deserializes [group] into a concrete [Group] class.
+  Group _deserializeGroup(Map group) {
+    var metadata = new Metadata.deserialize(group['metadata']);
+    return new Group(group['name'], group['entries'].map((entry) {
+      if (entry['type'] == 'group') return _deserializeGroup(entry);
+      var testMetadata = new Metadata.deserialize(entry['metadata']);
+      return new IsolateTest(entry['name'], testMetadata, entry['sendPort']);
+    }), metadata: metadata);
   }
 
   /// Closes the loader and releases all resources allocated by it.
   Future close() {
     return _closeMemo.runOnce(() async {
       await Future.wait(_suites.map((suite) => suite.close()));
       _suites.clear();
 
       if (!_browserServerMemo.hasRun) return;
       await (await _browserServer).close();
     });
   }
 }