Added functionality to dump relevant status file entries to a single file to make it easier to see …

tools/migration/bin/migrate_batch.dart

 // Copyright (c) 2017, 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.
 
 /// Given the beginning and ending file names in a batch, does as much automated
 /// migration and possible and prints out the remaining manual steps required.
 ///
 /// This should be safe to run, and safe to re-run on an in-progress chunk.
 /// However, it has not been thoroughly tested, so run at your own risk.
 
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
 
 import 'package:migration/src/log.dart';
+import 'package:status_file/status_file.dart';
 
 const simpleDirs = const ["corelib", "language", "lib"];
 
 final String sdkRoot =
     p.normalize(p.join(p.dirname(p.fromUri(Platform.script)), '../../../'));
 
 final String testRoot = p.join(sdkRoot, "tests");
 
 bool dryRun = false;
 
@@ skipping 29 matching lines @@
     if (startIndex == -1 && tests[i].twoPath.compareTo(first) >= 0) {
       startIndex = i;
     }
 
     if (tests[i].twoPath.compareTo(last) > 0) {
       endIndex = i;
       break;
     }
   }
 
+  if ((endIndex - startIndex) == 0) {
+    print(bold("No tests to migrate."));
+    return;
+  }
+
   print("Migrating ${bold(endIndex - startIndex)} tests from ${bold(first)} "
       "to ${bold(last)}...");
   print("");
 
+  tests = tests.getRange(startIndex, endIndex);
   var todos = <String>[];
   var migratedTests = 0;
   var unmigratedTests = 0;
-  for (var i = startIndex; i < endIndex; i++) {
-    if (tests[i].migrate(todos)) {
+  for (var test in tests) {
+    if (test.migrate(todos)) {
       migratedTests++;
     } else {
       unmigratedTests++;
     }
   }
 
   print("");
 
   var summary = "";
 
   if (migratedTests > 0) {
     var s = migratedTests == 1 ? "" : "s";
     summary += "Successfully migrated ${green(migratedTests)} test$s. ";
   }
 
   if (unmigratedTests > 0) {
     var s = migratedTests == 1 ? "" : "s";
     summary += "Need manual work on ${red(unmigratedTests)} test$s:";
   }
 
   print(summary);
   todos.forEach(todo);
+
+  // Print status file entries.
+  var statusFileEntries = new StringBuffer();
+  var statusFiles = loadStatusFiles();
+  for (var statusFile in statusFiles) {
+    statusFileEntries.write(printStatusFileEntries(tests, statusFile));
+  }
+
+  new File("statuses.migration")
+      .writeAsStringSync(statusFileEntries.toString());
+  print(
+      bold("Wrote relevant test status file entries to 'statuses.migration'"));
+}
+
+/// Returns a [String] of the relevant status file entries associated with the
+/// tests in [tests] found in [statusFile].
+String printStatusFileEntries(List<Fork> tests, StatusFile statusFile) {
+  var statusFileEntries = new StringBuffer();

[Bob Nystrom, 2017/07/25 23:48:21]

Instead of creating a new StringBuffer in each call to this whose results are
added to the outer StringBuffer in main(), it will be faster to just pass that
one StringBuffer in and keep adding to it. (Not that this code is super perf
critical, but it's a good habit to be in and doesn't make the code notably more
complex.)

[bkonyi, 2017/07/26 00:27:12]

Done.

+  var filteredStatusFile = new StatusFile(statusFile.path);
+  var testNames = <String>[];
+  for (var test in tests) {
+    testNames.add(test.twoPath.split("/").last.split(".")[0]);
+  }
+  for (var section in statusFile.sections) {
+    StatusSection currentSection = null;

[Bob Nystrom, 2017/07/25 23:48:21]

"= null" isn't needed.

https://www.dartlang.org/guides/language/effective-dart/usage#dont-explicitly...

[bkonyi, 2017/07/26 00:27:12]

Done.

+    for (var entry in section.entries) {
+      for (var testName in testNames) {
+        if (entry.path.contains(testName)) {
+          if (currentSection == null) {
+            currentSection = new StatusSection(section.condition);
+          }
+          currentSection.entries.add(entry);
+        }
+      }
+    }
+    if (currentSection != null) {
+      filteredStatusFile.sections.add(currentSection);
+    }
+  }
+  if (!filteredStatusFile.isEmpty) {
+    statusFileEntries.writeln("Entries for status file ${statusFile.path}:");
+    statusFileEntries.writeln(filteredStatusFile.toString());

[Bob Nystrom, 2017/07/25 23:48:21]

".toString()" isn't needed. StringBuffer.writeln() accepts any object and
automatically calls toString() on it for you.

[bkonyi, 2017/07/26 00:27:12]

Done.

+  }
+  return statusFileEntries.toString();
 }
 
 String toTwoPath(String path) {
   // Allow eliding "_test" and/or ".dart" to make things more command-line
   // friendly.
   if (!path.endsWith("_test.dart")) path += "_test.dart";
   if (!path.endsWith(".dart")) path += ".dart";
 
   for (var dir in simpleDirs) {
     if (p.isWithin(dir, path)) {
@@ skipping 24 matching lines @@
 List<Fork> scanTests() {
   var tests = <String, Fork>{};
 
   addTestDirectory(String fromDir, String twoDir) {
     for (var entry
         in new Directory(p.join(testRoot, fromDir)).listSync(recursive: true)) {
       if (!entry.path.endsWith("_test.dart")) continue;
 
       var fromPath = p.relative(entry.path, from: testRoot);
       var twoPath = p.join(twoDir, p.relative(fromPath, from: fromDir));
-
       var fork = tests.putIfAbsent(twoPath, () => new Fork(twoPath));
       if (fromDir.contains("_strong")) {
         fork.strongPath = fromPath;
       } else {
         fork.onePath = fromPath;
       }
     }
   }
 
   addTestDirectory("corelib", "corelib_2");
   addTestDirectory("corelib_strong", "corelib_2");
   addTestDirectory("html", "lib_2/html");
   addTestDirectory("isolate", "lib_2/isolate");
   addTestDirectory("language", "language_2");
   addTestDirectory("language_strong", "language_2");
   addTestDirectory("lib", "lib_2");
   addTestDirectory("lib_strong", "lib_2");
 
   var sorted = tests.values.toList();
   sorted.sort((a, b) => a.twoPath.compareTo(b.twoPath));
   return sorted;
 }
 
+List<StatusFile> loadStatusFiles() {
+  var statusFiles = <String, List<StatusFile>>{};

[Bob Nystrom, 2017/07/25 23:48:21]

Looks like my suggestion was wrong and you don't actually need to group the
status files by anything. Maybe discard this and just build one big
List<StatusFile>?

[bkonyi, 2017/07/26 00:27:12]

Done.

+
+  addStatusFile(String fromDir) {
+    var statusFileList = statusFiles.putIfAbsent(fromDir, () => <StatusFile>[]);
+    for (var entry
+        in new Directory(p.join(testRoot, fromDir)).listSync(recursive: true)) {
+      if (!entry.path.endsWith(".status")) continue;
+
+      statusFileList.add(new StatusFile.read(entry.path));
+    }
+  }
+
+  addStatusFile("corelib");
+  addStatusFile("corelib_strong");
+  addStatusFile("html");
+  addStatusFile("isolate");
+  addStatusFile("language");
+  addStatusFile("language_strong");
+  addStatusFile("lib");
+  addStatusFile("lib_strong");
+  var statusFilesList = <StatusFile>[];
+  for (var list in statusFiles.values) {
+    statusFilesList.addAll(list);
+  }
+  return statusFilesList;
+}
+
 /// Moves the file from [from] to [to], which are both assumed to be relative
 /// paths inside "tests".
 void moveFile(String from, String to) {
   if (dryRun) {
     print("  Dry run: move $from to $to");
     return;
   }
 
   new File(p.join(testRoot, from)).renameSync(p.join(testRoot, to));
 }
@@ skipping 107 matching lines @@
       }
     }
 
     if (checkForUnitTest(twoPath, twoSource)) {
       todos.add("Migrate ${bold(twoPath)} off unittest.");
     }
 
     return todos.length == todosBefore;
   }
 }