Refactor LegacyESVersion tests from Version tests (#1662)
In preparation for removing all LegacyESVersion support by 3.0; this commit largely refactors the LegacyESVersion test logic from the OpenSearch Version test logic into an independent test class. This PR also updates Version.fromString to ensure a proper legacy version is returned when major is > 3 (to support legacy yaml test and build scripts). Note that bwc w/ legacy versions are still supported so some cross compatibility testing is retained in the Version test class. Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
This commit is contained in:
Nick Knize
GitHub
parent
7496f8058b
commit
33d8677796
|
|
@ -239,7 +239,8 @@ public class LegacyESVersion extends Version {
|
|||
return fromStringSlow(version);
|
||||
}
|
||||
|
||||
private static Version fromStringSlow(String version) {
|
||||
// pkg private for usage in Version (todo: remove in 3.0)
|
||||
static Version fromStringSlow(String version) {
|
||||
final boolean snapshot; // this is some BWC for 2.x and before indices
|
||||
if (snapshot = version.endsWith("-SNAPSHOT")) {
|
||||
version = version.substring(0, version.length() - 9);
|
||||
|
|
|
|||
|
|
@ -176,6 +176,19 @@ public class Version implements Comparable<Version>, ToXContentFragment {
|
|||
if (cached != null) {
|
||||
return cached;
|
||||
}
|
||||
{
|
||||
// get major string; remove when creating OpenSearch 3.0
|
||||
String[] parts = version.split("[.-]");
|
||||
if (parts.length < 3 || parts.length > 4) {
|
||||
throw new IllegalArgumentException(
|
||||
"the version needs to contain major, minor, and revision, and optionally the build: " + version
|
||||
);
|
||||
}
|
||||
int major = Integer.parseInt(parts[0]);
|
||||
if (major > 3) {
|
||||
return LegacyESVersion.fromStringSlow(version);
|
||||
}
|
||||
}
|
||||
return fromStringSlow(version);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,294 @@
|
|||
/*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* The OpenSearch Contributors require contributions made to
|
||||
* this file be licensed under the Apache-2.0 license or a
|
||||
* compatible open source license.
|
||||
*/
|
||||
|
||||
package org.opensearch;
|
||||
|
||||
import org.opensearch.cluster.metadata.IndexMetadata;
|
||||
import org.opensearch.common.settings.Settings;
|
||||
import org.opensearch.test.OpenSearchTestCase;
|
||||
import org.opensearch.test.VersionUtils;
|
||||
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.equalTo;
|
||||
import static org.hamcrest.Matchers.containsString;
|
||||
import static org.hamcrest.Matchers.greaterThan;
|
||||
import static org.hamcrest.Matchers.is;
|
||||
import static org.hamcrest.Matchers.lessThan;
|
||||
import static org.hamcrest.Matchers.sameInstance;
|
||||
import static org.opensearch.LegacyESVersion.V_6_3_0;
|
||||
import static org.opensearch.LegacyESVersion.V_7_0_0;
|
||||
import static org.opensearch.test.VersionUtils.randomLegacyVersion;
|
||||
import static org.opensearch.VersionTests.isCompatible;
|
||||
|
||||
/**
|
||||
* tests LegacyESVersion utilities.
|
||||
* note: legacy version compatibility is already tested by e predecessor
|
||||
*/
|
||||
public class LegacyESVersionTests extends OpenSearchTestCase {
|
||||
|
||||
public void testVersionComparison() {
|
||||
assertThat(V_6_3_0.before(V_7_0_0), is(true));
|
||||
assertThat(V_6_3_0.before(V_6_3_0), is(false));
|
||||
assertThat(V_7_0_0.before(V_6_3_0), is(false));
|
||||
|
||||
assertThat(V_6_3_0.onOrBefore(V_7_0_0), is(true));
|
||||
assertThat(V_6_3_0.onOrBefore(V_6_3_0), is(true));
|
||||
assertThat(V_7_0_0.onOrBefore(V_6_3_0), is(false));
|
||||
|
||||
assertThat(V_6_3_0.after(V_7_0_0), is(false));
|
||||
assertThat(V_6_3_0.after(V_6_3_0), is(false));
|
||||
assertThat(V_7_0_0.after(V_6_3_0), is(true));
|
||||
|
||||
assertThat(V_6_3_0.onOrAfter(V_7_0_0), is(false));
|
||||
assertThat(V_6_3_0.onOrAfter(V_6_3_0), is(true));
|
||||
assertThat(V_7_0_0.onOrAfter(V_6_3_0), is(true));
|
||||
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0-alpha2").onOrAfter(LegacyESVersion.fromString("5.0.0-alpha1")));
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0").onOrAfter(LegacyESVersion.fromString("5.0.0-beta2")));
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0-rc1").onOrAfter(LegacyESVersion.fromString("5.0.0-beta24")));
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0-alpha24").before(LegacyESVersion.fromString("5.0.0-beta0")));
|
||||
|
||||
assertThat(V_6_3_0, is(lessThan(V_7_0_0)));
|
||||
assertThat(V_6_3_0.compareTo(V_6_3_0), is(0));
|
||||
assertThat(V_7_0_0, is(greaterThan(V_6_3_0)));
|
||||
|
||||
// compare opensearch version to LegacyESVersion
|
||||
assertThat(Version.V_1_0_0.compareMajor(LegacyESVersion.V_7_0_0), is(0));
|
||||
assertThat(Version.V_1_0_0.compareMajor(LegacyESVersion.V_6_3_0), is(1));
|
||||
assertThat(LegacyESVersion.V_6_3_0.compareMajor(Version.V_1_0_0), is(-1));
|
||||
}
|
||||
|
||||
public void testMin() {
|
||||
assertEquals(VersionUtils.getPreviousVersion(), LegacyESVersion.min(Version.CURRENT, VersionUtils.getPreviousVersion()));
|
||||
assertEquals(LegacyESVersion.fromString("7.0.1"), LegacyESVersion.min(LegacyESVersion.fromString("7.0.1"), Version.CURRENT));
|
||||
Version legacyVersion = VersionUtils.randomLegacyVersion(random());
|
||||
Version opensearchVersion = VersionUtils.randomOpenSearchVersion(random());
|
||||
assertEquals(legacyVersion, Version.min(opensearchVersion, legacyVersion));
|
||||
}
|
||||
|
||||
public void testMax() {
|
||||
assertEquals(Version.CURRENT, Version.max(Version.CURRENT, VersionUtils.randomLegacyVersion(random())));
|
||||
assertEquals(Version.CURRENT, Version.max(LegacyESVersion.fromString("1.0.1"), Version.CURRENT));
|
||||
Version legacyVersion = VersionUtils.randomOpenSearchVersion(random());
|
||||
Version opensearchVersion = VersionUtils.randomLegacyVersion(random());
|
||||
assertEquals(legacyVersion, Version.max(opensearchVersion, legacyVersion));
|
||||
}
|
||||
|
||||
public void testMinimumIndexCompatibilityVersion() {
|
||||
assertEquals(LegacyESVersion.fromId(5000099), LegacyESVersion.V_6_0_0_beta1.minimumIndexCompatibilityVersion());
|
||||
assertEquals(LegacyESVersion.fromId(2000099), LegacyESVersion.fromId(5000099).minimumIndexCompatibilityVersion());
|
||||
assertEquals(LegacyESVersion.fromId(2000099), LegacyESVersion.fromId(5010000).minimumIndexCompatibilityVersion());
|
||||
assertEquals(LegacyESVersion.fromId(2000099), LegacyESVersion.fromId(5000001).minimumIndexCompatibilityVersion());
|
||||
}
|
||||
|
||||
public void testVersionFromString() {
|
||||
final int iters = scaledRandomIntBetween(100, 1000);
|
||||
for (int i = 0; i < iters; i++) {
|
||||
LegacyESVersion version = randomLegacyVersion(random());
|
||||
assertThat(LegacyESVersion.fromString(version.toString()), sameInstance(version));
|
||||
}
|
||||
}
|
||||
|
||||
public void testTooLongVersionFromString() {
|
||||
Exception e = expectThrows(IllegalArgumentException.class, () -> LegacyESVersion.fromString("1.0.0.1.3"));
|
||||
assertThat(e.getMessage(), containsString("needs to contain major, minor, and revision"));
|
||||
}
|
||||
|
||||
public void testTooShortVersionFromString() {
|
||||
Exception e = expectThrows(IllegalArgumentException.class, () -> LegacyESVersion.fromString("1.0"));
|
||||
assertThat(e.getMessage(), containsString("needs to contain major, minor, and revision"));
|
||||
}
|
||||
|
||||
public void testWrongVersionFromString() {
|
||||
Exception e = expectThrows(IllegalArgumentException.class, () -> LegacyESVersion.fromString("WRONG.VERSION"));
|
||||
assertThat(e.getMessage(), containsString("needs to contain major, minor, and revision"));
|
||||
}
|
||||
|
||||
public void testVersionNoPresentInSettings() {
|
||||
Exception e = expectThrows(IllegalStateException.class, () -> LegacyESVersion.indexCreated(Settings.builder().build()));
|
||||
assertThat(e.getMessage(), containsString("[index.version.created] is not present"));
|
||||
}
|
||||
|
||||
public void testIndexCreatedVersion() {
|
||||
// an actual index has a IndexMetadata.SETTING_INDEX_UUID
|
||||
final LegacyESVersion version = (LegacyESVersion) LegacyESVersion.fromId(6000026);
|
||||
assertEquals(
|
||||
version,
|
||||
LegacyESVersion.indexCreated(
|
||||
Settings.builder().put(IndexMetadata.SETTING_INDEX_UUID, "foo").put(IndexMetadata.SETTING_VERSION_CREATED, version).build()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public void testMinCompatVersion() {
|
||||
Version major = LegacyESVersion.fromString("6.8.0");
|
||||
assertThat(LegacyESVersion.fromString("1.0.0").minimumCompatibilityVersion(), equalTo(major));
|
||||
assertThat(LegacyESVersion.fromString("1.2.0").minimumCompatibilityVersion(), equalTo(major));
|
||||
assertThat(LegacyESVersion.fromString("1.3.0").minimumCompatibilityVersion(), equalTo(major));
|
||||
|
||||
Version major5x = LegacyESVersion.fromString("5.0.0");
|
||||
assertThat(LegacyESVersion.fromString("5.0.0").minimumCompatibilityVersion(), equalTo(major5x));
|
||||
assertThat(LegacyESVersion.fromString("5.2.0").minimumCompatibilityVersion(), equalTo(major5x));
|
||||
assertThat(LegacyESVersion.fromString("5.3.0").minimumCompatibilityVersion(), equalTo(major5x));
|
||||
|
||||
Version major56x = LegacyESVersion.fromString("5.6.0");
|
||||
assertThat(LegacyESVersion.V_6_5_0.minimumCompatibilityVersion(), equalTo(major56x));
|
||||
assertThat(LegacyESVersion.V_6_3_1.minimumCompatibilityVersion(), equalTo(major56x));
|
||||
|
||||
// from 7.0 on we are supporting the latest minor of the previous major... this might fail once we add a new version ie. 5.x is
|
||||
// released since we need to bump the supported minor in Version#minimumCompatibilityVersion()
|
||||
LegacyESVersion lastVersion = LegacyESVersion.V_6_8_0; // TODO: remove this once min compat version is a constant instead of method
|
||||
assertEquals(lastVersion.major, LegacyESVersion.V_7_0_0.minimumCompatibilityVersion().major);
|
||||
assertEquals(
|
||||
"did you miss to bump the minor in Version#minimumCompatibilityVersion()",
|
||||
lastVersion.minor,
|
||||
LegacyESVersion.V_7_0_0.minimumCompatibilityVersion().minor
|
||||
);
|
||||
assertEquals(0, LegacyESVersion.V_7_0_0.minimumCompatibilityVersion().revision);
|
||||
}
|
||||
|
||||
public void testToString() {
|
||||
// with 2.0.beta we lowercase
|
||||
assertEquals("2.0.0-beta1", LegacyESVersion.fromString("2.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-alpha1", LegacyESVersion.fromId(5000001).toString());
|
||||
assertEquals("2.3.0", LegacyESVersion.fromString("2.3.0").toString());
|
||||
assertEquals("0.90.0.Beta1", LegacyESVersion.fromString("0.90.0.Beta1").toString());
|
||||
assertEquals("1.0.0.Beta1", LegacyESVersion.fromString("1.0.0.Beta1").toString());
|
||||
assertEquals("2.0.0-beta1", LegacyESVersion.fromString("2.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-beta1", LegacyESVersion.fromString("5.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-alpha1", LegacyESVersion.fromString("5.0.0-alpha1").toString());
|
||||
}
|
||||
|
||||
public void testIsRc() {
|
||||
assertTrue(LegacyESVersion.fromString("2.0.0-rc1").isRC());
|
||||
assertTrue(LegacyESVersion.fromString("1.0.0.RC1").isRC());
|
||||
|
||||
for (int i = 0; i < 25; i++) {
|
||||
assertEquals(LegacyESVersion.fromString("5.0.0-rc" + i).id, LegacyESVersion.fromId(5000000 + i + 50).id);
|
||||
assertEquals("5.0.0-rc" + i, LegacyESVersion.fromId(5000000 + i + 50).toString());
|
||||
|
||||
// legacy RC versioning
|
||||
assertEquals(LegacyESVersion.fromString("1.0.0.RC" + i).id, LegacyESVersion.fromId(1000000 + i + 50).id);
|
||||
assertEquals("1.0.0.RC" + i, LegacyESVersion.fromId(1000000 + i + 50).toString());
|
||||
}
|
||||
}
|
||||
|
||||
public void testIsBeta() {
|
||||
assertTrue(LegacyESVersion.fromString("2.0.0-beta1").isBeta());
|
||||
assertTrue(LegacyESVersion.fromString("1.0.0.Beta1").isBeta());
|
||||
assertTrue(LegacyESVersion.fromString("0.90.0.Beta1").isBeta());
|
||||
|
||||
for (int i = 0; i < 25; i++) {
|
||||
assertEquals(LegacyESVersion.fromString("5.0.0-beta" + i).id, LegacyESVersion.fromId(5000000 + i + 25).id);
|
||||
assertEquals("5.0.0-beta" + i, LegacyESVersion.fromId(5000000 + i + 25).toString());
|
||||
}
|
||||
}
|
||||
|
||||
public void testIsAlpha() {
|
||||
assertTrue(new LegacyESVersion(5000001, org.apache.lucene.util.Version.LUCENE_7_0_0).isAlpha());
|
||||
assertFalse(new LegacyESVersion(4000002, org.apache.lucene.util.Version.LUCENE_7_0_0).isAlpha());
|
||||
assertTrue(new LegacyESVersion(4000002, org.apache.lucene.util.Version.LUCENE_7_0_0).isBeta());
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0-alpha14").isAlpha());
|
||||
assertEquals(5000014, LegacyESVersion.fromString("5.0.0-alpha14").id);
|
||||
assertTrue(LegacyESVersion.fromId(5000015).isAlpha());
|
||||
|
||||
for (int i = 0; i < 25; i++) {
|
||||
assertEquals(LegacyESVersion.fromString("5.0.0-alpha" + i).id, LegacyESVersion.fromId(5000000 + i).id);
|
||||
assertEquals("5.0.0-alpha" + i, LegacyESVersion.fromId(5000000 + i).toString());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseVersion() {
|
||||
final int iters = scaledRandomIntBetween(100, 1000);
|
||||
for (int i = 0; i < iters; i++) {
|
||||
LegacyESVersion version = randomLegacyVersion(random());
|
||||
LegacyESVersion parsedVersion = (LegacyESVersion) LegacyESVersion.fromString(version.toString());
|
||||
assertEquals(version, parsedVersion);
|
||||
}
|
||||
|
||||
expectThrows(IllegalArgumentException.class, () -> { LegacyESVersion.fromString("5.0.0-alph2"); });
|
||||
assertEquals(LegacyESVersion.fromString("2.0.0-SNAPSHOT"), LegacyESVersion.fromId(2000099));
|
||||
expectThrows(IllegalArgumentException.class, () -> { LegacyESVersion.fromString("5.0.0-SNAPSHOT"); });
|
||||
}
|
||||
|
||||
public void testAllVersionsMatchId() throws Exception {
|
||||
final Set<Version> releasedVersions = new HashSet<>(VersionUtils.allReleasedVersions());
|
||||
final Set<Version> unreleasedVersions = new HashSet<>(VersionUtils.allUnreleasedVersions());
|
||||
Map<String, Version> maxBranchVersions = new HashMap<>();
|
||||
for (java.lang.reflect.Field field : Version.class.getFields()) {
|
||||
if (field.getName().matches("_ID")) {
|
||||
assertTrue(field.getName() + " should be static", Modifier.isStatic(field.getModifiers()));
|
||||
assertTrue(field.getName() + " should be final", Modifier.isFinal(field.getModifiers()));
|
||||
int versionId = (Integer) field.get(Version.class);
|
||||
|
||||
String constantName = field.getName().substring(0, field.getName().indexOf("_ID"));
|
||||
java.lang.reflect.Field versionConstant = Version.class.getField(constantName);
|
||||
assertTrue(constantName + " should be static", Modifier.isStatic(versionConstant.getModifiers()));
|
||||
assertTrue(constantName + " should be final", Modifier.isFinal(versionConstant.getModifiers()));
|
||||
|
||||
Version v = (Version) versionConstant.get(null);
|
||||
logger.debug("Checking {}", v);
|
||||
if (field.getName().endsWith("_UNRELEASED")) {
|
||||
assertTrue(unreleasedVersions.contains(v));
|
||||
} else {
|
||||
assertTrue(releasedVersions.contains(v));
|
||||
}
|
||||
assertEquals("Version id " + field.getName() + " does not point to " + constantName, v, Version.fromId(versionId));
|
||||
assertEquals("Version " + constantName + " does not have correct id", versionId, v.id);
|
||||
if (v.major >= 2) {
|
||||
String number = v.toString();
|
||||
if (v.isBeta()) {
|
||||
number = number.replace("-beta", "_beta");
|
||||
} else if (v.isRC()) {
|
||||
number = number.replace("-rc", "_rc");
|
||||
} else if (v.isAlpha()) {
|
||||
number = number.replace("-alpha", "_alpha");
|
||||
}
|
||||
assertEquals("V_" + number.replace('.', '_'), constantName);
|
||||
} else {
|
||||
assertEquals("V_" + v.toString().replace('.', '_'), constantName);
|
||||
}
|
||||
|
||||
// only the latest version for a branch should be a snapshot (ie unreleased)
|
||||
String branchName = "" + v.major + "." + v.minor;
|
||||
Version maxBranchVersion = maxBranchVersions.get(branchName);
|
||||
if (maxBranchVersion == null) {
|
||||
maxBranchVersions.put(branchName, v);
|
||||
} else if (v.after(maxBranchVersion)) {
|
||||
if (v == Version.CURRENT) {
|
||||
// Current is weird - it counts as released even though it shouldn't.
|
||||
continue;
|
||||
}
|
||||
assertFalse(
|
||||
"Version " + maxBranchVersion + " cannot be a snapshot because version " + v + " exists",
|
||||
VersionUtils.allUnreleasedVersions().contains(maxBranchVersion)
|
||||
);
|
||||
maxBranchVersions.put(branchName, v);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void testIsCompatible() {
|
||||
assertTrue(isCompatible(LegacyESVersion.V_6_8_0, LegacyESVersion.V_7_0_0));
|
||||
assertFalse(isCompatible(LegacyESVersion.V_6_6_0, LegacyESVersion.V_7_0_0));
|
||||
assertFalse(isCompatible(LegacyESVersion.V_6_7_0, LegacyESVersion.V_7_0_0));
|
||||
|
||||
assertFalse(isCompatible(LegacyESVersion.fromId(5000099), LegacyESVersion.fromString("6.0.0")));
|
||||
assertFalse(isCompatible(LegacyESVersion.fromId(5000099), LegacyESVersion.fromString("7.0.0")));
|
||||
|
||||
Version a = randomLegacyVersion(random());
|
||||
Version b = randomLegacyVersion(random());
|
||||
assertThat(a.isCompatible(b), equalTo(b.isCompatible(a)));
|
||||
}
|
||||
}
|
||||
|
|
@ -49,10 +49,11 @@ import java.util.Locale;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import static org.opensearch.LegacyESVersion.V_6_3_0;
|
||||
import static org.opensearch.LegacyESVersion.V_7_0_0;
|
||||
import static org.opensearch.Version.V_1_1_1;
|
||||
import static org.opensearch.Version.V_1_3_0;
|
||||
import static org.opensearch.Version.MASK;
|
||||
import static org.opensearch.test.VersionUtils.allVersions;
|
||||
import static org.opensearch.test.VersionUtils.randomOpenSearchVersion;
|
||||
import static org.opensearch.test.VersionUtils.randomVersion;
|
||||
import static org.hamcrest.CoreMatchers.equalTo;
|
||||
import static org.hamcrest.Matchers.containsString;
|
||||
|
|
@ -61,37 +62,36 @@ import static org.hamcrest.Matchers.is;
|
|||
import static org.hamcrest.Matchers.lessThan;
|
||||
import static org.hamcrest.Matchers.sameInstance;
|
||||
|
||||
/**
|
||||
* Test Version class logic
|
||||
*/
|
||||
public class VersionTests extends OpenSearchTestCase {
|
||||
|
||||
public void testVersionComparison() throws Exception {
|
||||
assertThat(V_6_3_0.before(V_7_0_0), is(true));
|
||||
assertThat(V_6_3_0.before(V_6_3_0), is(false));
|
||||
assertThat(V_7_0_0.before(V_6_3_0), is(false));
|
||||
public void testVersionComparison() {
|
||||
assertThat(V_1_1_1.before(V_1_3_0), is(true));
|
||||
assertThat(V_1_1_1.before(V_1_1_1), is(false));
|
||||
assertThat(V_1_3_0.before(V_1_1_1), is(false));
|
||||
|
||||
assertThat(V_6_3_0.onOrBefore(V_7_0_0), is(true));
|
||||
assertThat(V_6_3_0.onOrBefore(V_6_3_0), is(true));
|
||||
assertThat(V_7_0_0.onOrBefore(V_6_3_0), is(false));
|
||||
assertThat(V_1_1_1.onOrBefore(V_1_3_0), is(true));
|
||||
assertThat(V_1_1_1.onOrBefore(V_1_1_1), is(true));
|
||||
assertThat(V_1_3_0.onOrBefore(V_1_1_1), is(false));
|
||||
|
||||
assertThat(V_6_3_0.after(V_7_0_0), is(false));
|
||||
assertThat(V_6_3_0.after(V_6_3_0), is(false));
|
||||
assertThat(V_7_0_0.after(V_6_3_0), is(true));
|
||||
assertThat(V_1_1_1.after(V_1_3_0), is(false));
|
||||
assertThat(V_1_1_1.after(V_1_1_1), is(false));
|
||||
assertThat(V_1_3_0.after(V_1_1_1), is(true));
|
||||
|
||||
assertThat(V_6_3_0.onOrAfter(V_7_0_0), is(false));
|
||||
assertThat(V_6_3_0.onOrAfter(V_6_3_0), is(true));
|
||||
assertThat(V_7_0_0.onOrAfter(V_6_3_0), is(true));
|
||||
assertThat(V_1_1_1.onOrAfter(V_1_3_0), is(false));
|
||||
assertThat(V_1_1_1.onOrAfter(V_1_1_1), is(true));
|
||||
assertThat(V_1_3_0.onOrAfter(V_1_1_1), is(true));
|
||||
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0-alpha2").onOrAfter(LegacyESVersion.fromString("5.0.0-alpha1")));
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0").onOrAfter(LegacyESVersion.fromString("5.0.0-beta2")));
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0-rc1").onOrAfter(LegacyESVersion.fromString("5.0.0-beta24")));
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0-alpha24").before(LegacyESVersion.fromString("5.0.0-beta0")));
|
||||
assertTrue(Version.fromString("1.0.0-alpha2").onOrAfter(Version.fromString("1.0.0-alpha1")));
|
||||
assertTrue(Version.fromString("1.0.0").onOrAfter(Version.fromString("1.0.0-beta2")));
|
||||
assertTrue(Version.fromString("1.0.0-rc1").onOrAfter(Version.fromString("1.0.0-beta24")));
|
||||
assertTrue(Version.fromString("1.0.0-alpha24").before(Version.fromString("1.0.0-beta0")));
|
||||
|
||||
assertThat(V_6_3_0, is(lessThan(V_7_0_0)));
|
||||
assertThat(V_6_3_0.compareTo(V_6_3_0), is(0));
|
||||
assertThat(V_7_0_0, is(greaterThan(V_6_3_0)));
|
||||
|
||||
assertThat(Version.V_1_0_0.compareMajor(LegacyESVersion.V_7_0_0), is(0));
|
||||
assertThat(Version.V_1_0_0.compareMajor(LegacyESVersion.V_6_3_0), is(1));
|
||||
assertThat(LegacyESVersion.V_6_3_0.compareMajor(Version.V_1_0_0), is(-1));
|
||||
assertThat(V_1_1_1, is(lessThan(V_1_3_0)));
|
||||
assertThat(V_1_1_1.compareTo(V_1_1_1), is(0));
|
||||
assertThat(V_1_3_0, is(greaterThan(V_1_1_1)));
|
||||
}
|
||||
|
||||
public void testMin() {
|
||||
|
|
@ -108,7 +108,7 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
|
||||
public void testMax() {
|
||||
assertEquals(Version.CURRENT, Version.max(Version.CURRENT, VersionUtils.getPreviousVersion()));
|
||||
assertEquals(Version.CURRENT, Version.max(LegacyESVersion.fromString("1.0.1"), Version.CURRENT));
|
||||
assertEquals(Version.CURRENT, Version.max(Version.fromString("1.0.1"), Version.CURRENT));
|
||||
Version version = VersionUtils.randomVersion(random());
|
||||
Version version1 = VersionUtils.randomVersion(random());
|
||||
if (version.id >= version1.id) {
|
||||
|
|
@ -119,10 +119,11 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
}
|
||||
|
||||
public void testMinimumIndexCompatibilityVersion() {
|
||||
assertEquals(Version.fromId(5000099), LegacyESVersion.V_6_0_0_beta1.minimumIndexCompatibilityVersion());
|
||||
assertEquals(Version.fromId(2000099), Version.fromId(5000099).minimumIndexCompatibilityVersion());
|
||||
assertEquals(Version.fromId(2000099), Version.fromId(5010000).minimumIndexCompatibilityVersion());
|
||||
assertEquals(Version.fromId(2000099), Version.fromId(5000001).minimumIndexCompatibilityVersion());
|
||||
// note: all Legacy compatibility support will be removed in OpenSearch 3.0
|
||||
assertEquals(LegacyESVersion.fromId(6000026), V_1_3_0.minimumIndexCompatibilityVersion());
|
||||
assertEquals(LegacyESVersion.fromId(7000099), Version.fromId(2000099).minimumIndexCompatibilityVersion());
|
||||
assertEquals(LegacyESVersion.fromId(7000099), Version.fromId(2010000).minimumIndexCompatibilityVersion());
|
||||
assertEquals(LegacyESVersion.fromId(7000099), Version.fromId(2000001).minimumIndexCompatibilityVersion());
|
||||
}
|
||||
|
||||
public void testVersionConstantPresent() {
|
||||
|
|
@ -153,7 +154,7 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
public void testVersionFromString() {
|
||||
final int iters = scaledRandomIntBetween(100, 1000);
|
||||
for (int i = 0; i < iters; i++) {
|
||||
Version version = randomVersion(random());
|
||||
Version version = randomOpenSearchVersion(random());
|
||||
assertThat(Version.fromString(version.toString()), sameInstance(version));
|
||||
}
|
||||
}
|
||||
|
|
@ -180,7 +181,7 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
|
||||
public void testIndexCreatedVersion() {
|
||||
// an actual index has a IndexMetadata.SETTING_INDEX_UUID
|
||||
final LegacyESVersion version = LegacyESVersion.V_6_0_0_beta1;
|
||||
final Version version = Version.V_1_0_0;
|
||||
assertEquals(
|
||||
version,
|
||||
Version.indexCreated(
|
||||
|
|
@ -195,25 +196,10 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
assertThat(Version.fromString("1.2.0").minimumCompatibilityVersion(), equalTo(major));
|
||||
assertThat(Version.fromString("1.3.0").minimumCompatibilityVersion(), equalTo(major));
|
||||
|
||||
Version major5x = Version.fromString("5.0.0");
|
||||
assertThat(Version.fromString("5.0.0").minimumCompatibilityVersion(), equalTo(major5x));
|
||||
assertThat(Version.fromString("5.2.0").minimumCompatibilityVersion(), equalTo(major5x));
|
||||
assertThat(Version.fromString("5.3.0").minimumCompatibilityVersion(), equalTo(major5x));
|
||||
|
||||
Version major56x = LegacyESVersion.fromString("5.6.0");
|
||||
assertThat(LegacyESVersion.V_6_5_0.minimumCompatibilityVersion(), equalTo(major56x));
|
||||
assertThat(LegacyESVersion.V_6_3_1.minimumCompatibilityVersion(), equalTo(major56x));
|
||||
|
||||
// from 7.0 on we are supporting the latest minor of the previous major... this might fail once we add a new version ie. 5.x is
|
||||
// released since we need to bump the supported minor in Version#minimumCompatibilityVersion()
|
||||
Version lastVersion = LegacyESVersion.V_6_8_0; // TODO: remove this once min compat version is a constant instead of method
|
||||
assertEquals(lastVersion.major, LegacyESVersion.V_7_0_0.minimumCompatibilityVersion().major);
|
||||
assertEquals(
|
||||
"did you miss to bump the minor in Version#minimumCompatibilityVersion()",
|
||||
lastVersion.minor,
|
||||
LegacyESVersion.V_7_0_0.minimumCompatibilityVersion().minor
|
||||
);
|
||||
assertEquals(0, LegacyESVersion.V_7_0_0.minimumCompatibilityVersion().revision);
|
||||
Version major2x = LegacyESVersion.fromString("7.10.0");
|
||||
assertThat(Version.fromString("2.0.0").minimumCompatibilityVersion(), equalTo(major2x));
|
||||
assertThat(Version.fromString("2.2.0").minimumCompatibilityVersion(), equalTo(major2x));
|
||||
assertThat(Version.fromString("2.3.0").minimumCompatibilityVersion(), equalTo(major2x));
|
||||
}
|
||||
|
||||
/** test opensearch min wire compatibility */
|
||||
|
|
@ -258,26 +244,22 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
}
|
||||
|
||||
public void testToString() {
|
||||
// with 2.0.beta we lowercase
|
||||
assertEquals("2.0.0-beta1", LegacyESVersion.fromString("2.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-alpha1", LegacyESVersion.fromId(5000001).toString());
|
||||
assertEquals("2.0.0-beta1", Version.fromString("2.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-alpha1", Version.fromId(5000001).toString());
|
||||
assertEquals("2.3.0", Version.fromString("2.3.0").toString());
|
||||
assertEquals("0.90.0.Beta1", LegacyESVersion.fromString("0.90.0.Beta1").toString());
|
||||
assertEquals("1.0.0.Beta1", LegacyESVersion.fromString("1.0.0.Beta1").toString());
|
||||
assertEquals("2.0.0-beta1", LegacyESVersion.fromString("2.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-beta1", LegacyESVersion.fromString("5.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-alpha1", LegacyESVersion.fromString("5.0.0-alpha1").toString());
|
||||
assertEquals("1.0.0-beta1", Version.fromString("1.0.0-beta1").toString());
|
||||
assertEquals("2.0.0-beta1", Version.fromString("2.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-beta1", Version.fromString("5.0.0-beta1").toString());
|
||||
assertEquals("5.0.0-alpha1", Version.fromString("5.0.0-alpha1").toString());
|
||||
}
|
||||
|
||||
public void testIsRc() {
|
||||
assertTrue(LegacyESVersion.fromString("2.0.0-rc1").isRC());
|
||||
assertTrue(LegacyESVersion.fromString("1.0.0.RC1").isRC());
|
||||
assertTrue(Version.fromString("1.0.0-rc1").isRC());
|
||||
assertTrue(Version.fromString("2.0.0.RC1").isRC());
|
||||
|
||||
for (int i = 0; i < 25; i++) {
|
||||
assertEquals(LegacyESVersion.fromString("5.0.0-rc" + i).id, LegacyESVersion.fromId(5000000 + i + 50).id);
|
||||
assertEquals("5.0.0-rc" + i, LegacyESVersion.fromId(5000000 + i + 50).toString());
|
||||
assertEquals(Version.fromString("5.0.0-rc" + i).id, Version.fromId(5000000 + i + 50).id);
|
||||
assertEquals("5.0.0-rc" + i, Version.fromId(5000000 + i + 50).toString());
|
||||
|
||||
assertEquals(Version.fromString("1.0.0-rc" + i).id, Version.fromId(135217728 + i + 50).id);
|
||||
assertEquals("1.0.0-rc" + i, Version.fromId(135217728 + i + 50).toString());
|
||||
|
|
@ -285,60 +267,42 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
}
|
||||
|
||||
public void testIsBeta() {
|
||||
assertTrue(LegacyESVersion.fromString("2.0.0-beta1").isBeta());
|
||||
assertTrue(LegacyESVersion.fromString("1.0.0.Beta1").isBeta());
|
||||
assertTrue(LegacyESVersion.fromString("0.90.0.Beta1").isBeta());
|
||||
assertTrue(Version.fromString("1.0.0.Beta1").isBeta());
|
||||
assertTrue(Version.fromString("2.0.0.beta1").isBeta());
|
||||
|
||||
for (int i = 0; i < 25; i++) {
|
||||
assertEquals(LegacyESVersion.fromString("5.0.0-beta" + i).id, LegacyESVersion.fromId(5000000 + i + 25).id);
|
||||
assertEquals("5.0.0-beta" + i, LegacyESVersion.fromId(5000000 + i + 25).toString());
|
||||
|
||||
assertEquals(Version.fromString("1.0.0-beta" + i).id, Version.fromId(135217728 + i + 25).id);
|
||||
assertEquals("1.0.0-beta" + i, Version.fromId(135217728 + i + 25).toString());
|
||||
}
|
||||
}
|
||||
|
||||
public void testIsAlpha() {
|
||||
assertTrue(new LegacyESVersion(5000001, org.apache.lucene.util.Version.LUCENE_7_0_0).isAlpha());
|
||||
assertFalse(new LegacyESVersion(4000002, org.apache.lucene.util.Version.LUCENE_7_0_0).isAlpha());
|
||||
assertTrue(new LegacyESVersion(4000002, org.apache.lucene.util.Version.LUCENE_7_0_0).isBeta());
|
||||
assertTrue(LegacyESVersion.fromString("5.0.0-alpha14").isAlpha());
|
||||
assertEquals(5000014, LegacyESVersion.fromString("5.0.0-alpha14").id);
|
||||
assertTrue(LegacyESVersion.fromId(5000015).isAlpha());
|
||||
|
||||
assertEquals(135217742, Version.fromString("1.0.0-alpha14").id);
|
||||
assertTrue(new Version(1000001, org.apache.lucene.util.Version.LUCENE_8_8_2).isAlpha());
|
||||
assertFalse(new Version(1000026, org.apache.lucene.util.Version.LUCENE_8_8_2).isAlpha());
|
||||
assertTrue(new Version(1000026, org.apache.lucene.util.Version.LUCENE_8_8_2).isBeta());
|
||||
assertTrue(Version.fromString("2.0.0-alpha14").isAlpha());
|
||||
assertEquals(2000014 ^ MASK, Version.fromString("2.0.0-alpha14").id);
|
||||
assertTrue(Version.fromId(5000015 ^ MASK).isAlpha());
|
||||
assertEquals(1000014 ^ MASK, Version.fromString("1.0.0-alpha14").id);
|
||||
assertTrue(Version.fromString("1.0.0-alpha14").isAlpha());
|
||||
|
||||
for (int i = 0; i < 25; i++) {
|
||||
assertEquals(LegacyESVersion.fromString("5.0.0-alpha" + i).id, LegacyESVersion.fromId(5000000 + i).id);
|
||||
assertEquals("5.0.0-alpha" + i, LegacyESVersion.fromId(5000000 + i).toString());
|
||||
|
||||
assertEquals(Version.fromString("1.0.0-alpha" + i).id, Version.fromId(135217728 + i).id);
|
||||
assertEquals("1.0.0-alpha" + i, Version.fromId(135217728 + i).toString());
|
||||
assertEquals(Version.fromString("1.0.0-alpha" + i).id, Version.fromId((1000000 + i) ^ MASK).id);
|
||||
assertEquals("1.0.0-alpha" + i, Version.fromId((1000000 + i) ^ MASK).toString());
|
||||
}
|
||||
}
|
||||
|
||||
public void testParseVersion() {
|
||||
final int iters = scaledRandomIntBetween(100, 1000);
|
||||
for (int i = 0; i < iters; i++) {
|
||||
Version version = randomVersion(random());
|
||||
if (random().nextBoolean()) {
|
||||
version = version.id < MASK
|
||||
? new LegacyESVersion(version.id, version.luceneVersion)
|
||||
: new Version(version.id ^ MASK, version.luceneVersion);
|
||||
}
|
||||
Version version = randomOpenSearchVersion(random());
|
||||
Version parsedVersion = Version.fromString(version.toString());
|
||||
assertEquals(version, parsedVersion);
|
||||
}
|
||||
|
||||
expectThrows(IllegalArgumentException.class, () -> { Version.fromString("5.0.0-alph2"); });
|
||||
expectThrows(IllegalArgumentException.class, () -> Version.fromString("5.0.0-alph2"));
|
||||
assertSame(Version.CURRENT, Version.fromString(Version.CURRENT.toString()));
|
||||
|
||||
assertEquals(LegacyESVersion.fromString("2.0.0-SNAPSHOT"), LegacyESVersion.fromId(2000099));
|
||||
|
||||
expectThrows(IllegalArgumentException.class, () -> { LegacyESVersion.fromString("5.0.0-SNAPSHOT"); });
|
||||
expectThrows(IllegalArgumentException.class, () -> Version.fromString("1.0.0-SNAPSHOT"));
|
||||
}
|
||||
|
||||
public void testParseLenient() {
|
||||
|
|
@ -436,11 +400,8 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
|
||||
public void testIsCompatible() {
|
||||
assertTrue(isCompatible(Version.CURRENT, Version.CURRENT.minimumCompatibilityVersion()));
|
||||
assertFalse(isCompatible(LegacyESVersion.V_6_6_0, LegacyESVersion.V_7_0_0));
|
||||
assertFalse(isCompatible(LegacyESVersion.V_6_7_0, LegacyESVersion.V_7_0_0));
|
||||
assertTrue(isCompatible(LegacyESVersion.V_6_8_0, LegacyESVersion.V_7_0_0));
|
||||
assertFalse(isCompatible(Version.fromId(2000099), LegacyESVersion.V_7_0_0));
|
||||
assertFalse(isCompatible(Version.fromId(2000099), LegacyESVersion.V_6_5_0));
|
||||
assertFalse(isCompatible(Version.fromId(2000099), LegacyESVersion.fromId(6050099)));
|
||||
|
||||
int currentMajorID = Version.computeID(Version.CURRENT.major, 0, 0, 99);
|
||||
final Version currentMajorVersion = Version.fromId(currentMajorID);
|
||||
|
|
@ -487,7 +448,7 @@ public class VersionTests extends OpenSearchTestCase {
|
|||
assertThat(versionsByMinCompat, equalTo(allVersions()));
|
||||
}
|
||||
|
||||
public boolean isCompatible(Version left, Version right) {
|
||||
public static boolean isCompatible(Version left, Version right) {
|
||||
boolean result = left.isCompatible(right);
|
||||
assert result == right.isCompatible(left);
|
||||
return result;
|
||||
|
|
|
|||
|
|
@ -267,6 +267,13 @@ public class VersionUtils {
|
|||
return ALL_OPENSEARCH_VERSIONS.get(random.nextInt(ALL_OPENSEARCH_VERSIONS.size()));
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a random {@link LegacyESVersion} from all available legacy versions.
|
||||
**/
|
||||
public static LegacyESVersion randomLegacyVersion(Random random) {
|
||||
return (LegacyESVersion) ALL_LEGACY_VERSIONS.get(random.nextInt(ALL_LEGACY_VERSIONS.size()));
|
||||
}
|
||||
|
||||
/** Returns the first released (e.g., patch version 0) {@link Version} of the last minor from the requested major version
|
||||
* e.g., for version 1.0.0 this would be legacy version (7.10.0); the first release (patch 0), of the last
|
||||
* minor (for 7.x that is minor version 10) for the desired major version (7)
|
||||
|
|
|
|||
|
|
@ -120,14 +120,14 @@ public class VersionUtilsTests extends OpenSearchTestCase {
|
|||
}
|
||||
|
||||
public static class TestReleaseBranch {
|
||||
public static final Version V_4_0_0 = Version.fromString("4.0.0");
|
||||
public static final Version V_4_0_1 = Version.fromString("4.0.1");
|
||||
public static final Version V_5_3_0 = Version.fromString("5.3.0");
|
||||
public static final Version V_5_3_1 = Version.fromString("5.3.1");
|
||||
public static final Version V_5_3_2 = Version.fromString("5.3.2");
|
||||
public static final Version V_5_4_0 = Version.fromString("5.4.0");
|
||||
public static final Version V_5_4_1 = Version.fromString("5.4.1");
|
||||
public static final Version CURRENT = V_5_4_1;
|
||||
public static final Version V_2_0_0 = Version.fromString("2.0.0");
|
||||
public static final Version V_2_0_1 = Version.fromString("2.0.1");
|
||||
public static final Version V_3_3_0 = Version.fromString("3.3.0");
|
||||
public static final Version V_3_3_1 = Version.fromString("3.3.1");
|
||||
public static final Version V_3_3_2 = Version.fromString("3.3.2");
|
||||
public static final Version V_3_4_0 = Version.fromString("3.4.0");
|
||||
public static final Version V_3_4_1 = Version.fromString("3.4.1");
|
||||
public static final Version CURRENT = V_3_4_1;
|
||||
}
|
||||
|
||||
public void testResolveReleasedVersionsForReleaseBranch() {
|
||||
|
|
@ -139,25 +139,25 @@ public class VersionUtilsTests extends OpenSearchTestCase {
|
|||
released,
|
||||
equalTo(
|
||||
Arrays.asList(
|
||||
TestReleaseBranch.V_4_0_0,
|
||||
TestReleaseBranch.V_5_3_0,
|
||||
TestReleaseBranch.V_5_3_1,
|
||||
TestReleaseBranch.V_5_3_2,
|
||||
TestReleaseBranch.V_5_4_0
|
||||
TestReleaseBranch.V_2_0_0,
|
||||
TestReleaseBranch.V_3_3_0,
|
||||
TestReleaseBranch.V_3_3_1,
|
||||
TestReleaseBranch.V_3_3_2,
|
||||
TestReleaseBranch.V_3_4_0
|
||||
)
|
||||
)
|
||||
);
|
||||
assertThat(unreleased, equalTo(Arrays.asList(TestReleaseBranch.V_4_0_1, TestReleaseBranch.V_5_4_1)));
|
||||
assertThat(unreleased, equalTo(Arrays.asList(TestReleaseBranch.V_2_0_1, TestReleaseBranch.V_3_4_1)));
|
||||
}
|
||||
|
||||
public static class TestStableBranch {
|
||||
public static final Version V_4_0_0 = Version.fromString("4.0.0");
|
||||
public static final Version V_4_0_1 = Version.fromString("4.0.1");
|
||||
public static final Version V_5_0_0 = Version.fromString("5.0.0");
|
||||
public static final Version V_5_0_1 = Version.fromString("5.0.1");
|
||||
public static final Version V_5_0_2 = Version.fromString("5.0.2");
|
||||
public static final Version V_5_1_0 = Version.fromString("5.1.0");
|
||||
public static final Version CURRENT = V_5_1_0;
|
||||
public static final Version V_2_0_0 = Version.fromString("2.0.0");
|
||||
public static final Version V_2_0_1 = Version.fromString("2.0.1");
|
||||
public static final Version V_3_0_0 = Version.fromString("3.0.0");
|
||||
public static final Version V_3_0_1 = Version.fromString("3.0.1");
|
||||
public static final Version V_3_0_2 = Version.fromString("3.0.2");
|
||||
public static final Version V_3_1_0 = Version.fromString("3.1.0");
|
||||
public static final Version CURRENT = V_3_1_0;
|
||||
}
|
||||
|
||||
public void testResolveReleasedVersionsForUnreleasedStableBranch() {
|
||||
|
|
@ -165,19 +165,19 @@ public class VersionUtilsTests extends OpenSearchTestCase {
|
|||
List<Version> released = t.v1();
|
||||
List<Version> unreleased = t.v2();
|
||||
|
||||
assertThat(released, equalTo(Arrays.asList(TestStableBranch.V_4_0_0, TestStableBranch.V_5_0_0, TestStableBranch.V_5_0_1)));
|
||||
assertThat(unreleased, equalTo(Arrays.asList(TestStableBranch.V_4_0_1, TestStableBranch.V_5_0_2, TestStableBranch.V_5_1_0)));
|
||||
assertThat(released, equalTo(Arrays.asList(TestStableBranch.V_2_0_0, TestStableBranch.V_3_0_0, TestStableBranch.V_3_0_1)));
|
||||
assertThat(unreleased, equalTo(Arrays.asList(TestStableBranch.V_2_0_1, TestStableBranch.V_3_0_2, TestStableBranch.V_3_1_0)));
|
||||
}
|
||||
|
||||
public static class TestStableBranchBehindStableBranch {
|
||||
public static final Version V_4_0_0 = Version.fromString("4.0.0");
|
||||
public static final Version V_4_0_1 = Version.fromString("4.0.1");
|
||||
public static final Version V_5_3_0 = Version.fromString("5.3.0");
|
||||
public static final Version V_5_3_1 = Version.fromString("5.3.1");
|
||||
public static final Version V_5_3_2 = Version.fromString("5.3.2");
|
||||
public static final Version V_5_4_0 = Version.fromString("5.4.0");
|
||||
public static final Version V_5_5_0 = Version.fromString("5.5.0");
|
||||
public static final Version CURRENT = V_5_5_0;
|
||||
public static final Version V_2_0_0 = Version.fromString("2.0.0");
|
||||
public static final Version V_2_0_1 = Version.fromString("2.0.1");
|
||||
public static final Version V_3_3_0 = Version.fromString("3.3.0");
|
||||
public static final Version V_3_3_1 = Version.fromString("3.3.1");
|
||||
public static final Version V_3_3_2 = Version.fromString("3.3.2");
|
||||
public static final Version V_3_4_0 = Version.fromString("3.4.0");
|
||||
public static final Version V_3_5_0 = Version.fromString("3.5.0");
|
||||
public static final Version CURRENT = V_3_5_0;
|
||||
}
|
||||
|
||||
public void testResolveReleasedVersionsForStableBranchBehindStableBranch() {
|
||||
|
|
@ -192,9 +192,9 @@ public class VersionUtilsTests extends OpenSearchTestCase {
|
|||
released,
|
||||
equalTo(
|
||||
Arrays.asList(
|
||||
TestStableBranchBehindStableBranch.V_4_0_0,
|
||||
TestStableBranchBehindStableBranch.V_5_3_0,
|
||||
TestStableBranchBehindStableBranch.V_5_3_1
|
||||
TestStableBranchBehindStableBranch.V_2_0_0,
|
||||
TestStableBranchBehindStableBranch.V_3_3_0,
|
||||
TestStableBranchBehindStableBranch.V_3_3_1
|
||||
)
|
||||
)
|
||||
);
|
||||
|
|
@ -202,22 +202,22 @@ public class VersionUtilsTests extends OpenSearchTestCase {
|
|||
unreleased,
|
||||
equalTo(
|
||||
Arrays.asList(
|
||||
TestStableBranchBehindStableBranch.V_4_0_1,
|
||||
TestStableBranchBehindStableBranch.V_5_3_2,
|
||||
TestStableBranchBehindStableBranch.V_5_4_0,
|
||||
TestStableBranchBehindStableBranch.V_5_5_0
|
||||
TestStableBranchBehindStableBranch.V_2_0_1,
|
||||
TestStableBranchBehindStableBranch.V_3_3_2,
|
||||
TestStableBranchBehindStableBranch.V_3_4_0,
|
||||
TestStableBranchBehindStableBranch.V_3_5_0
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
public static class TestNewMajorRelease {
|
||||
public static final Version V_4_6_0 = Version.fromString("4.6.0");
|
||||
public static final Version V_4_6_1 = Version.fromString("4.6.1");
|
||||
public static final Version V_4_6_2 = Version.fromString("4.6.2");
|
||||
public static final Version V_5_0_0 = Version.fromString("5.0.0");
|
||||
public static final Version V_5_0_1 = Version.fromString("5.0.1");
|
||||
public static final Version CURRENT = V_5_0_1;
|
||||
public static final Version V_2_6_0 = Version.fromString("2.6.0");
|
||||
public static final Version V_2_6_1 = Version.fromString("2.6.1");
|
||||
public static final Version V_2_6_2 = Version.fromString("2.6.2");
|
||||
public static final Version V_3_0_0 = Version.fromString("3.0.0");
|
||||
public static final Version V_3_0_1 = Version.fromString("3.0.1");
|
||||
public static final Version CURRENT = V_3_0_1;
|
||||
}
|
||||
|
||||
public void testResolveReleasedVersionsAtNewMajorRelease() {
|
||||
|
|
@ -228,8 +228,8 @@ public class VersionUtilsTests extends OpenSearchTestCase {
|
|||
List<Version> released = t.v1();
|
||||
List<Version> unreleased = t.v2();
|
||||
|
||||
assertThat(released, equalTo(Arrays.asList(TestNewMajorRelease.V_4_6_0, TestNewMajorRelease.V_4_6_1, TestNewMajorRelease.V_5_0_0)));
|
||||
assertThat(unreleased, equalTo(Arrays.asList(TestNewMajorRelease.V_4_6_2, TestNewMajorRelease.V_5_0_1)));
|
||||
assertThat(released, equalTo(Arrays.asList(TestNewMajorRelease.V_2_6_0, TestNewMajorRelease.V_2_6_1, TestNewMajorRelease.V_3_0_0)));
|
||||
assertThat(unreleased, equalTo(Arrays.asList(TestNewMajorRelease.V_2_6_2, TestNewMajorRelease.V_3_0_1)));
|
||||
}
|
||||
|
||||
public static class TestVersionBumpIn2x {
|
||||
|
|
|
|||
Loading…
Reference in New Issue