fixing tests

Author: masseyke

server/src/test/java/org/elasticsearch/action/bulk/TransportSimulateBulkActionTests.java

@@ -185,7 +185,8 @@ public void onResponse(BulkResponse response) {
                                           "_index": "%s",
                                           "_version": -3,
                                           "_source": %s,
-                                          "executed_pipelines": [%s]
+                                          "executed_pipelines": [%s],
+                                          "effective_mapping":{}
                                         }""",
                                     indexRequest.id(),
                                     indexRequest.index(),
@@ -319,7 +320,8 @@ public void onResponse(BulkResponse response) {
                                               "_version": -3,
                                               "_source": %s,
                                               "executed_pipelines": [%s],
-                                              "error":{"type":"exception","reason":"invalid mapping"}
+                                              "error":{"type":"exception","reason":"invalid mapping"},
+                                              "effective_mapping":{"_doc":{"dynamic":"strict"}}
                                             }""",
                                         indexRequest.id(),
                                         indexName,
@@ -346,7 +348,8 @@ public void onResponse(BulkResponse response) {
                                               "_index": "%s",
                                               "_version": -3,
                                               "_source": %s,
-                                              "executed_pipelines": [%s]
+                                              "executed_pipelines": [%s],
+                                              "effective_mapping":{"_doc":{"dynamic":"strict"}}
                                             }""",
                                         indexRequest.id(),
                                         indexName,
@@ -373,7 +376,9 @@ public void onFailure(Exception e) {
         };
         when(indicesService.withTempIndexService(any(), any())).thenAnswer((Answer<?>) invocation -> {
             IndexMetadata imd = invocation.getArgument(0);
-            if (indicesWithInvalidMappings.contains(imd.getIndex().getName())) {
+            if (indicesWithInvalidMappings.contains(imd.getIndex().getName())
+                // We only want to throw exceptions inside TransportSimulateBulkAction:
+                && invocation.getArgument(1).getClass().getSimpleName().contains("TransportSimulateBulkAction")) {
                 throw new ElasticsearchException("invalid mapping");
             } else {
                 // we don't actually care what is returned, as long as no exception is thrown the request is considered valid:

server/src/test/java/org/elasticsearch/rest/action/ingest/RestSimulateIngestActionTests.java

@@ -15,6 +15,7 @@
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.ingest.SimulateIndexResponse;
 import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.rest.AbstractRestChannel;
 import org.elasticsearch.rest.RestResponse;
@@ -23,6 +24,7 @@
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 import org.elasticsearch.xcontent.XContentType;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -157,9 +159,9 @@ private void testInputJsonConvertsToOutputJson(String inputJson, String expected
     public void testSimulateIngestRestToXContentListener() throws Exception {
         // First, make sure it works with success responses:
         BulkItemResponse[] responses = new BulkItemResponse[3];
-        responses[0] = getSuccessBulkItemResponse("123", "{\"foo\": \"bar\"}");
+        responses[0] = getSuccessBulkItemResponse("123", "{\"foo\": \"bar\"}", false);
         responses[1] = getFailureBulkItemResponse("678", "This has failed");
-        responses[2] = getSuccessBulkItemResponse("456", "{\"bar\": \"baz\"}");
+        responses[2] = getSuccessBulkItemResponse("456", "{\"bar\": \"baz\"}", true);
         BulkResponse bulkResponse = new BulkResponse(responses, randomLongBetween(0, 50000));
         String expectedXContent = """
             {
@@ -183,7 +185,8 @@ public void testSimulateIngestRestToXContentListener() throws Exception {
                       {
                         "field" : "def"
                       }
-                    ]
+                    ],
+                    "effective_mapping" : { }
                   }
                 },
                 {
@@ -215,7 +218,14 @@ public void testSimulateIngestRestToXContentListener() throws Exception {
                       {
                         "field" : "def"
                       }
-                    ]
+                    ],
+                    "effective_mapping" : {
+                      "properties" : {
+                        "foo" : {
+                          "type" : "keyword"
+                        }
+                      }
+                    }
                   }
                 }
               ]
@@ -231,7 +241,7 @@ private BulkItemResponse getFailureBulkItemResponse(String id, String failureMes
         );
     }
 
-    private BulkItemResponse getSuccessBulkItemResponse(String id, String source) {
+    private BulkItemResponse getSuccessBulkItemResponse(String id, String source, boolean hasMapping) throws IOException {
         ByteBuffer[] sourceByteBuffer = new ByteBuffer[1];
         sourceByteBuffer[0] = ByteBuffer.wrap(source.getBytes(StandardCharsets.UTF_8));
         return BulkItemResponse.success(
@@ -246,7 +256,7 @@ private BulkItemResponse getSuccessBulkItemResponse(String id, String source) {
                 List.of("pipeline1", "pipeline2"),
                 List.of("abc", "def"),
                 null,
-                null
+                hasMapping ? new CompressedXContent("{\"properties\":{\"foo\":{\"type\":\"keyword\"}}}") : null
             )
         );
     }