Hook up dependency overrides to the rest of pub.

sdk/lib/_internal/pub/test/version_solver_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_upgrade_test;
 
 import 'dart:async';
 
 import 'package:unittest/unittest.dart';
 
@@ skipping 1005 matching lines @@
     source1 = new MockSource('mock1');
     source2 = new MockSource('mock2');
     cache.register(source1);
     cache.register(source2);
     cache.sources.setDefault(source1.name);
 
     // Build the test package graph.
     var root;
     packages.forEach((description, dependencies) {
       var id = parseSpec(description);
-      var package = mockPackage(id, dependencies);
+      var package = mockPackage(id, dependencies,
+          id.name == 'myapp' ? overrides : null);
       if (id.name == 'myapp') {
         // Don't add the root package to the server, so we can verify that Pub
         // doesn't try to look up information about the local package on the
         // remote server.
         root = package;
       } else {
         (cache.sources[id.source] as MockSource).addPackage(
             id.description, package);
       }
     });
@@ skipping 11 matching lines @@
     // Parse the lockfile.
     var realLockFile = new LockFile.empty();
     if (lockfile != null) {
       lockfile.forEach((name, version) {
         version = new Version.parse(version);
         realLockFile.packages[name] =
             new PackageId(name, source1.name, version, name);
       });
     }
 
-    // Parse the overrides.
-    var realOverrides = [];
-    if (overrides != null) {
-      overrides.forEach((spec, constraint) {
-        realOverrides.add(parseSpec(spec).withConstraint(
-            new VersionConstraint.parse(constraint)));
-      });
-    }
-
     // Make a version number like the continuous build's version.
     var previousVersion = sdk.version;
     if (useBleedingEdgeSdkVersion) {
       sdk.version = new Version(0, 1, 2, build: '0_r12345_juser');
     }
 
     // Resolve the versions.
-    var future = resolveVersions(cache.sources, root,
-        lockFile: realLockFile, overrides: realOverrides);
+    var future = resolveVersions(cache.sources, root, lockFile: realLockFile);
 
     var matcher;
     if (result != null) {
       matcher = new SolveSuccessMatcher(result, maxTries);
     } else if (error != null) {
       matcher = error(maxTries);
     }
 
     future = future.whenComplete(() {
       if (useBleedingEdgeSdkVersion) {
@@ skipping 238 matching lines @@
   Future<bool> get(PackageId id, String path) {
     throw new Exception('no');
   }
 
   void addPackage(String description, Package package) {
     _packages.putIfAbsent(description, () => new Map<Version, Package>());
     _packages[description][package.version] = package;
   }
 }
 
-Package mockPackage(PackageId id, Map dependencyStrings) {
+Package mockPackage(PackageId id, Map dependencyStrings, Map overrides) {
   var sdkConstraint = null;
 
   // Build the pubspec dependencies.
   var dependencies = <PackageDep>[];
   var devDependencies = <PackageDep>[];
 
-  dependencyStrings.forEach((description, constraint) {
-    var isDev = description.startsWith("(dev) ");
+  dependencyStrings.forEach((spec, constraint) {
+    var isDev = spec.startsWith("(dev) ");
     if (isDev) {
-      description = description.substring("(dev) ".length);
+      spec = spec.substring("(dev) ".length);
     }
 
-    var dep = parseSpec(description).withConstraint(
+    var dep = parseSpec(spec).withConstraint(
         new VersionConstraint.parse(constraint));
 
     if (dep.name == 'sdk') {
       sdkConstraint = dep.constraint;
       return;
     }
 
     if (isDev) {
       devDependencies.add(dep);
     } else {
       dependencies.add(dep);
     }
   });
 
+  var dependencyOverrides = <PackageDep>[];
+  if (overrides != null) {
+    overrides.forEach((spec, constraint) {
+      dependencyOverrides.add(parseSpec(spec).withConstraint(
+          new VersionConstraint.parse(constraint)));
+    });
+  }
+
   var pubspec = new Pubspec(id.name, id.version, dependencies,
-      devDependencies, new PubspecEnvironment(sdkConstraint), []);
+      devDependencies, dependencyOverrides,
+      new PubspecEnvironment(sdkConstraint), []);
   return new Package.inMemory(pubspec);
 }
 
 /// Creates a new [PackageId] parsed from [text], which looks something like
 /// this:
 ///
 ///   foo-xyz 1.0.0 from mock
 ///
 /// The package name is "foo". A hyphenated suffix like "-xyz" here is part
 /// of the package description, but not its name, so the description here is
@@ skipping 32 matching lines @@
   }
 
   var source = "mock1";
   if (match[7] != null) {
     source = match[7];
     if (source == "root") source = null;
   }
 
   return new PackageId(name, source, parsedVersion, description);
 }