| OLD | NEW |
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, 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:developer'; | 6 import 'dart:developer'; |
| 7 import 'package:observatory/service_io.dart'; | 7 import 'package:observatory/service_io.dart'; |
| 8 import 'package:unittest/unittest.dart'; | 8 import 'package:unittest/unittest.dart'; |
| 9 import 'service_test_common.dart'; | 9 import 'service_test_common.dart'; |
| 10 import 'test_helper.dart'; | 10 import 'test_helper.dart'; |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 (Isolate isolate) async { | 56 (Isolate isolate) async { |
| 57 // Get the flags. | 57 // Get the flags. |
| 58 Map flags = await isolate.vm.invokeRpcNoUpgrade('_getVMTimelineFlags', {}); | 58 Map flags = await isolate.vm.invokeRpcNoUpgrade('_getVMTimelineFlags', {}); |
| 59 expect(flags['type'], 'TimelineFlags'); | 59 expect(flags['type'], 'TimelineFlags'); |
| 60 // Confirm that only Dart is being recorded. | 60 // Confirm that only Dart is being recorded. |
| 61 expect(flags['recordedStreams'].length, equals(1)); | 61 expect(flags['recordedStreams'].length, equals(1)); |
| 62 expect(flags['recordedStreams'].contains('Dart'), isTrue); | 62 expect(flags['recordedStreams'].contains('Dart'), isTrue); |
| 63 print(flags); | 63 print(flags); |
| 64 }, | 64 }, |
| 65 resumeIsolate, | 65 resumeIsolate, |
| 66 hasStoppedAtBreakpoint, |
| 66 (Isolate isolate) async { | 67 (Isolate isolate) async { |
| 67 // Get the timeline. | 68 // Get the timeline. |
| 68 Map result = await isolate.vm.invokeRpcNoUpgrade('_getVMTimeline', {}); | 69 Map result = await isolate.vm.invokeRpcNoUpgrade('_getVMTimeline', {}); |
| 69 expect(result['type'], equals('_Timeline')); | 70 expect(result['type'], equals('_Timeline')); |
| 70 expect(result['traceEvents'], new isInstanceOf<List>()); | 71 expect(result['traceEvents'], new isInstanceOf<List>()); |
| 71 print(result['traceEvents']); | 72 print(result['traceEvents']); |
| 72 // Confirm that Dart events are added. | 73 // Confirm that Dart events are added. |
| 73 expect(filterEvents(result['traceEvents'], isDart).length, greaterThan(0)); | 74 expect(filterEvents(result['traceEvents'], isDart).length, greaterThan(0)); |
| 74 // Confirm that zero non-Dart events are added. | 75 // Confirm that zero non-Dart events are added. |
| 75 expect( | 76 expect( |
| (...skipping 13 matching lines...) Expand all Loading... |
| 89 dartEventCount = filterEvents(result['traceEvents'], isDart).length; | 90 dartEventCount = filterEvents(result['traceEvents'], isDart).length; |
| 90 }, | 91 }, |
| 91 (Isolate isolate) async { | 92 (Isolate isolate) async { |
| 92 // Get the flags. | 93 // Get the flags. |
| 93 Map flags = await isolate.vm.invokeRpcNoUpgrade('_getVMTimelineFlags', {}); | 94 Map flags = await isolate.vm.invokeRpcNoUpgrade('_getVMTimelineFlags', {}); |
| 94 expect(flags['type'], 'TimelineFlags'); | 95 expect(flags['type'], 'TimelineFlags'); |
| 95 // Confirm that 'Dart' is not being recorded. | 96 // Confirm that 'Dart' is not being recorded. |
| 96 expect(flags['recordedStreams'].length, equals(0)); | 97 expect(flags['recordedStreams'].length, equals(0)); |
| 97 }, | 98 }, |
| 98 resumeIsolate, | 99 resumeIsolate, |
| 100 hasStoppedAtBreakpoint, |
| 99 (Isolate isolate) async { | 101 (Isolate isolate) async { |
| 100 // Grab the timeline and verify that we haven't added any new Dart events. | 102 // Grab the timeline and verify that we haven't added any new Dart events. |
| 101 Map result = await isolate.vm.invokeRpcNoUpgrade('_getVMTimeline', {}); | 103 Map result = await isolate.vm.invokeRpcNoUpgrade('_getVMTimeline', {}); |
| 102 expect(result['type'], equals('_Timeline')); | 104 expect(result['type'], equals('_Timeline')); |
| 103 expect(result['traceEvents'], new isInstanceOf<List>()); | 105 expect(result['traceEvents'], new isInstanceOf<List>()); |
| 104 expect(filterEvents(result['traceEvents'], isDart).length, dartEventCount); | 106 expect(filterEvents(result['traceEvents'], isDart).length, dartEventCount); |
| 105 // Confirm that zero non-Dart events are added. | 107 // Confirm that zero non-Dart events are added. |
| 106 expect( | 108 expect( |
| 107 filterEvents(result['traceEvents'], isNotDartAndMetaData).length, | 109 filterEvents(result['traceEvents'], isNotDartAndMetaData).length, |
| 108 equals(0)); | 110 equals(0)); |
| 109 }, | 111 }, |
| 110 ]; | 112 ]; |
| 111 | 113 |
| 112 main(args) async => runIsolateTests(args, | 114 main(args) async => runIsolateTests(args, |
| 113 tests, | 115 tests, |
| 114 testeeConcurrent: primeDartTimeline); | 116 testeeConcurrent: primeDartTimeline); |
| OLD | NEW |