| Index: tests/standalone/io/directory_test.dart
|
| diff --git a/tests/standalone/io/directory_test.dart b/tests/standalone/io/directory_test.dart
|
| index aaedf1cb73970c4a90b890f3938afd432f4ea6b4..770839ecbdd6fd01a91468e7ac8567b55ce50995 100644
|
| --- a/tests/standalone/io/directory_test.dart
|
| +++ b/tests/standalone/io/directory_test.dart
|
| @@ -15,7 +15,7 @@ class DirectoryTest {
|
| bool listedDir = false;
|
| bool listedFile = false;
|
|
|
| - Directory directory = new Directory("").createTempSync();
|
| + Directory directory = Directory.createSystemTempSync('dart_directory_test');
|
| Directory subDirectory = new Directory("${directory.path}/subdir");
|
| Expect.isTrue('$directory'.contains(directory.path));
|
| Expect.isFalse(subDirectory.existsSync());
|
| @@ -87,7 +87,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testListingTailingPaths() {
|
| - Directory directory = new Directory("").createTempSync();
|
| + Directory directory = Directory.createSystemTempSync('dart_directory_test');
|
| Directory subDirectory = new Directory("${directory.path}/subdir/");
|
| subDirectory.createSync();
|
| File f = new File('${subDirectory.path}/file.txt');
|
| @@ -112,7 +112,7 @@ class DirectoryTest {
|
| Expect.isTrue(error is DirectoryException);
|
| });
|
| }
|
| - new Directory("").createTemp().then((d) {
|
| + Directory.createSystemTemp('dart_directory').then((d) {
|
| d.delete().then((ignore) {
|
| setupListerHandlers(d.list());
|
| setupListerHandlers(d.list(recursive: true));
|
| @@ -121,7 +121,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testListTooLongName() {
|
| - new Directory("").createTemp().then((d) {
|
| + Directory.createSystemTemp('dart_directory').then((d) {
|
| var errors = 0;
|
| asyncStart();
|
| setupListHandlers(Stream<FileSystemEntity> stream) {
|
| @@ -163,7 +163,7 @@ class DirectoryTest {
|
| });
|
| }
|
|
|
| - new Directory("").createTemp().then((d) {
|
| + Directory.createSystemTemp('dart_directory').then((d) {
|
| d.delete().then((ignore) {
|
| setupFutureHandlers(d.delete());
|
| setupFutureHandlers(d.delete(recursive: true));
|
| @@ -173,7 +173,7 @@ class DirectoryTest {
|
|
|
| static void testDeleteTooLongName() {
|
| asyncStart();
|
| - new Directory("").createTemp().then((d) {
|
| + Directory.createSystemTemp('dart_directory').then((d) {
|
| var subDirName = 'subdir';
|
| var subDir = new Directory("${d.path}/$subDirName");
|
| subDir.create().then((ignore) {
|
| @@ -200,14 +200,14 @@ class DirectoryTest {
|
| }
|
|
|
| static void testDeleteNonExistentSync() {
|
| - Directory d = new Directory("").createTempSync();
|
| + Directory d = Directory.createSystemTempSync('dart_directory_test');
|
| d.deleteSync();
|
| Expect.throws(d.deleteSync);
|
| Expect.throws(() => d.deleteSync(recursive: true));
|
| }
|
|
|
| static void testDeleteTooLongNameSync() {
|
| - Directory d = new Directory("").createTempSync();
|
| + Directory d = Directory.createSystemTempSync('dart_directory_test');
|
| var subDirName = 'subdir';
|
| var subDir = new Directory("${d.path}/$subDirName");
|
| subDir.createSync();
|
| @@ -225,7 +225,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testExistsCreateDelete() {
|
| - new Directory("").createTemp().then((d) {
|
| + Directory.createSystemTemp('dart_directory').then((d) {
|
| d.exists().then((bool exists) {
|
| Expect.isTrue(exists);
|
| Directory created = new Directory("${d.path}/subdir");
|
| @@ -249,7 +249,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testExistsCreateDeleteSync() {
|
| - Directory d = new Directory("").createTempSync();
|
| + Directory d = Directory.createSystemTempSync('dart_directory_test');
|
| Directory d2 = new Directory('${d.path}/');
|
| Expect.isTrue(d.existsSync());
|
| Expect.isTrue(d2.existsSync());
|
| @@ -263,7 +263,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testDeleteLinkSync() {
|
| - Directory tmp = new Directory("").createTempSync();
|
| + Directory tmp = Directory.createSystemTempSync('dart_directory_test');
|
| var path = "${tmp.path}${Platform.pathSeparator}";
|
| Directory d = new Directory("${path}target");
|
| d.createSync();
|
| @@ -280,7 +280,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testDeleteLinkAsFileSync() {
|
| - Directory tmp = new Directory("").createTempSync();
|
| + Directory tmp = Directory.createSystemTempSync('dart_directory_test');
|
| var path = "${tmp.path}${Platform.pathSeparator}";
|
| Directory d = new Directory("${path}target");
|
| d.createSync();
|
| @@ -297,7 +297,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testDeleteBrokenLinkAsFileSync() {
|
| - Directory tmp = new Directory("").createTempSync();
|
| + Directory tmp = Directory.createSystemTempSync('dart_directory_test');
|
| var path = "${tmp.path}${Platform.pathSeparator}";
|
| Directory d = new Directory("${path}target");
|
| d.createSync();
|
| @@ -313,7 +313,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testListBrokenLinkSync() {
|
| - Directory tmp = new Directory("").createTempSync();
|
| + Directory tmp = Directory.createSystemTempSync('dart_directory_test');
|
| var path = "${tmp.path}${Platform.pathSeparator}";
|
| Directory d = new Directory("${path}target");
|
| d.createSync();
|
| @@ -334,7 +334,7 @@ class DirectoryTest {
|
| }
|
|
|
| static void testListLinkSync() {
|
| - Directory tmp = new Directory("").createTempSync();
|
| + Directory tmp = Directory.createSystemTempSync('dart_directory_test');
|
| var path = "${tmp.path}${Platform.pathSeparator}";
|
| Directory d = new Directory("${path}target");
|
| d.createSync();
|
| @@ -354,11 +354,13 @@ class DirectoryTest {
|
| });
|
| }
|
|
|
| - static void testCreateTemp([String template = ""]) {
|
| - asyncStart();
|
| - Directory dir = new Directory(template);
|
| - Future.wait([dir.createTemp(), dir.createTemp()])
|
| - .then((tempDirs) {
|
| + static void testCreateTemp() {
|
| + Directory base = new Directory('/tmp');
|
| + String template = 'dart_temp_dir';
|
| + if (base.existsSync()) {
|
| + asyncStart();
|
| + Future.wait([base.createTemp(template), base.createTemp(template)])
|
| + .then((tempDirs) {
|
| Expect.notEquals(tempDirs[0].path, tempDirs[1].path);
|
| for (Directory t in tempDirs) {
|
| Expect.isTrue(t.existsSync());
|
| @@ -366,17 +368,28 @@ class DirectoryTest {
|
| Expect.isFalse(t.existsSync());
|
| }
|
| asyncEnd();
|
| - });
|
| + });
|
| + }
|
| }
|
|
|
| - static void testCreateTempTemplate() {
|
| - if (new Directory("/tmp").existsSync()) {
|
| - testCreateTemp("/tmp/dart_temp_dir_");
|
| - }
|
| + static void testCreateSystemTemp() {
|
| + String template = 'dart_system_temp_dir';
|
| + asyncStart();
|
| + Future.wait([Directory.createSystemTemp(template),
|
| + Directory.createSystemTemp(template)])
|
| + .then((tempDirs) {
|
| + Expect.notEquals(tempDirs[0].path, tempDirs[1].path);
|
| + for (Directory t in tempDirs) {
|
| + Expect.isTrue(t.existsSync());
|
| + t.deleteSync();
|
| + Expect.isFalse(t.existsSync());
|
| + }
|
| + asyncEnd();
|
| + });
|
| }
|
|
|
| static void testCreateDeleteTemp() {
|
| - new Directory("").createTemp().then((tempDirectory) {
|
| + Directory.createSystemTemp('dart_directory').then((tempDirectory) {
|
| String filename =
|
| "${tempDirectory.path}${Platform.pathSeparator}dart_testfile";
|
| File file = new File(filename);
|
| @@ -430,6 +443,7 @@ class DirectoryTest {
|
| testListBrokenLinkSync();
|
| testListLinkSync();
|
| testCreateTemp();
|
| + testCreateSystemTemp();
|
| testCreateDeleteTemp();
|
| testCurrent();
|
| testEquals();
|
| @@ -443,7 +457,7 @@ class NestedTempDirectoryTest {
|
|
|
| NestedTempDirectoryTest.run()
|
| : createdDirectories = new List<Directory>() {
|
| - new Directory("").createTemp().then(createPhaseCallback);
|
| + Directory.createSystemTemp('dart_directory').then(createPhaseCallback);
|
| }
|
|
|
| void createPhaseCallback(temp) {
|
| @@ -491,7 +505,7 @@ String illegalTempDirectoryLocation() {
|
| testCreateTempErrorSync() {
|
| var location = illegalTempDirectoryLocation();
|
| if (location != null) {
|
| - Expect.throws(new Directory(location).createTempSync,
|
| + Expect.throws(() => new Directory(location).createTempSync('dart_tempdir'),
|
| (e) => e is DirectoryException);
|
| }
|
| }
|
| @@ -502,15 +516,14 @@ testCreateTempError() {
|
| if (location == null) return;
|
|
|
| asyncStart();
|
| - var future = new Directory(location).createTemp();
|
| + var future = new Directory(location).createTemp('dart_tempdir');
|
| future.catchError((_) => asyncEnd());
|
| }
|
|
|
|
|
| testCreateExistingSync() {
|
| // Test that creating an existing directory succeeds.
|
| - var d = new Directory('');
|
| - var temp = d.createTempSync();
|
| + var temp = Directory.createSystemTempSync('directory_test');
|
| var subDir = new Directory('${temp.path}/flaf');
|
| Expect.isFalse(subDir.existsSync());
|
| subDir.createSync();
|
| @@ -524,8 +537,7 @@ testCreateExistingSync() {
|
| testCreateExisting() {
|
| // Test that creating an existing directory succeeds.
|
| asyncStart();
|
| - var d = new Directory('');
|
| - d.createTemp().then((temp) {
|
| + Directory.createSystemTemp('dart_directory').then((temp) {
|
| var subDir = new Directory('${temp.path}/flaf');
|
| subDir.exists().then((dirExists) {
|
| Expect.isFalse(dirExists);
|
| @@ -549,8 +561,7 @@ testCreateExisting() {
|
|
|
| testCreateDirExistingFileSync() {
|
| // Test that creating an existing directory succeeds.
|
| - var d = new Directory('');
|
| - var temp = d.createTempSync();
|
| + var temp = Directory.createSystemTempSync('directory_test');
|
| var path = '${temp.path}/flaf';
|
| var file = new File(path);
|
| file.createSync();
|
| @@ -564,8 +575,7 @@ testCreateDirExistingFileSync() {
|
| testCreateDirExistingFile() {
|
| // Test that creating an existing directory succeeds.
|
| asyncStart();
|
| - var d = new Directory('');
|
| - d.createTemp().then((temp) {
|
| + Directory.createSystemTemp('dart_directory').then((temp) {
|
| var path = '${temp.path}/flaf';
|
| var file = new File(path);
|
| var subDir = new Directory(path);
|
| @@ -584,7 +594,7 @@ testCreateDirExistingFile() {
|
|
|
|
|
| testCreateRecursiveSync() {
|
| - var temp = new Directory('').createTempSync();
|
| + var temp = Directory.createSystemTempSync('directory_test');
|
| var d = new Directory('${temp.path}/a/b/c');
|
| d.createSync(recursive: true);
|
| Expect.isTrue(new Directory('${temp.path}/a').existsSync());
|
| @@ -596,7 +606,7 @@ testCreateRecursiveSync() {
|
|
|
| testCreateRecursive() {
|
| asyncStart();
|
| - new Directory('').createTemp().then((temp) {
|
| + Directory.createSystemTemp('dart_directory').then((temp) {
|
| var d = new Directory('${temp.path}/a/b/c');
|
| d.create(recursive: true).then((_) {
|
| Expect.isTrue(new Directory('${temp.path}/a').existsSync());
|
| @@ -610,9 +620,8 @@ testCreateRecursive() {
|
|
|
|
|
| testRename() {
|
| - var d = new Directory('');
|
| - var temp1 = d.createTempSync();
|
| - var temp2 = d.createTempSync();
|
| + var temp1 = Directory.createSystemTempSync('directory_test');
|
| + var temp2 = Directory.createSystemTempSync('directory_test');
|
| var temp3 = temp1.renameSync(temp2.path);
|
| Expect.isFalse(temp1.existsSync());
|
| Expect.isTrue(temp2.existsSync());
|
|
|