Refactor test.dart.

tools/testing/dart/multitest.dart

Index: tools/testing/dart/multitest.dart
diff --git a/tools/testing/dart/multitest.dart b/tools/testing/dart/multitest.dart
index 34551dbc74ce9bd5cf079560f147c0db19e5f4dc..b67428505a39476926b8c12f71d3d026b4ef5301 100644
--- a/tools/testing/dart/multitest.dart
+++ b/tools/testing/dart/multitest.dart
@@ -188,11 +188,8 @@ Set<Path> _findAllRelativeImports(Path topLibrary) {
   return foundImports;
 }
 
-void DoMultitest(Path filePath,
-                 String outputDir,
-                 Path suiteDir,
-                 CreateTest doTest,
-                 VoidFunction multitestDone) {
+Future doMultitest(Path filePath, String outputDir, Path suiteDir,
+                   CreateTest doTest) {
   // Each new test is a single String value in the Map tests.
   Map<String, String> tests = new Map<String, String>();
   Map<String, Set<String>> outcomes = new Map<String, Set<String>>();
@@ -217,7 +214,7 @@ void DoMultitest(Path filePath,
   }
 
   // Wait until all imports are copied before scheduling test cases.
-  Futures.wait(futureCopies).then((ignored) {
+  return Futures.wait(futureCopies).transform((_) {
     String baseFilename = filePath.filenameWithoutExtension;
     for (String key in tests.keys) {
       final Path multitestFilename =
@@ -241,7 +238,8 @@ void DoMultitest(Path filePath,
              hasFatalTypeErrors: enableFatalTypeErrors,
              multitestOutcome: outcome);
     }
-    multitestDone();
+
+    return null;

[Emily Fortuna, 2012/11/09 01:41:44]

shouldn't we get rid of these lines if we're returning a Future at line 217?

[Bob Nystrom, 2012/11/09 20:56:26]

This code's a bit hard to read. So the return here is for the function
expression that gets passed to transform(). It works like:

1. futureCopies is a built up list of futures.
2. We pass that to Futures.wait(). That returns a new future that will complete
when everything in the list does.
3. We get that resulting future and call transform() on it.
4. We pass in a function to transform that takes (and discards) the list of
futures, does the work we actually care about and then returns null.
5. transform() returns a future that calls that callback.
6. We return the result of 6 from the method.

Async code is hard to follow. :(

[Emily Fortuna, 2012/11/09 21:03:14]

Oh, I see. And I apparently misread the indentation. Carry on!

   });
 }