development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 11:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some of the generic types specified to avoid runtime errors in --preview-dart-2 (#15166)

Browse source 
* Fix some of the generic types specified to avoid runtime errors in
--preview-dart-2

  type 'YamlMap' is not a subtype of type 'Map<String, dynamic>' where
    YamlMap is from package:yaml/src/yaml_node.dart
    Map is from dart:core
    String is from dart:core

  package:flutter_devicelab/framework/manifest.dart 17:36       loadTaskManifest
  test/manifest_test.dart 14:33                                 main.<fn>.<fn>
  package:test/src/backend/declarer.dart 161:27                 Declarer.test.<fn>.<fn>.<fn>

* Add dynamic generic types to keep the analyer happy.

* Address code review comment.
This commit is contained in:
Siva 2018-03-07 00:33:21 -08:00 committed by GitHub
parent 0d59679624
commit 9c38d6bb35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dev/devicelab/lib/framework/manifest.dart
View file

@ -52,7 +52,7 @@ class ManifestTask {
final String stage; final String stage;
/// Capabilities required of the build agent to be able to perform this task. /// Capabilities required of the build agent to be able to perform this task.
final List<String> requiredAgentCapabilities; final List<dynamic> requiredAgentCapabilities;
/// Whether this test is flaky. /// Whether this test is flaky.
/// ///
@ -75,14 +75,14 @@ class ManifestError extends Error {
// There's no good YAML validator, at least not for Dart, so we validate // There's no good YAML validator, at least not for Dart, so we validate
// manually. It's not too much code and produces good error messages. // manually. It's not too much code and produces good error messages.
Manifest _validateAndParseManifest(Map<String, dynamic> manifestYaml) { Manifest _validateAndParseManifest(Map<dynamic, dynamic> manifestYaml) {
_checkKeys(manifestYaml, 'manifest', const <String>['tasks']); _checkKeys(manifestYaml, 'manifest', const <String>['tasks']);
return new Manifest._(_validateAndParseTasks(manifestYaml['tasks'])); return new Manifest._(_validateAndParseTasks(manifestYaml['tasks']));
} }
List<ManifestTask> _validateAndParseTasks(dynamic tasksYaml) { List<ManifestTask> _validateAndParseTasks(dynamic tasksYaml) {
_checkType(tasksYaml is Map, tasksYaml, 'Value of "tasks"', 'dictionary'); _checkType(tasksYaml is Map, tasksYaml, 'Value of "tasks"', 'dictionary');
final List<String> sortedKeys = tasksYaml.keys.toList()..sort(); final List<dynamic> sortedKeys = tasksYaml.keys.toList()..sort();
return sortedKeys.map((dynamic taskName) => _validateAndParseTask(taskName, tasksYaml[taskName])).toList(); return sortedKeys.map((dynamic taskName) => _validateAndParseTask(taskName, tasksYaml[taskName])).toList();
} }
@ -107,7 +107,7 @@ ManifestTask _validateAndParseTask(dynamic taskName, dynamic taskYaml) {
_checkType(timeoutInMinutes is int, timeoutInMinutes, 'timeout_in_minutes', 'integer'); _checkType(timeoutInMinutes is int, timeoutInMinutes, 'timeout_in_minutes', 'integer');
} }
final List<String> capabilities = _validateAndParseCapabilities(taskName, taskYaml['required_agent_capabilities']); final List<dynamic> capabilities = _validateAndParseCapabilities(taskName, taskYaml['required_agent_capabilities']);
return new ManifestTask._( return new ManifestTask._(
name: taskName, name: taskName,
description: taskYaml['description'], description: taskYaml['description'],
@ -124,7 +124,7 @@ List<String> _validateAndParseCapabilities(String taskName, dynamic capabilities
final dynamic capability = capabilitiesYaml[i]; final dynamic capability = capabilitiesYaml[i];
_checkType(capability is String, capability, 'required_agent_capabilities[$i]', 'string'); _checkType(capability is String, capability, 'required_agent_capabilities[$i]', 'string');
} }
return capabilitiesYaml; return capabilitiesYaml.cast<String>();
} }
void _checkType(bool isValid, dynamic value, String variableName, String typeName) { void _checkType(bool isValid, dynamic value, String variableName, String typeName) {
@ -141,7 +141,7 @@ void _checkIsNotBlank(dynamic value, String variableName, String ownerName) {
} }
} }
void _checkKeys(Map<String, dynamic> map, String variableName, List<String> allowedKeys) { void _checkKeys(Map<dynamic, dynamic> map, String variableName, List<String> allowedKeys) {
for (String key in map.keys) { for (String key in map.keys) {
if (!allowedKeys.contains(key)) { if (!allowedKeys.contains(key)) {
throw new ManifestError( throw new ManifestError(