Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(854)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: utils/tests/pub/io_test.dart

Issue 13332009: Make listDir and createSymlink synchronous in pub. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Code review changes Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « utils/tests/pub/descriptor/tar.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: utils/tests/pub/io_test.dart
diff --git a/utils/tests/pub/io_test.dart b/utils/tests/pub/io_test.dart
index 585d068b2e1127db5bd4e7a70c0ee8cc01ebd786..a1825af54803782e7f9b703ff35ae68bfcc14087 100644
--- a/utils/tests/pub/io_test.dart
+++ b/utils/tests/pub/io_test.dart
@@ -19,120 +19,104 @@ main() {
group('listDir', () {
test('lists a simple directory non-recursively', () {
expect(withTempDir((temp) {
- var future = defer(() {
- writeTextFile(path.join(temp, 'file1.txt'), '');
- writeTextFile(path.join(temp, 'file2.txt'), '');
- createDir(path.join(temp, 'subdir'));
- writeTextFile(path.join(temp, 'subdir', 'file3.txt'), '');
- return listDir(temp);
- });
- expect(future, completion(unorderedEquals([
+ writeTextFile(path.join(temp, 'file1.txt'), '');
+ writeTextFile(path.join(temp, 'file2.txt'), '');
+ createDir(path.join(temp, 'subdir'));
+ writeTextFile(path.join(temp, 'subdir', 'file3.txt'), '');
+
+ expect(listDir(temp), unorderedEquals([
path.join(temp, 'file1.txt'),
path.join(temp, 'file2.txt'),
path.join(temp, 'subdir')
- ])));
- return future;
+ ]));
}), completes);
});
test('lists a simple directory recursively', () {
expect(withTempDir((temp) {
- var future = defer(() {
- writeTextFile(path.join(temp, 'file1.txt'), '');
- writeTextFile(path.join(temp, 'file2.txt'), '');
- createDir(path.join(temp, 'subdir'));
- writeTextFile(path.join(temp, 'subdir', 'file3.txt'), '');
- return listDir(temp, recursive: true);
- });
+ writeTextFile(path.join(temp, 'file1.txt'), '');
+ writeTextFile(path.join(temp, 'file2.txt'), '');
+ createDir(path.join(temp, 'subdir'));
+ writeTextFile(path.join(temp, 'subdir', 'file3.txt'), '');
- expect(future, completion(unorderedEquals([
+ expect(listDir(temp, recursive: true), unorderedEquals([
path.join(temp, 'file1.txt'),
path.join(temp, 'file2.txt'),
path.join(temp, 'subdir'),
path.join(temp, 'subdir', 'file3.txt'),
- ])));
- return future;
+ ]));
}), completes);
});
test('ignores hidden files by default', () {
expect(withTempDir((temp) {
- var future = defer(() {
- writeTextFile(path.join(temp, 'file1.txt'), '');
- writeTextFile(path.join(temp, 'file2.txt'), '');
- writeTextFile(path.join(temp, '.file3.txt'), '');
- createDir(path.join(temp, '.subdir'));
- writeTextFile(path.join(temp, '.subdir', 'file3.txt'), '');
- return listDir(temp, recursive: true);
- });
- expect(future, completion(unorderedEquals([
+ writeTextFile(path.join(temp, 'file1.txt'), '');
+ writeTextFile(path.join(temp, 'file2.txt'), '');
+ writeTextFile(path.join(temp, '.file3.txt'), '');
+ createDir(path.join(temp, '.subdir'));
+ writeTextFile(path.join(temp, '.subdir', 'file3.txt'), '');
+
+ expect(listDir(temp, recursive: true), unorderedEquals([
path.join(temp, 'file1.txt'),
path.join(temp, 'file2.txt')
- ])));
- return future;
+ ]));
}), completes);
});
test('includes hidden files when told to', () {
expect(withTempDir((temp) {
- var future = defer(() {
- writeTextFile(path.join(temp, 'file1.txt'), '');
- writeTextFile(path.join(temp, 'file2.txt'), '');
- writeTextFile(path.join(temp, '.file3.txt'), '');
- createDir(path.join(temp, '.subdir'));
- writeTextFile(path.join(temp, '.subdir', 'file3.txt'), '');
- return listDir(temp, recursive: true, includeHiddenFiles: true);
- });
- expect(future, completion(unorderedEquals([
+ writeTextFile(path.join(temp, 'file1.txt'), '');
+ writeTextFile(path.join(temp, 'file2.txt'), '');
+ writeTextFile(path.join(temp, '.file3.txt'), '');
+ createDir(path.join(temp, '.subdir'));
+ writeTextFile(path.join(temp, '.subdir', 'file3.txt'), '');
+
+ expect(listDir(temp, recursive: true, includeHiddenFiles: true),
+ unorderedEquals([
path.join(temp, 'file1.txt'),
path.join(temp, 'file2.txt'),
path.join(temp, '.file3.txt'),
path.join(temp, '.subdir'),
path.join(temp, '.subdir', 'file3.txt')
- ])));
- return future;
+ ]));
}), completes);
});
test('returns the unresolved paths for symlinks', () {
expect(withTempDir((temp) {
var dirToList = path.join(temp, 'dir-to-list');
- var future = defer(() {
- createDir(path.join(temp, 'dir1'));
- writeTextFile(path.join(temp, 'dir1', 'file1.txt'), '');
- createDir(path.join(temp, 'dir2'));
- writeTextFile(path.join(temp, 'dir2', 'file2.txt'), '');
- createDir(dirToList);
- return createSymlink(path.join(temp, 'dir1'),
- path.join(dirToList, 'linked-dir1'));
- }).then((_) {
- createDir(path.join(dirToList, 'subdir'));
- return createSymlink(
- path.join(temp, 'dir2'),
- path.join(dirToList, 'subdir', 'linked-dir2'));
- }).then((_) => listDir(dirToList, recursive: true));
- expect(future, completion(unorderedEquals([
+ createDir(path.join(temp, 'dir1'));
+ writeTextFile(path.join(temp, 'dir1', 'file1.txt'), '');
+ createDir(path.join(temp, 'dir2'));
+ writeTextFile(path.join(temp, 'dir2', 'file2.txt'), '');
+ createDir(dirToList);
+ createSymlink(
+ path.join(temp, 'dir1'),
+ path.join(dirToList, 'linked-dir1'));
+ createDir(path.join(dirToList, 'subdir'));
+ createSymlink(
+ path.join(temp, 'dir2'),
+ path.join(dirToList, 'subdir', 'linked-dir2'));
+
+ expect(listDir(dirToList, recursive: true), unorderedEquals([
path.join(dirToList, 'linked-dir1'),
path.join(dirToList, 'linked-dir1', 'file1.txt'),
path.join(dirToList, 'subdir'),
path.join(dirToList, 'subdir', 'linked-dir2'),
path.join(dirToList, 'subdir', 'linked-dir2', 'file2.txt'),
- ])));
- return future;
+ ]));
}), completes);
});
test('works with recursive symlinks', () {
expect(withTempDir((temp) {
- var future = defer(() {
- writeTextFile(path.join(temp, 'file1.txt'), '');
- return createSymlink(temp, path.join(temp, 'linkdir'));
- }).then((_) => listDir(temp, recursive: true));
- expect(future, completion(unorderedEquals([
+ writeTextFile(path.join(temp, 'file1.txt'), '');
+ createSymlink(temp, path.join(temp, 'linkdir'));
+
+ expect(listDir(temp, recursive: true), unorderedEquals([
path.join(temp, 'file1.txt'),
path.join(temp, 'linkdir')
- ])));
- return future;
+ ]));
}), completes);
});
});
@@ -209,9 +193,8 @@ void testExistencePredicate(String name, bool predicate(String path),
var targetPath = path.join(temp, "dir");
var symlinkPath = path.join(temp, "linkdir");
createDir(targetPath);
- return createSymlink(targetPath, symlinkPath).then((_) {
- expect(predicate(symlinkPath), equals(forDirectorySymlink));
- });
+ createSymlink(targetPath, symlinkPath);
+ expect(predicate(symlinkPath), equals(forDirectorySymlink));
}), completes);
});
@@ -222,12 +205,10 @@ void testExistencePredicate(String name, bool predicate(String path),
var symlink1Path = path.join(temp, "link1dir");
var symlink2Path = path.join(temp, "link2dir");
createDir(targetPath);
- return createSymlink(targetPath, symlink1Path)
- .then((_) => createSymlink(symlink1Path, symlink2Path))
- .then((_) {
- expect(predicate(symlink2Path),
+ createSymlink(targetPath, symlink1Path);
+ createSymlink(symlink1Path, symlink2Path);
+ expect(predicate(symlink2Path),
equals(forMultiLevelDirectorySymlink));
- });
}), completes);
});
@@ -236,10 +217,9 @@ void testExistencePredicate(String name, bool predicate(String path),
var targetPath = path.join(temp, "dir");
var symlinkPath = path.join(temp, "linkdir");
createDir(targetPath);
- return createSymlink(targetPath, symlinkPath).then((_) {
- deleteEntry(targetPath);
- expect(predicate(symlinkPath), equals(forBrokenSymlink));
- });
+ createSymlink(targetPath, symlinkPath);
+ deleteEntry(targetPath);
+ expect(predicate(symlinkPath), equals(forBrokenSymlink));
}), completes);
});
@@ -250,12 +230,10 @@ void testExistencePredicate(String name, bool predicate(String path),
var symlink1Path = path.join(temp, "link1dir");
var symlink2Path = path.join(temp, "link2dir");
createDir(targetPath);
- return createSymlink(targetPath, symlink1Path)
- .then((_) => createSymlink(symlink1Path, symlink2Path))
- .then((_) {
- deleteEntry(targetPath);
- expect(predicate(symlink2Path), equals(forMultiLevelBrokenSymlink));
- });
+ createSymlink(targetPath, symlink1Path);
+ createSymlink(symlink1Path, symlink2Path);
+ deleteEntry(targetPath);
+ expect(predicate(symlink2Path), equals(forMultiLevelBrokenSymlink));
}), completes);
});
@@ -266,9 +244,8 @@ void testExistencePredicate(String name, bool predicate(String path),
var targetPath = path.join(temp, "test.txt");
var symlinkPath = path.join(temp, "link.txt");
writeTextFile(targetPath, "contents");
- return createSymlink(targetPath, symlinkPath).then((_) {
- expect(predicate(symlinkPath), equals(forFileSymlink));
- });
+ createSymlink(targetPath, symlinkPath);
+ expect(predicate(symlinkPath), equals(forFileSymlink));
}), completes);
});
@@ -279,11 +256,9 @@ void testExistencePredicate(String name, bool predicate(String path),
var symlink1Path = path.join(temp, "link1.txt");
var symlink2Path = path.join(temp, "link2.txt");
writeTextFile(targetPath, "contents");
- return createSymlink(targetPath, symlink1Path)
- .then((_) => createSymlink(symlink1Path, symlink2Path))
- .then((_) {
- expect(predicate(symlink2Path), equals(forMultiLevelFileSymlink));
- });
+ createSymlink(targetPath, symlink1Path);
+ createSymlink(symlink1Path, symlink2Path);
+ expect(predicate(symlink2Path), equals(forMultiLevelFileSymlink));
}), completes);
});
}
« no previous file with comments | « utils/tests/pub/descriptor/tar.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698