Skip to content

Fix XContentTypeTests where version was a negative byte #63382

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

Merged
merged 3 commits into from
Oct 8, 2020
Merged

Fix XContentTypeTests where version was a negative byte #63382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2a85d2
Fix XContentTypeTests where version was a negative byte
pgomulka Oct 7, 2020
be07feb
use rnadomByte()
pgomulka Oct 8, 2020
1459519
Merge branch 'master' into test/fix_negative_byte
pgomulka Oct 8, 2020
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
8 changes: 4 additions & 4 deletions server/src/test/java/org/elasticsearch/common/xcontent/XContentTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void testFromRubbish() throws Exception {
}

public void testVersionedMediaType() {
String version = String.valueOf(Math.abs(randomByte()));
String version = String.valueOf(randomNonNegativeByte());
assertThat(XContentType.fromMediaType("application/vnd.elasticsearch+json;compatible-with=" + version),
equalTo(XContentType.JSON));
assertThat(XContentType.fromMediaType("application/vnd.elasticsearch+cbor;compatible-with=" + version),
Expand All @@ -119,7 +119,7 @@ public void testVersionedMediaType() {
}

public void testVersionParsing() {
byte version = (byte) Math.abs(randomByte());
byte version = randomNonNegativeByte();
assertThat(XContentType.parseVersion("application/vnd.elasticsearch+json;compatible-with=" + version),
equalTo(version));
assertThat(XContentType.parseVersion("application/vnd.elasticsearch+cbor;compatible-with=" + version),
Expand All @@ -146,12 +146,12 @@ public void testUnrecognizedParameter() {
is(nullValue())); }

public void testMediaTypeWithoutESSubtype() {
String version = String.valueOf(Math.abs(randomByte()));
String version = String.valueOf(randomNonNegativeByte());
assertThat(XContentType.fromMediaType("application/json;compatible-with=" + version), nullValue());
}

public void testAnchoring() {
String version = String.valueOf(Math.abs(randomByte()));
String version = String.valueOf(randomNonNegativeByte());
assertThat(XContentType.fromMediaType("sth_application/json;compatible-with=" + version + ".0"), nullValue());
assertThat(XContentType.fromMediaType("sth_application/json;compatible-with=" + version + "_sth"), nullValue());
assertThat(XContentType.fromMediaType("application/json;compatible-with=" + version + "_sth"), nullValue());
Expand Down
5 changes: 5 additions & 0 deletions test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,11 @@ public static byte randomByte() {
return (byte) random().nextInt();
}

public static byte randomNonNegativeByte() {
byte randomByte = randomByte();
return (byte) (randomByte == Byte.MIN_VALUE ? 0 : Math.abs(randomByte));
}

/**
* Helper method to create a byte array of a given length populated with random byte values
*
Expand Down