diff --git a/modules/addons/transports/http/undertow/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineTest.java b/modules/addons/transports/http/undertow/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineTest.java index 30553ce3e..a47fec9c9 100644 --- a/modules/addons/transports/http/undertow/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineTest.java +++ b/modules/addons/transports/http/undertow/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineTest.java @@ -29,6 +29,7 @@ import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -156,7 +157,7 @@ private void pingServer(URL url) { HttpURLConnection connection1 = (HttpURLConnection) url.openConnection(); StringBuilder sb = new StringBuilder(); - BufferedReader br = new BufferedReader(new InputStreamReader(connection1.getInputStream())); + BufferedReader br = new BufferedReader(new InputStreamReader(connection1.getInputStream(), StandardCharsets.UTF_8)); String line; while ((line = br.readLine()) != null) { sb.append(line); @@ -186,7 +187,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception count.incrementAndGet(); exchange.setResponseCode(200); OutputStream os = exchange.getOutputStream(); - os.write("Hello".getBytes()); + os.write("Hello".getBytes(StandardCharsets.UTF_8)); os.flush(); } diff --git a/modules/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java b/modules/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java index 1da7f737d..b6b37ab9b 100644 --- a/modules/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java +++ b/modules/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java @@ -27,7 +27,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -190,7 +192,7 @@ private static AppclientProcess newAppclientProcess(final String archive, final } private static void printLogTrailer(OutputStream logOutputStreams, String appclientFullName) { - final PrintWriter pw = new PrintWriter(logOutputStreams); + final PrintWriter pw = new PrintWriter(new OutputStreamWriter(logOutputStreams, StandardCharsets.UTF_8)); pw.write("Starting appclient process: " + appclientFullName + "...\n"); pw.flush(); } diff --git a/modules/test-utils/src/main/java/org/jboss/wsf/test/XOPTestSupport.java b/modules/test-utils/src/main/java/org/jboss/wsf/test/XOPTestSupport.java index 089d75537..2359996d0 100644 --- a/modules/test-utils/src/main/java/org/jboss/wsf/test/XOPTestSupport.java +++ b/modules/test-utils/src/main/java/org/jboss/wsf/test/XOPTestSupport.java @@ -30,6 +30,7 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.StandardCharsets; import javax.activation.DataHandler; import javax.xml.transform.stream.StreamSource; @@ -77,7 +78,7 @@ public static Image createTestImage(File imgFile) public static StreamSource createTestSource() { - return new StreamSource(new ByteArrayInputStream("".getBytes())); + return new StreamSource(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8))); } public static DataHandler createDataHandler(File imgFile)