Tighten types in test.dart even more.

tools/testing/dart/options.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:io';
 import 'drt_updater.dart';
 import 'test_suite.dart';
 import 'path.dart';
 import 'compiler_configuration.dart' show CompilerConfiguration;
 import 'runtime_configuration.dart' show RuntimeConfiguration;
@@ skipping 379 matching lines @@
     'write_debug_log',
     'write_test_outcome_log',
   ].toSet();
 
   /// Parses a list of strings as test options.
   ///
   /// Returns a list of configurations in which to run the tests.
   /// Configurations are maps mapping from option keys to values. When
   /// encountering the first non-option string, the rest of the arguments are
   /// stored in the returned Map under the 'rest' key.
-  List<Map> parse(List<String> arguments) {
+  List<Map<String, dynamic>> parse(List<String> arguments) {
     // TODO(rnystrom): The builders on the buildbots still pass this even
     // though it does nothing. Until those can be fixed, silently ignore the
     // option. Remove this once the buildbot scripts are fixed.
     if (arguments.contains("--failure-summary")) {
       arguments = arguments.where((arg) => arg != "--failure-summary").toList();
       print('Note: Ignoring unsupported "--failure-summary" option.');
     }
 
-    var configuration = {};
+    var configuration = <String, dynamic>{};
 
     // Fill in configuration with arguments passed to the test script.
     for (var i = 0; i < arguments.length; i++) {
       var arg = arguments[i];
 
       // Help supersedes all other arguments.
       if (arg == "--help" || arg == "-h") {
         _printHelp();
         return null;
       }
@@ skipping 138 matching lines @@
     }
 
     return arguments;
   }
 
   /// Determines if a particular configuration has a valid combination of
   /// compiler and runtime elements.
   bool _isValidConfig(Map config) {
     var isValid = true;
     List<String> validRuntimes;
-    switch (config['compiler']) {
+    switch (config['compiler'] as String) {
       case 'dart2js':
         // Note: by adding 'none' as a configuration, if the user
         // runs test.py -c dart2js -r drt,none the dart2js_none and
         // dart2js_drt will be duplicating work. If later we don't need 'none'
         // with dart2js, we should remove it from here.
         validRuntimes = const [
           'd8',
           'jsshell',
           'drt',
           'none',
@@ skipping 32 matching lines @@
         break;
     }
 
     if (!validRuntimes.contains(config['runtime'])) {
       isValid = false;
       print("Warning: combination of compiler '${config['compiler']}' and "
           "runtime '${config['runtime']}' is invalid. "
           "Skipping this combination.");
     }
 
-    if (config['ie'] && Platform.operatingSystem != 'windows') {
+    if ((config['ie'] as bool) && Platform.operatingSystem != 'windows') {
       isValid = false;
       print("Warning: cannot run Internet Explorer on non-Windows operating"
           " system.");
     }
 
-    if (config['shard'] < 1 || config['shard'] > config['shards']) {
+    if ((config['shard'] as int) < 1 ||
+        (config['shard'] as int) > (config['shards'] as int)) {
       isValid = false;
       print("Error: shard index is ${config['shard']} out of "
           "${config['shards']} shards");
     }
 
     if (config['runtime'] == 'flutter' && config['flutter'] == '') {
       isValid = false;
       print("-rflutter requires the flutter engine executable to "
           "be specified using --flutter=");
     }
 
     if (config['runtime'] == 'flutter' && config['arch'] != 'x64') {
       isValid = false;
       print("-rflutter is applicable only for --arch=x64");
     }
 
     return isValid;
   }
 
   /// Recursively expands a configuration with multiple values per key into a
   /// list of configurations with exactly one value per key.
-  List<Map> _expandConfigurations(Map configuration) {
+  List<Map<String, dynamic>> _expandConfigurations(
+      Map<String, dynamic> configuration) {
     // Expand the pseudo-values such as 'all'.
     if (configuration['arch'] == 'all') {
       configuration['arch'] = 'ia32,x64,simarm,simarm64,simmips,simdbc64';
     }
 
     if (configuration['mode'] == 'all') {
       configuration['mode'] = 'debug,release,product';
     }
 
-    if (configuration['report_in_json']) {
+    if (configuration['report_in_json'] as bool) {
       configuration['list'] = true;
       configuration['report'] = true;
     }
 
     // Use verbose progress indication for verbose output unless buildbot
     // progress indication is requested.
-    if (configuration['verbose'] && configuration['progress'] != 'buildbot') {
+    if ((configuration['verbose'] as bool) &&
+        (configuration['progress'] as String) != 'buildbot') {
       configuration['progress'] = 'verbose';
     }
 
     // Create the artificial negative options that test status files
     // expect.
-    configuration['unchecked'] = !configuration['checked'];
-    configuration['host_unchecked'] = !configuration['host_checked'];
-    configuration['unminified'] = !configuration['minified'];
-    configuration['nocsp'] = !configuration['csp'];
+    configuration['unchecked'] = !(configuration['checked'] as bool);
+    configuration['host_unchecked'] = !(configuration['host_checked'] as bool);
+    configuration['unminified'] = !(configuration['minified'] as bool);
+    configuration['nocsp'] = !(configuration['csp'] as bool);
 
-    String runtime = configuration['runtime'];
+    var runtime = configuration['runtime'] as String;
     if (runtime == 'firefox') {
       configuration['runtime'] == 'ff';
     }
 
-    String compiler = configuration['compiler'];
+    var compiler = configuration['compiler'] as String;
     configuration['browser'] = TestUtils.isBrowserRuntime(runtime);
     configuration['analyzer'] = TestUtils.isCommandLineAnalyzer(compiler);
 
     // Set the javascript command line flag for less verbose status files.
     configuration['jscl'] = TestUtils.isJsCommandLineRuntime(runtime);
 
     // Allow suppression that is valid for all ie versions
     configuration['ie'] = runtime.startsWith('ie');
 
     // Expand the test selectors into a suite name and a simple
     // regular expressions to be used on the full path of a test file
     // in that test suite. If no selectors are explicitly given use
     // the default suite patterns.
     var selectors = configuration['selectors'];
     if (selectors is! Map) {
       if (selectors == null) {
         if (configuration['suite_dir'] != null) {
-          var suite_path = new Path(configuration['suite_dir']);
+          var suite_path = new Path(configuration['suite_dir'] as String);
           selectors = [suite_path.filename];
         } else {
           selectors = _defaultTestSelectors.toList();
         }
 
         var excludeSuites = configuration['exclude_suite'] != null
             ? configuration['exclude_suite'].split(',')
             : [];
         for (var exclude in excludeSuites) {
-          if (selectors.contains(exclude)) {
+          if ((selectors as List).contains(exclude)) {
             selectors.remove(exclude);
           } else {
             print("Warning: default selectors does not contain $exclude");
           }
         }
       }
       var selectorMap = <String, RegExp>{};
-      for (var i = 0; i < selectors.length; i++) {
-        var pattern = selectors[i];
+      for (var i = 0; i < (selectors as List).length; i++) {
+        var pattern = selectors[i] as String;
         var suite = pattern;
         var slashLocation = pattern.indexOf('/');
         if (slashLocation != -1) {
           suite = pattern.substring(0, slashLocation);
           pattern = pattern.substring(slashLocation + 1);
           pattern = pattern.replaceAll('*', '.*');
         } else {
           pattern = ".?";
         }
         if (selectorMap.containsKey(suite)) {
           print("Error: '$suite/$pattern'.  Only one test selection"
               " pattern is allowed to start with '$suite/'");
           exit(1);
         }
         selectorMap[suite] = new RegExp(pattern);
       }
       configuration['selectors'] = selectorMap;
     }
 
     // Put observatory_ui in a configuration with its own packages override.
     // Only one value in the configuration map is mutable:
     selectors = configuration['selectors'];
-    if (selectors.containsKey('observatory_ui')) {
+    if ((selectors as Map<String, dynamic>).containsKey('observatory_ui')) {
       if (selectors.length == 1) {
         configuration['packages'] = TestUtils.dartDirUri
             .resolve('runtime/observatory/.packages')
             .toFilePath();
       } else {
         // Make a new configuration whose selectors map only contains
         // observatory_ui, and remove the key from the original selectors.
         // The only mutable value in the map is the selectors, so a
         // shallow copy is safe.
-        var observatoryConfiguration = new Map.from(configuration);
+        var observatoryConfiguration =
+            new Map<String, dynamic>.from(configuration);
         observatoryConfiguration['selectors'] = {
           'observatory_ui': selectors['observatory_ui']
         };
         selectors.remove('observatory_ui');
 
         // Set the packages flag.
         observatoryConfiguration['packages'] = TestUtils.dartDirUri
             .resolve('runtime/observatory/.packages')
             .toFilePath();
 
         // Return the expansions of both configurations. Neither will reach
         // this line in the recursive call to _expandConfigurations.
         return _expandConfigurations(configuration)
           ..addAll(_expandConfigurations(observatoryConfiguration));
       }
     }
 
     // Set the default package spec explicitly.
     if (configuration['package_root'] == null &&
         configuration['packages'] == null) {
       configuration['packages'] =
           TestUtils.dartDirUri.resolve('.packages').toFilePath();
     }
 
     // Expand the architectures.
-    if (configuration['arch'].contains(',')) {
+    if ((configuration['arch'] as String).contains(',')) {
       return _expandHelper('arch', configuration);
     }
 
     // Expand modes.
-    if (configuration['mode'].contains(',')) {
+    if ((configuration['mode'] as String).contains(',')) {
       return _expandHelper('mode', configuration);
     }
 
     // Expand compilers.
-    if (configuration['compiler'].contains(',')) {
+    if ((configuration['compiler'] as String).contains(',')) {
       return _expandHelper('compiler', configuration);
     }
 
     // Expand runtimes.
-    var runtimes = configuration['runtime'];
+    var runtimes = configuration['runtime'] as String;
     if (runtimes.contains(',')) {
       return _expandHelper('runtime', configuration);
     } else {
       // All runtimes eventually go through this path, after expansion.
       var updater = runtimeUpdater(configuration);
       if (updater != null) {
         updater.update();
       }
     }
 
     // Adjust default timeout based on mode, compiler, and sometimes runtime.
     if (configuration['timeout'] == -1) {
-      var isReload =
-          configuration['hot_reload'] || configuration['hot_reload_rollback'];
+      var isReload = (configuration['hot_reload'] as bool) ||
+          (configuration['hot_reload_rollback'] as bool);
       int compilerMulitiplier =
           new CompilerConfiguration(configuration).computeTimeoutMultiplier();
       int runtimeMultiplier = new RuntimeConfiguration(configuration)
           .computeTimeoutMultiplier(
-              mode: configuration['mode'],
-              isChecked: configuration['checked'],
+              mode: configuration['mode'] as String,
+              isChecked: configuration['checked'] as bool,
               isReload: isReload,
-              arch: configuration['arch']);
+              arch: configuration['arch'] as String);
       configuration['timeout'] = 60 * compilerMulitiplier * runtimeMultiplier;
     }
 
     return [configuration];
   }
 
   /// Helper for _expandConfigurations. Creates a new configuration and adds it
   /// to a list, for use in a case when a particular configuration has multiple
   /// results (separated by a ',').
   /// Arguments:
   /// option: The particular test option we are expanding.
   /// configuration: The map containing all test configuration information
   /// specified.
-  List<Map> _expandHelper(String option, Map configuration) {
-    var result = <Map>[];
+  List<Map<String, dynamic>> _expandHelper(
+      String option, Map<String, dynamic> configuration) {
+    var result = <Map<String, dynamic>>[];
     var configs = configuration[option];
     for (var config in configs.split(',')) {
-      var newConfiguration = new Map.from(configuration);
+      var newConfiguration = new Map<String, dynamic>.from(configuration);
       newConfiguration[option] = config;
       result.addAll(_expandConfigurations(newConfiguration));
     }
     return result;
   }
 
   /// Print out usage information.
   void _printHelp() {
     var buffer = new StringBuffer();
 
@@ skipping 63 matching lines @@
       if (name == option.name) return option;
 
       // Allow hyphens instead of underscores as the separator since they are
       // more common for command line flags.
       if (name == option.name.replaceAll("_", "-")) return option;
     }
 
     return null;
   }
 }