From a992ca414f212fa4cdc52d8c510e6cfae27cc67c Mon Sep 17 00:00:00 2001
From: Michal Kordas <kordas.michal@gmail.com>
Date: Sat, 22 Aug 2015 23:54:53 +0200
Subject: [PATCH] Specify charset used in test code. #1555

Fixes `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/google/checkstyle/test/base/BaseCheckTestSupport.java  | 3 ++-
 .../tools/checkstyle/checks/javadoc/WriteTagCheckTest.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/it/java/com/google/checkstyle/test/base/BaseCheckTestSupport.java b/src/it/java/com/google/checkstyle/test/base/BaseCheckTestSupport.java
index 98486851b..d7e5a68e3 100644
--- a/src/it/java/com/google/checkstyle/test/base/BaseCheckTestSupport.java
+++ b/src/it/java/com/google/checkstyle/test/base/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.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -130,7 +131,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 < aExpected.length; i++) {
             final String expected = aMessageFileName + ":" + aExpected[i];
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java
index 9a74ca6f9..8ea1428f9 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheckTest.java
@@ -29,6 +29,7 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
 
@@ -204,7 +205,7 @@ public class WriteTagCheckTest extends 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];