Make VersionSolver actually return PackageIds.

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/package.dart');
@@ skipping 252 matching lines @@
     if (result != null) {
       result.forEach((name, version) {
         result[name] = new Version.parse(version);
       });
     }
 
     // Resolve the versions.
     var future = resolveVersions(sources, root);
 
     if (result != null) {
-      expect(future, completion(equals(result)));
+      expect(future, completion(predicate((actualResult) {
+        for (var id in actualResult) {
+          if (!result.containsKey(id.description)) return false;
+          if (id.version != result.remove(id.description)) return false;
+        }
+        if (!result.isEmpty()) return false;
+        return true;

[Bob Nystrom, 2012/07/11 22:51:02]

return result.isEmpty();

[nweiz, 2012/07/11 22:55:40]

Done.

+      }, description: 'packages to match $result')));
     } else if (error == noVersion) {
       expect(future, throwsA(new isInstanceOf<NoVersionException>()));
     } else if (error == disjointConstraint) {
       expect(future, throwsA(new isInstanceOf<DisjointConstraintException>()));
     } else if (error == sourceMismatch) {
       expect(future, throwsA(new isInstanceOf<SourceMismatchException>()));
     } else if (error == descriptionMismatch) {
       expect(future, throwsA(new isInstanceOf<DescriptionMismatchException>()));
     } else if (error == couldNotSolve) {
       expect(future, throwsA(new isInstanceOf<CouldNotSolveException>()));
@@ skipping 104 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);
   }
 }