Tighten up a bunch of types in test.dart.

tools/testing/dart/multitest.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.
 
 library multitest;
 
 import "dart:async";
 import "dart:io";
 
 import "path.dart";
@@ skipping 54 matching lines @@
 //   fff
 
 /// Until legacy multitests are ported we need to support both /// and //#
 final _multitestMarker = new RegExp(r"//[/#]");
 
 void ExtractTestsFromMultitest(Path filePath, Map<String, String> tests,
     Map<String, Set<String>> outcomes) {
   // Read the entire file into a byte buffer and transform it to a
   // String. This will treat the file as ascii but the only parts
   // we are interested in will be ascii in any case.
-  List bytes = new File(filePath.toNativePath()).readAsBytesSync();
-  String contents = decodeUtf8(bytes);
-  int first_newline = contents.indexOf('\n');
-  final String line_separator =
-      (first_newline == 0 || contents[first_newline - 1] != '\r')
-          ? '\n'
-          : '\r\n';
-  List<String> lines = contents.split(line_separator);
+  var bytes = new File(filePath.toNativePath()).readAsBytesSync();
+  var contents = decodeUtf8(bytes);
+  var firstNewline = contents.indexOf('\n');
+  var lineSeparator =
+      (firstNewline == 0 || contents[firstNewline - 1] != '\r') ? '\n' : '\r\n';
+  var lines = contents.split(lineSeparator);
   if (lines.last == '') lines.removeLast();
   bytes = null;
   contents = null;
-  Set<String> validMultitestOutcomes = new Set<String>.from([
+  var validMultitestOutcomes = [
     'ok',
     'compile-time error',
     'runtime error',
     'static type warning',
     'dynamic type error',
     'checked mode compile-time error'
-  ]);
+  ].toSet();
 
   // Create the set of multitests, which will have a new test added each
   // time we see a multitest line with a new key.
-  Map<String, List<String>> testsAsLines = new Map<String, List<String>>();
+  var testsAsLines = <String, List<String>>{};
 
   // Add the default case with key "none".
-  testsAsLines['none'] = new List<String>();
+  testsAsLines['none'] = <String>[];
   outcomes['none'] = new Set<String>();
 
-  int lineCount = 0;
-  for (String line in lines) {
+  var lineCount = 0;
+  for (var line in lines) {
     lineCount++;
     var annotation = new _Annotation.from(line);
     if (annotation != null) {
       testsAsLines.putIfAbsent(
           annotation.key, () => new List<String>.from(testsAsLines["none"]));
       // Add line to test with annotation.key as key, empty line to the rest.
       for (var key in testsAsLines.keys) {
         testsAsLines[key].add(annotation.key == key ? line : "");
       }
       outcomes.putIfAbsent(annotation.key, () => new Set<String>());
       if (annotation.rest != 'continued') {
         for (String nextOutcome in annotation.outcomesList) {
           if (validMultitestOutcomes.contains(nextOutcome)) {
             outcomes[annotation.key].add(nextOutcome);
           } else {
             DebugLogger.warning(
                 "Warning: Invalid test directive '$nextOutcome' on line "
                 "${lineCount}:\n${annotation.rest} ");
           }
         }
       }
     } else {
       for (var test in testsAsLines.values) test.add(line);
     }
   }
   // End marker, has a final line separator so we don't need to add it after
   // joining the lines.
   var marker =
       '// Test created from multitest named ${filePath.toNativePath()}.'
-      '$line_separator';
+      '$lineSeparator';
   for (var test in testsAsLines.values) test.add(marker);
 
-  var keysToDelete = [];
+  var keysToDelete = <String>[];
   // Check that every key (other than the none case) has at least one outcome
   for (var outcomeKey in outcomes.keys) {
     if (outcomeKey != 'none' && outcomes[outcomeKey].isEmpty) {
       DebugLogger.warning(
           "Warning: Test ${outcomeKey} has no valid annotated outcomes.\n"
           "Expected one of: ${validMultitestOutcomes.toString()}");
       // If this multitest doesn't have an outcome, mark the multitest for
       // deletion.
       keysToDelete.add(outcomeKey);
     }
   }
   // If a key/multitest was marked for deletion, do the necessary cleanup.
   keysToDelete.forEach(outcomes.remove);
   keysToDelete.forEach(testsAsLines.remove);
 
   // Copy all the tests into the output map tests, as multiline strings.
-  for (String key in testsAsLines.keys) {
-    tests[key] = testsAsLines[key].join(line_separator);
+  for (var key in testsAsLines.keys) {
+    tests[key] = testsAsLines[key].join(lineSeparator);
   }
 }
 
 // Represents a mutlitest annotation in the special //# comment.
 class _Annotation {
   String key;
   String rest;
   List<String> outcomesList;
   _Annotation() {}
   factory _Annotation.from(String line) {
@@ skipping 17 matching lines @@
     annotation.rest = parts[1];
     annotation.outcomesList =
         annotation.rest.split(',').map((s) => s.trim()).toList();
     return annotation;
   }
 }
 
 // Find all relative imports and copy them into the dir that contains
 // the generated tests.
 Set<String> _findAllRelativeImports(Path topLibrary) {
-  Set<Path> toSearch = new Set<Path>.from([topLibrary]);
-  Set<String> foundImports = new Set<String>();
-  Path libraryDir = topLibrary.directoryPath;
-  RegExp relativeImportRegExp = new RegExp(
+  var toSearch = [topLibrary].toSet();
+  var foundImports = new Set<String>();
+  var libraryDir = topLibrary.directoryPath;
+  var relativeImportRegExp = new RegExp(
       '^(?:@.*\\s+)?' // Allow for a meta-data annotation.
       '(import|part)'
       '\\s+["\']'
       '(?!(dart:|dart-ext:|data:|package:|/))' // Look-ahead: not in package.
       '([^"\']*)' // The path to the imported file.
       '["\']');
   while (!toSearch.isEmpty) {
     var thisPass = toSearch;
     toSearch = new Set<Path>();
     for (Path filename in thisPass) {
@@ skipping 103 matching lines @@
 
 Path createMultitestDirectory(String outputDir, Path suiteDir, Path sourceDir) {
   Path relative = sourceDir.relativeTo(suiteDir);
   Path path = new Path(outputDir)
       .append('generated_tests')
       .append(suiteNameFromPath(suiteDir))
       .join(relative);
   TestUtils.mkdirRecursive(TestUtils.currentWorkingDirectory, path);
   return new Path(new File(path.toNativePath()).absolute.path);
 }