Tighten types in test.dart even more.

This removes all implicit casts and many implicit uses of dynamic. It
adds a gratuitous number of explicit "as" casts and arguably makes the
code worse.

This is an interim step towards replacing the big configuration map
with an actual typed object. These "as" casts should help catch places
where the configuration object is being used and where the code will
need to be changed to use a new object.

[email protected]

Review-Url: https://codereview.chromium.org/2903703002 .

Author: munificent

tools/testing/dart/analysis_options.yaml

@@ -1,2 +1,3 @@
 analyzer:
-  strong-mode: true
+  strong-mode:
+    implicit-casts: false

tools/testing/dart/android.dart

@@ -76,8 +76,8 @@ Future<AdbCommandResult> _executeCommand(String executable, List<String> args,
     if (timer != null) timer.cancel();
 
     String command = "$executable ${args.join(' ')}";
-    return new AdbCommandResult(
-        command, results[0], results[1], results[2], timedOut);
+    return new AdbCommandResult(command, results[0] as String,
+        results[1] as String, results[2] as int, timedOut);
   });
 }
 
@@ -251,7 +251,7 @@ class AdbDevice {
    * Upload data to the device, unless [local] is the same as the most recently
    * used source for [remote].
    */
-  Future pushCachedData(String local, String remote) {
+  Future<AdbCommandResult> pushCachedData(String local, String remote) {
     if (_cachedData[remote] == local) {
       return new Future.value(
           new AdbCommandResult("Skipped cached push", "", "", 0, false));
@@ -390,7 +390,7 @@ class AdbHelper {
             "stderr: ${result.stderr}]");
       }
       return _deviceLineRegexp
-          .allMatches(result.stdout)
+          .allMatches(result.stdout as String)
           .map((Match m) => m.group(1))
           .toList();
     });

tools/testing/dart/browser_controller.dart

@@ -468,15 +468,15 @@ class Chrome extends Browser {
         _logEvent("Make sure $_binary is a valid program for running chrome");
         return false;
       }
-      _version = versionResult.stdout;
+      _version = versionResult.stdout as String;
       return true;
     });
   }
 
   Future<bool> start(String url) {
     _logEvent("Starting chrome browser on: $url");
     // Get the version and log that.
-    return _getVersion().then((success) {
+    return _getVersion().then<bool>((success) {
       if (!success) return false;
       _logEvent("Got version: $_version");
 
@@ -615,9 +615,11 @@ class IE extends Browser {
         // HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer
         //    version    REG_SZ    9.0.8112.16421
         var findString = "REG_SZ";
-        var index = result.stdout.indexOf(findString);
+        var index = (result.stdout as String).indexOf(findString);
         if (index > 0) {
-          return result.stdout.substring(index + findString.length).trim();
+          return (result.stdout as String)
+              .substring(index + findString.length)
+              .trim();
         }
       }
       return "Could not get the version of internet explorer";
@@ -817,7 +819,7 @@ class Firefox extends Browser {
         _logEvent("Make sure $_binary is a valid program for running firefox");
         return new Future.value(false);
       }
-      version = versionResult.stdout;
+      version = versionResult.stdout as String;
       _logEvent("Got version: $version");
 
       return Directory.systemTemp.createTemp().then((userDir) {
@@ -943,7 +945,7 @@ class BrowserTestRunner {
   /// If the queue was recently empty, don't start another browser.
   static const Duration MIN_NONEMPTY_QUEUE_TIME = const Duration(seconds: 1);
 
-  final Map<String, String> configuration;
+  final Map<String, dynamic> configuration;
   final BrowserTestingServer testingServer;
 
   final String localIp;
@@ -996,12 +998,12 @@ class BrowserTestRunner {
     if (_currentStartingBrowserId == id) _currentStartingBrowserId = null;
   }
 
-  BrowserTestRunner(Map configuration, String localIp, String browserName,
-      this.maxNumBrowsers)
+  BrowserTestRunner(Map<String, dynamic> configuration, String localIp,
+      String browserName, this.maxNumBrowsers)
       : configuration = configuration,
         localIp = localIp,
         browserName = (browserName == 'ff') ? 'firefox' : browserName,
-        checkedMode = configuration['checked'],
+        checkedMode = configuration['checked'] as bool,
         testingServer = new BrowserTestingServer(
             configuration,
             localIp,
@@ -1380,7 +1382,7 @@ class BrowserTestingServer {
       this.configuration, this.localIp, this.useIframe, this.requiresFocus);
 
   Future start() {
-    var testDriverErrorPort = configuration['test_driver_error_port'];
+    var testDriverErrorPort = configuration['test_driver_error_port'] as int;
     return HttpServer
         .bind(localIp, testDriverErrorPort)
         .then(setupErrorServer)
@@ -1416,7 +1418,7 @@ class BrowserTestingServer {
   }
 
   void setupDispatchingServer(_) {
-    DispatchingServer server = configuration['_servers_'].server;
+    var server = (configuration['_servers_'] as TestingServers).server;
     void noCache(HttpRequest request) {
       request.response.headers
           .set("Cache-Control", "no-cache, no-store, must-revalidate");
@@ -1532,7 +1534,7 @@ class BrowserTestingServer {
       exit(1);
       // This should never happen - exit immediately;
     }
-    var port = configuration['_servers_'].port;
+    var port = (configuration['_servers_'] as TestingServers).port;
     return "http://$localIp:$port/driver/$browserId";
   }
 

tools/testing/dart/co19_test.dart

@@ -60,7 +60,7 @@ const List<List<String>> COMMAND_LINES = const <List<String>>[
 void main(List<String> args) {
   TestUtils.setDartDirUri(Platform.script.resolve('../../..'));
   var optionsParser = new OptionsParser();
-  var configurations = <Map>[];
+  var configurations = <Map<String, dynamic>>[];
   for (var commandLine in COMMAND_LINES) {
     var arguments = <String>[];
     arguments.addAll(COMMON_ARGUMENTS);

tools/testing/dart/co19_test_config.dart

@@ -10,7 +10,7 @@ import 'test_suite.dart';
 class Co19TestSuite extends StandardTestSuite {
   RegExp _testRegExp = new RegExp(r"t[0-9]{2}.dart$");
 
-  Co19TestSuite(Map configuration)
+  Co19TestSuite(Map<String, dynamic> configuration)
       : super(configuration, "co19", new Path("tests/co19/src"), [
           "tests/co19/co19-co19.status",
           "tests/co19/co19-analyzer.status",

tools/testing/dart/compiler_configuration.dart

@@ -56,23 +56,23 @@ abstract class CompilerConfiguration {
   // TODO(ahe): Remove this constructor and move the switch to
   // test_options.dart.  We probably want to store an instance of
   // [CompilerConfiguration] in [configuration] there.
-  factory CompilerConfiguration(Map configuration) {
-    String compiler = configuration['compiler'];
+  factory CompilerConfiguration(Map<String, dynamic> configuration) {
+    var compiler = configuration['compiler'] as String;
 
     // TODO(ahe): Move these booleans into a struction configuration object
     // which can eventually completely replace the Map-based configuration
     // object.
-    bool isDebug = configuration['mode'] == 'debug';
-    bool isChecked = configuration['checked'];
-    bool isStrong = configuration['strong'];
-    bool isHostChecked = configuration['host_checked'];
-    bool useSdk = configuration['use_sdk'];
-    bool isCsp = configuration['csp'];
-    bool useBlobs = configuration['use_blobs'];
-    bool hotReload = configuration['hot_reload'];
-    bool hotReloadRollback = configuration['hot_reload_rollback'];
-    bool useFastStartup = configuration['fast_startup'];
-    bool useKernelInDart2js = configuration['dart2js_with_kernel'];
+    var isDebug = (configuration['mode'] as String) == 'debug';
+    var isChecked = configuration['checked'] as bool;
+    var isStrong = configuration['strong'] as bool;
+    var isHostChecked = configuration['host_checked'] as bool;
+    var useSdk = configuration['use_sdk'] as bool;
+    var isCsp = configuration['csp'] as bool;
+    var useBlobs = configuration['use_blobs'] as bool;
+    var hotReload = configuration['hot_reload'] as bool;
+    var hotReloadRollback = configuration['hot_reload_rollback'] as bool;
+    var useFastStartup = configuration['fast_startup'] as bool;
+    var useKernelInDart2js = configuration['dart2js_with_kernel'] as bool;
 
     switch (compiler) {
       case 'dart2analyzer':
@@ -100,7 +100,7 @@ abstract class CompilerConfiguration {
         return new PrecompilerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
-            arch: configuration['arch'],
+            arch: configuration['arch'] as String,
             useBlobs: useBlobs,
             isAndroid: configuration['system'] == 'android');
       case 'dartk':
@@ -116,7 +116,7 @@ abstract class CompilerConfiguration {
         return new PrecompilerCompilerConfiguration(
             isDebug: isDebug,
             isChecked: isChecked,
-            arch: configuration['arch'],
+            arch: configuration['arch'] as String,
             useBlobs: useBlobs,
             isAndroid: configuration['system'] == 'android',
             useDfe: true);

tools/testing/dart/drt_updater.dart

@@ -71,7 +71,7 @@ _DartiumUpdater _contentShellUpdater;
 _DartiumUpdater _dartiumUpdater;
 
 _DartiumUpdater runtimeUpdater(Map configuration) {
-  String runtime = configuration['runtime'];
+  var runtime = configuration['runtime'] as String;
   if (runtime == 'drt' && configuration['drt'] == '') {
     // Download the default content shell from Google Storage.
     if (_contentShellUpdater == null) {

tools/testing/dart/html_test.dart

@@ -27,9 +27,11 @@ HtmlTestInformation getInformation(String filename) {
         " Should end in _htmltest.html.");
     return null;
   }
-  String contents = new File(filename).readAsStringSync();
+
+  var contents = new File(filename).readAsStringSync();
   var match = htmlAnnotation.firstMatch(contents);
   if (match == null) return null;
+
   var annotation = JSON.decode(match[1]);
   if (annotation is! Map ||
       annotation['expectedMessages'] is! List ||
@@ -38,8 +40,11 @@ HtmlTestInformation getInformation(String filename) {
         " Should have {'scripts':[...], 'expectedMessages':[...]}");
     return null;
   }
-  return new HtmlTestInformation(new Path(filename),
-      annotation['expectedMessages'], annotation['scripts']);
+
+  return new HtmlTestInformation(
+      new Path(filename),
+      new List<String>.from(annotation['expectedMessages'] as List),
+      new List<String>.from(annotation['scripts'] as List));
 }
 
 String getContents(HtmlTestInformation info, bool compileToJS) {

tools/testing/dart/http_server.dart

@@ -88,15 +88,20 @@ void main(List<String> arguments) {
       help: 'The runtime we are using (for csp flags).', defaultsTo: 'none');
 
   var args = parser.parse(arguments);
-  if (args['help']) {
+  if (args['help'] as bool) {
     print(parser.getUsage());
   } else {
-    var servers = new TestingServers(args['build-directory'], args['csp'],
-        args['runtime'], null, args['package-root'], args['packages']);
-    var port = int.parse(args['port']);
-    var crossOriginPort = int.parse(args['crossOriginPort']);
+    var servers = new TestingServers(
+        args['build-directory'] as String,
+        args['csp'] as bool,
+        args['runtime'] as String,
+        null,
+        args['package-root'] as String,
+        args['packages'] as String);
+    var port = int.parse(args['port'] as String);
+    var crossOriginPort = int.parse(args['crossOriginPort'] as String);
     servers
-        .startServers(args['network'],
+        .startServers(args['network'] as String,
             port: port, crossOriginPort: crossOriginPort)
         .then((_) {
       DebugLogger.info('Server listening on port ${servers.port}');
@@ -212,7 +217,8 @@ class TestingServers {
     DebugLogger.error('HttpServer: an error occured', e);
   }
 
-  Future _startHttpServer(String host, {int port: 0, int allowedPort: -1}) {
+  Future<DispatchingServer> _startHttpServer(String host,
+      {int port: 0, int allowedPort: -1}) {
     return HttpServer.bind(host, port).then((HttpServer httpServer) {
       var server = new DispatchingServer(httpServer, _onError, _sendNotFound);
       server.addHandler('/echo', _handleEchoRequest);