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 // VMOptions=--error_on_bad_type --error_on_bad_override | 4 // VMOptions=--error_on_bad_type --error_on_bad_override |
5 | 5 |
6 import 'dart:async'; | 6 import 'dart:async'; |
7 import 'dart:convert'; | 7 import 'dart:convert'; |
8 import 'dart:developer'; | 8 import 'dart:developer'; |
9 import 'package:observatory/service_io.dart'; | 9 import 'package:observatory/service_io.dart'; |
10 import 'package:observatory/cpu_profile.dart'; | 10 import 'package:observatory/cpu_profile.dart'; |
(...skipping 29 matching lines...) Expand all Loading... |
40 'method': method, | 40 'method': method, |
41 'parameters': paremeters, | 41 'parameters': paremeters, |
42 }))); | 42 }))); |
43 case '__null': | 43 case '__null': |
44 return null; | 44 return null; |
45 case '__nullFuture': | 45 case '__nullFuture': |
46 return new Future.value(null); | 46 return new Future.value(null); |
47 } | 47 } |
48 } | 48 } |
49 | 49 |
| 50 Future<ServiceExtensionResponse> LanguageErrorHandler(String method, |
| 51 Map paremeters) { |
| 52 // The following is an intentional syntax error. |
| 53 klajsdlkjfad |
| 54 } |
| 55 |
50 void test() { | 56 void test() { |
51 registerExtension('__delay', Handler); | 57 registerExtension('__delay', Handler); |
52 registerExtension('__error', Handler); | 58 registerExtension('__error', Handler); |
53 registerExtension('__exception', Handler); | 59 registerExtension('__exception', Handler); |
54 registerExtension('__null', Handler); | 60 registerExtension('__null', Handler); |
55 registerExtension('__nullFuture', Handler); | 61 registerExtension('__nullFuture', Handler); |
56 registerExtension('__success', Handler); | 62 registerExtension('__success', Handler); |
57 bool exceptionThrown = false; | 63 bool exceptionThrown = false; |
58 try { | 64 try { |
59 registerExtension('__delay', Handler); | 65 registerExtension('__delay', Handler); |
60 } catch (e) { | 66 } catch (e) { |
61 exceptionThrown = true; | 67 exceptionThrown = true; |
62 } | 68 } |
63 expect(exceptionThrown, isTrue); | 69 expect(exceptionThrown, isTrue); |
| 70 registerExtension('__languageError', LanguageErrorHandler); |
64 } | 71 } |
65 | 72 |
66 var tests = [ | 73 var tests = [ |
67 // Initial. | 74 // Initial. |
68 (Isolate isolate) async { | 75 (Isolate isolate) async { |
69 var result; | 76 var result; |
70 | 77 |
71 result = await isolate.invokeRpcNoUpgrade('__delay', {}); | 78 result = await isolate.invokeRpcNoUpgrade('__delay', {}); |
72 expect(result['type'], equals('_delayedType')); | 79 expect(result['type'], equals('_delayedType')); |
73 expect(result['method'], equals('__delay')); | 80 expect(result['method'], equals('__delay')); |
(...skipping 17 matching lines...) Expand all Loading... |
91 await isolate.invokeRpcNoUpgrade('__null', {}); | 98 await isolate.invokeRpcNoUpgrade('__null', {}); |
92 } on ServerRpcException catch (e, st) { | 99 } on ServerRpcException catch (e, st) { |
93 expect(e.code, equals(ServiceExtensionResponse.kExtensionError)); | 100 expect(e.code, equals(ServiceExtensionResponse.kExtensionError)); |
94 expect(e.message, equals('Extension handler must return a Future')); | 101 expect(e.message, equals('Extension handler must return a Future')); |
95 } | 102 } |
96 | 103 |
97 try { | 104 try { |
98 await isolate.invokeRpcNoUpgrade('__nullFuture', {}); | 105 await isolate.invokeRpcNoUpgrade('__nullFuture', {}); |
99 } on ServerRpcException catch (e, st) { | 106 } on ServerRpcException catch (e, st) { |
100 expect(e.code, equals(ServiceExtensionResponse.kExtensionError)); | 107 expect(e.code, equals(ServiceExtensionResponse.kExtensionError)); |
101 expect(e.message, equals('Extension handler returned null')); | 108 expect(e.message, equals('Extension handler must complete to a ' |
| 109 'ServiceExtensionResponse')); |
102 } | 110 } |
103 | 111 |
104 result = await isolate.invokeRpcNoUpgrade('__success', | 112 result = await isolate.invokeRpcNoUpgrade('__success', |
105 {'apple': 'banana'}); | 113 {'apple': 'banana'}); |
106 expect(result['type'], equals('_extensionType')); | 114 expect(result['type'], equals('_extensionType')); |
107 expect(result['method'], equals('__success')); | 115 expect(result['method'], equals('__success')); |
108 expect(result['parameters']['isolateId'], isNotNull); | 116 expect(result['parameters']['isolateId'], isNotNull); |
109 expect(result['parameters']['apple'], equals('banana')); | 117 expect(result['parameters']['apple'], equals('banana')); |
110 | 118 |
111 | 119 |
| 120 try { |
| 121 result = await isolate.invokeRpcNoUpgrade('__languageError', {}); |
| 122 } on ServerRpcException catch (e, st) { |
| 123 expect(e.code, equals(ServiceExtensionResponse.kExtensionError)); |
| 124 expect(e.message, stringContainsInOrder([ |
| 125 'Error in extension `__languageError`:', |
| 126 'developer_extension_test.dart', |
| 127 'semicolon expected'])); |
| 128 } |
| 129 |
112 }, | 130 }, |
113 ]; | 131 ]; |
114 | 132 |
115 main(args) async => runIsolateTests(args, tests, testeeBefore:test); | 133 main(args) async => runIsolateTests(args, tests, testeeBefore:test); |
OLD | NEW |