From 8b70948104e60fe1c6c0e5145fb33842d79342cd Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Wed, 26 Aug 2015 23:49:29 +0200 Subject: [PATCH] Use explicit charset in test code. #1555 Fixes some `ImplicitDefaultCharsetUsage` inspection violations. Description: >Reports method and constructor calls which implicitly use the platform's default charset. These can produce different results on (e.g. foreign language) systems that use a different default charset, resulting in unexpected behaviour. --- .../com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java | 3 ++- .../java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java index 6cba93116..5241a1ea0 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/BaseCheckTestSupport.java @@ -12,6 +12,7 @@ import java.io.LineNumberReader; import java.io.OutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import java.util.Locale; @@ -114,7 +115,7 @@ public abstract class BaseCheckTestSupport { final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); final LineNumberReader lnr = - new LineNumberReader(new InputStreamReader(bais)); + new LineNumberReader(new InputStreamReader(bais, StandardCharsets.UTF_8)); for (int i = 0; i < expected.length; i++) { final String expectedResult = messageFileName + ":" + expected[i]; diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java index 46ad820cb..6d6876e09 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/XMLLoggerTest.java @@ -29,6 +29,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.regex.Pattern; @@ -221,7 +222,7 @@ public class XMLLoggerTest { final ByteArrayInputStream inStream = new ByteArrayInputStream(bytes); final BufferedReader reader = - new BufferedReader(new InputStreamReader(inStream)); + new BufferedReader(new InputStreamReader(inStream, StandardCharsets.UTF_8)); final List lineList = Lists.newArrayList(); while (true) { final String line = reader.readLine();