Add suite information to the JSON reporter.

lib/src/runner/reporter/json.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.
 
 import 'dart:async';
 import 'dart:convert';
 
 import '../../backend/group.dart';
 import '../../backend/live_test.dart';
 import '../../backend/metadata.dart';
+import '../../backend/suite.dart';
 import '../../frontend/expect.dart';
 import '../../utils.dart';
 import '../engine.dart';
 import '../load_suite.dart';
 import '../reporter.dart';
 import '../version.dart';
 
 /// A reporter that prints machine-readable JSON-formatted test results.
 class JsonReporter implements Reporter {
   /// Whether to use verbose stack traces.
@@ skipping 13 matching lines @@
 
   /// Whether the reporter is paused.
   var _paused = false;
 
   /// The set of all subscriptions to various streams.
   final _subscriptions = new Set<StreamSubscription>();
 
   /// An expando that associates unique IDs with [LiveTest]s.
   final _liveTestIDs = new Map<LiveTest, int>();
 
+  /// An expando that associates unique IDs with [Suite]s.
+  final _suiteIDs = new Map<Suite, int>();
+
   /// An expando that associates unique IDs with [Group]s.
   final _groupIDs = new Map<Group, int>();
 
   /// The next ID to associate with a [LiveTest].
   var _nextID = 0;
 
   /// Watches the tests run by [engine] and prints their results as JSON.
   ///
   /// If [verboseTrace] is `true`, this will print core library frames.
   static JsonReporter watch(Engine engine, {bool verboseTrace: false}) {
@@ skipping 43 matching lines @@
     _subscriptions.clear();
   }
 
   /// A callback called when the engine begins running [liveTest].
   void _onTestStarted(LiveTest liveTest) {
     if (!_stopwatchStarted) {
       _stopwatchStarted = true;
       _stopwatch.start();
     }
 
+    var suiteID = _idForSuite(liveTest.suite);
+
     // Don't emit groups for load suites. They're always empty and they provide
     // unnecessary clutter.
     var groupIDs = liveTest.suite is LoadSuite
         ? []
-        : _idsForGroups(liveTest.groups);
+        : _idsForGroups(liveTest.groups, suiteID);
 
     var id = _nextID++;
     _liveTestIDs[liveTest] = id;
     _emit("testStart", {
       "test": {
         "id": id,
         "name": liveTest.test.name, 
+        "suiteID": suiteID,
         "groupIDs": groupIDs,
         "metadata": _serializeMetadata(liveTest.test.metadata)
       }
     });
 
     /// Convert the future to a stream so that the subscription can be paused or
     /// canceled.
     _subscriptions.add(liveTest.onComplete.asStream().listen((_) =>
         _onComplete(liveTest)));
 
     _subscriptions.add(liveTest.onError.listen((error) =>
         _onError(liveTest, error.error, error.stackTrace)));
 
     _subscriptions.add(liveTest.onPrint.listen((line) {
       _emit("print", {
         "testID": id,
         "message": line
       });
     }));
   }
 
-  /// Returns a list of the IDs for all the groups in [groups].
+  /// Returns an ID for [suite].
+  ///
+  /// If [suite] doesn't have an ID yet, this assigns one and emits a new event
+  /// for that suite.
+  int _idForSuite(Suite suite) {
+    if (_suiteIDs.containsKey(suite)) return _suiteIDs[suite];
+
+    var id = _nextID++;
+    _suiteIDs[suite] = id;
+
+    // Give the load suite's suite the same ID, because it doesn't have any
+    // different metadata.
+    if (suite is LoadSuite) {
+      suite.suite.then((runnerSuite) {
+        if (runnerSuite != null) _suiteIDs[runnerSuite] = id;
+      });
+    }
+
+    _emit("suite", {
+      "suite": {
+        "id": id,
+        "platform": suite.platform?.identifier,
+        "path": suite.path
+      }
+    });
+    return id;
+  }
+
+  /// Returns a list of the IDs for all the groups in [groups], which are
+  /// contained in the suite identified by [suiteID].
   ///
   /// If a group doesn't have an ID yet, this assigns one and emits a new event
   /// for that group.
-  List<int> _idsForGroups(Iterable<Group> groups) {
+  List<int> _idsForGroups(Iterable<Group> groups, int suiteID) {
     var parentID;
     return groups.map((group) {
       if (_groupIDs.containsKey(group)) {
         parentID = _groupIDs[group];
         return parentID;
       }
 
       var id = _nextID++;
       _groupIDs[group] = id;
 
       _emit("group", {
         "group": {
           "id": id,
+          "suiteID": suiteID,
           "parentID": parentID,
           "name": group.name,
           "metadata": _serializeMetadata(group.metadata)
         }
       });
       parentID = id;
       return id;
     }).toList();
   }
 
@@ skipping 31 matching lines @@
     _emit("done", {"success": success});
   }
 
   /// Emits an event with the given type and attributes.
   void _emit(String type, Map attributes) {
     attributes["type"] = type;
     attributes["time"] = _stopwatch.elapsed.inMilliseconds;
     print(JSON.encode(attributes));
   }
 }