Fixes; remove test_package_small

Author: srawlins

lib/src/model/package_builder.dart

@@ -104,8 +104,8 @@ class PubPackageBuilder implements PackageBuilder {
     assert(_packageMap == null);
     _packageMap = <String, List<Folder>>{};
     Folder cwd = resourceProvider.getResource(config.inputDir);
-    var info =
-        await packageConfigProvider.findPackageConfigUri(Uri.file(cwd.path));
+    var info = await packageConfigProvider
+        .findPackageConfig(resourceProvider.getFolder(cwd.path));
     if (info == null) return;
 
     for (var package in info.packages) {
@@ -313,7 +313,7 @@ class PubPackageBuilder implements PackageBuilder {
 
     if (autoIncludeDependencies) {
       var info = await packageConfigProvider
-          .findPackageConfigUri(Uri.file(basePackageDir));
+          .findPackageConfig(resourceProvider.getFolder(basePackageDir));
       for (var package in info.packages) {
         if (!filterExcludes || !config.exclude.contains(package.name)) {
           packageDirs.add(

lib/src/package_config_provider.dart

@@ -3,31 +3,32 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:io' as io;
 
+import 'package:analyzer/file_system/file_system.dart';
 import 'package:package_config/package_config.dart' as package_config;
 
 abstract class PackageConfigProvider {
-  Future<package_config.PackageConfig> findPackageConfigUri(Uri location);
+  Future<package_config.PackageConfig> findPackageConfig(Folder dir);
 }
 
 class PhysicalPackageConfigProvider implements PackageConfigProvider {
   @override
-  Future<package_config.PackageConfig> findPackageConfigUri(Uri location) =>
-      package_config.findPackageConfigUri(location);
+  Future<package_config.PackageConfig> findPackageConfig(Folder dir) =>
+      package_config.findPackageConfig(io.Directory(dir.path));
 }
 
 class FakePackageConfigProvider implements PackageConfigProvider {
   /// A mapping of package config search locations to configured packages.
-  final _packageConfigData = <Uri, List<package_config.Package>>{};
+  final _packageConfigData = <String, List<package_config.Package>>{};
 
-  void addPackageToConfigFor(Uri location, String name, Uri root) {
+  void addPackageToConfigFor(String location, String name, Uri root) {
     _packageConfigData.putIfAbsent(location, () => []);
     _packageConfigData[location].add(package_config.Package(name, root));
   }
 
   @override
-  Future<package_config.PackageConfig> findPackageConfigUri(
-      Uri location) async {
-    return package_config.PackageConfig(_packageConfigData[location]);
+  Future<package_config.PackageConfig> findPackageConfig(Folder dir) async {
+    return package_config.PackageConfig(_packageConfigData[dir.path]);
   }
 }

test/end2end/dartdoc_test.dart

@@ -31,8 +31,6 @@ final Folder _testPackageBadDir = _getFolder('testing/test_package_bad');
 final Folder _testPackageMinimumDir =
     _getFolder('testing/test_package_minimum');
 final Folder _testSkyEnginePackage = _getFolder('testing/sky_engine');
-final Folder _testPackageWithNoReadme =
-    _getFolder('testing/test_package_small');
 final Folder _testPackageIncludeExclude =
     _getFolder('testing/test_package_include_exclude');
 final Folder _testPackageImportExportError =
@@ -332,19 +330,6 @@ void main() {
         skip: 'Blocked on getting analysis errors with correct interpretation'
             'from analysis_options');
 
-    test('generate docs for a package that does not have a readme', () async {
-      var dartdoc = await buildDartdoc([], _testPackageWithNoReadme, tempDir);
-
-      var results = await dartdoc.generateDocs();
-      expect(results.packageGraph, isNotNull);
-
-      var p = results.packageGraph;
-      expect(p.defaultPackage.name, 'test_package_small');
-      expect(p.defaultPackage.hasHomepage, isFalse);
-      expect(p.defaultPackage.hasDocumentationFile, isFalse);
-      expect(p.localPublicLibraries, hasLength(1));
-    });
-
     test('generate docs including a single library', () async {
       var dartdoc =
           await buildDartdoc(['--include', 'fake'], _testPackageDir, tempDir);

test/package_test.dart

@@ -53,7 +53,7 @@ name: $packageName
         .writeAsStringSync('');
     resourceProvider.getFolder(pathContext.join(projectRoot, 'lib')).create();
     packageConfigProvider.addPackageToConfigFor(
-        Uri.file(projectRoot), packageName, Uri.file('$projectRoot/'));
+        projectRoot, packageName, Uri.file('$projectRoot/'));
   }
 
   setUp(() async {
@@ -132,6 +132,22 @@ int x;
     expect(packageGraph.defaultPackage.documentation, isNull);
   });
 
+  test('package with no README has no homepage', () async {
+    writePackage();
+    resourceProvider
+        .getFile(
+            resourceProvider.pathContext.join(projectRoot, 'lib', 'a.dart'))
+        .writeAsStringSync('''
+/// Documentation comment.
+int x;
+''');
+    packageGraph = await utils.bootBasicPackage(
+        projectRoot, [], packageMetaProvider, packageConfigProvider);
+
+    expect(packageGraph.defaultPackage.hasHomepage, isFalse);
+    expect(packageGraph.localPublicLibraries, hasLength(1));
+  });
+
   test('package with no doc comments has no categories', () async {
     writePackage();
     resourceProvider