firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[frdb] Fix JSON casting in RPC calls. (#18655)

Browse Source 
This prevents the error:

`type 'List<dynamic>' is not a subtype of type 'List<Map<String, dynamic>>' `

The test added fails when dart_vm.dart is reverted to `master`, and succeeds in
its current state.  This issue was run into while connecting to the
Dart VM.
This commit is contained in:
Andrew Davies 2018-06-22 14:00:49 -07:00 committed by GitHub
parent 7fdb404a13
commit 08d3deec80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 103 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fuchsia_remote_debug_protocol/lib/src/dart/dart_vm.dart
View File

@ -122,9 +122,8 @@ class DartVm {
Future<List<IsolateRef>> getMainIsolatesByPattern(Pattern pattern) async {
final Map<String, dynamic> jsonVmRef =
await invokeRpc('getVM', timeout: _kRpcTimeout);
final List<Map<String, dynamic>> jsonIsolates = jsonVmRef['isolates'];
final List<IsolateRef> result = <IsolateRef>[];
for (Map<String, dynamic> jsonIsolate in jsonIsolates) {
for (Map<String, dynamic> jsonIsolate in jsonVmRef['isolates']) {
final String name = jsonIsolate['name'];
if (name.contains(pattern) && name.contains(new RegExp(r':main\(\)'))) {
result.add(new IsolateRef._fromJson(jsonIsolate, this));
@ -164,8 +163,7 @@ class DartVm {
final List<FlutterView> views = <FlutterView>[];
final Map<String, dynamic> rpcResponse =
await invokeRpc('_flutter.listViews', timeout: _kRpcTimeout);
final List<Map<String, dynamic>> flutterViewsJson = rpcResponse['views'];
for (Map<String, dynamic> jsonView in flutterViewsJson) {
for (Map<String, dynamic> jsonView in rpcResponse['views']) {
final FlutterView flutterView = new FlutterView._fromJson(jsonView);
if (flutterView != null) {
views.add(flutterView);

101
packages/fuchsia_remote_debug_protocol/test/src/dart/dart_vm_test.dart
View File

@ -107,6 +107,63 @@ void main() {
expect(views[2].name, 'file://flutterBinary2');
});
test('basic flutter view parsing with casting checks', () async {
final Map<String, dynamic> flutterViewCannedResponses = <String, dynamic>{
'views': <dynamic>[
<String, dynamic>{
'type': 'FlutterView',
'id': 'flutterView0',
},
<String, dynamic>{
'type': 'FlutterView',
'id': 'flutterView1',
'isolate': <String, dynamic>{
'type': '@Isolate',
'fixedId': 'true',
'id': 'isolates/1',
'name': 'file://flutterBinary1',
'number': '1',
},
},
<String, dynamic>{
'type': 'FlutterView',
'id': 'flutterView2',
'isolate': <String, dynamic>{
'type': '@Isolate',
'fixedId': 'true',
'id': 'isolates/2',
'name': 'file://flutterBinary2',
'number': '2',
},
},
],
};
Future<json_rpc.Peer> mockVmConnectionFunction(Uri uri) {
when(mockPeer.sendRequest(
typed<String>(any), typed<Map<String, dynamic>>(any)))
.thenAnswer((_) => new Future<Map<String, dynamic>>(
() => flutterViewCannedResponses));
return new Future<json_rpc.Peer>(() => mockPeer);
}
fuchsiaVmServiceConnectionFunction = mockVmConnectionFunction;
final DartVm vm =
await DartVm.connect(Uri.parse('http://whatever.com/ws'));
expect(vm, isNot(null));
final List<FlutterView> views = await vm.getAllFlutterViews();
expect(views.length, 3);
// Check ID's as they cannot be null.
expect(views[0].id, 'flutterView0');
expect(views[1].id, 'flutterView1');
expect(views[2].id, 'flutterView2');
// Verify names.
expect(views[0].name, equals(null));
expect(views[1].name, 'file://flutterBinary1');
expect(views[2].name, 'file://flutterBinary2');
});
test('invalid flutter view missing ID', () async {
final Map<String, dynamic> flutterViewCannedResponseMissingId =
<String, dynamic>{
@ -150,6 +207,50 @@ void main() {
expect(failingFunction, throwsA(const isInstanceOf<RpcFormatError>()));
});
test('get isolates by pattern', () async {
final Map<String, dynamic> vmCannedResponse = <String, dynamic>{
'isolates': <dynamic>[
<String, dynamic>{
'type': '@Isolate',
'fixedId': 'true',
'id': 'isolates/1',
'name': 'file://thingThatWillNotMatch:main()',
'number': '1',
},
<String, dynamic>{
'type': '@Isolate',
'fixedId': 'true',
'id': 'isolates/1',
'name': 'file://flutterBinary1:main()',
'number': '2',
},
<String, dynamic>{
'type': '@Isolate',
'fixedId': 'true',
'id': 'isolates/2',
'name': 'file://flutterBinary2:main()',
'number': '3',
},
],
};
Future<json_rpc.Peer> mockVmConnectionFunction(Uri uri) {
when(mockPeer.sendRequest(
typed<String>(any), typed<Map<String, dynamic>>(any)))
.thenAnswer((_) =>
new Future<Map<String, dynamic>>(() => vmCannedResponse));
return new Future<json_rpc.Peer>(() => mockPeer);
}
fuchsiaVmServiceConnectionFunction = mockVmConnectionFunction;
final DartVm vm =
await DartVm.connect(Uri.parse('http://whatever.com/ws'));
expect(vm, isNot(null));
final List<IsolateRef> isolates =
await vm.getMainIsolatesByPattern('flutterBinary');
expect(isolates.length, 2);
});
test('invalid flutter view missing ID', () async {
final Map<String, dynamic> flutterViewCannedResponseMissingIsolateName =
<String, dynamic>{