Remove AsyncError with Expando.

tests/standalone/io/directory_error_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.
 //
 // Dart test program for testing error handling in directory I/O.
 
 import "package:expect/expect.dart";
 import "dart:async";
 import "dart:io";
 import "dart:isolate";
@@ skipping 17 matching lines @@
 
   return true;
 }
 
 
 void testCreateInNonExistent(Directory temp, Function done) {
   Directory inNonExistent = new Directory("${temp.path}/nonExistent/xxx");
   Expect.throws(() => inNonExistent.createSync(),
                 (e) => checkCreateInNonExistentFileException(e));
 
-  inNonExistent.create().catchError((e) {
-    checkCreateInNonExistentFileException(e.error);
+  inNonExistent.create().catchError((error) {
+    checkCreateInNonExistentFileException(error);
     done();
   });
 }
 
 
 bool checkCreateTempInNonExistentFileException(e) {
   Expect.isTrue(e is DirectoryIOException);
   Expect.isTrue(e.osError != null);
   if (Platform.operatingSystem == "linux") {
     Expect.equals(2, e.osError.errorCode);
   } else if (Platform.operatingSystem == "macos") {
     Expect.equals(2, e.osError.errorCode);
   } else if (Platform.operatingSystem == "windows") {
     Expect.equals(3, e.osError.errorCode);
   }
 
   return true;
 }
 
 
 void testCreateTempInNonExistent(Directory temp, Function done) {
   Directory nonExistent = new Directory("${temp.path}/nonExistent/xxx");
   Expect.throws(() => nonExistent.createTempSync(),
                 (e) => checkCreateTempInNonExistentFileException(e));
 
-  nonExistent.createTemp().catchError((e) {
-    checkCreateTempInNonExistentFileException(e.error);
+  nonExistent.createTemp().catchError((error) {
+    checkCreateTempInNonExistentFileException(error);
     done();
   });
 }
 
 
 bool checkDeleteNonExistentFileException(e) {
   Expect.isTrue(e is DirectoryIOException);
   Expect.isTrue(e.osError != null);
   // File not not found has error code 2 on all supported platforms.
   Expect.equals(2, e.osError.errorCode);
 
   return true;
 }
 
 
 void testDeleteNonExistent(Directory temp, Function done) {
   Directory nonExistent = new Directory("${temp.path}/nonExistent");
   Expect.throws(() => nonExistent.deleteSync(),
                 (e) => checkDeleteNonExistentFileException(e));
 
-  nonExistent.delete().catchError((e) {
-    checkDeleteNonExistentFileException(e.error);
+  nonExistent.delete().catchError((error) {
+    checkDeleteNonExistentFileException(error);
     done();
   });
 }
 
 
 bool checkDeleteRecursivelyNonExistentFileException(e) {
   Expect.isTrue(e is DirectoryIOException);
   Expect.isTrue(e.osError != null);
   Expect.isTrue(e.toString().indexOf("Deletion failed") != -1);
   // File not not found has error code 2 on all supported platforms.
   Expect.equals(2, e.osError.errorCode);
 
   return true;
 }
 
 
 void testDeleteRecursivelyNonExistent(Directory temp, Function done) {
   Directory nonExistent = new Directory("${temp.path}/nonExistent");
   Expect.throws(() => nonExistent.deleteSync(recursive: true),
                 (e) => checkDeleteRecursivelyNonExistentFileException(e));
 
-  nonExistent.delete(recursive: true).catchError((e) {
-    checkDeleteRecursivelyNonExistentFileException(e.error);
+  nonExistent.delete(recursive: true).catchError((error) {
+    checkDeleteRecursivelyNonExistentFileException(error);
     done();
   });
 }
 
 
 bool checkListNonExistentFileException(e) {
   Expect.isTrue(e is DirectoryIOException);
   Expect.isTrue(e.osError != null);
   Expect.isTrue(e.toString().indexOf("Directory listing failed") != -1);
   if (Platform.operatingSystem == "linux") {
     Expect.equals(2, e.osError.errorCode);
   } else if (Platform.operatingSystem == "macos") {
     Expect.equals(2, e.osError.errorCode);
   } else if (Platform.operatingSystem == "windows") {
     Expect.equals(3, e.osError.errorCode);
   }
 
   return true;
 }
 
 
-bool checkAsyncListNonExistentFileException(e) {
-  Expect.isTrue(e is AsyncError);
-  return checkListNonExistentFileException(e.error);
+bool checkAsyncListNonExistentFileException(error) {
+  return checkListNonExistentFileException(error);
 }
 
 
 void testListNonExistent(Directory temp, Function done) {
   Directory nonExistent = new Directory("${temp.path}/nonExistent");
   Expect.throws(() => nonExistent.listSync(), (e) => e is DirectoryIOException);
   nonExistent.list().listen(
       (_) => Expect.fail("listing should not succeed"),
       onError: (e) {
         checkAsyncListNonExistentFileException(e);
         done();
       });
 }
 
 
 void testRenameNonExistent(Directory temp, Function done) {
   Directory nonExistent = new Directory("${temp.path}/nonExistent");
   var newPath = "${temp.path}/nonExistent2";
   Expect.throws(() => nonExistent.renameSync(newPath),
                 (e) => e is DirectoryIOException);
   var renameDone = nonExistent.rename(newPath);
   renameDone.then((ignore) => Expect.fail('rename non existent'))
-            .catchError((e) {
-              Expect.isTrue(e.error is DirectoryIOException);
+            .catchError((error) {
+              Expect.isTrue(error is DirectoryIOException);
             done();
   });
 }
 
 
 void testRenameFileAsDirectory(Directory temp, Function done) {
   File f = new File("${temp.path}/file");
   var newPath = "${temp.path}/file2";
   f.createSync();
   var d = new Directory(f.path);
   Expect.throws(() => d.renameSync(newPath),
                 (e) => e is DirectoryIOException);
   var renameDone = d.rename(newPath);
   renameDone.then((ignore) => Expect.fail('rename file as directory'))
-            .catchError((e) {
-              Expect.isTrue(e.error is DirectoryIOException);
+            .catchError((error) {
+              Expect.isTrue(error is DirectoryIOException);
               done();
             });
 }
 
 
 testRenameOverwriteFile(Directory temp, Function done) {
   var d = new Directory('');
   var temp1 = d.createTempSync();
   var fileName = '${temp.path}/x';
   new File(fileName).createSync();
   Expect.throws(() => temp1.renameSync(fileName),
                 (e) => e is DirectoryIOException);
   var renameDone = temp1.rename(fileName);
   renameDone.then((ignore) => Expect.fail('rename dir overwrite file'))
-            .catchError((e) {
-              Expect.isTrue(e.error is DirectoryIOException);
+            .catchError((error) {
+              Expect.isTrue(error is DirectoryIOException);
               temp1.deleteSync(recursive: true);
               done();
             });
 }
 
 
 void runTest(Function test) {
   // Create a temporary directory for the test.
   var temp = new Directory('').createTempSync();
 
@@ skipping 12 matching lines @@
 main() {
   runTest(testCreateInNonExistent);
   runTest(testCreateTempInNonExistent);
   runTest(testDeleteNonExistent);
   runTest(testDeleteRecursivelyNonExistent);
   runTest(testListNonExistent);
   runTest(testRenameNonExistent);
   runTest(testRenameFileAsDirectory);
   runTest(testRenameOverwriteFile);
 }