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

Unified Diff: lib/src/runner/browser/iframe_listener.dart

Issue 1400743002: Add support for setUpAll and tearDownAll. (Closed) Base URL: git@github.com:dart-lang/test@master
Patch Set: Created 5 years, 2 months 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/browser/browser_manager.dart ('k') | lib/src/runner/engine.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/runner/browser/iframe_listener.dart
diff --git a/lib/src/runner/browser/iframe_listener.dart b/lib/src/runner/browser/iframe_listener.dart
index 815a37e878caae8bd2a20fad934087e0997c460e..834f3e1734d2f8d95fffdcfc0f06a7d182bcdf06 100644
--- a/lib/src/runner/browser/iframe_listener.dart
+++ b/lib/src/runner/browser/iframe_listener.dart
@@ -131,32 +131,42 @@ class IframeListener {
});
}
- /// Serializes [entries] into a JSON-safe map.
+ /// Serializes [group] into a JSON-safe map.
Map _serializeGroup(MultiChannel channel, Group group) {
return {
"type": "group",
"name": group.name,
"metadata": group.metadata.serialize(),
+ "setUpAll": _serializeTest(channel, group.setUpAll),
+ "tearDownAll": _serializeTest(channel, group.tearDownAll),
"entries": group.entries.map((entry) {
- if (entry is Group) return _serializeGroup(channel, entry);
-
- var test = entry as Test;
- var testChannel = channel.virtualChannel();
- testChannel.stream.listen((message) {
- assert(message['command'] == 'run');
- _runTest(test, channel.virtualChannel(message['channel']));
- });
-
- return {
- "type": "test",
- "name": test.name,
- "metadata": test.metadata.serialize(),
- "channel": testChannel.id
- };
+ return entry is Group
+ ? _serializeGroup(channel, entry)
+ : _serializeTest(channel, entry);
}).toList()
};
}
+ /// Serializes [test] into a JSON-safe map.
+ ///
+ /// Returns `null` if [test] is `null`.
+ Map _serializeTest(MultiChannel channel, Test test) {
+ if (test == null) return null;
+
+ var testChannel = channel.virtualChannel();
+ testChannel.stream.listen((message) {
+ assert(message['command'] == 'run');
+ _runTest(test, channel.virtualChannel(message['channel']));
+ });
+
+ return {
+ "type": "test",
+ "name": test.name,
+ "metadata": test.metadata.serialize(),
+ "channel": testChannel.id
+ };
+ }
+
/// Runs [test] and sends the results across [channel].
void _runTest(Test test, MultiChannel channel) {
var liveTest = test.load(_suite);
« no previous file with comments | « lib/src/runner/browser/browser_manager.dart ('k') | lib/src/runner/engine.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698