| 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 '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 import 'test_helper.dart'; | 8 import 'test_helper.dart'; | 
| 9 | 9 | 
| 10 import 'dart:developer'; | 10 import 'dart:developer'; | 
| 11 | 11 | 
| 12 void script() { | 12 void script() { | 
| 13   var counter = new Counter('a.b.c', 'description'); | 13   var counter = new Counter('a.b.c', 'description'); | 
| 14   Metrics.register(counter); | 14   Metrics.register(counter); | 
| 15   counter.value = 1234.5; | 15   counter.value = 1234.5; | 
| 16 } | 16 } | 
| 17 | 17 | 
| 18 var tests = [ | 18 var tests = [ | 
|  | 19 | 
| 19   (Isolate isolate) async { | 20   (Isolate isolate) async { | 
| 20     Map metrics = await isolate.refreshNativeMetrics(); | 21     Map metrics = await isolate.refreshNativeMetrics(); | 
| 21     expect(metrics.length, greaterThan(1)); | 22     expect(metrics.length, greaterThan(1)); | 
| 22     expect(metrics.length, greaterThan(1)); | 23     expect(metrics.length, greaterThan(1)); | 
| 23     var foundOldHeapCapacity = | 24     var foundOldHeapCapacity = metrics.values.any( | 
| 24         metrics.values.any((m) => m.name == 'heap.old.capacity'); | 25         (m) => m.name == 'heap.old.capacity'); | 
| 25     expect(foundOldHeapCapacity, equals(true)); | 26     expect(foundOldHeapCapacity, equals(true)); | 
| 26   }, | 27   }, | 
|  | 28 | 
| 27   (Isolate isolate) async { | 29   (Isolate isolate) async { | 
| 28     var params = {'metricId': 'metrics/native/heap.old.used'}; | 30     var params = { 'metricId': 'metrics/native/heap.old.used' }; | 
| 29     ServiceMetric counter = | 31     ServiceMetric counter = | 
| 30         await isolate.invokeRpc('_getIsolateMetric', params); | 32       await isolate.invokeRpc('_getIsolateMetric', params); | 
| 31     expect(counter.type, equals('Counter')); | 33     expect(counter.type, equals('Counter')); | 
| 32     expect(counter.name, equals('heap.old.used')); | 34     expect(counter.name, equals('heap.old.used')); | 
| 33   }, | 35   }, | 
|  | 36 | 
| 34   (Isolate isolate) async { | 37   (Isolate isolate) async { | 
| 35     bool caughtException; | 38     bool caughtException; | 
| 36     try { | 39     try { | 
| 37       await isolate.invokeRpc( | 40       await isolate.invokeRpc('_getIsolateMetric', | 
| 38           '_getIsolateMetric', {'metricId': 'metrics/native/doesnotexist'}); | 41                               { 'metricId': 'metrics/native/doesnotexist' }); | 
| 39       expect(false, isTrue, reason: 'Unreachable'); | 42       expect(false, isTrue, reason:'Unreachable'); | 
| 40     } on ServerRpcException catch (e) { | 43     } on ServerRpcException catch (e) { | 
| 41       caughtException = true; | 44       caughtException = true; | 
| 42       expect(e.code, equals(ServerRpcException.kInvalidParams)); | 45       expect(e.code, equals(ServerRpcException.kInvalidParams)); | 
| 43       expect( | 46       expect(e.message, | 
| 44           e.message, | 47              "_getIsolateMetric: invalid 'metricId' " | 
| 45           "_getIsolateMetric: invalid 'metricId' " | 48              "parameter: metrics/native/doesnotexist"); | 
| 46           "parameter: metrics/native/doesnotexist"); |  | 
| 47     } | 49     } | 
| 48     expect(caughtException, isTrue); | 50     expect(caughtException, isTrue); | 
| 49   }, | 51   }, | 
|  | 52 | 
| 50 ]; | 53 ]; | 
| 51 | 54 | 
| 52 main(args) => runIsolateTests(args, tests, testeeBefore: script); | 55 main(args) => runIsolateTests(args, tests, testeeBefore: script); | 
| OLD | NEW | 
|---|