Index: sdk/lib/_internal/pub/test/version_solver_test.dart |
diff --git a/sdk/lib/_internal/pub/test/version_solver_test.dart b/sdk/lib/_internal/pub/test/version_solver_test.dart |
index b5302cb7e498c7d0b9642f53c65b9274ee5450e8..817d88819ead6db1a0249fb30eee5584f7ff676b 100644 |
--- a/sdk/lib/_internal/pub/test/version_solver_test.dart |
+++ b/sdk/lib/_internal/pub/test/version_solver_test.dart |
@@ -924,6 +924,20 @@ void prerelease() { |
'myapp from root': '0.0.0', |
'a': '1.1.0' |
}); |
Bob Nystrom
2014/07/09 18:19:00
It would be nice to have unit tests for the other
nweiz
2014/07/09 21:28:58
I thought this code was mostly for testing behavio
Bob Nystrom
2014/07/10 17:46:11
It tries to test all of the solving behavior that
nweiz
2014/07/14 21:52:05
I moved over downgrades_dependency, but the other
|
+ |
+ testResolve('use earliest allowed prerelease if no stable versions match ' |
+ 'while downgrading', { |
+ 'myapp 0.0.0': { |
+ 'a': '>=2.0.0-dev.1 <3.0.0' |
+ }, |
+ 'a 1.0.0': {}, |
+ 'a 2.0.0-dev.1': {}, |
+ 'a 2.0.0-dev.2': {}, |
+ 'a 2.0.0-dev.3': {} |
+ }, result: { |
+ 'myapp from root': '0.0.0', |
+ 'a': '2.0.0-dev.1' |
+ }, downgrade: true); |
} |
void override() { |
@@ -1059,23 +1073,25 @@ void override() { |
testResolve(String description, Map packages, { |
Map lockfile, Map overrides, Map result, FailMatcherBuilder error, |
- int maxTries}) { |
+ int maxTries, bool downgrade: false}) { |
_testResolve(test, description, packages, lockfile: lockfile, |
- overrides: overrides, result: result, error: error, maxTries: maxTries); |
+ overrides: overrides, result: result, error: error, maxTries: maxTries, |
+ downgrade: downgrade); |
} |
solo_testResolve(String description, Map packages, { |
Map lockfile, Map overrides, Map result, FailMatcherBuilder error, |
- int maxTries}) { |
+ int maxTries, bool downgrade: false}) { |
log.verbosity = log.Verbosity.SOLVER; |
_testResolve(solo_test, description, packages, lockfile: lockfile, |
- overrides: overrides, result: result, error: error, maxTries: maxTries); |
+ overrides: overrides, result: result, error: error, maxTries: maxTries, |
+ downgrade: downgrade); |
} |
_testResolve(void testFn(String description, Function body), |
String description, Map packages, { |
Map lockfile, Map overrides, Map result, FailMatcherBuilder error, |
- int maxTries}) { |
+ int maxTries, bool downgrade: false}) { |
if (maxTries == null) maxTries = 1; |
testFn(description, () { |
@@ -1124,7 +1140,9 @@ _testResolve(void testFn(String description, Function body), |
} |
// Resolve the versions. |
- var future = resolveVersions(cache.sources, root, lockFile: realLockFile); |
+ var future = resolveVersions( |
+ downgrade ? SolveType.DOWNGRADE : SolveType.GET, |
+ cache.sources, root, lockFile: realLockFile); |
var matcher; |
if (result != null) { |