| 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=--compile-all --error_on_bad_type --error_on_bad_override | 4 // VMOptions=--compile-all --error_on_bad_type --error_on_bad_override |
| 5 | 5 |
| 6 import 'package:observatory/service_io.dart'; | 6 import 'package:observatory/service_io.dart'; |
| 7 import 'package:unittest/unittest.dart'; | 7 import 'package:unittest/unittest.dart'; |
| 8 | 8 |
| 9 import 'test_helper.dart'; | 9 import 'test_helper.dart'; |
| 10 | 10 |
| 11 class _TestClass { | 11 class _TestClass { |
| 12 _TestClass(this.x, this.y); | 12 _TestClass(this.x, this.y); |
| 13 var x; | 13 var x; |
| 14 var y; | 14 var y; |
| 15 } | 15 } |
| 16 | 16 |
| 17 var global; | 17 var global; |
| 18 | 18 |
| 19 void warmup() { | 19 void warmup() { |
| 20 global = new _TestClass(new _TestClass(1, 2), null); | 20 global = new _TestClass(new _TestClass(1, 2), null); |
| 21 } | 21 } |
| 22 | 22 |
| 23 eval(Isolate isolate, String expression) async { | 23 eval(Isolate isolate, String expression) async { |
| 24 Map params = { | 24 Map params = { |
| 25 'targetId': isolate.rootLib.id, | 25 'targetId': isolate.rootLibrary.id, |
| 26 'expression': expression, | 26 'expression': expression, |
| 27 }; | 27 }; |
| 28 return await isolate.invokeRpcNoUpgrade('eval', params); | 28 return await isolate.invokeRpcNoUpgrade('evaluate', params); |
| 29 } | 29 } |
| 30 | 30 |
| 31 var tests = [ | 31 var tests = [ |
| 32 (Isolate isolate) async { | 32 (Isolate isolate) async { |
| 33 var obj = await eval(isolate, 'global'); | 33 var obj = await eval(isolate, 'global'); |
| 34 var params = { | 34 var params = { |
| 35 'classId': obj['class']['id'], | 35 'classId': obj['class']['id'], |
| 36 'limit': 4, | 36 'limit': 4, |
| 37 }; | 37 }; |
| 38 var result = await isolate.invokeRpcNoUpgrade('_getInstances', params); | 38 var result = await isolate.invokeRpcNoUpgrade('_getInstances', params); |
| 39 expect(result['type'], equals('InstanceSet')); | 39 expect(result['type'], equals('InstanceSet')); |
| 40 expect(result['totalCount'], equals(2)); | 40 expect(result['totalCount'], equals(2)); |
| 41 expect(result['samples'].length, equals(2)); | 41 expect(result['samples'].length, equals(2)); |
| 42 expect(result['samples'][0]['type'], equals('@Instance')); | 42 expect(result['samples'][0]['type'], equals('@Instance')); |
| 43 | 43 |
| 44 // Limit is respected. | 44 // Limit is respected. |
| 45 params = { | 45 params = { |
| 46 'classId': obj['class']['id'], | 46 'classId': obj['class']['id'], |
| 47 'limit': 1, | 47 'limit': 1, |
| 48 }; | 48 }; |
| 49 result = await isolate.invokeRpcNoUpgrade('_getInstances', params); | 49 result = await isolate.invokeRpcNoUpgrade('_getInstances', params); |
| 50 expect(result['type'], equals('InstanceSet')); | 50 expect(result['type'], equals('InstanceSet')); |
| 51 expect(result['totalCount'], equals(2)); | 51 expect(result['totalCount'], equals(2)); |
| 52 expect(result['samples'].length, equals(1)); | 52 expect(result['samples'].length, equals(1)); |
| 53 expect(result['samples'][0]['type'], equals('@Instance')); | 53 expect(result['samples'][0]['type'], equals('@Instance')); |
| 54 }, | 54 }, |
| 55 ]; | 55 ]; |
| 56 | 56 |
| 57 main(args) async => runIsolateTests(args, tests, testeeBefore:warmup); | 57 main(args) async => runIsolateTests(args, tests, testeeBefore:warmup); |
| OLD | NEW |