Fix error messages for disjoint version errors.

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 243 matching lines @@
     'myapp 1.0.0': {
       'foo': '1.0.0',
       'bar': '1.0.0'
     },
     'foo 1.0.0': {
       'myapp': '>=1.0.0'
     },
     'bar 1.0.0': {
       'myapp from mock2': '>=1.0.0'
     }
-  }, error: sourceMismatch('foo', 'bar'));
+  }, error: sourceMismatch('myapp', 'foo', 'bar'));
 
   testResolve('with wrong version', {
     'myapp 1.0.0': {
       'foo': '1.0.0'
     },
     'foo 1.0.0': {
       'myapp': '<1.0.0'
     }
   }, error: couldNotSolve);
 }
@@ skipping 40 matching lines @@
   });
 }
 
 unsolvable() {
   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(['myapp']));
+  }, error: noVersion(['myapp', 'foo']));
 
   testResolve('no version that matches combined constraint', {
     'myapp 0.0.0': {
       'foo': '1.0.0',
       'bar': '1.0.0'
     },
     'foo 1.0.0': {
       'shared': '>=2.0.0 <3.0.0'
     },
     'bar 1.0.0': {
       'shared': '>=2.9.0 <4.0.0'
     },
     'shared 2.5.0': {},
     'shared 3.5.0': {}
-  }, error: noVersion(['foo', 'bar']));
+  }, error: noVersion(['shared', 'foo', 'bar']));
 
   testResolve('disjoint constraints', {
     'myapp 0.0.0': {
       'foo': '1.0.0',
       'bar': '1.0.0'
     },
     '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(['foo', 'bar']));
+  }, error: disjointConstraint(['shared', 'foo', 'bar']));
 
   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('foo', 'bar'));
+  }, error: descriptionMismatch('shared', 'foo', 'bar'));
 
   testResolve('mismatched sources', {
     'myapp 0.0.0': {
       'foo': '1.0.0',
       'bar': '1.0.0'
     },
     'foo 1.0.0': {
       'shared': '1.0.0'
     },
     'bar 1.0.0': {
       'shared from mock2': '1.0.0'
     },
     'shared 1.0.0': {},
     'shared 1.0.0 from mock2': {}
-  }, error: sourceMismatch('foo', 'bar'));
+  }, error: sourceMismatch('shared', 'foo', 'bar'));
 
   testResolve('no valid solution', {
     'myapp 0.0.0': {
       'a': 'any',
       'b': 'any'
     },
     'a 1.0.0': {
       'b': '1.0.0'
     },
     'a 2.0.0': {
       'b': '2.0.0'
     },
     'b 1.0.0': {
       'a': '2.0.0'
     },
     'b 2.0.0': {
       'a': '1.0.0'
     }
   }, error: couldNotSolve, maxTries: 4);
 
   // This is a regression test for #15550.
   testResolve('no version that matches while backtracking', {
     'myapp 0.0.0': {
       'a': 'any',
       'b': '>1.0.0'
     },
     'a 1.0.0': {},
     'b 1.0.0': {}
-  }, error: noVersion(['myapp']), maxTries: 1);
+  }, error: noVersion(['myapp', 'b']), maxTries: 1);
 }
 
 badSource() {
   testResolve('fail if the root package has a bad source in dep', {
     'myapp 0.0.0': {
       'foo from bad': 'any'
     },
   }, error: unknownSource('myapp', 'foo', 'bad'));
 
   testResolve('fail if the root package has a bad source in dev dep', {
@@ skipping 200 matching lines @@
     'a 1.0.0': {},
     'a 1.0.0 from mock2': {},
     'b 1.0.0': {
       'a from mock2': 'any'
     },
     'c 1.0.0': {},
     'c 2.0.0': {},
     'c 3.0.0': {},
     'c 4.0.0': {},
     'c 5.0.0': {},
-  }, error: sourceMismatch('myapp', 'b'), maxTries: 1);
+  }, error: sourceMismatch('a', 'myapp', 'b'), maxTries: 1);
 
   testResolve('backjump to conflicting description', {
     'myapp 0.0.0': {
       'a-x': 'any',
       'b': 'any',
       'c': 'any'
     },
     'a-x 1.0.0': {},
     'a-y 1.0.0': {},
     'b 1.0.0': {
       'a-y': 'any'
     },
     'c 1.0.0': {},
     'c 2.0.0': {},
     'c 3.0.0': {},
     'c 4.0.0': {},
     'c 5.0.0': {},
-  }, error: descriptionMismatch('myapp', 'b'), maxTries: 1);
+  }, error: descriptionMismatch('a', 'myapp', 'b'), maxTries: 1);
 
   // Dependencies are ordered so that packages with fewer versions are tried
   // first. Here, there are two valid solutions (either a or b must be
   // downgraded once). The chosen one depends on which dep is traversed first.
   // Since b has fewer versions, it will be traversed first, which means a will
   // come later. Since later selections are revised first, a gets downgraded.
   testResolve('traverse into package with fewer versions first', {
     'myapp 0.0.0': {
       'a': 'any',
       'b': 'any'
@@ skipping 412 matching lines @@
 FailMatcherBuilder noVersion(List<String> packages) {
   return (maxTries) => new SolveFailMatcher(packages, maxTries,
       NoVersionException);
 }
 
 FailMatcherBuilder disjointConstraint(List<String> packages) {
   return (maxTries) => new SolveFailMatcher(packages, maxTries,
       DisjointConstraintException);
 }
 
-FailMatcherBuilder descriptionMismatch(String package1, String package2) {
-  return (maxTries) => new SolveFailMatcher([package1, package2], maxTries,
-      DescriptionMismatchException);
+FailMatcherBuilder descriptionMismatch(
+    String package, String depender1, String depender2) {
+  return (maxTries) => new SolveFailMatcher([package, depender1, depender2],
+      maxTries, DescriptionMismatchException);
 }
 
 // If no solution can be found, the solver just reports the last failure that
 // happened during propagation. Since we don't specify the order that solutions
 // are tried, this just validates that *some* failure occurred, but not which.
 SolveFailMatcher couldNotSolve(maxTries) =>
     new SolveFailMatcher([], maxTries, null);
 
-FailMatcherBuilder sourceMismatch(String package1, String package2) {
-  return (maxTries) => new SolveFailMatcher([package1, package2], maxTries,
-      SourceMismatchException);
+FailMatcherBuilder sourceMismatch(
+    String package, String depender1, String depender2) {
+  return (maxTries) => new SolveFailMatcher([package, depender1, depender2],
+      maxTries, SourceMismatchException);
 }
 
 unknownSource(String depender, String dependency, String source) {
   return (maxTries) => new SolveFailMatcher([depender, dependency, source],
       maxTries, UnknownSourceException);
 }
 
 class SolveSuccessMatcher implements Matcher {
   /// The expected concrete package selections.
   final Map<String, PackageId> _expected;
@@ skipping 285 matching lines @@
   }
 
   var source = "mock1";
   if (match[7] != null) {
     source = match[7];
     if (source == "root") source = null;
   }
 
   return new PackageId(name, source, parsedVersion, description);
 }