Make listDir always emit paths within the given directory.

utils/tests/pub/io_test.dart

Index: utils/tests/pub/io_test.dart
diff --git a/utils/tests/pub/io_test.dart b/utils/tests/pub/io_test.dart
new file mode 100644
index 0000000000000000000000000000000000000000..01b15907dd1bed3798baba55e0d07e8248212b9f
--- /dev/null
+++ b/utils/tests/pub/io_test.dart
@@ -0,0 +1,120 @@
+// 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.
+
+library io_test;
+
+import '../../../pkg/unittest/lib/unittest.dart';
+import '../../pub/io.dart';
+
+main() {
+  group('listDir', () {
+    test('lists a simple directory non-recursively', () {
+      expect(withTempDir((path) {
+        var future = writeTextFile(join(path, 'file1.txt'), '')
+            .chain((_) => writeTextFile(join(path, 'file2.txt'), ''))
+            .chain((_) => createDir(join(path, 'subdir')))
+            .chain((_) => writeTextFile(join(path, 'subdir', 'file3.txt'), ''))
+            .chain((_) => listDir(path));
+        expect(future, completion(unorderedEquals([
+          join(path, 'file1.txt'),
+          join(path, 'file2.txt'),
+          join(path, 'subdir')
+        ])));
+        return future;
+      }), completes);
+    });
+
+    test('lists a simple directory recursively', () {
+      expect(withTempDir((path) {
+        var future = writeTextFile(join(path, 'file1.txt'), '')
+            .chain((_) => writeTextFile(join(path, 'file2.txt'), ''))
+            .chain((_) => createDir(join(path, 'subdir')))
+            .chain((_) => writeTextFile(join(path, 'subdir', 'file3.txt'), ''))
+            .chain((_) => listDir(path, recursive: true));
+        expect(future, completion(unorderedEquals([
+          join(path, 'file1.txt'),
+          join(path, 'file2.txt'),
+          join(path, 'subdir'),
+          join(path, 'subdir/file3.txt'),
+        ])));
+        return future;
+      }), completes);
+    });
+
+    test('ignores hidden files by default', () {
+      expect(withTempDir((path) {
+        var future = writeTextFile(join(path, 'file1.txt'), '')
+            .chain((_) => writeTextFile(join(path, 'file2.txt'), ''))
+            .chain((_) => writeTextFile(join(path, '.file3.txt'), ''))
+            .chain((_) => createDir(join(path, '.subdir')))
+            .chain((_) => writeTextFile(join(path, '.subdir', 'file3.txt'), ''))
+            .chain((_) => listDir(path, recursive: true));
+        expect(future, completion(unorderedEquals([
+          join(path, 'file1.txt'),
+          join(path, 'file2.txt')
+        ])));
+        return future;
+      }), completes);
+    });
+
+    test('includes hidden files when told to', () {
+      expect(withTempDir((path) {
+        var future = writeTextFile(join(path, 'file1.txt'), '')
+            .chain((_) => writeTextFile(join(path, 'file2.txt'), ''))
+            .chain((_) => writeTextFile(join(path, '.file3.txt'), ''))
+            .chain((_) => createDir(join(path, '.subdir')))
+            .chain((_) => writeTextFile(join(path, '.subdir', 'file3.txt'), ''))
+            .chain((_) {
+              return listDir(path, recursive: true, includeHiddenFiles: true);
+            });
+        expect(future, completion(unorderedEquals([
+          join(path, 'file1.txt'),
+          join(path, 'file2.txt'),
+          join(path, '.file3.txt'),
+          join(path, '.subdir'),
+          join(path, '.subdir/file3.txt')
+        ])));
+        return future;
+      }), completes);
+    });
+
+    test('returns the unresolved paths for symlinks', () {
+      expect(withTempDir((path) {
+        var dirToList = join(path, 'dir-to-list');
+        var future = writeTextFile(join(path, 'file1.txt'), '')
+            .chain((_) => writeTextFile(join(path, 'file2.txt'), ''))
+            .chain((_) => createDir(dirToList))
+            .chain((_) {
+              return createSymlink(
+                  join(path, 'file1.txt'),
+                  join(dirToList, 'link1'));
+            }).chain((_) => createDir(join(dirToList, 'subdir')))
+            .chain((_) {
+              return createSymlink(
+                  join(path, 'file2.txt'),
+                  join(dirToList, 'subdir', 'link2'));
+            }).chain((_) => listDir(dirToList, recursive: true));
+        expect(future, completion(unorderedEquals([
+          join(dirToList, 'link1'),
+          join(dirToList, 'subdir'),
+          join(dirToList, 'subdir/link2'),
+        ])));
+        return future;
+      }), completes);
+    });
+
+    test('works with recursive symlinks', () {
+      expect(withTempDir((path) {
+        var future = writeTextFile(join(path, 'file1.txt'), '')
+            .chain((_) => createSymlink(path, join(path, 'linkdir')))
+            .chain((_) => listDir(path, recursive: true));
+        expect(future, completion(unorderedEquals([
+          join(path, 'file1.txt'),
+          join(path, 'linkdir')
+        ])));
+        return future;
+      }), completes);
+    });
+  });
+}