Don't extract the name of a package from its description.

utils/tests/pub/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_update_test');
 
 #import('dart:io');
 #import('dart:isolate');
 
 #import('../../pub/lock_file.dart');
@@ skipping 308 matching lines @@
     if (result != null) {
       result.forEach((name, version) {
         result[name] = new Version.parse(version);
       });
     }
 
     var realLockFile = new LockFile.empty();
     if (lockfile != null) {
       lockfile.forEach((name, version) {
         version = new Version.parse(version);
-        realLockFile.packages[name] = new PackageId(source1, version, name);
+        realLockFile.packages[name] =
+          new PackageId(name, source1, version, name);
       });
     }
 
     // Resolve the versions.
     var future = resolveVersions(sources, root, realLockFile);
 
     if (result != null) {
       expect(future, completion(predicate((actualResult) {
         for (var id in actualResult) {
           if (!result.containsKey(id.description)) return false;
@@ skipping 36 matching lines @@
  */
 class MockSource extends Source {
   final Map<String, Map<Version, Package>> _packages;
 
   final String name;
   bool get shouldCache => true;
 
   MockSource(this.name)
       : _packages = <String, Map<Version, Package>>{};
 
-  Future<List<Version>> getVersions(String name) {
-    return fakeAsync(() => _packages[name].getKeys());
+  Future<List<Version>> getVersions(String name, String description) {
+    return fakeAsync(() => _packages[description].getKeys());
   }
 
   Future<Pubspec> describe(PackageId id) {
     return fakeAsync(() {
       return _packages[id.name][id.version].pubspec;
     });
   }
 
   Future<bool> install(PackageId id, String path) {
     throw 'no';
   }
 
   Package mockPackage(String description, String version,
       Map dependencyStrings) {
     // Build the pubspec dependencies.
     var dependencies = <PackageRef>[];
     dependencyStrings.forEach((name, constraint) {
       var parsed = parseSource(name);
-      dependencies.add(new PackageRef(
-          parsed.last, new VersionConstraint.parse(constraint), parsed.first));
+      var description = parsed.first;
+      var packageName = description.replaceFirst(new RegExp(@"-[^-]+$"), "");
+      dependencies.add(new PackageRef(packageName, parsed.last,
+          new VersionConstraint.parse(constraint), description));
     });
 
     var pubspec = new Pubspec(
         description, new Version.parse(version), dependencies);
     return new Package.inMemory(pubspec);
   }
 
   void addPackage(Package package) {
     _packages.putIfAbsent(package.name, () => new Map<Version, Package>());
     _packages[package.name][package.version] = package;
   }
-
-  String packageName(String description) =>
-    description.replaceFirst(new RegExp(@"-[^-]+$"), "");
 }
 
 /**
  * A source used for testing that doesn't natively understand versioning,
  * similar to how the Git and SDK sources work.
  */
 class MockVersionlessSource extends Source {
   final Map<String, Package> _packages;
 
   final String name = 'versionless';
@@ skipping 27 matching lines @@
 Pair<String, Source> parseSource(String name) {
   var match = new RegExp(@"(.*) from (.*)").firstMatch(name);
   if (match == null) return new Pair<String, Source>(name, source1);
   switch (match[2]) {
   case 'mock1': return new Pair<String, Source>(match[1], source1);
   case 'mock2': return new Pair<String, Source>(match[1], source2);
   case 'versionless':
     return new Pair<String, Source>(match[1], versionlessSource);
   }
 }