Index: tests/standalone/src/DirectoryTest.dart |
diff --git a/tests/standalone/src/DirectoryTest.dart b/tests/standalone/src/DirectoryTest.dart |
index f9cdd0fcb1dd56310cabfab54e9ee223519d9004..3a55d1e4c12c2d9e22bdc6d3666f421b49bec949 100644 |
--- a/tests/standalone/src/DirectoryTest.dart |
+++ b/tests/standalone/src/DirectoryTest.dart |
@@ -21,35 +21,35 @@ class DirectoryTest { |
Expect.isFalse(f.existsSync()); |
f.createSync(); |
- directory.dirHandler = (dir) { |
+ directory.onDir = (dir) { |
listedDir = true; |
Expect.isTrue(dir.contains(directory.path)); |
Expect.isTrue(dir.contains('subdir')); |
}; |
- directory.fileHandler = (f) { |
+ directory.onFile = (f) { |
listedFile = true; |
Expect.isTrue(f.contains(directory.path)); |
Expect.isTrue(f.contains('subdir')); |
Expect.isTrue(f.contains('file.txt')); |
}; |
- directory.doneHandler = (completed) { |
+ directory.onDone = (completed) { |
Expect.isTrue(completed, "directory listing did not complete"); |
Expect.isTrue(listedDir, "directory not found"); |
Expect.isTrue(listedFile, "file not found"); |
directory.delete(recursive: true); |
- directory.deleteHandler = () { |
+ directory.onDelete = () { |
f.exists(); |
- f.existsHandler = (exists) => Expect.isFalse(exists); |
+ f.onExists = (exists) => Expect.isFalse(exists); |
directory.exists(); |
- directory.existsHandler = (exists) => Expect.isFalse(exists); |
+ directory.onExists = (exists) => Expect.isFalse(exists); |
subDirectory.exists(); |
- subDirectory.existsHandler = (exists) => Expect.isFalse(exists); |
+ subDirectory.onExists = (exists) => Expect.isFalse(exists); |
}; |
}; |
- directory.errorHandler = (error) { |
+ directory.onError = (error) { |
Expect.fail("error listing directory: $error"); |
}; |
@@ -63,26 +63,26 @@ class DirectoryTest { |
static void testListNonExistent() { |
Directory d = new Directory(""); |
- d.errorHandler = (error) { |
+ d.onError = (error) { |
Expect.fail("Directory error: $error"); |
}; |
d.createTemp(); |
- d.createTempHandler = () { |
+ d.onCreateTemp = () { |
d.delete(); |
- d.deleteHandler = () { |
+ d.onDelete = () { |
// Test that listing a non-existing directory fails. |
- d.errorHandler = (error) { |
+ d.onError = (error) { |
// TODO(ager): When directory errors have been changed to |
// post back exceptions, check that we get the right exception |
// type here. |
}; |
- d.fileHandler = (file) { |
+ d.onFile = (file) { |
Expect.fail("Listing of non-existing directory should fail"); |
}; |
- d.fileHandler = (dir) { |
+ d.onFile = (dir) { |
Expect.fail("Listing of non-existing directory should fail"); |
}; |
- d.doneHandler = (done) { |
+ d.onDone = (done) { |
Expect.isFalse(done); |
}; |
d.list(); |
@@ -93,18 +93,18 @@ class DirectoryTest { |
static void testListTooLongName() { |
Directory d = new Directory(""); |
- d.errorHandler = (error) { |
+ d.onError = (error) { |
Expect.fail("Directory error: $error"); |
}; |
d.createTemp(); |
- d.createTempHandler = () { |
+ d.onCreateTemp = () { |
var subDirName = 'subdir'; |
var subDir = new Directory("${d.path}/$subDirName"); |
- subDir.errorHandler = (error) { |
+ subDir.onError = (error) { |
Expect.fail("Directory error: $error"); |
}; |
subDir.create(); |
- subDir.createHandler = () { |
+ subDir.onCreate = () { |
// Construct a long string of the form |
// 'tempdir/subdir/../subdir/../subdir'. |
var buffer = new StringBuffer(); |
@@ -114,7 +114,7 @@ class DirectoryTest { |
} |
var long = new Directory("${buffer.toString()}"); |
var errors = 0; |
- long.errorHandler = (error) { |
+ long.onError = (error) { |
// TODO(ager): When directory errors have been changed to |
// post back exceptions, check that we get the right exception |
// type here. |
@@ -122,13 +122,13 @@ class DirectoryTest { |
d.delete(recursive: true); |
} |
}; |
- long.fileHandler = (file) { |
+ long.onFile = (file) { |
Expect.fail("Listing of non-existing directory should fail"); |
}; |
- long.fileHandler = (dir) { |
+ long.onFile = (dir) { |
Expect.fail("Listing of non-existing directory should fail"); |
}; |
- long.doneHandler = (done) { |
+ long.onDone = (done) { |
Expect.isFalse(done); |
}; |
long.list(); |
@@ -139,20 +139,20 @@ class DirectoryTest { |
static void testDeleteNonExistent() { |
Directory d = new Directory(""); |
- d.errorHandler = (error) { |
+ d.onError = (error) { |
Expect.fail("Directory error: $error"); |
}; |
d.createTemp(); |
- d.createTempHandler = () { |
+ d.onCreateTemp = () { |
d.delete(); |
- d.deleteHandler = () { |
+ d.onDelete = () { |
// Test that deleting a non-existing directory fails. |
- d.errorHandler = (error) { |
+ d.onError = (error) { |
// TODO(ager): When directory errors have been changed to |
// post back exceptions, check that we get the right exception |
// type here. |
}; |
- d.deleteHandler = () { |
+ d.onDelete = () { |
Expect.fail("Deletion of non-existing directory should fail"); |
}; |
d.delete(); |
@@ -163,18 +163,18 @@ class DirectoryTest { |
static void testDeleteTooLongName() { |
Directory d = new Directory(""); |
- d.errorHandler = (error) { |
+ d.onError = (error) { |
Expect.fail("Directory error: $error"); |
}; |
d.createTemp(); |
- d.createTempHandler = () { |
+ d.onCreateTemp = () { |
var subDirName = 'subdir'; |
var subDir = new Directory("${d.path}/$subDirName"); |
- subDir.errorHandler = (error) { |
+ subDir.onError = (error) { |
Expect.fail("Directory error: $error"); |
}; |
subDir.create(); |
- subDir.createHandler = () { |
+ subDir.onCreate = () { |
// Construct a long string of the form |
// 'tempdir/subdir/../subdir/../subdir'. |
var buffer = new StringBuffer(); |
@@ -184,7 +184,7 @@ class DirectoryTest { |
} |
var long = new Directory("${buffer.toString()}"); |
var errors = 0; |
- long.errorHandler = (error) { |
+ long.onError = (error) { |
// TODO(ager): When directory errors have been changed to |
// post back exceptions, check that we get the right exception |
// type here. |
@@ -192,7 +192,7 @@ class DirectoryTest { |
d.delete(recursive: true); |
} |
}; |
- long.deleteHandler = () { |
+ long.onDelete = () { |
Expect.fail("Deletion of a directory with a long name should fail"); |
}; |
long.delete(); |
@@ -229,18 +229,18 @@ class DirectoryTest { |
static void testExistsCreateDelete() { |
Directory d = new Directory(""); |
- d.createTempHandler = () { |
- d.existsHandler = (bool exists) { |
+ d.onCreateTemp = () { |
+ d.onExists = (bool exists) { |
Expect.isTrue(exists); |
Directory created = new Directory("${d.path}/subdir"); |
- created.createHandler = () { |
- created.existsHandler = (bool exists) { |
+ created.onCreate = () { |
+ created.onExists = (bool exists) { |
Expect.isTrue(exists); |
- created.deleteHandler = () { |
- created.existsHandler = (bool exists) { |
+ created.onDelete = () { |
+ created.onExists = (bool exists) { |
Expect.isFalse(exists); |
- d.deleteHandler = () { |
- d.existsHandler = (bool exists) { |
+ d.onDelete = () { |
+ d.onExists = (bool exists) { |
Expect.isFalse(exists); |
}; |
d.exists(); |
@@ -288,15 +288,15 @@ class DirectoryTest { |
Function stage3; // Loops to stage 0. |
Function error(String message) { |
- Expect.fail("Directory errorHandler: $message"); |
+ Expect.fail("Directory onError: $message"); |
} |
stage0 = () { |
- tempDir1.createTempHandler = stage1a; |
- tempDir1.errorHandler = error; |
+ tempDir1.onCreateTemp = stage1a; |
+ tempDir1.onError = error; |
tempDir1.createTemp(); |
- tempDir2.createTempHandler = stage1b; |
- tempDir2.errorHandler = error; |
+ tempDir2.onCreateTemp = stage1b; |
+ tempDir2.onError = error; |
tempDir2.createTemp(); |
}; |
@@ -348,23 +348,23 @@ class DirectoryTest { |
static void testCreateDeleteTemp() { |
Directory tempDirectory = new Directory(""); |
- tempDirectory.createTempHandler = () { |
+ tempDirectory.onCreateTemp = () { |
String filename = tempDirectory.path + |
new Platform().pathSeparator() + "dart_testfile"; |
File file = new File(filename); |
Expect.isFalse(file.existsSync()); |
- file.errorHandler = (error) { |
- Expect.fail("testCreateTemp file.errorHandler called: $error"); |
+ file.onError = (error) { |
+ Expect.fail("testCreateTemp file.onError called: $error"); |
}; |
- file.createHandler = () { |
- file.existsHandler = (bool exists) { |
+ file.onCreate = () { |
+ file.onExists = (bool exists) { |
Expect.isTrue(exists); |
// Try to delete the directory containing the file - should throw. |
Expect.throws(tempDirectory.deleteSync); |
Expect.isTrue(tempDirectory.existsSync()); |
// Delete the file, and then delete the directory. |
- file.deleteHandler = () { |
+ file.onDelete = () { |
tempDirectory.deleteSync(); |
Expect.isFalse(tempDirectory.existsSync()); |
}; |
@@ -400,8 +400,8 @@ class NestedTempDirectoryTest { |
NestedTempDirectoryTest.run() |
: createdDirectories = new List<Directory>(), |
current = new Directory("") { |
- current.createTempHandler = createPhaseCallback; |
- current.errorHandler = errorCallback; |
+ current.onCreateTemp = createPhaseCallback; |
+ current.onError = errorCallback; |
current.createTemp(); |
} |
@@ -417,8 +417,8 @@ class NestedTempDirectoryTest { |
if (createdDirectories.length < nestingDepth) { |
current = new Directory( |
current.path + "/nested_temp_dir_${createdDirectories.length}_"); |
- current.errorHandler = errorCallback; |
- current.createTempHandler = createPhaseCallback; |
+ current.onError = errorCallback; |
+ current.onCreateTemp = createPhaseCallback; |
current.createTemp(); |
} else { |
deletePhaseCallback(); |
@@ -472,8 +472,8 @@ testCreateTempError() { |
}); |
Directory dir = new Directory(location); |
- dir.errorHandler = (error) { resultPort.toSendPort().send("error"); }; |
- dir.createTempHandler = () { resultPort.toSendPort().send("success"); }; |
+ dir.onError = (error) { resultPort.toSendPort().send("error"); }; |
+ dir.onCreateTemp = () { resultPort.toSendPort().send("success"); }; |
dir.createTemp(); |
} |