From e3610eaf0c7798bf8c1e833e23fdd93dd4148c8b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 14 Apr 2025 16:15:29 -0700 Subject: [PATCH] Fix "Used nested format for ECS structure logging" test on Windows See gh-45063 --- ...icCommonSchemaStructuredLogFormatterTests.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatterTests.java index 14505d815a..11fa3d53fb 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatterTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatterTests.java @@ -94,14 +94,13 @@ class ElasticCommonSchemaStructuredLogFormatterTests extends AbstractStructuredL expectedError.put("message", "Boom"); assertThat(error).containsAllEntriesOf(expectedError); String stackTrace = (String) error.get("stack_trace"); - assertThat(stackTrace) - .startsWith(String.format("java.lang.RuntimeException: Boom%n\tat org.springframework.boot.logging.log4j2." - + "ElasticCommonSchemaStructuredLogFormatterTests.shouldFormatException")); - assertThat(json).contains(String - .format("java.lang.RuntimeException: Boom%n\\tat org.springframework.boot.logging.log4j2." - + "ElasticCommonSchemaStructuredLogFormatterTests.shouldFormatException") - .replace("\n", "\\n") - .replace("\r", "\\r")); + assertThat(stackTrace).startsWith( + """ + java.lang.RuntimeException: Boom + \tat org.springframework.boot.logging.log4j2.ElasticCommonSchemaStructuredLogFormatterTests.shouldFormatException"""); + assertThat(json).contains( + """ + java.lang.RuntimeException: Boom\\n\\tat org.springframework.boot.logging.log4j2.ElasticCommonSchemaStructuredLogFormatterTests.shouldFormatException"""); } @Test