Merge IO v2 branch to bleeding edge

tests/standalone/io/file_output_stream_test.dart

Index: tests/standalone/io/file_output_stream_test.dart
diff --git a/tests/standalone/io/file_output_stream_test.dart b/tests/standalone/io/file_output_stream_test.dart
index e700c5c645f99f4f78feeb4432395d174869b86e..645399ab55d35ceb2b2834cce71896d69bdf2d0f 100644
--- a/tests/standalone/io/file_output_stream_test.dart
+++ b/tests/standalone/io/file_output_stream_test.dart
@@ -19,88 +19,18 @@ void testOpenOutputStreamSync() {
   String fileName = "${tempDirectory.path}/test";
   File file = new File(fileName);
   file.createSync();
-  OutputStream x = file.openOutputStream();
-  x.write([65, 66, 67]);
-  Expect.isFalse(x.closed);
+  IOSink x = file.openWrite();
+  var data = [65, 66, 67];
+  x.add(data);
   x.close();
-  Expect.isTrue(x.closed);
-  x.onClosed = () {
-    Expect.isTrue(x.closed);
+  x.done.then((_) {
+    Expect.listEquals(file.readAsBytesSync(), data);
     file.deleteSync();
     done.toSendPort().send("done");
-  };
-}
-
-
-void testOutputStreamNoPendingWrite() {
-  var tempDirectory;
-
-  // Create a port for waiting on the final result of this test.
-  ReceivePort done = new ReceivePort();
-  done.receive((message, replyTo) {
-    tempDirectory.delete(recursive: true).then((ignore) => done.close());
-  });
-
-  new Directory('').createTemp().then((temp) {
-    tempDirectory = temp;
-    String fileName = "${tempDirectory.path}/test";
-    File file = new File(fileName);
-    file.create().then((ignore) {
-      OutputStream stream = file.openOutputStream();
-      final total = 100;
-      var count = 0;
-      stream.onNoPendingWrites = () {
-        stream.write([count++]);
-        if (count == total) {
-          stream.close();
-        }
-        stream.onClosed = () {
-          List buffer = new List<int>.fixedLength(total);
-          File fileSync = new File(fileName);
-          var openedFile = fileSync.openSync();
-          openedFile.readListSync(buffer, 0, total);
-          for (var i = 0; i < total; i++) {
-            Expect.equals(i, buffer[i]);
-          }
-          openedFile.closeSync();
-          fileSync.deleteSync();
-          done.toSendPort().send("done");
-        };
-      };
-    });
   });
 }
 
 
-void testOutputStreamFlush() {
-  Directory tempDirectory = new Directory('').createTempSync();
-
-  // Create a port for waiting on the final result of this test.
-  ReceivePort done = new ReceivePort();
-  done.receive((message, replyTo) {
-    tempDirectory.deleteSync();
-    done.close();
-  });
-
-  String fileName = "${tempDirectory.path}/test";
-  File file = new File(fileName);
-  file.createSync();
-  OutputStream x = file.openOutputStream();
-  x.write([65, 66, 67]);
-  x.flush();
-  x.write([68, 69, 70]);
-  x.flush();
-  x.write([71, 72, 73]);
-  x.onClosed = () {
-    file.deleteSync();
-    done.toSendPort().send("done");
-  };
-  x.close();
-  x.onError = (e) => Expect.fail("No error expected");
-}
-
 main() {
   testOpenOutputStreamSync();
-  testOutputStreamNoPendingWrite();
-  testOutputStreamFlush();
 }