Tighten up a bunch of types in test.dart.

tools/testing/dart/test_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.
 
 library test_options_parser;
 
 import "dart:io";
 import "drt_updater.dart";
 import "test_suite.dart";
 import "path.dart";
@@ skipping 25 matching lines @@
  * the Map returned from the [TestOptionParser] parse method.
  */
 class _TestOptionSpecification {
   _TestOptionSpecification(
       this.name, this.description, this.keys, this.values, this.defaultValue,
       {this.type: 'string'});
   String name;
   String description;
   List<String> keys;
   List<String> values;
-  var defaultValue;
+  Object defaultValue;
   String type;
 }
 
 /**
  * Parser of test options.
  */
 class TestOptionsParser {
   /**
    * Creates a test options parser initialized with the known options.
    */
@@ skipping 496 matching lines @@
               print('No value supplied for option $name');
               return null;
             }
             value = arguments[++i];
           }
         }
       } else {
         // The argument does not start with '-' or '--' and is
         // therefore not an option. We use it as a test selection
         // pattern.
-        configuration.putIfAbsent('selectors', () => []);
-        var patterns = configuration['selectors'];
+        var patterns = configuration.putIfAbsent('selectors', () => <String>[]);
         patterns.add(arg);
         continue;
       }
 
       // Multiple uses of a flag are an error, because there is no
       // naturally correct way to handle conflicting options.
       if (configuration.containsKey(spec.name)) {
         print('Error: test.dart disallows multiple "--${spec.name}" flags');
         exit(1);
       }
@@ skipping 36 matching lines @@
     List<Map> result = expandedConfigs.where(_isValidConfig).toList();
     for (var config in result) {
       config['_reproducing_arguments_'] =
           _constructReproducingCommandArguments(config);
     }
     return result.isEmpty ? null : result;
   }
 
   // For printing out reproducing command lines, we don't want to add these
   // options.
-  Set<String> _blacklistedOptions = new Set<String>.from([
+  final _blacklistedOptions = [
     'append_logs',
     'build_directory',
     'chrome',
     'copy_coredumps',
     'dart',
     'flutter',
     'dartium',
     'drt',
     'exclude_suite',
     'failure-summary',
     'firefox',
     'local_ip',
     'progress',
     'report',
     'safari',
     'shard',
     'shards',
     'step_name',
     'tasks',
     'time',
     'verbose',
     'write_debug_log',
     'write_test_outcome_log',
-  ]);
+  ].toSet();
 
   List<String> _constructReproducingCommandArguments(Map config) {
     var arguments = new List<String>();
     for (var option in _options) {
       var name = option.name;
       if (!config.containsKey(name) || _blacklistedOptions.contains(name)) {
         continue;
       }
       var value = config[name];
       if (config[name] == option.defaultValue ||
@@ skipping 150 matching lines @@
     // 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']);
           selectors = [suite_path.filename];
         } else {
-          selectors = new List.from(defaultTestSelectors);
+          selectors = defaultTestSelectors.toList();
         }
 
-        var exclude_suites = configuration['exclude_suite'] != null
+        var excludeSuites = configuration['exclude_suite'] != null
             ? configuration['exclude_suite'].split(',')
             : [];
-        for (var exclude in exclude_suites) {
+        for (var exclude in excludeSuites) {
           if (selectors.contains(exclude)) {
             selectors.remove(exclude);
           } else {
             print("Warning: default selectors does not contain $exclude");
           }
         }
       }
-      Map<String, RegExp> selectorMap = new Map<String, RegExp>();
+      var selectorMap = <String, RegExp>{};
       for (var i = 0; i < selectors.length; i++) {
         var pattern = selectors[i];
         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 = ".?";
@@ skipping 163 matching lines @@
         return option;
       }
     }
     print('Unknown test option $name');
     exit(1);
     return null; // Unreachable.
   }
 
   List<_TestOptionSpecification> _options;
 }