OLD | NEW |
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 import 'package:stack_trace/stack_trace.dart'; | 5 import 'package:stack_trace/stack_trace.dart'; |
6 import 'package:stream_channel/stream_channel.dart'; | 6 import 'package:stream_channel/stream_channel.dart'; |
7 | 7 |
8 import '../backend/group.dart'; | 8 import '../backend/group.dart'; |
9 import '../backend/live_test.dart'; | 9 import '../backend/live_test.dart'; |
10 import '../backend/live_test_controller.dart'; | 10 import '../backend/live_test_controller.dart'; |
| 11 import '../backend/message.dart'; |
11 import '../backend/metadata.dart'; | 12 import '../backend/metadata.dart'; |
12 import '../backend/operating_system.dart'; | 13 import '../backend/operating_system.dart'; |
13 import '../backend/state.dart'; | 14 import '../backend/state.dart'; |
14 import '../backend/suite.dart'; | 15 import '../backend/suite.dart'; |
15 import '../backend/test.dart'; | 16 import '../backend/test.dart'; |
16 import '../backend/test_platform.dart'; | 17 import '../backend/test_platform.dart'; |
17 import '../util/remote_exception.dart'; | 18 import '../util/remote_exception.dart'; |
18 import '../utils.dart'; | 19 import '../utils.dart'; |
19 | 20 |
20 typedef StackTrace _MapTrace(StackTrace trace); | 21 typedef StackTrace _MapTrace(StackTrace trace); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 if (message['type'] == 'error') { | 56 if (message['type'] == 'error') { |
56 var asyncError = RemoteException.deserialize(message['error']); | 57 var asyncError = RemoteException.deserialize(message['error']); |
57 | 58 |
58 var stackTrace = _mapTrace(asyncError.stackTrace); | 59 var stackTrace = _mapTrace(asyncError.stackTrace); |
59 controller.addError(asyncError.error, stackTrace); | 60 controller.addError(asyncError.error, stackTrace); |
60 } else if (message['type'] == 'state-change') { | 61 } else if (message['type'] == 'state-change') { |
61 controller.setState( | 62 controller.setState( |
62 new State( | 63 new State( |
63 new Status.parse(message['status']), | 64 new Status.parse(message['status']), |
64 new Result.parse(message['result']))); | 65 new Result.parse(message['result']))); |
65 } else if (message['type'] == 'print') { | 66 } else if (message['type'] == 'message') { |
66 controller.print(message['line']); | 67 controller.message(new Message( |
| 68 new MessageType.parse(message['message-type']), |
| 69 message['text'])); |
67 } else { | 70 } else { |
68 assert(message['type'] == 'complete'); | 71 assert(message['type'] == 'complete'); |
69 controller.completer.complete(); | 72 controller.completer.complete(); |
70 } | 73 } |
71 }, onDone: () { | 74 }, onDone: () { |
72 // When the test channel closes—presumably becuase the browser | 75 // When the test channel closes—presumably becuase the browser |
73 // closed—mark the test as complete no matter what. | 76 // closed—mark the test as complete no matter what. |
74 if (controller.completer.isCompleted) return; | 77 if (controller.completer.isCompleted) return; |
75 controller.completer.complete(); | 78 controller.completer.complete(); |
76 }); | 79 }); |
(...skipping 19 matching lines...) Expand all Loading... |
96 Test forPlatform(TestPlatform platform, {OperatingSystem os}) { | 99 Test forPlatform(TestPlatform platform, {OperatingSystem os}) { |
97 if (!metadata.testOn.evaluate(platform, os: os)) return null; | 100 if (!metadata.testOn.evaluate(platform, os: os)) return null; |
98 return new RunnerTest._( | 101 return new RunnerTest._( |
99 name, | 102 name, |
100 metadata.forPlatform(platform, os: os), | 103 metadata.forPlatform(platform, os: os), |
101 trace, | 104 trace, |
102 _channel, | 105 _channel, |
103 _mapTrace); | 106 _mapTrace); |
104 } | 107 } |
105 } | 108 } |
OLD | NEW |