Skip to content

Fix ignores malformed testcase #125337

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
Mar 20, 2025
Merged

Fix ignores malformed testcase #125337

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
7dba7cf
Fix testSynthesizeArrayRandomIgnoresMalformed
jordan-powers Mar 20, 2025
afd73db
Unmute testSynthesizeArrayRandomIgnoresMalformed
jordan-powers Mar 20, 2025
09a380a
Merge remote-tracking branch 'upstream/main' into fix-ignores-malform…
jordan-powers Mar 20, 2025
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,6 @@ tests:
- class: org.elasticsearch.reservedstate.service.ReservedClusterStateServiceTests
method: testProcessMultipleChunks
issue: https://github.com/elastic/elasticsearch/issues/125305
- class: org.elasticsearch.index.mapper.NativeArrayIntegrationTestCase
method: testSynthesizeArrayRandomIgnoresMalformed
issue: https://github.com/elastic/elasticsearch/issues/125319

# Examples:
#
Expand Down
8 changes: 4 additions & 4 deletions server/src/test/java/org/elasticsearch/index/mapper/NativeArrayIntegrationTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ public void testSynthesizeArrayRandomIgnoresMalformed() throws Exception {
var expectedDocument = jsonBuilder().startObject();
var inputDocument = jsonBuilder().startObject();

boolean expectedContainsArray = values.length > 0 || malformed.length > 1;
if (expectedContainsArray) {
boolean expectedIsArray = values.length != 0 || malformed.length != 1;
if (expectedIsArray) {
expectedDocument.startArray("field");
} else if (malformed.length > 0) {
} else {
expectedDocument.field("field");
}
inputDocument.startArray("field");
Expand All @@ -113,7 +113,7 @@ public void testSynthesizeArrayRandomIgnoresMalformed() throws Exception {
}
}

if (expectedContainsArray) {
if (expectedIsArray) {
expectedDocument.endArray();
}
expectedDocument.endObject();
Expand Down