Skip to content
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

Avoid noisy errors in testSyntheticSourceKeepArrays #114391

Merged
merged 16 commits into from
Oct 9, 2024
Merged

Avoid noisy errors in testSyntheticSourceKeepArrays #114391

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3efbb73
Minimize storing array source
kkrik-es Oct 2, 2024
c9011b2
restrict to fields
kkrik-es Oct 2, 2024
6dd9858
Merge branch 'main' into synthetic-source/single-element-arrays
kkrik-es Oct 3, 2024
9c6bea7
revert changes for `addIgnoredFieldFromContext`
kkrik-es Oct 3, 2024
b1d84d3
Merge branch 'main' into synthetic-source/single-element-arrays
kkrik-es Oct 5, 2024
31efafe
fix test
kkrik-es Oct 5, 2024
8448866
spotless
kkrik-es Oct 5, 2024
e626324
Merge branch 'main' into synthetic-source/single-element-arrays
kkrik-es Oct 7, 2024
f95c5dc
Merge branch 'main' into synthetic-source/single-element-arrays
kkrik-es Oct 8, 2024
e79d95e
count nulls
kkrik-es Oct 8, 2024
c131df2
Merge branch 'main' into synthetic-source/single-element-arrays
kkrik-es Oct 9, 2024
b16a785
Avoid noisy errors in testSyntheticSourceKeepArrays
kkrik-es Oct 9, 2024
4465b1f
update
kkrik-es Oct 9, 2024
503622b
update
kkrik-es Oct 9, 2024
83091da
update
kkrik-es Oct 9, 2024
5abc879
update
kkrik-es Oct 9, 2024
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
7 changes: 2 additions & 5 deletions test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ public void testSyntheticSourceKeepArrays() throws IOException {
b.endObject();
}));

int elementCount = randomIntBetween(1, 5);
int elementCount = randomIntBetween(2, 5);
CheckedConsumer<XContentBuilder, IOException> buildInput = (XContentBuilder builder) -> {
example.buildInputArray(builder, elementCount);
};
Expand All @@ -1581,10 +1581,7 @@ public void testSyntheticSourceKeepArrays() throws IOException {
builder.endObject();
String expected = Strings.toString(builder);
String actual = syntheticSource(mapperAll, buildInput);
// Check for single-element array, the array source is not stored in this case.
if (expected.replace("[", "").replace("]", "").equals(actual) == false) {
assertThat(actual, equalTo(expected));
}
assertThat(actual, equalTo(expected));
}

@Override
Expand Down