Skip to content

[Test] Always check the XContent equivalent when parsing aggregations #24208

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
Apr 20, 2017
Merged

[Test] Always check the XContent equivalent when parsing aggregations #24208

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
a16ffd1
[Test] Always check the XContent equivalent when parsing aggregations
tlrx Apr 20, 2017
ab951b3
Fix checkstyle violation
tlrx Apr 20, 2017
13f3a90
Update after Christoph review
tlrx Apr 20, 2017
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
23 changes: 10 additions & 13 deletions core/src/test/java/org/elasticsearch/search/aggregations/InternalAggregationTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,7 @@ public final void testFromXContent() throws IOException {
assumeTrue("This test does not support the aggregation type yet",
getNamedXContents().stream().filter(entry -> entry.name.match(aggregation.getType())).count() > 0);

final ToXContent.Params params = new ToXContent.MapParams(singletonMap(RestSearchAction.TYPED_KEYS_PARAM, "true"));
final boolean humanReadable = randomBoolean();
final XContentType xContentType = randomFrom(XContentType.values());
final BytesReference originalBytes = toShuffledXContent(aggregation, xContentType, params, humanReadable);

final Aggregation parsedAggregation = parse(aggregation, xContentType, humanReadable, randomBoolean());

final BytesReference parsedBytes = toXContent((ToXContent) parsedAggregation, xContentType, params, humanReadable);
assertToXContentEquivalent(originalBytes, parsedBytes, xContentType);
final Aggregation parsedAggregation = parseAndAssert(aggregation, randomBoolean());
assertFromXContent(aggregation, (ParsedAggregation) parsedAggregation);
}

Expand All @@ -220,12 +212,13 @@ protected void assertFromXContent(T aggregation, ParsedAggregation parsedAggrega
}

@SuppressWarnings("unchecked")
protected <P extends ParsedAggregation> P parse(final InternalAggregation aggregation,
final XContentType xContentType,
final boolean humanReadable,
final boolean shuffled) throws IOException {
protected <P extends ParsedAggregation> P parseAndAssert(final InternalAggregation aggregation,
final boolean shuffled) throws IOException {

final ToXContent.Params params = new ToXContent.MapParams(singletonMap(RestSearchAction.TYPED_KEYS_PARAM, "true"));
final XContentType xContentType = randomFrom(XContentType.values());
final boolean humanReadable = randomBoolean();

final BytesReference originalBytes;
if (shuffled) {
originalBytes = toShuffledXContent(aggregation, xContentType, params, humanReadable);
Expand Down Expand Up @@ -255,6 +248,10 @@ protected <P extends ParsedAggregation> P parse(final InternalAggregation aggreg
assertTrue(parsedAggregation instanceof ParsedAggregation);
assertEquals(aggregation.getType(), ((ParsedAggregation) parsedAggregation).getType());
}

BytesReference parsedBytes = toXContent((ToXContent) parsedAggregation, xContentType, params, humanReadable);
assertToXContentEquivalent(originalBytes, parsedBytes, xContentType);

return (P) parsedAggregation;
}

Expand Down
2 changes: 1 addition & 1 deletion ...rg/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected abstract T createTestInstance(String name, List<PipelineAggregator> pi

public void testPercentilesIterators() throws IOException {
final T aggregation = createTestInstance();
final Iterable<Percentile> parsedAggregation = parse(aggregation, randomFrom(XContentType.values()), randomBoolean(), false);
final Iterable<Percentile> parsedAggregation = parseAndAssert(aggregation, false);

Iterator<Percentile> it = aggregation.iterator();
Iterator<Percentile> parsedIt = parsedAggregation.iterator();
Expand Down