Refactor Source and SourceRegistry.

test/test_pub.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.
 
 /// 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.
 import 'dart:async';
@@ skipping 35 matching lines @@
 /// enabled.
 Matcher isMinifiedDart2JSOutput =
     isNot(contains("// The code supports the following hooks"));
 
 /// A [Matcher] that matches JavaScript generated by dart2js with minification
 /// disabled.
 Matcher isUnminifiedDart2JSOutput =
     contains("// The code supports the following hooks");
 
 /// The entrypoint for pub itself.
-final _entrypoint = new Entrypoint(
-    pubRoot, new SystemCache.withSources(isOffline: true));
+final _entrypoint = new Entrypoint(pubRoot, new SystemCache(isOffline: true));
 
 /// Converts [value] into a YAML string.
 String yaml(value) => JSON.encode(value);
 
 /// The full path to the created sandbox directory for an integration test.
 String get sandboxDir => _sandboxDir;
 String _sandboxDir;
 
 /// The path of the package cache directory used for tests, relative to the
 /// sandbox directory.
@@ skipping 401 matching lines @@
 /// [sandbox] is a list of path dependencies to be found in the sandbox
 /// directory. [pkg] is a list of packages in the Dart repo's "pkg" directory;
 /// each package listed here and all its dependencies will be linked to the
 /// version in the Dart repo.
 ///
 /// [hosted] is a list of package names to version strings for dependencies on
 /// hosted packages.
 void createLockFile(String package, {Iterable<String> sandbox,
     Map<String, String> hosted}) {
   schedule(() async {
-    var cache = new SystemCache.withSources(
-        rootDir: p.join(sandboxDir, cachePath));
+    var cache = new SystemCache(rootDir: p.join(sandboxDir, cachePath));
 
     var lockFile = _createLockFile(cache.sources,
         sandbox: sandbox, hosted: hosted);
 
     await d.dir(package, [
       d.file('pubspec.lock', lockFile.serialize(null)),
-      d.file('.packages', lockFile.packagesFile(package))
+      d.file('.packages', lockFile.packagesFile(cache, package))
     ]).create();
   }, "creating lockfile for $package");
 }
 
 /// Like [createLockFile], but creates only a `.packages` file without a
 /// lockfile.
 void createPackagesFile(String package, {Iterable<String> sandbox,
     Map<String, String> hosted}) {
   schedule(() async {
-    var cache = new SystemCache.withSources(
-        rootDir: p.join(sandboxDir, cachePath));
-
+    var cache = new SystemCache(rootDir: p.join(sandboxDir, cachePath));
     var lockFile = _createLockFile(cache.sources,
         sandbox: sandbox, hosted: hosted);
 
     await d.dir(package, [
-      d.file('.packages', lockFile.packagesFile(package))
+      d.file('.packages', lockFile.packagesFile(cache, package))
     ]).create();
   }, "creating .packages for $package");
 }
 
 /// Creates a lock file for [package] without running `pub get`.
 ///
 /// [sandbox] is a list of path dependencies to be found in the sandbox
 /// directory. [pkg] is a list of packages in the Dart repo's "pkg" directory;
 /// each package listed here and all its dependencies will be linked to the
 /// version in the Dart repo.
@@ skipping 203 matching lines @@
 /// A function that creates a [Validator] subclass.
 typedef Validator ValidatorCreator(Entrypoint entrypoint);
 
 /// Schedules a single [Validator] to run on the [appPath].
 ///
 /// Returns a scheduled Future that contains the errors and warnings produced
 /// by that validator.
 Future<Pair<List<String>, List<String>>> schedulePackageValidation(
     ValidatorCreator fn) {
   return schedule(() {
-    var cache = new SystemCache.withSources(
-        rootDir: p.join(sandboxDir, cachePath));
-
+    var cache = new SystemCache(rootDir: p.join(sandboxDir, cachePath));
     return new Future.sync(() {
       var validator = fn(new Entrypoint(p.join(sandboxDir, appPath), cache));
       return validator.validate().then((_) {
         return new Pair(validator.errors, validator.warnings);
       });
     });
   }, "validating package");
 }
 
 /// A matcher that matches a Pair.
@@ skipping 12 matching lines @@
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     return description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }
 
 /// A [StreamMatcher] that matches multiple lines of output.
 StreamMatcher emitsLines(String output) => inOrder(output.split("\n"));