Allow DirectoryDescriptor.load to load a file next to a directory.

pkg/scheduled_test/test/descriptor/directory_test.dart

 // Copyright (c) 2013, 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.
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:pathos/path.dart' as path;
 import 'package:scheduled_test/descriptor.dart' as d;
 import 'package:scheduled_test/scheduled_test.dart';
@@ skipping 273 matching lines @@
           d.file('name.txt', 'subcontents')
         ]),
         d.file('name.txt', 'contents')
       ]);
 
       expect(byteStreamToString(dir.load('subdir/name.txt')),
           completion(equals('subcontents')));
     });
   });
 
-  expectTestsPass("directory().read() fails", () {
-    test('test', () {
-      var dir = d.dir('dir', [d.file('name.txt', 'contents')]);
-      expect(dir.read().toList(),
-          throwsA(equals("Can't read the contents of 'dir': is a directory.")));
-    });
-  });
-
   expectTestsPass("directory().load() fails to load a nested directory", () {
     test('test', () {
       var dir = d.dir('dir', [
         d.dir('subdir', [
           d.file('name.txt', 'subcontents')
         ]),
         d.file('name.txt', 'contents')
       ]);
 
       expect(dir.load('subdir').toList(),
-          throwsA(equals("Can't read the contents of 'subdir': is a "
-              "directory.")));
+          throwsA(equals("Couldn't find a readable entry named 'subdir' within "
+              "'dir'.")));
     });
   });
 
   expectTestsPass("directory().load() fails to load an absolute path", () {
     test('test', () {
       var dir = d.dir('dir', [d.file('name.txt', 'contents')]);
 
       expect(dir.load('/name.txt').toList(),
           throwsA(equals("Can't load absolute path '/name.txt'.")));
     });
@@ skipping 13 matching lines @@
           throwsA(equals("Can't load '' from within 'dir'.")));
     });
   });
 
   expectTestsPass("directory().load() fails to load a file that doesn't exist",
       () {
     test('test', () {
       var dir = d.dir('dir', [d.file('name.txt', 'contents')]);
 
       expect(dir.load('not-name.txt').toList(),
-          throwsA(equals("Couldn't find an entry named 'not-name.txt' within "
-              "'dir'.")));
+          throwsA(equals("Couldn't find a readable entry named 'not-name.txt' "
+              "within 'dir'.")));
     });
   });
 
   expectTestsPass("directory().load() fails to load a file that exists "
       "multiple times", () {
     test('test', () {
       var dir = d.dir('dir', [
         d.file('name.txt', 'contents'),
         d.file('name.txt', 'contents')
       ]);
 
       expect(dir.load('name.txt').toList(),
-          throwsA(equals("Found multiple entries named 'name.txt' within "
-              "'dir'.")));
+          throwsA(equals("Found multiple readable entries named 'name.txt' "
+              "within 'dir'.")));
     });
   });
 
+  expectTestsPass("directory().load() loads a file next to a directory with "

[Bob Nystrom, 2013/06/04 15:45:53]

"directory" -> "subdirectory"

[nweiz, 2013/06/04 18:26:45]

Done.

+      "the same name", () {
+    test('test', () {
+      var dir = d.dir('dir', [
+        d.file('name', 'contents'),
+        d.dir('name', [d.file('subfile', 'contents')])
+      ]);
+
+      expect(byteStreamToString(dir.load('name')),
+          completion(equals('contents')));
+    });
+  });
+
   expectTestsPass("directory().describe() lists the contents of the directory",
       () {
     test('test', () {
       var dir = d.dir('dir', [
         d.file('file1.txt', 'contents1'),
         d.file('file2.txt', 'contents2')
       ]);
 
       expect(dir.describe(), equals(
           "dir\n"
@@ skipping 29 matching lines @@
     });
   });
 
   expectTestsPass("directory().describe() with no contents returns the "
       "directory name", () {
     test('test', () {
       expect(d.dir('dir').describe(), equals('dir'));
     });
   });
 }