More test fixes

Author: smalyshev

libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java

@@ -70,7 +70,7 @@ private static XContentParseException newXContentParseException(JsonProcessingEx
      */
     private static IOException handleParserException(IOException e) throws IOException {
         switch (e) {
-            case JsonEOFException eof -> throw new XContentEOFException(getLocation(eof), eof.getMessage(), e);
+            case JsonEOFException eof -> throw new XContentEOFException(getLocation(eof), "Unexpected end of file", e);
             case JsonParseException pe -> throw newXContentParseException(pe);
             case InputCoercionException ice -> throw newXContentParseException(ice);
             case CharConversionException cce -> throw new XContentParseException(null, cce.getMessage(), cce);

modules/reindex/src/test/java/org/elasticsearch/reindex/remote/RemoteRequestBuildersTests.java

@@ -246,7 +246,7 @@ public void testInitialSearchEntity() throws IOException {
         );
         assertThat(e.getCause().getMessage(), containsString("Unexpected character (',' (code 44))"));
         e = expectThrows(RuntimeException.class, () -> initialSearch(searchRequest, new BytesArray("{"), remoteVersion));
-        assertThat(e.getCause().getMessage(), containsString("Unexpected end-of-input"));
+        assertThat(e.getCause().getMessage(), containsString("Unexpected end of file"));
     }
 
     public void testScrollParams() {

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

@@ -24,7 +24,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 
-import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
 public class BulkRequestParserTests extends ESTestCase {
@@ -395,7 +394,7 @@ public void testFailMissingCloseBrace() {
                 req -> fail("expected failure before we got this far")
             )
         );
-        assertThat(ex.getMessage(), containsString("[1:14] Unexpected end-of-input"));
+        assertEquals("[1:14] Unexpected end of file", ex.getMessage());
     }
 
     public void testFailExtraKeys() {

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

@@ -432,7 +432,7 @@ public void testBulkActionWithoutCurlyBrace() throws Exception {
             () -> bulkRequest.add(bulkAction.getBytes(StandardCharsets.UTF_8), 0, bulkAction.length(), null, XContentType.JSON)
         );
 
-        assertThat(ex.getMessage(), containsString("Unexpected end-of-input"));
+        assertThat(ex.getMessage(), containsString("Unexpected end of file"));
     }
 
     public void testBulkActionWithAdditionalKeys() throws Exception {

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/response/XContentUtilsTests.java

@@ -103,7 +103,7 @@ public void testPositionParserAtTokenAfterField_ThrowsWithMalformedJSON() throws
                 XContentEOFException.class,
                 () -> XContentUtils.positionParserAtTokenAfterField(parser, missingField, errorFormat)
             );
-            assertThat(exception.getMessage(), containsString("[4:1] Unexpected end-of-input"));
+            assertThat(exception.getMessage(), containsString("[4:1] Unexpected end of file"));
         }
     }
 

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/external/response/huggingface/HuggingFaceElserResponseEntityTests.java

@@ -309,7 +309,7 @@ public void testFails_ResponseIsInvalidJson_MissingSquareBracket() {
                 new HttpResult(mock(HttpResponse.class), responseJson.getBytes(StandardCharsets.UTF_8))
             )
         );
-        assertThat(thrownException.getMessage(), containsString("[5:1] Unexpected end-of-input"));
+        assertThat(thrownException.getMessage(), containsString("[5:1] Unexpected end of file"));
         assertThat(thrownException.getCause().getMessage(), containsString("expected close marker for Array (start marker at"));
     }
 

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/email/attachment/ReportingAttachmentParserTests.java

@@ -239,7 +239,7 @@ public void testInitialRequestContainsInvalidPayload() throws Exception {
             XContentParseException.class,
             () -> reportingAttachmentParser.toAttachment(createWatchExecutionContext(), Payload.EMPTY, attachment)
         );
-        assertThat(e.getMessage(), containsString("Unexpected end-of-input"));
+        assertThat(e.getMessage(), containsString("Unexpected end of file"));
     }
 
     public void testInitialRequestContainsPathAsObject() throws Exception {