From e6d60d937e0b94fe630c9e3610a9316bd88ab344 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sun, 22 Sep 2019 20:31:51 +0100 Subject: [PATCH] Ensure the use of UTF-8 encoding in ImageBannerTests Closes gh-18301 --- .../org/springframework/boot/ImageBannerTests.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java index 964a59622e..9626172f85 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java @@ -18,6 +18,7 @@ package org.springframework.boot; import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.io.UnsupportedEncodingException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -204,8 +205,13 @@ class ImageBannerTests { ConfigurableEnvironment environment = new MockEnvironment(); TestPropertySourceUtils.addInlinedPropertiesToEnvironment(environment, properties); ByteArrayOutputStream out = new ByteArrayOutputStream(); - banner.printBanner(environment, getClass(), new PrintStream(out)); - return out.toString(); + try { + banner.printBanner(environment, getClass(), new PrintStream(out, false, "UTF-8")); + return out.toString("UTF-8"); + } + catch (UnsupportedEncodingException ex) { + throw new IllegalStateException(ex); + } } }