From 7dba7cf99f93472190f2bf5c72b5a37186bd237a Mon Sep 17 00:00:00 2001 From: Jordan Powers Date: Thu, 20 Mar 2025 10:41:28 -0700 Subject: [PATCH 1/2] Fix testSynthesizeArrayRandomIgnoresMalformed --- .../index/mapper/NativeArrayIntegrationTestCase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NativeArrayIntegrationTestCase.java b/server/src/test/java/org/elasticsearch/index/mapper/NativeArrayIntegrationTestCase.java index 0097dfca44fa0..17f39be5b1a60 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NativeArrayIntegrationTestCase.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NativeArrayIntegrationTestCase.java @@ -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"); @@ -113,7 +113,7 @@ public void testSynthesizeArrayRandomIgnoresMalformed() throws Exception { } } - if (expectedContainsArray) { + if (expectedIsArray) { expectedDocument.endArray(); } expectedDocument.endObject(); From afd73db25633f317c85e1c106df51aa9c124f7a5 Mon Sep 17 00:00:00 2001 From: Jordan Powers Date: Thu, 20 Mar 2025 09:24:42 -0700 Subject: [PATCH 2/2] Unmute testSynthesizeArrayRandomIgnoresMalformed --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index a37798ebccef4..f1c564c7e56ce 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -399,9 +399,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: #