FakeHttpServletResponse: Explicitly specify charset in PrintWriter Change-Id: I131b4405975db9abbcab7de22768940941c3e7eb
diff --git a/javatests/com/google/gitiles/FakeHttpServletResponse.java b/javatests/com/google/gitiles/FakeHttpServletResponse.java index 544c075..2cf316d 100644 --- a/javatests/com/google/gitiles/FakeHttpServletResponse.java +++ b/javatests/com/google/gitiles/FakeHttpServletResponse.java
@@ -25,6 +25,7 @@ import com.google.common.net.HttpHeaders; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.nio.charset.Charset; import java.util.Locale; @@ -79,7 +80,7 @@ public synchronized ServletOutputStream getOutputStream() { checkState(writer == null, "getWriter() already called"); if (outputStream == null) { - final PrintWriter osWriter = new PrintWriter(actualBody); + PrintWriter osWriter = newPrintWriter(); outputStream = new ServletOutputStream() { @Override @@ -96,7 +97,7 @@ public synchronized PrintWriter getWriter() { checkState(outputStream == null, "getOutputStream() already called"); if (writer == null) { - writer = new PrintWriter(actualBody); + writer = newPrintWriter(); } return writer; } @@ -254,4 +255,8 @@ public String getHeader(String name) { return Iterables.getFirst(headers.get(checkNotNull(name)), null); } + + private PrintWriter newPrintWriter() { + return new PrintWriter(new OutputStreamWriter(actualBody, UTF_8)); + } }