commit b2f1b241d731960ca91210fb6a865660b23c7963
author Tobias Thierer <tobiast@google.com> Thu Jun 30 12:48:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 30 12:48:46 2016 +0000
tree 5f981cdd5452e9d4ac20d11121550aa5f81112d9
parent 3b7f991451c3a70f910fe5a3a3b54429e9b75111
parent 47a37a9e6469a23064ccbefa3dd92fa9b0fdb16a

Merge changes from topic \'okhttp2-upgrade\'
am: 47a37a9e64

Change-Id: I11d2a4b9bd410a1fe0eb0569011bc41df0b368e4

okio/okio/src/test/java/okio/BufferedSinkTest.java

diff --git a/okio/okio/src/test/java/okio/BufferedSinkTest.java b/okio/okio/src/test/java/okio/BufferedSinkTest.java
index f546214..45b9b48 100644
--- a/okio/okio/src/test/java/okio/BufferedSinkTest.java
+++ b/okio/okio/src/test/java/okio/BufferedSinkTest.java
@@ -41,6 +41,7 @@
 
   // ANDROID-BEGIN
   //  @Parameterized.Parameters(name = "{0}")
+  @Parameterized.Parameters
   // ANDROID-END
   public static List<Object[]> parameters() {
     return Arrays.asList(new Object[] {
@@ -68,7 +69,10 @@
 
   // ANDROID-BEGIN
   //  @Parameterized.Parameter
-  public Factory factory = (Factory) (parameters().get(0))[0];
+  private final Factory factory;
+  public BufferedSinkTest(Factory factory) {
+    this.factory = factory;
+  }
   // ANDROID-END
 
   private Buffer data;

okio/okio/src/test/java/okio/BufferedSourceTest.java

diff --git a/okio/okio/src/test/java/okio/BufferedSourceTest.java b/okio/okio/src/test/java/okio/BufferedSourceTest.java
index 767c071..6f58865 100644
--- a/okio/okio/src/test/java/okio/BufferedSourceTest.java
+++ b/okio/okio/src/test/java/okio/BufferedSourceTest.java
@@ -94,6 +94,7 @@
 
   // ANDROID-BEGIN
   //  @Parameterized.Parameters(name = "{0}")
+  @Parameterized.Parameters
   // ANDROID-END
   public static List<Object[]> parameters() {
     return Arrays.asList(
@@ -104,7 +105,10 @@
 
   // ANDROID-BEGIN
   // @Parameterized.Parameter
-  public Factory factory = (Factory) (parameters().get(0))[0];
+  private final Factory factory;
+  public BufferedSourceTest(Factory factory) {
+    this.factory = factory;
+  }
   // ANDROID-END
   private BufferedSink sink;
   private BufferedSource source;

okio/okio/src/test/java/okio/ReadUtf8LineTest.java

diff --git a/okio/okio/src/test/java/okio/ReadUtf8LineTest.java b/okio/okio/src/test/java/okio/ReadUtf8LineTest.java
index 9867ca0..80e3851 100644
--- a/okio/okio/src/test/java/okio/ReadUtf8LineTest.java
+++ b/okio/okio/src/test/java/okio/ReadUtf8LineTest.java
@@ -36,6 +36,7 @@
 
   // ANDROID-BEGIN
   //  @Parameterized.Parameters(name = "{0}")
+  @Parameterized.Parameters
   // ANDROID-END
   public static List<Object[]> parameters() {
     return Arrays.asList(
@@ -75,7 +76,10 @@
 
   // ANDROID-BEGIN
   //  @Parameterized.Parameter
-  public Factory factory = (Factory) (parameters().get(0))[0];
+  private final Factory factory;
+  public ReadUtf8LineTest(Factory factory) {
+    this.factory = factory;
+  }
   // ANDROID-END
 
   private Buffer data;