Big merge from experimental to bleeding edge.

tests/standalone/io/directory_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.
 //
 // Directory listing test.
 
 import "dart:io";
 import "dart:isolate";
 
 class DirectoryTest {
@@ skipping 125 matching lines @@
         var long = new Directory("${buffer.toString()}");
         setupListHandlers(long.list());
         setupListHandlers(long.list(recursive: true));
       });
     });
   }
 
   static void testDeleteNonExistent() {
     // Test that deleting a non-existing directory fails.
     setupFutureHandlers(future) {
-      future.handleException((e) {
-        Expect.isTrue(e is DirectoryIOException);
-        return true;
-      });
       future.then((ignore) {
         Expect.fail("Deletion of non-existing directory should fail");
+      }).catchError((e) {
+        Expect.isTrue(e.error is DirectoryIOException);
       });
     }
 
     new Directory("").createTemp().then((d) {
       d.delete().then((ignore) {
         setupFutureHandlers(d.delete());
         setupFutureHandlers(d.delete(recursive: true));
       });
     });
   }
 
   static void testDeleteTooLongName() {
     var port = new ReceivePort();
     new Directory("").createTemp().then((d) {
       var subDirName = 'subdir';
       var subDir = new Directory("${d.path}/$subDirName");
       subDir.create().then((ignore) {
           // Construct a long string of the form
           // 'tempdir/subdir/../subdir/../subdir'.
           var buffer = new StringBuffer();
           buffer.add(subDir.path);
           for (var i = 0; i < 1000; i++) {
             buffer.add("/../${subDirName}");
           }
           var long = new Directory("${buffer.toString()}");
           var errors = 0;
           onError(e) {
-            Expect.isTrue(e is DirectoryIOException);
+            Expect.isTrue(e.error is DirectoryIOException);
             if (++errors == 2) {
               d.delete(recursive: true).then((ignore) => port.close());
             }
             return true;
           }
-          long.delete().handleException(onError);
-          long.delete(recursive: true).handleException(onError);
+          long.delete().catchError(onError);
+          long.delete(recursive: true).catchError(onError);
         });
     });
   }
 
   static void testDeleteNonExistentSync() {
     Directory d = new Directory("").createTempSync();
     d.deleteSync();
     Expect.throws(d.deleteSync);
     Expect.throws(() => d.deleteSync(recursive: true));
   }
@@ skipping 278 matching lines @@
   }
 }
 
 
 testCreateTempError() {
   var location = illegalTempDirectoryLocation();
   if (location == null) return;
 
   var port = new ReceivePort();
   var future = new Directory(location).createTemp();
-  future.handleException((e) => port.close());
+  future.catchError((e) => port.close());
 }
 
 
 testCreateExistingSync() {
   // Test that creating an existing directory succeeds.
   var d = new Directory('');
   var temp = d.createTempSync();
   var subDir = new Directory('${temp.path}/flaf');
   Expect.isFalse(subDir.existsSync());
   subDir.createSync();
@@ skipping 47 matching lines @@
 testCreateDirExistingFile() {
   // Test that creating an existing directory succeeds.
   var port = new ReceivePort();
   var d = new Directory('');
   d.createTemp().then((temp) {
     var path = '${temp.path}/flaf';
     var file = new File(path);
     var subDir = new Directory(path);
     file.create().then((_) {
       subDir.create()
-        ..then((_) { Expect.fail("dir create should fail on existing file"); })
-        ..handleException((e) {
-            Expect.isTrue(e is DirectoryIOException);
-            temp.delete(recursive: true).then((_) {
-              port.close();
-            });
-            return true;
+        .then((_) { Expect.fail("dir create should fail on existing file"); })
+        .catchError((e) {
+          Expect.isTrue(e.error is DirectoryIOException);
+          temp.delete(recursive: true).then((_) {
+            port.close();
           });
+        });
     });
   });
 }
 
 
 testCreateRecursiveSync() {
   var temp = new Directory('').createTempSync();
   var d = new Directory('${temp.path}/a/b/c');
   d.createSync(recursive: true);
   Expect.isTrue(new Directory('${temp.path}/a').existsSync());
@@ skipping 43 matching lines @@
   testCreateTempErrorSync();
   testCreateTempError();
   testCreateExistingSync();
   testCreateExisting();
   testCreateDirExistingFileSync();
   testCreateDirExistingFile();
   testCreateRecursive();
   testCreateRecursiveSync();
   testRename();
 }