Fix tons of errorprone warnings.

2 files changed, 8 insertions, 6 deletions

diff --git a/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/AndroidHttpClientTest.java b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/AndroidHttpClientTest.java
index defcf8f0e..e1fc389a1 100644
--- a/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/AndroidHttpClientTest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/AndroidHttpClientTest.java
@@ -1,5 +1,6 @@
 package org.robolectric.shadows.httpclient;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import android.net.http.AndroidHttpClient;
@@ -34,7 +35,7 @@ public class AndroidHttpClientTest {
     FakeHttp.addPendingHttpResponse(200, "foo");
     HttpResponse resp = client.execute(new HttpGet("/foo"));
     assertThat(resp.getStatusLine().getStatusCode()).isEqualTo(200);
-    assertThat(CharStreams.toString(new InputStreamReader(resp.getEntity().getContent())))
+    assertThat(CharStreams.toString(new InputStreamReader(resp.getEntity().getContent(), UTF_8)))
         .isEqualTo("foo");
   }
 }
\ No newline at end of file
diff --git a/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirectorTest.java b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirectorTest.java
index 0e21c76cd..7ec88003a 100644
--- a/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirectorTest.java
+++ b/shadows/httpclient/src/test/java/org/robolectric/shadows/httpclient/ShadowDefaultRequestDirectorTest.java
@@ -1,5 +1,6 @@
 package org.robolectric.shadows.httpclient;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -151,14 +152,14 @@ public class ShadowDefaultRequestDirectorTest {
 
     HttpResponse getResponse = requestDirector.execute(null, new HttpGet("http://some.uri"), null);
     InputStream getResponseStream = getResponse.getEntity().getContent();
-    assertThat(CharStreams.toString(new InputStreamReader(getResponseStream)))
+    assertThat(CharStreams.toString(new InputStreamReader(getResponseStream, UTF_8)))
         .isEqualTo("a cheery response body");
     assertThat(testHttpResponse.entityContentStreamsHaveBeenClosed()).isFalse();
 
     HttpResponse postResponse =
         requestDirector.execute(null, new HttpPost("http://some.uri"), null);
     InputStream postResponseStream = postResponse.getEntity().getContent();
-    assertThat(CharStreams.toString(new InputStreamReader(postResponseStream)))
+    assertThat(CharStreams.toString(new InputStreamReader(postResponseStream, UTF_8)))
         .isEqualTo("a cheery response body");
     assertThat(testHttpResponse.entityContentStreamsHaveBeenClosed()).isFalse();
 
@@ -422,12 +423,12 @@ public class ShadowDefaultRequestDirectorTest {
 
     InputStream content =
         FakeHttp.getFakeHttpLayer().getLastHttpResponse().getEntity().getContent();
-    BufferedReader contentReader = new BufferedReader(new InputStreamReader(content));
+    BufferedReader contentReader = new BufferedReader(new InputStreamReader(content, UTF_8));
     String firstLineOfContent = contentReader.readLine();
     assertThat(firstLineOfContent).contains("Google");
 
     BufferedReader cacheReader =
-        new BufferedReader(new InputStreamReader(new ByteArrayInputStream(cachedContent)));
+        new BufferedReader(new InputStreamReader(new ByteArrayInputStream(cachedContent), UTF_8));
     String firstLineOfCachedContent = cacheReader.readLine();
     assertThat(firstLineOfCachedContent).isEqualTo(firstLineOfContent);
   }
@@ -448,7 +449,7 @@ public class ShadowDefaultRequestDirectorTest {
   }
 
   private static String getStringContent(HttpResponse response) throws IOException {
-    return CharStreams.toString(new InputStreamReader(response.getEntity().getContent()));
+    return CharStreams.toString(new InputStreamReader(response.getEntity().getContent(), UTF_8));
   }
 
 }
\ No newline at end of file