Add asynchronous versions of the methods on Directory.

tests/standalone/src/DirectoryTest.dart

Index: tests/standalone/src/DirectoryTest.dart
diff --git a/tests/standalone/src/DirectoryTest.dart b/tests/standalone/src/DirectoryTest.dart
index 77d4bdb79aee9c416e3cd35bc805056484323a7d..bf43d5074e5741937cf532ddb2ee5c89fab6ed5d 100644
--- a/tests/standalone/src/DirectoryTest.dart
+++ b/tests/standalone/src/DirectoryTest.dart
@@ -55,6 +55,39 @@ class DirectoryTest {
 
   static void testExistsCreateDelete() {

[Søren Gjesse, 2011/12/20 09:12:40]

We should avoid using /tmp, or at least check for it's existence - on Windows
there is a high probability that it does not exist. I prepared the following
change on my Windows machine at some point, but I forgot to get it reviewed and
committed.

-    Directory d = new Directory("/tmp/dart_temp_dir_");
+    Directory d;
+    if (new Directory("/tmp").existsSync()) {
+      d = new Directory("/tmp/dart_temp_dir_");
+    } else {
+      d = new Directory("");
+    }

If we want to try to use /tmp a check like this is needed.

[Mads Ager (google), 2011/12/20 09:26:24]

We have one test that does the check. Let's just use default temp directory
creation for these. Updated to pass in the empty string.

     Directory d = new Directory("/tmp/dart_temp_dir_");
+    d.createTempHandler = () {
+      d.existsHandler = (bool exists) {
+        Expect.isTrue(exists);
+        Directory created = new Directory("${d.path}/subdir");
+        created.createHandler = () {
+          created.existsHandler = (bool exists) {
+            Expect.isTrue(exists);
+            created.deleteHandler = () {
+              created.existsHandler = (bool exists) {
+                Expect.isFalse(exists);
+                d.deleteHandler = () {
+                  d.existsHandler = (bool exists) {
+                    Expect.isFalse(exists);
+                  };
+                  d.exists();
+                };
+                d.delete();
+              };
+              created.exists();
+            };
+            created.delete();
+          };
+          created.exists();
+        };
+        created.create();
+      };
+      d.exists();
+    };
+    d.createTemp();
+  }
+
+  static void testExistsCreateDeleteSync() {
+    Directory d = new Directory("/tmp/dart_temp_dir_");

[Søren Gjesse, 2011/12/20 09:12:40]

Ditto.

[Mads Ager (google), 2011/12/20 09:26:24]

Done.

     d.createTempSync();
     Expect.isTrue(d.existsSync());
     Directory created = new Directory("${d.path}/subdir");
@@ -64,7 +97,9 @@ class DirectoryTest {
     Expect.isFalse(created.existsSync());
     d.deleteSync();
     Expect.isFalse(d.existsSync());
+  }
 
+  static void testCreateTemp() {
     Directory tempDir1 = new Directory("/tmp/dart_temp_dir_");

[Søren Gjesse, 2011/12/20 09:12:40]

Ditto.

[Mads Ager (google), 2011/12/20 09:26:24]

This one does the check further down.

     Directory tempDir2 = new Directory("/tmp/dart_temp_dir_");
     bool stage1aDone = false;
@@ -137,7 +172,7 @@ class DirectoryTest {
     }
   }
 
-  static void testCreateTemp() {
+  static void testCreateDeleteTemp() {
     Directory tempDirectory = new Directory("");
     tempDirectory.createTempHandler = () {
       String filename = tempDirectory.path +
@@ -148,56 +183,39 @@ class DirectoryTest {
         Expect.fail("testCreateTemp file.errorHandler called: $error");
       };
       file.createHandler = () {
-        file.openHandler = (RandomAccessFile openedFile) {
-          openedFile.writeList([65, 66, 67, 13], 0, 4);
-          openedFile.noPendingWriteHandler = () {
-            openedFile.length();
-          };
-          openedFile.lengthHandler = (int length) {
-            Expect.equals(4, length);
-            openedFile.close();
-          };
-          openedFile.closeHandler = () {
-            file.exists();
-          };
-          file.existsHandler = (bool exists) {
-            Expect.isTrue(exists);
-            // Try to delete the directory containing the file - should throw.
-            bool threw_exception = false;
-            try {
-              tempDirectory.deleteSync();
-            } catch (var e) {
-              Expect.isTrue(tempDirectory.existsSync());
-              threw_exception = true;
-            }
-            Expect.isTrue(threw_exception);
+        file.existsHandler = (bool exists) {
+          Expect.isTrue(exists);
+          // Try to delete the directory containing the file - should throw.
+          bool threw_exception = false;
+          try {

[Søren Gjesse, 2011/12/20 09:12:40]

Can't we use Expect.throws here?

[Mads Ager (google), 2011/12/20 09:26:24]

Done.

+            tempDirectory.deleteSync();
+          } catch (var e) {
             Expect.isTrue(tempDirectory.existsSync());
+            threw_exception = true;
+          }
+          Expect.isTrue(threw_exception);
+          Expect.isTrue(tempDirectory.existsSync());
 
-            // Delete the file, and then delete the directory.
-            file.delete();
-          };
+          // Delete the file, and then delete the directory.
           file.deleteHandler = () {
             tempDirectory.deleteSync();
             Expect.isFalse(tempDirectory.existsSync());
           };
+          file.delete();
         };
-        file.open(writable: true);
+        file.exists();
       };
       file.create();
     };
     tempDirectory.createTemp();
   }
 
-  static void testNestedTempDirectory() {
-    var test = new NestedTempDirectoryTest();
-  }
-
-
   static void testMain() {
     testListing();
     testExistsCreateDelete();
+    testExistsCreateDeleteSync();
     testCreateTemp();
-    testNestedTempDirectory();
+    testCreateDeleteTemp();
   }
 }
 
@@ -206,7 +224,13 @@ class NestedTempDirectoryTest {
   List<Directory> createdDirectories;
   Directory current;
 
-  NestedTempDirectoryTest(): createdDirectories = new List<Directory>();
+  NestedTempDirectoryTest.run()
+      : createdDirectories = new List<Directory>(),
+        current = new Directory("") {
+    current.createTempHandler = createPhaseCallback;
+    current.errorHandler = errorCallback;
+    current.createTemp();
+  }
 
   void errorCallback(error) {
     Expect.fail("Error callback called in NestedTempDirectoryTest: $error");
@@ -236,16 +260,9 @@ class NestedTempDirectoryTest {
     }
   }
 
-  void startTest() {
-    current = new Directory("");
-    current.createTempHandler = createPhaseCallback;
-    current.errorHandler = errorCallback;
-    current.createTemp();
-  }
-
   static void testMain() {
-    new NestedTempDirectoryTest().startTest();
-    new NestedTempDirectoryTest().startTest();
+    new NestedTempDirectoryTest.run();
+    new NestedTempDirectoryTest.run();
   }
 }