aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Sauer <nicksauer@google.com>2016-04-18 16:16:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-18 16:16:20 +0000
commit08cb5181d810fdf6dbb218034f9b6f4082f3a421 (patch)
tree4452e01013d9e3b7f3a43c1b5b090a46a8b37344
parent4c521731e582bbd36d1ef7276b25a347f91d9bbb (diff)
parent6b171660c821f02ea7b03175c696e3152b7d8003 (diff)
downloadokhttp-08cb5181d810fdf6dbb218034f9b6f4082f3a421.tar.gz
Modify tests with parameters to work with CTS
am: 6b17166 * commit '6b171660c821f02ea7b03175c696e3152b7d8003': Modify tests with parameters to work with CTS Change-Id: I1ea34668c572992150d79bf271dcc4abc5f4dbd5
-rw-r--r--okio/okio/src/test/java/okio/BufferedSinkTest.java6
-rw-r--r--okio/okio/src/test/java/okio/BufferedSourceTest.java6
-rw-r--r--okio/okio/src/test/java/okio/ReadUtf8LineTest.java6
3 files changed, 15 insertions, 3 deletions
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 @@ public class BufferedSinkTest {
// ANDROID-BEGIN
// @Parameterized.Parameters(name = "{0}")
+ @Parameterized.Parameters
// ANDROID-END
public static List<Object[]> parameters() {
return Arrays.asList(new Object[] {
@@ -68,7 +69,10 @@ public class BufferedSinkTest {
// 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;
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 @@ public class BufferedSourceTest {
// ANDROID-BEGIN
// @Parameterized.Parameters(name = "{0}")
+ @Parameterized.Parameters
// ANDROID-END
public static List<Object[]> parameters() {
return Arrays.asList(
@@ -104,7 +105,10 @@ public class BufferedSourceTest {
// 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;
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 @@ public final class ReadUtf8LineTest {
// ANDROID-BEGIN
// @Parameterized.Parameters(name = "{0}")
+ @Parameterized.Parameters
// ANDROID-END
public static List<Object[]> parameters() {
return Arrays.asList(
@@ -75,7 +76,10 @@ public final class ReadUtf8LineTest {
// 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;