summaryrefslogtreecommitdiff
path: root/test/framework
diff options
context:
space:
mode:
authorTim Brooks <tim@uncontended.net>2017-06-06 15:47:23 -0500
committerGitHub <noreply@github.com>2017-06-06 15:47:23 -0500
commitfeca0a9f33113580ff1001bf17420238a9c0ffe6 (patch)
tree8cce8de1d30fa07d5612ae65cb6f04c8359c7d74 /test/framework
parent1a681a928d6f64b71147cdae2ad702d5861479fd (diff)
Bumping version to v6.0.0-alpha3 (#25077)
Diffstat (limited to 'test/framework')
-rw-r--r--test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java22
1 files changed, 12 insertions, 10 deletions
diff --git a/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java b/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java
index 2fd08075b1..479cd64240 100644
--- a/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java
+++ b/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java
@@ -52,14 +52,14 @@ public class VersionUtilsTests extends ESTestCase {
// sub range
got = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0,
- Version.V_6_0_0_alpha2);
+ Version.V_6_0_0_alpha3);
assertTrue(got.onOrAfter(Version.V_5_0_0));
- assertTrue(got.onOrBefore(Version.V_6_0_0_alpha2));
+ assertTrue(got.onOrBefore(Version.V_6_0_0_alpha3));
// unbounded lower
- got = VersionUtils.randomVersionBetween(random(), null, Version.V_6_0_0_alpha2);
+ got = VersionUtils.randomVersionBetween(random(), null, Version.V_6_0_0_alpha3);
assertTrue(got.onOrAfter(VersionUtils.getFirstVersion()));
- assertTrue(got.onOrBefore(Version.V_6_0_0_alpha2));
+ assertTrue(got.onOrBefore(Version.V_6_0_0_alpha3));
got = VersionUtils.randomVersionBetween(random(), null, VersionUtils.allReleasedVersions().get(0));
assertTrue(got.onOrAfter(VersionUtils.getFirstVersion()));
assertTrue(got.onOrBefore(VersionUtils.allReleasedVersions().get(0)));
@@ -77,9 +77,9 @@ public class VersionUtilsTests extends ESTestCase {
assertEquals(got, VersionUtils.getFirstVersion());
got = VersionUtils.randomVersionBetween(random(), Version.CURRENT, Version.CURRENT);
assertEquals(got, Version.CURRENT);
- got = VersionUtils.randomVersionBetween(random(), Version.V_6_0_0_alpha2,
- Version.V_6_0_0_alpha2);
- assertEquals(got, Version.V_6_0_0_alpha2);
+ got = VersionUtils.randomVersionBetween(random(), Version.V_6_0_0_alpha3,
+ Version.V_6_0_0_alpha3);
+ assertEquals(got, Version.V_6_0_0_alpha3);
// implicit range of one
got = VersionUtils.randomVersionBetween(random(), null, VersionUtils.getFirstVersion());
@@ -148,15 +148,17 @@ public class VersionUtilsTests extends ESTestCase {
public static final Version V_5_4_0 = Version.fromString("5.4.0");
public static final Version V_6_0_0_alpha1 = Version.fromString("6.0.0-alpha1");
public static final Version V_6_0_0_alpha2 = Version.fromString("6.0.0-alpha2");
- public static final Version CURRENT = V_6_0_0_alpha2;
+ public static final Version V_6_0_0_alpha3 = Version.fromString("6.0.0-alpha3");
+ public static final Version CURRENT = V_6_0_0_alpha3;
}
+
public void testResolveReleasedVersionsForUnstableBranch() {
Tuple<List<Version>, List<Version>> t = VersionUtils.resolveReleasedVersions(TestUnstableBranch.CURRENT,
TestUnstableBranch.class);
List<Version> released = t.v1();
List<Version> unreleased = t.v2();
assertEquals(Arrays.asList(TestUnstableBranch.V_5_3_0, TestUnstableBranch.V_5_3_1,
- TestUnstableBranch.V_6_0_0_alpha1, TestUnstableBranch.V_6_0_0_alpha2), released);
+ TestUnstableBranch.V_6_0_0_alpha1, TestUnstableBranch.V_6_0_0_alpha2, TestUnstableBranch.V_6_0_0_alpha3), released);
assertEquals(Arrays.asList(TestUnstableBranch.V_5_3_2, TestUnstableBranch.V_5_4_0), unreleased);
}
@@ -164,7 +166,7 @@ public class VersionUtilsTests extends ESTestCase {
* Tests that {@link Version#minimumCompatibilityVersion()} and {@link VersionUtils#allReleasedVersions()}
* agree with the list of wire and index compatible versions we build in gradle.
*/
- public void testGradleVersionsMatchVerionUtils() {
+ public void testGradleVersionsMatchVersionUtils() {
// First check the index compatible versions
VersionsFromProperty indexCompatible = new VersionsFromProperty("tests.gradle_index_compat_versions");