Merge IO v2 branch to bleeding edge

tests/standalone/io/file_system_links_test.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.
 
 import "dart:io";
+import "dart:isolate";
 
 
 createLink(String dst, String link, bool symbolic, void callback()) {
   var args = [ symbolic ? '-s' : '', dst, link ];
   var script = 'tests/standalone/io/ln.sh';
   if (!new File(script).existsSync()) {
     script = '../$script';
   }
   Process.run(script, args).then((result) {
     if (result.exitCode == 0) {
@@ skipping 43 matching lines @@
 }
 
 
 testFileWriteRead() {
   var temp = new Directory('').createTempSync();
   var x = '${temp.path}${Platform.pathSeparator}x';
   var y = '${temp.path}${Platform.pathSeparator}y';
   new File(x).createSync();
   createLink(x, y, true, () {
     var data = "asdf".charCodes;
-    var output = new File(y).openOutputStream(FileMode.WRITE);
-    output.write(data);
-    output.onNoPendingWrites = () {
-      output.close();
+    var output = new File(y).openWrite(FileMode.WRITE);
+    output.add(data);
+    output.close();
+    output.done.then((_) {
       var read = new File(y).readAsBytesSync();
       Expect.listEquals(data, read);
       var read2 = new File(x).readAsBytesSync();
       Expect.listEquals(data, read2);
       temp.deleteSync(recursive: true);
-    };
+    });
   });
 }
 
 
 testDirectoryExistsCreate() {
   var temp = new Directory('').createTempSync();
   var x = '${temp.path}${Platform.pathSeparator}x';
   var y = '${temp.path}${Platform.pathSeparator}y';
   createLink(x, y, true, () {
     Expect.isFalse(new Directory(x).existsSync());
@@ skipping 23 matching lines @@
       Expect.isFalse(link.existsSync());
       Expect.isTrue(temp2.existsSync());
       Expect.isTrue(new File(x).existsSync());
       temp2.deleteSync(recursive: true);
     });
   });
 }
 
 
 testDirectoryListing() {
+  var keepAlive = new ReceivePort();
   var temp = new Directory('').createTempSync();
   var temp2 = new Directory('').createTempSync();
   var y = '${temp.path}${Platform.pathSeparator}y';
   var x = '${temp2.path}${Platform.pathSeparator}x';
   new File(x).createSync();
   createLink(temp2.path, y, true, () {
     var files = [];
     var dirs = [];
     for (var entry in temp.listSync(recursive:true)) {
       if (entry is File) {
         files.add(entry.name);
       } else {
         Expect.isTrue(entry is Directory);
         dirs.add(entry.path);
       }
     }
     Expect.equals(1, files.length);
     Expect.isTrue(files[0].endsWith('$y${Platform.pathSeparator}x'));
     Expect.equals(1, dirs.length);
     Expect.isTrue(dirs[0].endsWith(y));
 
     files = [];
     dirs = [];
-    var lister = temp.list(recursive: true);
-    lister.onFile = (f) => files.add(f);
-    lister.onDir = (d) => dirs.add(d);
-    lister.onDone = (success) {
-      Expect.isTrue(success);
-      Expect.equals(1, files.length);
-      Expect.isTrue(files[0].endsWith('$y${Platform.pathSeparator}x'));
-      Expect.equals(1, dirs.length);
-      Expect.isTrue(dirs[0].endsWith(y));
-      temp.deleteSync(recursive: true);
-      temp2.deleteSync(recursive: true);
-    };
+    var lister = temp.list(recursive: true).listen(
+        (entity) {
+          if (entity is File) {
+            files.add(entity.name);
+          } else {
+            Expect.isTrue(entity is Directory);
+            dirs.add(entity.path);
+          }
+        },
+        onDone: () {
+          Expect.equals(1, files.length);
+          Expect.isTrue(files[0].endsWith('$y${Platform.pathSeparator}x'));
+          Expect.equals(1, dirs.length);
+          Expect.isTrue(dirs[0].endsWith(y));
+          temp.deleteSync(recursive: true);
+          temp2.deleteSync(recursive: true);
+          keepAlive.close();
+        });
   });
 }
 
 
 testDirectoryListingBrokenLink() {
+  var keepAlive = new ReceivePort();
   var temp = new Directory('').createTempSync();
   var x = '${temp.path}${Platform.pathSeparator}x';
   var link = '${temp.path}${Platform.pathSeparator}link';
   var doesNotExist = 'this_thing_does_not_exist';
   new File(x).createSync();
   createLink(doesNotExist, link, true, () {
     Expect.throws(() => temp.listSync(recursive: true),
                   (e) => e is DirectoryIOException);
     var files = [];
     var dirs = [];
     var errors = [];
-    var lister = temp.list(recursive: true);
-    lister.onFile = (f) => files.add(f);
-    lister.onDir = (d) => dirs.add(d);
-    lister.onError = (d) => errors.add(d);
-    lister.onDone = (success) {
-      Expect.isFalse(success);
-      Expect.equals(1, files.length);
-      Expect.isTrue(files[0].endsWith(x));
-      Expect.equals(0, dirs.length);
-      Expect.equals(1, errors.length);
-      Expect.isTrue(errors[0].toString().contains(link));
-      temp.deleteSync(recursive: true);
-    };
+    temp.list(recursive: true).listen(
+        (entity) {
+          if (entity is File) {
+            files.add(entity.name);
+          } else {
+            Expect.isTrue(entity is Directory);
+            dirs.add(entity.path);
+          }
+        },
+        onError: (e) => errors.add(e),
+        onDone: () {
+          Expect.equals(1, files.length);
+          Expect.isTrue(files[0].endsWith(x));
+          Expect.equals(0, dirs.length);
+          Expect.equals(1, errors.length);
+          Expect.isTrue(errors[0].toString().contains(link));
+          temp.deleteSync(recursive: true);
+          keepAlive.close();
+        });
   });
 }
 
 
 main() {
   testFileExistsCreate();
   testFileDelete();
   testFileWriteRead();
   testDirectoryExistsCreate();
   testDirectoryDelete();
   testDirectoryListing();
   testDirectoryListingBrokenLink();
 }