Support both new and old style package layouts.

utils/tests/pub/test_pub.dart

 // 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.
 
 /**
  * Test infrastructure for testing pub. Unlike typical unit tests, most pub
  * tests are integration tests that stage some stuff on the file system, run
  * pub, and then validate the results. This library provides an API to build
  * tests like that.
  */
@@ skipping 185 matching lines @@
         var versions = _servedPackages[name].getKeys();
         _servedPackageDir.contents.addAll([
           file('$name.json',
               JSON.stringify({'versions': versions})),
           dir(name, [
             dir('versions', flatten(versions.map((version) {
               return [
                 file('$version.yaml', _servedPackages[name][version]),
                 tar('$version.tar.gz', [
                   file('pubspec.yaml', _servedPackages[name][version]),
-                  file('$name.dart', 'main() => print("$name $version");')
+                  libDir(name, '$name $version')
                 ])
               ];
             })))
           ])
         ]);
       }
     });
   });
 }
 
@@ skipping 24 matching lines @@
 }
 
 /**
  * Describes a file named `pubspec.yaml` for a library package with the given
  * [name], [version], and [dependencies].
  */
 Descriptor libPubspec(String name, String version, [List dependencies]) =>
   pubspec(package(name, version, dependencies));
 
 /**
+ * Describes a directory named `lib` containing a single dart file named
+ * `<name>.dart` that contains a line of Dart code.
+ */
+Descriptor libDir(String name, [String code]) {
+  // Default to printing the name if no other code was given.
+  if (code == null) {
+    code = name;
+  }
+
+  return dir("lib", [
+    file("$name.dart", 'main() => "$code";')
+  ]);
+}
+
+/**
  * Describes a map representing a library package with the given [name],
  * [version], and [dependencies].
  */
 Map package(String name, String version, [List dependencies]) {
   var package = {"name": name, "version": version};
   if (dependencies != null) {
     package["dependencies"] = _dependencyListToMap(dependencies);
   }
   return package;
 }
 
 /**
  * Describes a map representing a dependency on a package in the package
  * repository.
  */
 Map dependency(String name, [String versionConstraint]) {
   var url = port.transform((p) => "http://localhost:$p");
   var dependency = {"hosted": {"name": name, "url": url}};
   if (versionConstraint != null) dependency["version"] = versionConstraint;
   return dependency;
 }
 
 /**
- * Describes a directory for a package installed from the mock package repo.
- * This directory is of the form found in the `packages/` directory.
- */
-DirectoryDescriptor packageDir(String name, String version) {
-  return dir(name, [
-    file("$name.dart", 'main() => print("$name $version");')
-  ]);
-}
-
-/**
  * Describes a directory for a package installed from the mock package server.
  * This directory is of the form found in the global package cache.
  */
 DirectoryDescriptor packageCacheDir(String name, String version) {
   return dir("$name-$version", [
-    file("$name.dart", 'main() => print("$name $version");')
+    libDir(name, '$name $version')
   ]);
 }
 
 /**
  * Describes a directory for a Git package. This directory is of the form found
  * in the revision cache of the global package cache.
  */
 DirectoryDescriptor gitPackageRevisionCacheDir(String name, [int modifier]) {
   var value = name;
   if (modifier != null) value = "$name $modifier";
   return dir(new RegExp("$name${@'-[a-f0-9]+'}"), [
-    file('$name.dart', 'main() => "$value";')
+    libDir(name, value)
   ]);
 }
 
 /**
  * Describes a directory for a Git package. This directory is of the form found
  * in the repo cache of the global package cache.
  */
 DirectoryDescriptor gitPackageRepoCacheDir(String name) {
   return dir(new RegExp("$name${@'-[a-f0-9]+'}"), [
     dir('branches'),
@@ skipping 10 matching lines @@
  * the format produced by the mock package server.
  *
  * A package with a null version should not be installed.
  */
 DirectoryDescriptor packagesDir(Map<String, String> packages) {
   var contents = <Descriptor>[];
   packages.forEach((name, version) {
     if (version == null) {
       contents.add(nothing(name));
     } else {
-      contents.add(packageDir(name, version));
+      contents.add(dir(name, [
+        file("$name.dart", 'main() => "$name $version";')
+      ]));
     }
   });
   return dir(packagesPath, contents);
 }
 
 /**
  * Describes the global package cache directory containing all the given
  * [packages], which should be name/version pairs. The packages will be
  * validated against the format produced by the mock package server.
  *
@@ skipping 772 matching lines @@
 }
 
 /**
  * Schedules a callback to be called after Pub is run with [runPub], even if it
  * fails.
  */
 void _scheduleCleanup(_ScheduledEvent event) {
   if (_scheduledCleanup == null) _scheduledCleanup = [];
   _scheduledCleanup.add(event);
 }