Make test.dart strong mode clean!

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 403 matching lines @@
   String createPubPackageBuildsDirectory(Path directoryOfPubspecYaml) {
     return createGeneratedTestDirectoryHelper(
         "pub_package_builds", 'public_packages', directoryOfPubspecYaml, "");
   }
 
   /**
    * Helper function for discovering the packages in the dart repository.
    */
   Future<List> listDir(Path path, Function isValid) {
     var dir = new Directory(path.toNativePath());
-    return dir.exists().then((var exist) {
-      if (!exist) return [];
+    return dir.exists().then((exists) {
+      if (!exists) return [];
       return dir
           .list(recursive: false)
           .where((fse) => fse is Directory)
-          .map((Directory directory) {
+          .map((FileSystemEntity entity) {
+            var directory = entity as Directory;

[Bill Hesse, 2017/05/04 15:49:38]

I'm pretty annoyed that this is needed.  Oh well.

[Bob Nystrom, 2017/07/18 18:06:16]

Yes. The long term fix is to add a method to Iterable, like of<T> that is
explicitly a .where() that filters on type and produces a result sequence of the
correct type. This is what .NET does.

We just don't have that yet (since it's a breaking change to add a method to
Iterable). Hence the annoying workaround.

             var fullPath = directory.absolute.path;
             var packageName = new Path(fullPath).filename;
             if (isValid(packageName)) {
               return [packageName, path.append(packageName).toNativePath()];
             }
             return null;
           })
           .where((name) => name != null)
           .toList();
     });
@@ skipping 24 matching lines @@
 class CCTestSuite extends TestSuite {
   final String testPrefix;
   String targetRunnerPath;
   String hostRunnerPath;
   final String dartDir;
   List<String> statusFilePaths;
 
   CCTestSuite(Map configuration, String suiteName, String runnerName,
       this.statusFilePaths,
       {this.testPrefix: ''})
-      : super(configuration, suiteName),
-        dartDir = TestUtils.dartDir.toNativePath() {
+      : dartDir = TestUtils.dartDir.toNativePath(),
+        super(configuration, suiteName) {
     // For running the tests we use the given '$runnerName' binary
     targetRunnerPath = '$buildDir/$runnerName';
 
     // For listing the tests we use the '$runnerName.host' binary if it exists
     // and use '$runnerName' if it doesn't.
     var binarySuffix = Platform.operatingSystem == 'windows' ? '.exe' : '';
     var hostBinary = '$targetRunnerPath.host$binarySuffix';
     if (new File(hostBinary).existsSync()) {
       hostRunnerPath = hostBinary;
     } else {
@@ skipping 88 matching lines @@
   List<TestInformation> cachedTests;
   final Path dartDir;
   Predicate<String> isTestFilePredicate;
   final bool listRecursively;
   final extraVmOptions;
   List<Uri> _dart2JsBootstrapDependencies;
 
   StandardTestSuite(Map configuration, String suiteName, Path suiteDirectory,
       this.statusFilePaths,
       {this.isTestFilePredicate, bool recursive: false})
-      : super(configuration, suiteName),
-        dartDir = TestUtils.dartDir,
+      : dartDir = TestUtils.dartDir,
         listRecursively = recursive,
         suiteDir = TestUtils.dartDir.join(suiteDirectory),
-        extraVmOptions = TestUtils.getExtraVmOptions(configuration) {
+        extraVmOptions = TestUtils.getExtraVmOptions(configuration),
+        super(configuration, suiteName) {
     if (!useSdk) {
       _dart2JsBootstrapDependencies = [];
     } else {
       var snapshotPath = TestUtils
           .absolutePath(
               new Path(buildDir).join(new Path('dart-sdk/bin/snapshots/'
                   'utils_wrapper.dart.snapshot')))
           .toString();
       _dart2JsBootstrapDependencies = [
         new Uri(scheme: 'file', path: snapshotPath)
@@ skipping 121 matching lines @@
         enqueueDirectory(dir, group);
         return group.future;
       }
     });
   }
 
   void enqueueDirectory(Directory dir, FutureGroup group) {
     var lister = dir
         .list(recursive: listRecursively)
         .where((fse) => fse is File)
-        .forEach((File f) {
-      enqueueFile(f.path, group);
+        .forEach((FileSystemEntity entity) {
+      enqueueFile((entity as File).path, group);
     });
     group.add(lister);
   }
 
   void enqueueFile(String filename, FutureGroup group) {
     if (isHtmlTestFile(filename)) {
       var info = htmlTest.getInformation(filename);
       if (info == null) {
         DebugLogger
             .error("HtmlTest $filename does not contain required annotations");
@@ skipping 109 matching lines @@
 
     for (var vmOptionsVarient = 0;
         vmOptionsVarient < vmOptionsList.length;
         vmOptionsVarient++) {
       var vmOptions = vmOptionsList[vmOptionsVarient];
       var allVmOptions = vmOptions;
       if (!extraVmOptions.isEmpty) {
         allVmOptions = new List.from(vmOptions)..addAll(extraVmOptions);
       }
 
-      var commands = []..addAll(baseCommands);
+      var commands = baseCommands.toList();
       commands.addAll(
           makeCommands(info, vmOptionsVarient, allVmOptions, commonArguments));
       enqueueNewTestCase(new TestCase(
           '$suiteName/$testName', commands, configuration, expectations,
           isNegative: isNegative(info), info: info));
     }
   }
 
   bool expectCompileError(TestInformation info) {
     return info.hasCompileError ||
@@ skipping 128 matching lines @@
 
   Uri _getUriForBrowserTest(String pathComponent, String subtestName) {
     // Note: If we run test.py with the "--list" option, no http servers
     // will be started. So we return a dummy url instead.
     if (configuration['list']) {
       return Uri.parse('http://listing_the_tests_only');
     }
     assert(configuration.containsKey('_servers_'));
     int serverPort = configuration['_servers_'].port;
     int crossOriginPort = configuration['_servers_'].crossOriginPort;
-    Map parameters = {'crossOriginPort': crossOriginPort.toString()};
+    var parameters = {'crossOriginPort': crossOriginPort.toString()};
     if (subtestName != null) {
       parameters['group'] = subtestName;
     }
     return new Uri(
         scheme: 'http',
         host: configuration['local_ip'],
         port: serverPort,
         path: pathComponent,
         queryParameters: parameters);
   }
@@ skipping 169 matching lines @@
         multitest ? info.optionsFromFile['subtestNames'] : [null];
     for (String subtestName in subtestNames) {
       // Construct the command that executes the browser test
       List<Command> commandSet = new List<Command>.from(commands);
 
       var htmlPath_subtest = _createUrlPathFromFile(new Path(htmlPath));
       var fullHtmlPath =
           _getUriForBrowserTest(htmlPath_subtest, subtestName).toString();
 
       if (runtime == "drt") {
-        var dartFlags = [];
-        var contentShellOptions = [];
-
-        contentShellOptions.add('--no-timeout');
-        contentShellOptions.add('--run-layout-test');
+        var dartFlags = <String>[];
+        var contentShellOptions = ['--no-timeout', '--run-layout-test'];
 
         // Disable the GPU under Linux and Dartium. If the GPU is enabled,
         // Chrome may send a termination signal to a test.  The test will be
         // terminated if a machine (bot) doesn't have a GPU or if a test is
         // still running after a certain period of time.
         if (configuration['system'] == 'linux' &&
             configuration['runtime'] == 'drt') {
           contentShellOptions.add('--disable-gpu');
         }
         if (compiler == 'none') {
@@ skipping 173 matching lines @@
     }
     if (Platform.operatingSystem == 'macos') {
       final path = dartDir.append(
           '/client/tests/drt/Content Shell.app/Contents/MacOS/Content Shell');
       return path.toNativePath();
     }
     return dartDir.append('client/tests/drt/content_shell').toNativePath();
   }
 
   List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) {
-    List args = TestUtils.standardOptions(configuration);
+    var args = TestUtils.standardOptions(configuration);
 
     String packages = packagesArgument(
         optionsFromFile['packageRoot'], optionsFromFile['packages']);
     if (packages != null) {
       args.add(packages);
     }
     args.addAll(additionalOptions(filePath));
     if (configuration['analyzer']) {
       args.add('--format=machine');
       args.add('--no-hints');
@@ skipping 596 matching lines @@
       result = 'out/';
     } else if (system == 'macos') {
       result = 'xcodebuild/';
     } else {
       throw new Exception('Unknown operating system: "$system"');
     }
     return result;
   }
 
   static List<String> standardOptions(Map configuration) {
-    List args = ["--ignore-unrecognized-flags"];
+    var args = ["--ignore-unrecognized-flags"];
     String compiler = configuration["compiler"];
     if (compiler == "dart2js") {
       args = ['--generate-code-with-compile-time-errors', '--test-mode'];
       if (configuration["checked"]) {
         args.add('--enable-checked-mode');
       }
       // args.add("--verbose");
       if (!isBrowserRuntime(configuration['runtime'])) {
         args.add("--allow-mock-compilation");
         args.add("--categories=all");
@@ skipping 203 matching lines @@
       }
       if (path.length > WINDOWS_SHORTEN_PATH_LIMIT) {
         ++shortNameCounter;
         var pathEnd = path.substring(path.length - WINDOWS_PATH_END_LENGTH);
         path = "short${shortNameCounter}_$pathEnd";
       }
     }
     return path;
   }
 }