Reapply "Change SDK/DartEditor versioning scheme to semantic versions."

dart/sdk/lib/_internal/pub/test/version_solver_test.dart

Index: dart/sdk/lib/_internal/pub/test/version_solver_test.dart
diff --git a/dart/sdk/lib/_internal/pub/test/version_solver_test.dart b/dart/sdk/lib/_internal/pub/test/version_solver_test.dart
index 83551b1e9a8a9b74c70ba37e27671655ccb351ba..f77d22cdb197d3f6b83b7506cdb401da358d7759 100644
--- a/dart/sdk/lib/_internal/pub/test/version_solver_test.dart
+++ b/dart/sdk/lib/_internal/pub/test/version_solver_test.dart
@@ -794,12 +794,6 @@ sdkConstraint() {
     'foo': '2.0.0',
     'bar': '2.0.0'
   }, maxTries: 3);
-
-  testResolve('ignores SDK constraints on bleeding edge', {
-    'myapp 0.0.0': {'sdk': badVersion }
-  }, result: {
-    'myapp from root': '0.0.0'
-  }, useBleedingEdgeSdkVersion: true);
 }
 
 void prerelease() {
@@ -989,27 +983,24 @@ void override() {
 
 testResolve(String description, Map packages, {
     Map lockfile, Map overrides, Map result, FailMatcherBuilder error,
-    int maxTries, bool useBleedingEdgeSdkVersion}) {
+    int maxTries}) {
   _testResolve(test, description, packages, lockfile: lockfile,
-      overrides: overrides, result: result, error: error, maxTries: maxTries,
-      useBleedingEdgeSdkVersion: useBleedingEdgeSdkVersion);
+      overrides: overrides, result: result, error: error, maxTries: maxTries);
 }
 
 solo_testResolve(String description, Map packages, {
     Map lockfile, Map overrides, Map result, FailMatcherBuilder error,
-    int maxTries, bool useBleedingEdgeSdkVersion}) {
+    int maxTries}) {
   log.showSolver();
   _testResolve(solo_test, description, packages, lockfile: lockfile,
-      overrides: overrides, result: result, error: error, maxTries: maxTries,
-      useBleedingEdgeSdkVersion: useBleedingEdgeSdkVersion);
+      overrides: overrides, result: result, error: error, maxTries: maxTries);
 }
 
 _testResolve(void testFn(String description, Function body),
     String description, Map packages, {
     Map lockfile, Map overrides, Map result, FailMatcherBuilder error,
-    int maxTries, bool useBleedingEdgeSdkVersion}) {
+    int maxTries}) {
   if (maxTries == null) maxTries = 1;
-  if (useBleedingEdgeSdkVersion == null) useBleedingEdgeSdkVersion = false;
 
   testFn(description, () {
     var cache = new SystemCache('.');
@@ -1056,12 +1047,6 @@ _testResolve(void testFn(String description, Function body),
       });
     }
 
-    // Make a version number like the continuous build's version.
-    var previousVersion = sdk.version;
-    if (useBleedingEdgeSdkVersion) {
-      sdk.version = new Version(0, 1, 2, build: '0_r12345_juser');
-    }
-
     // Resolve the versions.
     var future = resolveVersions(cache.sources, root, lockFile: realLockFile);
 
@@ -1072,12 +1057,6 @@ _testResolve(void testFn(String description, Function body),
       matcher = error(maxTries);
     }
 
-    future = future.whenComplete(() {
-      if (useBleedingEdgeSdkVersion) {
-        sdk.version = previousVersion;
-      }
-    });
-
     expect(future, completion(matcher));
   });
 }