Reapply "Update the test runner to use the new dart:io API"

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 34 matching lines @@
 
 /**
  * Calls [function] asynchronously. Returns a future that completes with the
  * result of the function. If the function is `null`, returns a future that
  * completes immediately with `null`.
  */
 Future asynchronously(function()) {
   if (function == null) return new Future.immediate(null);
 
   var completer = new Completer();
-  new Timer(0, (_) {
-    completer.complete(function());
-  });
+  Timer.run(() => completer.complete(function()));
 
   return completer.future;
 }
 
 /** A completer that waits until all added [Future]s complete. */
 // TODO(rnystrom): Copied from web_components. Remove from here when it gets
 // added to dart:core. (See #6626.)
 class FutureGroup {
   const _FINISHED = -1;
   int _pending = 0;
   Completer<List> _completer = new Completer<List>();
   final List<Future> futures = <Future>[];
   bool wasCompleted = false;
 
   /**
    * Wait for [task] to complete (assuming this barrier has not already been
    * marked as completed, otherwise you'll get an exception indicating that a
    * future has already been completed).
    */
   void add(Future task) {
     if (_pending == _FINISHED) {
       throw new Exception("FutureFutureAlreadyCompleteException");
     }
     _pending++;
     var handledTaskFuture = task.catchError((e) {
       if (!wasCompleted) {
-        _completer.completeError(e.error, task.stackTrace);
+        _completer.completeError(e.error, e.stackTrace);
         wasCompleted = true;
       }
     }).then((_) {
       _pending--;
       if (_pending == 0) {
         _pending = _FINISHED;
         if (!wasCompleted) {
           _completer.complete(futures);
           wasCompleted = true;
         }
@@ skipping 42 matching lines @@
    */
   String get compilerPath {
     if (configuration['compiler'] == 'none') {
       return null;  // No separate compiler for dartium tests.
     }
     var name;
     switch (configuration['compiler']) {
       case 'dartc':
       case 'new_analyzer':
         name = executablePath;
+        break;
       case 'dart2js':
       case 'dart2dart':
         var prefix = 'sdk/bin/';
         String suffix = getExecutableSuffix(configuration['compiler']);
         if (configuration['host_checked']) {
           // The script dart2js_developer is not included in the
           // shipped SDK, that is the script is not installed in
           // "$buildDir/dart-sdk/bin/"
           name = '$prefix/dart2js_developer$suffix';
         } else {
@@ skipping 93 matching lines @@
    * cache information about the test suite, so that directories do not need
    * to be listed each time.
    */
   void forEachTest(TestCaseEvent onTest, Map testCache, [VoidFunction onDone]);
 }
 
 
 void ccTestLister() {
   port.receive((String runnerPath, SendPort replyTo) {
     Future processFuture = Process.start(runnerPath, ["--list"]);
-    processFuture.then((p) {
+    processFuture.then((Process p) {
       // Drain stderr to not leak resources.
-      p.stderr.onData = p.stderr.read;
-      StringInputStream stdoutStream = new StringInputStream(p.stdout);
+      p.stderr.listen((_) { });
+      Stream<String> stdoutStream =
+          p.stdout.transform(new StringDecoder())
+                  .transform(new LineTransformer());
       var streamDone = false;
       var processExited = false;
       checkDone() {
         if (streamDone && processExited) {
           replyTo.send("");
         }
       }
-      stdoutStream.onLine = () {
-        String line = stdoutStream.readLine();
+      stdoutStream.listen((String line) {
         replyTo.send(line);
-      };
-      stdoutStream.onClosed = () {
+      },
+      onDone: () {
         streamDone = true;
         checkDone();
-      };
-      p.onExit = (code) {
+      });
+
+      p.exitCode.then((code) {
         if (code < 0) {
           print("Failed to list tests: $runnerPath --list");
           replyTo.send("");
         } else {
           processExited = true;
           checkDone();
         }
-      };
+      });
       port.close();
     }).catchError((e) {
       print("Failed to list tests: $runnerPath --list");
       replyTo.send("");
       return true;
     });
   });
 }
 
 
@@ skipping 281 matching lines @@
         enqueueDirectory(dir, group);
         return group.future;
       }
     });
   }
 
   void enqueueDirectory(Directory dir, FutureGroup group) {
     var listCompleter = new Completer();
     group.add(listCompleter.future);
 
-    var lister = dir.list(recursive: listRecursively);
-    lister.onFile = (file) => enqueueFile(file, group);
-    lister.onDone = listCompleter.complete;
+    var lister = dir.list(recursive: listRecursively)
+        .listen((FileSystemEntity fse) {
+          if (fse is File) enqueueFile(fse.path, group);
+        },
+        onDone: listCompleter.complete);
   }
 
   void enqueueFile(String filename, FutureGroup group) {
     if (!isTestFile(filename)) return;
     Path filePath = new Path(filename);
 
     // Only run the tests that match the pattern.
     RegExp pattern = configuration['selectors'][suiteName];
     if (!pattern.hasMatch('$filePath')) return;
     if (filePath.filename.endsWith('test_config.dart')) return;
@@ skipping 225 matching lines @@
 
     var fileString = file.toString();
     if (fileString.startsWith(buildDir.toString())) {
       var fileRelativeToBuildDir = file.relativeTo(buildDir);
       return "/$PREFIX_BUILDDIR/$fileRelativeToBuildDir";
     } else if (fileString.startsWith(dartDir.toString())) {
       var fileRelativeToDartDir = file.relativeTo(dartDir);
       return "/$PREFIX_DARTDIR/$fileRelativeToDartDir";
     }
     // Unreachable
-    Except.fail('This should be unreachable.');
+    Expect.fail('This should be unreachable.');
   }
 
-  void _getUriForBrowserTest(TestInformation info,
+  String _getUriForBrowserTest(TestInformation info,
                             String pathComponent,
                             subtestNames,
                             subtestIndex) {
     // Note: If we run test.py with the "--list" option, no http servers
     // will be started. So we use PORT/CROSS_ORIGIN_PORT instead of real ports.
     var serverPort = "PORT";
     var crossOriginPort = "CROSS_ORIGIN_PORT";
     if (!configuration['list']) {
       Expect.isTrue(configuration.containsKey('_servers_'));
       serverPort = configuration['_servers_'].port;
@@ skipping 643 matching lines @@
     if (hasDynamicTypeError) {
       // TODO(ahe): Remove this warning when co19 no longer uses this tag.
 
       // @dynamic-type-error has been replaced by tests that use
       // tests/co19/src/Utils/dynamic_check.dart to dynamically detect
       // if a test is running in checked mode or not and change its
       // expectations accordingly.
 
       // Using stderr.writeString to avoid breaking dartc/junit_tests
       // which parses the output of the --list option.
-      stderr.writeString(
-          "Warning: deprecated @dynamic-type-error tag used in $filePath\n");
+      stderr.writeln(
+          "Warning: deprecated @dynamic-type-error tag used in $filePath");
     }
 
     return {
       "vmOptions": <List>[[]],
       "dartOptions": null,
       "packageRoot": null,
       "hasCompileError": hasCompileError,
       "hasRuntimeError": hasRuntimeError,
       "isStaticClean" : !hasStaticWarning,
       "otherScripts": <String>[],
@@ skipping 103 matching lines @@
     testClasses = <String>[];
     // Do not read the status file.
     // All exclusions are hardcoded in this script, as they are in testcfg.py.
     processDirectory();
   }
 
   void processDirectory() {
     directoryPath = '$dartDir/$directoryPath';
     Directory dir = new Directory(directoryPath);
 
-    var lister = dir.list(recursive: true);
-    lister.onFile = processFile;
-    lister.onDone = createTest;
+    dir.list(recursive: true).listen((FileSystemEntity fse) {
+      if (fse is File) processFile(fse.path);
+    },
+    onDone: createTest);
   }
 
   void processFile(String filename) {
     if (!isTestFile(filename)) return;
 
     int index = filename.indexOf('compiler/javatests/com/google/dart');
     if (index != -1) {
       String testRelativePath =
           filename.substring(index + 'compiler/javatests/'.length,
                              filename.length - '.java'.length);
       String testClass = testRelativePath.replaceAll('/', '.');
       testClasses.add(testClass);
     }
   }
 
-  void createTest(successIgnored) {
+  void createTest() {
     var sdkDir = "$buildDir/dart-sdk".trim();
     List<String> args = <String>[
         '-ea',
         '-classpath', classPath,
         '-Dcom.google.dart.sdk=$sdkDir',
         '-Dcom.google.dart.corelib.SharedTests.test_py=$dartDir/tools/test.py',
         'org.junit.runner.JUnitCore'];
     args.addAll(testClasses);
 
     // Lengthen the timeout for JUnit tests.  It is normal for them
@@ skipping 25 matching lines @@
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-integration-1.3.0RC2.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-library-1.3.0RC2.jar',
          '$dartDir/third_party/junit/v4_8_2/junit.jar']
         .join(Platform.operatingSystem == 'windows'? ';': ':');  // Path separator.
   }
 }
 
 class LastModifiedCache {
-  Map<String, Date> _cache = <String, Date>{};
+  Map<String, DateTime> _cache = <String, DateTime>{};
 
   /**
    * Returns the last modified date of the given [uri].
    *
    * The return value will be cached for future queries. If [uri] is a local
    * file, it's last modified [Date] will be returned. If the file does not
    * exist, null will be returned instead.
    * In case [uri] is not a local file, this method will always return
    * the current date.
    */
-  Date getLastModified(Uri uri) {
+  DateTime getLastModified(Uri uri) {
     if (uri.scheme == "file") {
       if (_cache.containsKey(uri.path)) {
         return _cache[uri.path];
       }
       var file = new File(new Path(uri.path).toNativePath());
       _cache[uri.path] = file.existsSync() ? file.lastModifiedSync() : null;
       return _cache[uri.path];
     }
     return new Date.now();
   }
@@ skipping 37 matching lines @@
       Expect.isTrue(dir.existsSync(), "Failed to create ${dir.path}");
     }
     return dir;
   }
 
   /**
    * Copy a [source] file to a new place.
    * Assumes that the directory for [dest] already exists.
    */
   static Future copyFile(Path source, Path dest) {
-    var output = new File.fromPath(dest).openOutputStream();
-    new File.fromPath(source).openInputStream().pipe(output);
-    var completer = new Completer();
-    output.onClosed = (){ completer.complete(null); };
-    return completer.future;
+    return new File.fromPath(source).openRead()
+        .pipe(new File.fromPath(dest).openWrite());
   }
 
   static Path debugLogfile() {
     return new Path(".debug.log");
   }
 
   static String flakyFileName() {
     // If a flaky test did fail, infos about it (i.e. test name, stdin, stdout)
     // will be written to this file. This is useful for the debugging of
     // flaky tests.
@@ skipping 183 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }