Reverting 11266

utils/tests/pub/pub_test.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.
 
 #library('pub_tests');
 
 #import('dart:io');
 
 #import('test_pub.dart');
 #import('../../../pkg/unittest/unittest.dart');
@@ skipping 75 matching lines @@
           ''');
     });
   });
   */
 }
 
 installCommand() {
   test('checks out a package from the SDK', () {
     dir(sdkPath, [
       file('revision', '1234'),
-      dir('pkg', [packageDir("foo", "0.0.1234")])
+      dir('pkg', [
+        dir('foo', [
+          file('foo.dart', 'main() => "foo";')
+        ])
+      ])
     ]).scheduleCreate();
 
     dir(appPath, [
-      pubspec({"dependencies": {"foo": null}})
+      file('pubspec.yaml', 'dependencies:\n  foo:')
     ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: '''
         Dependencies installed!
         ''');
 
-    packagesDir({"foo": "0.0.1234"}).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo";')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 
   test('checks out a package from Git', () {
     ensureGit();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo";')
     ]).scheduleCreate();
 
-    appDir([{"git": "../foo.git"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(cachePath, [
       dir('git', [
-        dir('cache', [gitPackageCacheDir('foo')]),
-        gitPackageCacheDir('foo')
+        dir('cache', [
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo";')
+          ])
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ])
       ])
     ]).scheduleValidate();
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo";')
       ])
     ]).scheduleValidate();
 
     run();
   });
 
   test('checks out packages transitively from Git', () {
     ensureGit();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo";'),
-      appPubspec([{"git": "../bar.git"}])
+      file('pubspec.yaml', '''
+dependencies:
+  bar:
+    git: ../bar.git
+''')
     ]).scheduleCreate();
 
     git('bar.git', [
       file('bar.dart', 'main() => "bar";')
     ]).scheduleCreate();
 
-    appDir([{"git": "../foo.git"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp("Dependencies installed!\$"));
 
     dir(cachePath, [
       dir('git', [
         dir('cache', [
-          gitPackageCacheDir('foo'),
-          gitPackageCacheDir('bar')
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo";')
+          ]),
+          dir(new RegExp(@'bar-[a-f0-9]+'), [
+            file('bar.dart', 'main() => "bar";')
+          ])
         ]),
-        gitPackageCacheDir('foo'),
-        gitPackageCacheDir('bar')
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ]),
+        dir(new RegExp(@'bar-[a-f0-9]+'), [
+          file('bar.dart', 'main() => "bar";')
+        ])
       ])
     ]).scheduleValidate();
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo";')
       ]),
       dir('bar', [
         file('bar.dart', 'main() => "bar";')
       ])
     ]).scheduleValidate();
 
     run();
   });
 
   test('checks out and updates a package from Git', () {
     ensureGit();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo";')
     ]).scheduleCreate();
 
-    appDir([{"git": "../foo.git"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(cachePath, [
       dir('git', [
-        dir('cache', [gitPackageCacheDir('foo')]),
-        gitPackageCacheDir('foo')
+        dir('cache', [
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo";')
+          ])
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ])
       ])
     ]).scheduleValidate();
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo";')
       ])
     ]).scheduleValidate();
 
     // TODO(nweiz): remove this once we support pub update
     dir(packagesPath).scheduleDelete();
     file('$appPath/pubspec.lock', '').scheduleDelete();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo 2";')
     ]).scheduleCommit();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     // When we download a new version of the git package, we should re-use the
     // git/cache directory but create a new git/ directory.
     dir(cachePath, [
       dir('git', [
-        dir('cache', [gitPackageCacheDir('foo', 2)]),
-        gitPackageCacheDir('foo'),
-        gitPackageCacheDir('foo', 2)
+        dir('cache', [
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo 2";')
+          ])
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo 2";')
+        ])
       ])
     ]).scheduleValidate();
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo 2";')
       ])
     ]).scheduleValidate();
 
     run();
   });
 
   test('checks out a package from Git twice', () {
     ensureGit();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo";')
     ]).scheduleCreate();
 
-    appDir([{"git": "../foo.git"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(cachePath, [
       dir('git', [
-        dir('cache', [gitPackageCacheDir('foo')]),
-        gitPackageCacheDir('foo')
+        dir('cache', [
+          dir(new RegExp(@'foo-[a-f0-9]+'), [
+            file('foo.dart', 'main() => "foo";')
+          ])
+        ]),
+        dir(new RegExp(@'foo-[a-f0-9]+'), [
+          file('foo.dart', 'main() => "foo";')
+        ])
       ])
     ]).scheduleValidate();
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo";')
       ])
     ]).scheduleValidate();
 
     // TODO(nweiz): remove this once we support pub update
     dir(packagesPath).scheduleDelete();
 
     // Verify that nothing breaks if we install a Git revision that's already
     // in the cache.
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     run();
   });
 
   test('checks out a package at a specific revision from Git', () {
     ensureGit();
 
     var repo = git('foo.git', [
       file('foo.dart', 'main() => "foo 1";')
     ]);
     repo.scheduleCreate();
-    var commit = repo.revParse('HEAD');
+    var commitFuture = repo.revParse('HEAD');
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo 2";')
     ]).scheduleCommit();
 
-    appDir([{"git": {"url": "../foo.git", "ref": commit}}]).scheduleCreate();
+    dir(appPath, [
+      async(commitFuture.transform((commit) {
+        return file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git:
+      url: ../foo.git
+      ref: $commit
+''');
+      }))
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo 1";')
       ])
     ]).scheduleValidate();
 
     run();
   });
 
   test('checks out a package from a pub server', () {
-    servePackages("localhost", 3123, [package("foo", "1.2.3")]);
-
-    appDir([dependency("foo", "1.2.3")]).scheduleCreate();
+    servePackages("localhost", 3123, ['{name: foo, version: 1.2.3}']);
+
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo:
+      name: foo
+      url: http://localhost:3123
+    version: 1.2.3
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp("Dependencies installed!\$"));
 
-    cacheDir({"foo": "1.2.3"}).scheduleValidate();
-    packagesDir({"foo": "1.2.3"}).scheduleValidate();
+    dir(cachePath, [
+      dir('repo', [
+        dir('localhost%583123', [
+          dir('foo-1.2.3', [
+            file('pubspec.yaml', '{name: foo, version: 1.2.3}'),
+            file('foo.dart', 'main() => print("foo 1.2.3");')
+          ])
+        ])
+      ])
+    ]).scheduleValidate();
+
+    dir(packagesPath, [
+      dir('foo', [
+        file('pubspec.yaml', '{name: foo, version: 1.2.3}'),
+        file('foo.dart', 'main() => print("foo 1.2.3");')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 
   test('checks out packages transitively from a pub server', () {
     servePackages("localhost", 3123, [
-      package("foo", "1.2.3", [dependency("bar", "2.0.4")]),
-      package("bar", "2.0.3"),
-      package("bar", "2.0.4"),
-      package("bar", "2.0.5")
+      '''
+name: foo
+version: 1.2.3
+dependencies:
+  bar:
+    repo: {name: bar, url: http://localhost:3123}
+    version: 2.0.4
+''',
+      '{name: bar, version: 2.0.3}',
+      '{name: bar, version: 2.0.4}',
+      '{name: bar, version: 2.0.5}',
     ]);
 
-    appDir([dependency("foo", "1.2.3")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo:
+      name: foo
+      url: http://localhost:3123
+    version: 1.2.3
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp("Dependencies installed!\$"));
 
-    cacheDir({"foo": "1.2.3", "bar": "2.0.4"}).scheduleValidate();
-    packagesDir({"foo": "1.2.3", "bar": "2.0.4"}).scheduleValidate();
+    dir(cachePath, [
+      dir('repo', [
+        dir('localhost%583123', [
+          dir('foo-1.2.3', [
+            file('pubspec.yaml', '''
+name: foo
+version: 1.2.3
+dependencies:
+  bar:
+    repo: {name: bar, url: http://localhost:3123}
+    version: 2.0.4
+'''),
+            file('foo.dart', 'main() => print("foo 1.2.3");')
+          ]),
+          dir('bar-2.0.4', [
+            file('pubspec.yaml', '{name: bar, version: 2.0.4}'),
+            file('bar.dart', 'main() => print("bar 2.0.4");')
+          ])
+        ])
+      ])
+    ]).scheduleValidate();
+
+    dir(packagesPath, [
+      dir('foo', [
+            file('pubspec.yaml', '''
+name: foo
+version: 1.2.3
+dependencies:
+  bar:
+    repo: {name: bar, url: http://localhost:3123}
+    version: 2.0.4
+'''),
+        file('foo.dart', 'main() => print("foo 1.2.3");')
+      ]),
+      dir('bar', [
+        file('pubspec.yaml', '{name: bar, version: 2.0.4}'),
+        file('bar.dart', 'main() => print("bar 2.0.4");')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 
   test('resolves version constraints from a pub server', () {
     servePackages("localhost", 3123, [
-      package("foo", "1.2.3", [dependency("baz", ">=2.0.0")]),
-      package("bar", "2.3.4", [dependency("baz", "<3.0.0")]),
-      package("baz", "2.0.3"),
-      package("baz", "2.0.4"),
-      package("baz", "3.0.1")
+      '''
+name: foo
+version: 1.2.3
+dependencies:
+  baz:
+    repo: {name: baz, url: http://localhost:3123}
+    version: ">=2.0.0"
+''',
+      '''
+name: bar
+version: 2.3.4
+dependencies:
+  baz:
+    repo: {name: baz, url: http://localhost:3123}
+    version: "<3.0.0"
+''',
+      '{name: baz, version: 2.0.3}',
+      '{name: baz, version: 2.0.4}',
+      '{name: baz, version: 3.0.1}',
     ]);
 
-    appDir([dependency("foo"), dependency("bar")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo: {repo: {name: foo, url: http://localhost:3123}}
+  bar: {repo: {name: bar, url: http://localhost:3123}}
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp("Dependencies installed!\$"));
 
-    cacheDir({
-      "foo": "1.2.3",
-      "bar": "2.3.4",
-      "baz": "2.0.4"
-    }).scheduleValidate();
-
-    packagesDir({
-      "foo": "1.2.3",
-      "bar": "2.3.4",
-      "baz": "2.0.4"
-    }).scheduleValidate();
+    dir(cachePath, [
+      dir('repo', [
+        dir('localhost%583123', [
+          dir('foo-1.2.3', [
+            file('pubspec.yaml', '''
+name: foo
+version: 1.2.3
+dependencies:
+  baz:
+    repo: {name: baz, url: http://localhost:3123}
+    version: ">=2.0.0"
+'''),
+            file('foo.dart', 'main() => print("foo 1.2.3");')
+          ]),
+          dir('bar-2.3.4', [
+            file('pubspec.yaml', '''
+name: bar
+version: 2.3.4
+dependencies:
+  baz:
+    repo: {name: baz, url: http://localhost:3123}
+    version: "<3.0.0"
+'''),
+            file('bar.dart', 'main() => print("bar 2.3.4");')
+          ]),
+          dir('baz-2.0.4', [
+            file('pubspec.yaml', '{name: baz, version: 2.0.4}'),
+            file('baz.dart', 'main() => print("baz 2.0.4");')
+          ])
+        ])
+      ])
+    ]).scheduleValidate();
+
+    dir(packagesPath, [
+      dir('foo', [
+        file('pubspec.yaml', '''
+name: foo
+version: 1.2.3
+dependencies:
+  baz:
+    repo: {name: baz, url: http://localhost:3123}
+    version: ">=2.0.0"
+'''),
+        file('foo.dart', 'main() => print("foo 1.2.3");')
+      ]),
+      dir('bar', [
+        file('pubspec.yaml', '''
+name: bar
+version: 2.3.4
+dependencies:
+  baz:
+    repo: {name: baz, url: http://localhost:3123}
+    version: "<3.0.0"
+'''),
+        file('bar.dart', 'main() => print("bar 2.3.4");')
+      ]),
+      dir('baz', [
+        file('pubspec.yaml', '{name: baz, version: 2.0.4}'),
+        file('baz.dart', 'main() => print("baz 2.0.4");')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 
   test('keeps a Git package locked to the version in the lockfile', () {
     ensureGit();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo";')
     ]).scheduleCreate();
 
-    appDir([{"git": "../foo.git"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
 
     // This install should lock the foo.git dependency to the current revision.
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo";')
       ])
     ]).scheduleValidate();
@@ skipping 18 matching lines @@
     run();
   });
 
   test('updates a locked Git package with a new incompatible constraint', () {
     ensureGit();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo";')
     ]).scheduleCreate();
 
-    appDir([{"git": "../foo.git"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo";')
       ])
     ]).scheduleValidate();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo 1.0.0";'),
-      libPubspec("foo", "1.0.0")
+      file('pubspec.yaml', 'version: 1.0.0')
     ]).scheduleCommit();
 
-    appDir([{"git": "../foo.git", "version": ">=1.0.0"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+    version: ">=1.0.0"
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo 1.0.0";')
       ])
     ]).scheduleValidate();
 
     run();
   });
 
   test("doesn't update a locked Git package with a new compatible "
       "constraint", () {
     ensureGit();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo 1.0.0";'),
-      libPubspec("foo", "1.0.0")
+      file('pubspec.yaml', 'version: 1.0.0')
     ]).scheduleCreate();
 
-    appDir([{"git": "../foo.git"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo 1.0.0";')
       ])
     ]).scheduleValidate();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo 1.0.1";'),
-      libPubspec("foo", "1.0.1")
+      file('pubspec.yaml', 'version: 1.0.1')
     ]).scheduleCommit();
 
-    appDir([{"git": "../foo.git", "version": ">=1.0.0"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+    version: ">=1.0.0"
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo 1.0.0";')
       ])
     ]).scheduleValidate();
 
     run();
   });
 
   test('keeps a pub server package locked to the version in the lockfile', () {
-    servePackages("localhost", 3123, [package("foo", "1.0.0")]);
+    servePackages("localhost", 3123, ['{name: foo, version: 1.0.0}']);
 
-    appDir([dependency("foo")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+''')
+    ]).scheduleCreate();
 
     // This install should lock the foo dependency to version 1.0.0.
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({"foo": "1.0.0"}).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.0");')
+      ])
+    ]).scheduleValidate();
 
     // Delete the packages path to simulate a new checkout of the application.
     dir(packagesPath).scheduleDelete();
 
     // Start serving a newer package as well.
     servePackages("localhost", 3123, [
-      package("foo", "1.0.0"),
-      package("foo", "1.0.1")
+      '{name: foo, version: 1.0.0}',
+      '{name: foo, version: 1.0.1}'
     ]);
 
     // This install shouldn't update the foo dependency due to the lockfile.
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({"foo": "1.0.0"}).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.0");')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 
   test('updates a locked pub server package with a new incompatible '
       'constraint', () {
-    servePackages("localhost", 3123, [package("foo", "1.0.0")]);
+    servePackages("localhost", 3123, ['{name: foo, version: 1.0.0}']);
 
-    appDir([dependency("foo")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({"foo": "1.0.0"}).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.0");')
+      ])
+    ]).scheduleValidate();
 
     servePackages("localhost", 3123, [
-      package("foo", "1.0.0"),
-      package("foo", "1.0.1")
+      '{name: foo, version: 1.0.0}',
+      '{name: foo, version: 1.0.1}'
     ]);
 
-    appDir([dependency("foo", ">1.0.0")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+    version: ">1.0.0"
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({"foo": "1.0.1"}).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.1");')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 
   test("doesn't update a locked pub server package with a new compatible "
       "constraint", () {
-    servePackages("localhost", 3123, [package("foo", "1.0.0")]);
+    servePackages("localhost", 3123, ['{name: foo, version: 1.0.0}']);
 
-    appDir([dependency("foo")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({"foo": "1.0.0"}).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.0");')
+      ])
+    ]).scheduleValidate();
 
     servePackages("localhost", 3123, [
-      package("foo", "1.0.0"),
-      package("foo", "1.0.1")
+      '{name: foo, version: 1.0.0}',
+      '{name: foo, version: 1.0.1}'
     ]);
 
-    appDir([dependency("foo", ">=1.0.0")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+    version: ">=1.0.0"
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({"foo": "1.0.0"}).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.0");')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 
   test("unlocks dependencies if necessary to ensure that a new dependency "
       "is satisfied", () {
     servePackages("localhost", 3123, [
-      package("foo", "1.0.0", [dependency("bar", "<2.0.0")]),
-      package("bar", "1.0.0", [dependency("baz", "<2.0.0")]),
-      package("baz", "1.0.0", [dependency("qux", "<2.0.0")]),
-      package("qux", "1.0.0")
-    ]);
+      '''
+name: foo
+version: 1.0.0
+dependencies:
+  bar:
+    version: "<2.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+      '''
+name: bar
+version: 1.0.0
+dependencies:
+  baz:
+    version: "<2.0.0"
+    repo: {name: baz, url: http://localhost:3123}
+''',
+      '''
+name: baz
+version: 1.0.0
+dependencies:
+  qux:
+    version: "<2.0.0"
+    repo: {name: qux, url: http://localhost:3123}
+''',
+    '''
+name: qux
+version: 1.0.0
+''']);
 
-    appDir([dependency("foo")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({
-      "foo": "1.0.0",
-      "bar": "1.0.0",
-      "baz": "1.0.0",
-      "qux": "1.0.0"
-    }).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.0");')
+      ]),
+      dir('bar', [
+        file('bar.dart', 'main() => print("bar 1.0.0");')
+      ]),
+      dir('baz', [
+        file('baz.dart', 'main() => print("baz 1.0.0");')
+      ]),
+      dir('qux', [
+        file('qux.dart', 'main() => print("qux 1.0.0");')
+      ])
+    ]).scheduleValidate();
 
     servePackages("localhost", 3123, [
-      package("foo", "1.0.0", [dependency("bar", "<2.0.0")]),
-      package("foo", "2.0.0", [dependency("bar", "<3.0.0")]),
+      '''
+name: foo
+version: 1.0.0
+dependencies:
+  bar:
+    version: "<2.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+      '''
+name: foo
+version: 2.0.0
+dependencies:
+  bar:
+    version: "<3.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+      '''
+name: bar
+version: 1.0.0
+dependencies:
+  baz:
+    version: "<2.0.0"
+    repo: {name: baz, url: http://localhost:3123}
+''',
+      '''
+name: bar
+version: 2.0.0
+dependencies:
+  baz:
+    version: "<3.0.0"
+    repo: {name: baz, url: http://localhost:3123}
+''',
+      '''
+name: baz
+version: 1.0.0
+dependencies:
+  qux:
+    version: "<2.0.0"
+    repo: {name: qux, url: http://localhost:3123}
+''',
+      '''
+name: baz
+version: 2.0.0
+dependencies:
+  qux:
+    version: "<3.0.0"
+    repo: {name: qux, url: http://localhost:3123}
+''',
+    '''
+name: qux
+version: 1.0.0
+''',
+    '''
+name: qux
+version: 2.0.0
+''',
+    '''
+name: newdep
+version: 2.0.0
+dependencies:
+  baz:
+    version: ">=1.5.0"
+    repo: {name: baz, url: http://localhost:3123}
+''']);
 
-      package("bar", "1.0.0", [dependency("baz", "<2.0.0")]),
-      package("bar", "2.0.0", [dependency("baz", "<3.0.0")]),
-
-      package("baz", "1.0.0", [dependency("qux", "<2.0.0")]),
-      package("baz", "2.0.0", [dependency("qux", "<3.0.0")]),
-
-      package("qux", "1.0.0"),
-      package("qux", "2.0.0"),
-
-      package("newdep", "2.0.0", [dependency("baz", ">=1.5.0")])
-    ]);
-
-    appDir([dependency("foo"), dependency("newdep")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+  newdep:
+    repo: {name: newdep, url: http://localhost:3123}
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({
-      "foo": "2.0.0",
-      "bar": "2.0.0",
-      "baz": "2.0.0",
-      "qux": "1.0.0",
-      "newdep": "2.0.0"
-    }).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 2.0.0");')
+      ]),
+      dir('bar', [
+        file('bar.dart', 'main() => print("bar 2.0.0");')
+      ]),
+      dir('baz', [
+        file('baz.dart', 'main() => print("baz 2.0.0");')
+      ]),
+      dir('qux', [
+        file('qux.dart', 'main() => print("qux 1.0.0");')
+      ]),
+      dir('newdep', [
+        file('newdep.dart', 'main() => print("newdep 2.0.0");')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 
   test("doesn't unlock dependencies if a new dependency is already "
       "satisfied", () {
     servePackages("localhost", 3123, [
-      package("foo", "1.0.0", [dependency("bar", "<2.0.0")]),
-      package("bar", "1.0.0", [dependency("baz", "<2.0.0")]),
-      package("baz", "1.0.0")
-    ]);
+      '''
+name: foo
+version: 1.0.0
+dependencies:
+  bar:
+    version: "<2.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+      '''
+name: bar
+version: 1.0.0
+dependencies:
+  baz:
+    version: "<2.0.0"
+    repo: {name: baz, url: http://localhost:3123}
+''',
+    '''
+name: baz
+version: 1.0.0
+''']);
 
-    appDir([dependency("foo")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({
-      "foo": "1.0.0",
-      "bar": "1.0.0",
-      "baz": "1.0.0"
-    }).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.0");')
+      ]),
+      dir('bar', [
+        file('bar.dart', 'main() => print("bar 1.0.0");')
+      ]),
+      dir('baz', [
+        file('baz.dart', 'main() => print("baz 1.0.0");')
+      ])
+    ]).scheduleValidate();
 
     servePackages("localhost", 3123, [
-      package("foo", "1.0.0", [dependency("bar", "<2.0.0")]),
-      package("foo", "2.0.0", [dependency("bar", "<3.0.0")]),
+      '''
+name: foo
+version: 1.0.0
+dependencies:
+  bar:
+    version: "<2.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+      '''
+name: foo
+version: 2.0.0
+dependencies:
+  bar:
+    version: "<3.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+      '''
+name: bar
+version: 1.0.0
+dependencies:
+  baz:
+    version: "<2.0.0"
+    repo: {name: baz, url: http://localhost:3123}
+''',
+      '''
+name: bar
+version: 2.0.0
+dependencies:
+  baz:
+    version: "<3.0.0"
+    repo: {name: baz, url: http://localhost:3123}
+''',
+      '''
+name: baz
+version: 1.0.0
+''',
+      '''
+name: baz
+version: 2.0.0
+''',
+    '''
+name: newdep
+version: 2.0.0
+dependencies:
+  baz:
+    version: ">=1.0.0"
+    repo: {name: baz, url: http://localhost:3123}
+''']);
 
-      package("bar", "1.0.0", [dependency("baz", "<2.0.0")]),
-      package("bar", "2.0.0", [dependency("baz", "<3.0.0")]),
-
-      package("baz", "1.0.0"),
-      package("baz", "2.0.0"),
-
-      package("newdep", "2.0.0", [dependency("baz", ">=1.0.0")])
-    ]);
-
-    appDir([dependency("foo"), dependency("newdep")]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+  newdep:
+    repo: {name: newdep, url: http://localhost:3123}
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
-    packagesDir({
-      "foo": "1.0.0",
-      "bar": "1.0.0",
-      "baz": "1.0.0",
-      "newdep": "2.0.0"
-    }).scheduleValidate();
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => print("foo 1.0.0");')
+      ]),
+      dir('bar', [
+        file('bar.dart', 'main() => print("bar 1.0.0");')
+      ]),
+      dir('baz', [
+        file('baz.dart', 'main() => print("baz 1.0.0");')
+      ]),
+      dir('newdep', [
+        file('newdep.dart', 'main() => print("newdep 2.0.0");')
+      ])
+    ]).scheduleValidate();
 
     run();
   });
 }
 
 updateCommand() {
   test("updates locked Git packages", () {
     ensureGit();
 
     git('foo.git', [
       file('foo.dart', 'main() => "foo";')
     ]).scheduleCreate();
 
     git('bar.git', [
       file('bar.dart', 'main() => "bar";')
     ]).scheduleCreate();
 
-    appDir([{"git": "../foo.git"}, {"git": "../bar.git"}]).scheduleCreate();
+    dir(appPath, [
+      file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+  bar:
+    git: ../bar.git
+''')
+    ]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: const RegExp(@"Dependencies installed!$"));
 
     dir(packagesPath, [
       dir('foo', [
         file('foo.dart', 'main() => "foo";')
       ]),
       dir('bar', [
         file('bar.dart', 'main() => "bar";')
@@ skipping 28 matching lines @@
       ensureGit();
 
       git('foo.git', [
         file('foo.dart', 'main() => "foo";')
       ]).scheduleCreate();
 
       git('bar.git', [
         file('bar.dart', 'main() => "bar";')
       ]).scheduleCreate();
 
-      appDir([{"git": "../foo.git"}, {"git": "../bar.git"}]).scheduleCreate();
+      dir(appPath, [
+        file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+  bar:
+    git: ../bar.git
+''')
+      ]).scheduleCreate();
 
       schedulePub(args: ['install'],
           output: const RegExp(@"Dependencies installed!$"));
 
       dir(packagesPath, [
         dir('foo', [
           file('foo.dart', 'main() => "foo";')
         ]),
         dir('bar', [
           file('bar.dart', 'main() => "bar";')
@@ skipping 22 matching lines @@
 
       run();
     });
 
     test("doesn't update one locked Git package's dependencies if it's not "
         "necessary", () {
       ensureGit();
 
       git('foo.git', [
         file('foo.dart', 'main() => "foo";'),
-        libPubspec("foo", "1.0.0", [{"git": "../foo-dep.git"}])
+        file('pubspec.yaml', '''
+dependencies:
+  foo-dep:
+    git: ../foo-dep.git
+''')
       ]).scheduleCreate();
 
       git('foo-dep.git', [
-        file('foo-dep.dart', 'main() => "foo-dep";'),
+        file('foo-dep.dart', 'main() => "foo-dep";')
       ]).scheduleCreate();
 
-      appDir([{"git": "../foo.git"}]).scheduleCreate();
+      dir(appPath, [
+        file('pubspec.yaml', '''
+dependencies:
+  foo:
+    git: ../foo.git
+''')
+      ]).scheduleCreate();
 
       schedulePub(args: ['install'],
           output: const RegExp(@"Dependencies installed!$"));
 
       dir(packagesPath, [
         dir('foo', [
           file('foo.dart', 'main() => "foo";'),
-          libPubspec("foo", "1.0.0", [{"git": "../foo-dep.git"}])
+          file('pubspec.yaml', '''
+dependencies:
+  foo-dep:
+    git: ../foo-dep.git
+''')
         ]),
         dir('foo-dep', [
           file('foo-dep.dart', 'main() => "foo-dep";')
         ])
       ]).scheduleValidate();
 
       git('foo.git', [
         file('foo.dart', 'main() => "foo 2";'),
-        libPubspec("foo", "1.0.0", [{"git": "../foo-dep.git"}])
+        file('pubspec.yaml', '''
+dependencies:
+  foo-dep:
+    git: ../foo-dep.git
+''')
       ]).scheduleCreate();
 
       git('foo-dep.git', [
         file('foo-dep.dart', 'main() => "foo-dep 2";')
       ]).scheduleCommit();
 
       schedulePub(args: ['update', 'foo'],
           output: const RegExp(@"Dependencies updated!$"));
 
       dir(packagesPath, [
         dir('foo', [
           file('foo.dart', 'main() => "foo 2";'),
-          libPubspec("foo", "1.0.0", [{"git": "../foo-dep.git"}])
+          file('pubspec.yaml', '''
+dependencies:
+  foo-dep:
+    git: ../foo-dep.git
+''')
         ]),
         dir('foo-dep', [
           file('foo-dep.dart', 'main() => "foo-dep";')
         ]),
       ]).scheduleValidate();
 
       run();
     });
 
     test("updates one locked pub server package's dependencies if it's "
         "necessary", () {
       servePackages("localhost", 3123, [
-        package("foo", "1.0.0", [dependency("foo-dep")]),
-        package("foo-dep", "1.0.0")
+        '''
+name: foo
+version: 1.0.0
+dependencies:
+  foo-dep:
+    repo:
+      name: foo-dep
+      url: http://localhost:3123
+''',
+        '{name: foo-dep, version: 1.0.0}'
       ]);
 
-      appDir([dependency("foo")]).scheduleCreate();
+      dir(appPath, [
+        file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo:
+      name: foo
+      url: http://localhost:3123
+''')
+      ]).scheduleCreate();
 
       schedulePub(args: ['install'],
           output: const RegExp(@"Dependencies installed!$"));
 
-      packagesDir({
-        "foo": "1.0.0",
-        "foo-dep": "1.0.0"
-      }).scheduleValidate();
+      dir(packagesPath, [
+        dir('foo', [
+          file('foo.dart', 'main() => print("foo 1.0.0");'),
+          file('pubspec.yaml', '''
+name: foo
+version: 1.0.0
+dependencies:
+  foo-dep:
+    repo:
+      name: foo-dep
+      url: http://localhost:3123
+''')
+        ]),
+        dir('foo-dep', [
+          file('foo-dep.dart', 'main() => print("foo-dep 1.0.0");')
+        ])
+      ]).scheduleValidate();
 
       servePackages("localhost", 3123, [
-        package("foo", "2.0.0", [dependency("foo-dep", ">1.0.0")]),
-        package("foo-dep", "2.0.0")
+        '''
+name: foo
+version: 2.0.0
+dependencies:
+  foo-dep:
+    repo: {name: foo-dep, url: http://localhost:3123}
+    version: ">1.0.0"
+''',
+        '{name: foo-dep, version: 2.0.0}'
       ]);
 
       schedulePub(args: ['update', 'foo'],
           output: const RegExp(@"Dependencies updated!$"));
 
-      packagesDir({
-        "foo": "2.0.0",
-        "foo-dep": "2.0.0"
-      }).scheduleValidate();
+      dir(packagesPath, [
+        dir('foo', [
+          file('foo.dart', 'main() => print("foo 2.0.0");'),
+          file('pubspec.yaml', '''
+name: foo
+version: 2.0.0
+dependencies:
+  foo-dep:
+    repo: {name: foo-dep, url: http://localhost:3123}
+    version: ">1.0.0"
+''')
+        ]),
+        dir('foo-dep', [
+          file('foo-dep.dart', 'main() => print("foo-dep 2.0.0");')
+        ])
+      ]).scheduleValidate();
 
       run();
     });
 
     test("updates a locked package's dependers in order to get it to max "
         "version", () {
       servePackages("localhost", 3123, [
-        package("foo", "1.0.0", [dependency("bar", "<2.0.0")]),
-        package("bar", "1.0.0")
+        '''
+name: foo
+version: 1.0.0
+dependencies:
+  bar:
+    version: "<2.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+        '{name: bar, version: 1.0.0}'
       ]);
 
-      appDir([dependency("foo"), dependency("bar")]).scheduleCreate();
+      dir(appPath, [
+        file('pubspec.yaml', '''
+dependencies:
+  foo:
+    repo: {name: foo, url: http://localhost:3123}
+  bar:
+    repo: {name: bar, url: http://localhost:3123}
+''')
+      ]).scheduleCreate();
 
       schedulePub(args: ['install'],
           output: const RegExp(@"Dependencies installed!$"));
 
-      packagesDir({
-        "foo": "1.0.0",
-        "bar": "1.0.0"
-      }).scheduleValidate();
+      dir(packagesPath, [
+        dir('foo', [
+          file('foo.dart', 'main() => print("foo 1.0.0");'),
+        ]),
+        dir('bar', [
+          file('bar.dart', 'main() => print("bar 1.0.0");')
+        ])
+      ]).scheduleValidate();
 
       servePackages("localhost", 3123, [
-        package("foo", "1.0.0", [dependency("bar", "<2.0.0")]),
-        package("foo", "2.0.0", [dependency("bar", "<3.0.0")]),
-
-        package("bar", "1.0.0"),
-        package("bar", "2.0.0")
+        '''
+name: foo
+version: 1.0.0
+dependencies:
+  bar:
+    version: "<2.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+        '''
+name: foo
+version: 2.0.0
+dependencies:
+  bar:
+    version: "<3.0.0"
+    repo: {name: bar, url: http://localhost:3123}
+''',
+        '{name: bar, version: 1.0.0}',
+        '{name: bar, version: 2.0.0}'
       ]);
 
       schedulePub(args: ['update', 'bar'],
           output: const RegExp(@"Dependencies updated!$"));
 
-      packagesDir({
-        "foo": "2.0.0",
-        "bar": "2.0.0"
-      }).scheduleValidate();
+      dir(packagesPath, [
+        dir('foo', [
+          file('foo.dart', 'main() => print("foo 2.0.0");'),
+        ]),
+        dir('bar', [
+          file('bar.dart', 'main() => print("bar 2.0.0");')
+        ])
+      ]).scheduleValidate();
 
       run();
     });
   });
 }
 
 versionCommand() {
   test('displays the current version', () =>
     runPub(args: ['version'], output: VERSION_STRING));
 }