Skip to content

F
Front-End
Unverified Commit 349d694f authored by Jonah Williams's avatar Jonah Williams Committed by GitHub
Browse files
Options

Revert "Added a null check for ranges in the sourceReport map. (#43667)" (#43827) 

This reverts commit 0dc5ea4a.
parent 8f704840
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 440 deletions
packages/flutter_tools/lib/src/test/coverage_collector.dart
View file @ 349d694f
......@@ -245,37 +245,20 @@ void _buildCoverageMap(
final Map<String, Map<int, int>> hitMaps = <String, Map<int, int>>{};
for (String scriptId in scripts.keys) {
final Map<String, dynamic> sourceReport = sourceReports[scriptId];
final Map<String, dynamic> scripts = sourceReport['scripts'];
final List<Map<String, Object>> ranges = sourceReport['ranges'];
// Ranges may sometimes be null for a report.
if (ranges == null || scripts == null) {
continue;
}
for (Map<String, dynamic> range in ranges) {
for (Map<String, dynamic> range in sourceReport['ranges']) {
final Map<String, dynamic> coverage = range['coverage'];
final String scriptIndex = range['scriptIndex'];
// Coverage reports may sometimes be null for a Script.
if (coverage == null || scriptIndex == null) {
continue;
}
final Map<String, dynamic> scriptRef = scripts[scriptIndex];
if (scriptRef == null) {
if (coverage == null) {
continue;
}
final Map<String, dynamic> scriptRef = sourceReport['scripts'][range['scriptIndex']];
final String uri = scriptRef['uri'];
final String id = scriptRef['id'];
if (uri == null || id == null) {
continue;
}
final Map<String, Object> scriptById = scripts[id];
if (scriptById == null) {
continue;
}
hitMaps[uri] ??= <int, int>{};
final Map<int, int> hitMap = hitMaps[uri];
final List<dynamic> hits = coverage['hits'];
final List<dynamic> misses = coverage['misses'];
final List<dynamic> tokenPositions = scriptById['tokenPosTable'];
final List<dynamic> tokenPositions = scripts[scriptRef['id']]['tokenPosTable'];
// The token positions can be null if the script has no coverable lines.
if (tokenPositions == null) {
continue;
......
packages/flutter_tools/test/general.shard/coverage_collector_test.dart
View file @ 349d694f
......@@ -20,428 +20,15 @@ void main() {
test('Coverage collector Can handle coverage sentinenl data', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{'type': 'Sentinel', 'kind': 'Collected', 'valueAsString': '<collected>'};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{'type': 'CodeCoverage', 'coverage': <Object>[]});
});
test('Coverage collector can handle null scripts value', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'ranges': <Map<String, Object>>[<String, Object>{}]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{'type': 'CodeCoverage', 'coverage': <Object>[]});
});
test('Coverage collector can handle null ranges value', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{'scripts': <String, Object>{}};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{'type': 'CodeCoverage', 'coverage': <Object>[]});
});
test('Coverage collector can handle null scriptIndex values', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{'uri': 'some_uri', 'id': 'some_id'},
'ranges': <Map<String, Object>>[
<String, Object>{'coverage': <String, Object>{}}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{'type': 'CodeCoverage', 'coverage': <Object>[]});
});
test('Coverage collector can handle null scriptRef values', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{'uri': 'some_uri', 'id': 'some_id'},
'ranges': <Map<String, Object>>[
<String, Object>{'coverage': <String, Object>{}, 'scriptIndex': 'some_value'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{'type': 'CodeCoverage', 'coverage': <Object>[]});
});
test('Coverage collector can handle null scriptRef uri values', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{'uri': 'some_uri', 'id': 'some_id', 'index_0': <String, Object>{}},
'ranges': <Map<String, Object>>[
<String, Object>{'coverage': <String, Object>{}, 'scriptIndex': 'index_0'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{'type': 'CodeCoverage', 'coverage': <Object>[]});
});
test('Coverage collector can handle null scriptRef id values', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{
'uri': 'some_uri',
'id': 'some_id',
'index_0': <String, Object>{'uri': 'some_uri'}
},
'ranges': <Map<String, Object>>[
<String, Object>{'coverage': <String, Object>{}, 'scriptIndex': 'index_0'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
.thenAnswer((Invocation invocation) async {
return <String, Object>{'type': 'Sentinel', 'kind': 'Collected', 'valueAsString': '<collected>'};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{'type': 'CodeCoverage', 'coverage': <Object>[]});
});
test('Coverage collector can handle null scriptById values', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{
'uri': 'some_uri',
'id': 'some_id',
'index_0': <String, Object>{'uri': 'some_uri', 'id': '01'},
},
'ranges': <Map<String, Object>>[
<String, Object>{'coverage': <String, Object>{}, 'scriptIndex': 'index_0'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{'type': 'CodeCoverage', 'coverage': <Object>[]});
});
test('Coverage collector can handle null tokenPosTable values', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{
'uri': 'some_uri',
'id': 'some_id',
'index_0': <String, Object>{'uri': 'some_uri', 'id': '01'},
'01': <String, Object>{},
},
'ranges': <Map<String, Object>>[
<String, Object>{'coverage': <String, Object>{}, 'scriptIndex': 'index_0'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{
'type': 'CodeCoverage',
'coverage': <Map<String, Object>>[
<String, Object>{
'source': 'some_uri',
'script': <String, Object>{
'type': '@Script',
'fixedId': true,
'id': 'libraries/1/scripts/some_uri',
'uri': 'some_uri',
'_kind': 'library'
},
'hits': <Map<String, Object>>[]
}
]
});
});
test('Coverage collector can handle null hits values', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{
'uri': 'some_uri',
'id': 'some_id',
'index_0': <String, Object>{'uri': 'some_uri', 'id': '01'},
'01': <String, Object>{'tokenPosTable': <dynamic>[]},
},
'ranges': <Map<String, Object>>[
<String, Object>{'coverage': <String, Object>{}, 'scriptIndex': 'index_0'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{
'type': 'CodeCoverage',
'coverage': <Map<String, Object>>[
<String, Object>{
'source': 'some_uri',
'script': <String, Object>{
'type': '@Script',
'fixedId': true,
'id': 'libraries/1/scripts/some_uri',
'uri': 'some_uri',
'_kind': 'library'
},
'hits': <Map<String, Object>>[]
}
]
});
});
test('Coverage collector can handle null misses values', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{
'uri': 'some_uri',
'id': 'some_id',
'index_0': <String, Object>{'uri': 'some_uri', 'id': '01'},
'01': <String, Object>{'tokenPosTable': <dynamic>[]},
},
'ranges': <Map<String, Object>>[
<String, Object>{
'coverage': <String, Object>{'hits': <dynamic>[]},
'scriptIndex': 'index_0'
}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{
'type': 'CodeCoverage',
'coverage': <Map<String, Object>>[
<String, Object>{
'source': 'some_uri',
'script': <String, Object>{
'type': '@Script',
'fixedId': true,
'id': 'libraries/1/scripts/some_uri',
'uri': 'some_uri',
'_kind': 'library'
},
'hits': <Map<String, Object>>[]
}
]
});
});
test('Coverage collector should process hits and misses', () async {
when(mockVMService.vm.isolates.first.invokeRpcRaw('getScripts', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <Map<String, Object>>[
<String, Object>{'uri': 'some_uri', 'id': 'some_id'}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getSourceReport', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{
'scripts': <String, Object>{
'uri': 'some_uri',
'id': 'some_id',
'index_0': <String, Object>{'uri': 'some_uri', 'id': '01'},
'01': <String, Object>{
'tokenPosTable': <dynamic>[
<int>[1, 100, 5, 101, 8],
<int>[2, 102, 7],
]
},
},
'ranges': <Map<String, Object>>[
<String, Object>{
'coverage': <String, Object>{
'hits': <dynamic>[100, 101],
'misses': <dynamic>[102],
},
'scriptIndex': 'index_0'
}
]
};
});
when(mockVMService.vm.isolates.first.invokeRpcRaw('getObject', params: anyNamed('params')))
.thenAnswer((Invocation invocation) async {
return <String, Object>{};
});
final Map<String, Object> result = await collect(null, (String predicate) => true, connector: (Uri uri) async {
return mockVMService;
});
expect(result, <String, Object>{
'type': 'CodeCoverage',
'coverage': <Map<String, Object>>[
<String, Object>{
'source': 'some_uri',
'script': <String, Object>{
'type': '@Script',
'fixedId': true,
'id': 'libraries/1/scripts/some_uri',
'uri': 'some_uri',
'_kind': 'library'
},
'hits': <int>[1, 2, 2, 0]
}
]
});
});
}
class MockVMService extends Mock implements VMService {
......@@ -451,13 +38,13 @@ class MockVMService extends Mock implements VMService {
class MockVM extends Mock implements VM {
@override
final List<MockIsolate> isolates = <MockIsolate>[MockIsolate()];
final List<MockIsolate> isolates = <MockIsolate>[ MockIsolate() ];
}
class MockIsolate extends Mock implements Isolate {}
class MockProcess extends Mock implements Process {
final Completer<int> completer = Completer<int>();
final Completer<int>completer = Completer<int>();
@override
Future<int> get exitCode => completer.future;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab