Skip to content

Fix skip section version parsing #26964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix skip section version parsing #26964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SkipSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ private Version[] parseVersionRange(String versionRange) {
if (versionRange.trim().equals("all")) {
return new Version[]{VersionUtils.getFirstVersion(), Version.CURRENT};
}
String[] skipVersions = versionRange.split("-");
if (skipVersions.length > 2) {
String[] skipVersions = versionRange.split("-(?=\\d+|\\s+|$)", -1);
if (skipVersions.length != 2) {
throw new IllegalArgumentException("version range malformed: " + versionRange);
}

Expand Down
34 changes: 34 additions & 0 deletions test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SkipSectionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import org.elasticsearch.common.xcontent.yaml.YamlXContent;
import org.elasticsearch.test.VersionUtils;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
Expand All @@ -43,6 +45,38 @@ public void testSkip() {
assertTrue(section.skip(Version.CURRENT));
}

public void testParseVersionRange() throws Exception {
List<String> features = Collections.emptyList();
Arrays.asList("5.0.0 - 5.1.1", "5.0.0-5.1.1", "5.0.0- 5.1.1", "5.0.0 -5.1.1").forEach(
vr -> verifyVersionRange(vr, features, Version.V_5_0_0, Version.V_5_1_1));
Arrays.asList("5.0.0 - ", "5.0.0- ", "5.0.0 -", "5.0.0-").forEach(
vr -> verifyVersionRange(vr, features, Version.V_5_0_0, Version.CURRENT));
Arrays.asList(" - 5.0.0", " -5.0.0", "-5.0.0", "- 5.0.0").forEach(
vr -> verifyVersionRange(vr, features, VersionUtils.getFirstVersion(), Version.V_5_0_0));
Arrays.asList("5.0.0 - 6.0.0-rc1", "5.0.0 -6.0.0-rc1", "5.0.0- 6.0.0-rc1", "5.0.0-6.0.0-rc1").forEach(
vr -> verifyVersionRange(vr, features, Version.V_5_0_0, Version.V_6_0_0_rc1));
Arrays.asList("6.0.0-rc1 - 5.0.0", "6.0.0-rc1- 5.0.0", "6.0.0-rc1 -5.0.0", "6.0.0-rc1-5.0.0").forEach(
vr -> verifyVersionRange(vr, features, Version.V_6_0_0_rc1, Version.V_5_0_0));
Arrays.asList("5.0.0 - 6.0.0-beta1", "5.0.0 -6.0.0-beta1", "5.0.0- 6.0.0-beta1", "5.0.0-6.0.0-beta1").forEach(
vr -> verifyVersionRange(vr, features, Version.V_5_0_0, Version.V_6_0_0_beta1));
Arrays.asList("6.0.0-beta1 - 5.0.0", "6.0.0-beta1- 5.0.0", "6.0.0-beta1 -5.0.0", "6.0.0-beta1-5.0.0").forEach(
vr -> verifyVersionRange(vr, features, Version.V_6_0_0_beta1, Version.V_5_0_0));
Arrays.asList("5.0.0 - 6.0.0-alpha1", "5.0.0 -6.0.0-alpha1", "5.0.0- 6.0.0-alpha1", "5.0.0-6.0.0-alpha1").forEach(
vr -> verifyVersionRange(vr, features, Version.V_5_0_0, Version.V_6_0_0_alpha1));
Arrays.asList("6.0.0-alpha1 - 5.0.0", "6.0.0-alpha1- 5.0.0", "6.0.0-alpha1 -5.0.0", "6.0.0-alpha1-5.0.0").forEach(
vr -> verifyVersionRange(vr, features, Version.V_6_0_0_alpha1, Version.V_5_0_0));
Arrays.asList(" - 6.0.0-rc1", " -6.0.0-rc1", "- 6.0.0-rc1", "-6.0.0-rc1").forEach(
vr -> verifyVersionRange(vr, features, VersionUtils.getFirstVersion(), Version.V_6_0_0_rc1));
Arrays.asList("6.0.0-rc1 - ", "6.0.0-rc1- ", "6.0.0-rc1 -", "6.0.0-rc1-").forEach(
vr -> verifyVersionRange(vr, features, Version.V_6_0_0_rc1, Version.CURRENT));
}

private void verifyVersionRange(String versionRange, List<String> features, Version lowerVersion, Version upperVersion) {
SkipSection skipSection = new SkipSection(versionRange, features, "foo");
assertEquals(lowerVersion, skipSection.getLowerVersion());
assertEquals(upperVersion, skipSection.getUpperVersion());
}

public void testMessage() {
SkipSection section = new SkipSection("5.0.0 - 5.1.0",
Collections.singletonList("warnings"), "foobar");
Expand Down