Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(978)

Unified Diff: lib/src/runner/vm/isolate_listener.dart

Issue 1469863005: Add JSON protocol support for groups. (Closed) Base URL: git@github.com:dart-lang/test@master
Patch Set: Code review changes Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/src/runner/reporter/json.dart ('k') | lib/src/runner/vm/isolate_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/runner/vm/isolate_listener.dart
diff --git a/lib/src/runner/vm/isolate_listener.dart b/lib/src/runner/vm/isolate_listener.dart
index 23f7b7350b4a374cd23d04a6f4a0e00eda906b3d..18d385237583e1a964abdc5ecb1de60817c846e5 100644
--- a/lib/src/runner/vm/isolate_listener.dart
+++ b/lib/src/runner/vm/isolate_listener.dart
@@ -11,6 +11,7 @@ import 'package:stack_trace/stack_trace.dart';
import '../../backend/declarer.dart';
import '../../backend/group.dart';
+import '../../backend/live_test.dart';
import '../../backend/metadata.dart';
import '../../backend/suite.dart';
import '../../backend/test.dart';
@@ -107,20 +108,25 @@ class IsolateListener {
void _listen(SendPort sendPort) {
sendPort.send({
"type": "success",
- "root": _serializeGroup(_suite.group)
+ "root": _serializeGroup(_suite.group, [])
});
}
/// Serializes [group] into an Isolate-safe map.
- Map _serializeGroup(Group group) {
+ ///
+ /// [parents] lists the groups that contain [group].
+ Map _serializeGroup(Group group, Iterable<Group> parents) {
+ parents = parents.toList()..add(group);
return {
"type": "group",
"name": group.name,
"metadata": group.metadata.serialize(),
- "setUpAll": _serializeTest(group.setUpAll),
- "tearDownAll": _serializeTest(group.tearDownAll),
+ "setUpAll": _serializeTest(group.setUpAll, parents),
+ "tearDownAll": _serializeTest(group.tearDownAll, parents),
"entries": group.entries.map((entry) {
- return entry is Group ? _serializeGroup(entry) : _serializeTest(entry);
+ return entry is Group
+ ? _serializeGroup(entry, parents)
+ : _serializeTest(entry, parents);
}).toList()
};
}
@@ -128,13 +134,13 @@ class IsolateListener {
/// Serializes [test] into a JSON-safe map.
///
/// Returns `null` if [test] is `null`.
- Map _serializeTest(Test test) {
+ Map _serializeTest(Test test, Iterable<Group> groups) {
if (test == null) return null;
var receivePort = new ReceivePort();
receivePort.listen((message) {
assert(message['command'] == 'run');
- _runTest(test, message['reply']);
+ _runLiveTest(test.load(_suite, groups: groups), message['reply']);
});
return {
@@ -145,10 +151,8 @@ class IsolateListener {
};
}
- /// Runs [test] and sends the results across [sendPort].
- void _runTest(Test test, SendPort sendPort) {
- var liveTest = test.load(_suite);
-
+ /// Runs [liveTest] and sends the results across [sendPort].
+ void _runLiveTest(LiveTest liveTest, SendPort sendPort) {
var receivePort = new ReceivePort();
sendPort.send({"type": "started", "reply": receivePort.sendPort});
« no previous file with comments | « lib/src/runner/reporter/json.dart ('k') | lib/src/runner/vm/isolate_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698