Make VersionSolver source- and description-aware.

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');
 #import('../../pub/pubspec.dart');
 #import('../../pub/source.dart');
 #import('../../pub/source_registry.dart');
 #import('../../pub/version.dart');
 #import('../../pub/version_solver.dart');
 #import('../../../lib/unittest/unittest.dart');
 
 final noVersion = 'no version';
 final disjointConstraint = 'disjoint';
+final sourceMismatch = 'source mismatch';
+final descriptionMismatch = 'description mismatch';
 final couldNotSolve = 'unsolved';
 
 main() {
   testResolve('no dependencies', {
     'myapp 0.0.0': {}
   }, result: {
     'myapp': '0.0.0'
   });
 
   testResolve('simple dependency tree', {
@@ skipping 67 matching lines @@
     'bang': '1.0.0'
   });
 
   testResolve('dependency back onto root package', {
     'myapp 1.0.0': {
       'foo': '1.0.0'
     },
     'foo 1.0.0': {
       'myapp': '>=1.0.0'
     }
-  }, result: {
-    'myapp': '1.0.0',
-    'foo': '1.0.0'
-  });
-
-  testResolve("dependency back onto root package that doesn't contain root's "
-              "version", {
-    'myapp 1.0.0': {
-      'foo': '1.0.0'
-    },
-    'foo 1.0.0': {
-      'myapp': '>=2.0.0'
-    }
-  }, error: disjointConstraint);
+  }, error: sourceMismatch);

[Bob Nystrom, 2012/06/29 17:24:40]

Can you also add another test for sourceMismatch that doesn't involve the
semi-magic root source?

[nweiz, 2012/06/29 18:45:08]

Done.

 
   testResolve('no version that matches requirement', {
     'myapp 0.0.0': {
       'foo': '>=1.0.0 <2.0.0'
     },
     'foo 2.0.0': {},
     'foo 2.1.3': {}
   }, error: noVersion);
 
   testResolve('no version that matches combined constraint', {
@@ skipping 19 matching lines @@
     'foo 1.0.0': {
       'shared': '<=2.0.0'
     },
     'bar 1.0.0': {
       'shared': '>3.0.0'
     },
     'shared 2.0.0': {},
     'shared 4.0.0': {}
   }, error: disjointConstraint);
 
+  testResolve('mismatched descriptions', {
+    'myapp 0.0.0': {
+      'foo': '1.0.0',
+      'bar': '1.0.0'
+    },
+    'foo 1.0.0': {
+      'shared-x': '1.0.0'
+    },
+    'bar 1.0.0': {
+      'shared-y': '1.0.0'
+    },
+    'shared-x 1.0.0': {},
+    'shared-y 1.0.0': {}
+  }, error: descriptionMismatch);
+
   testResolve('unstable dependency graph', {
     'myapp 0.0.0': {
       'a': '>=1.0.0'
     },
     'a 1.0.0': {},
     'a 2.0.0': {
       'b': '1.0.0'
     },
     'b 1.0.0': {
       'a': '1.0.0'
@@ skipping 41 matching lines @@
 
     // Resolve the versions.
     var future = resolveVersions(sources, root);
 
     if (result != null) {
       expect(future, completion(equals(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>()));
     } else {
       expect(future, throwsA(error));
     }
 
     // If we aren't expecting an error, print some debugging info if we get one.
     if (error == null) {
       future.handleException((ex) {
         print(ex);
@@ skipping 10 matching lines @@
   String get name() => 'mock';
   bool get shouldCache() => true;
 
   MockSource()
       : _packages = <Map<Version, Package>>{};
 
   Future<List<Version>> getVersions(String name) {
     return fakeAsync(() => _packages[name].getKeys());
   }
 
-  Future<Pubspec> describe(String package, Version version) {
+  Future<Pubspec> describe(PackageId id) {
     return fakeAsync(() {
-      return _packages[package][version].pubspec;
+      return _packages[id.name][id.version].pubspec;
     });
   }
 
   Future<bool> install(PackageId id, String path) {
     throw 'no';
   }
 
   Package mockPackage(String name, String version, Map dependencyStrings) {

[Bob Nystrom, 2012/06/29 17:24:40]

"name" -> "description"

[nweiz, 2012/06/29 18:45:08]

Done.

     // Build the pubspec dependencies.
     var dependencies = <PackageRef>[];
     dependencyStrings.forEach((name, constraint) {
-      dependencies.add(new PackageRef(name, this,
-          new VersionConstraint.parse(constraint), name));
+      dependencies.add(new PackageRef(
+          this, new VersionConstraint.parse(constraint), name));
     });
 
     var pubspec = new Pubspec(new Version.parse(version), dependencies);
     return new Package.inMemory(name, pubspec);
   }
 
   void addPackage(Package package) {
     _packages.putIfAbsent(package.name, () => new Map<Version, Package>());
     _packages[package.name][package.version] = package;
     return package;
   }
+
+  String packageName(String name) =>
+    name.replaceFirst(new RegExp(@"-[^-]+$"), "");

[Bob Nystrom, 2012/06/29 17:24:40]

Please document this. It wasn't clear to me at first that "shared-x" and
"shared-y" were the same package.

[nweiz, 2012/06/29 18:45:08]

Done.

 }
 
 Future fakeAsync(callback()) {
   var completer = new Completer();
   new Timer(0, (_) {
     completer.complete(callback());
   });
 
   return completer.future;
 }