components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java - Issue 2892013002: [Cronet] Clean up tests

Unified Diff: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java

Issue 2892013002: [Cronet] Clean up tests (Closed)

Patch Set: fix Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('j') | components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java

diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java

index e83523b9a06b3d38629a3827c801f798b1bf9466..944882a0babca27251caa96a4fb19761aa7aff72 100644

--- a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java

+++ b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamQuicTest.java

@@ -21,7 +21,7 @@ import java.util.HashSet;

* Tests functionality of BidirectionalStream's QUIC implementation.

public class BidirectionalStreamQuicTest extends CronetTestBase {

- private CronetTestFramework mTestFramework;

+ private ExperimentalCronetEngine mCronetEngine;

private enum QuicBidirectionalStreams {

ENABLED,

DISABLED,

@@ -52,7 +52,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

CronetTestUtil.setMockCertVerifierForTesting(

builder, QuicTestServer.createMockCertVerifier());

- mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);

+ mCronetEngine = builder.build();

}

@Override

@@ -71,7 +71,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

String quicURL = QuicTestServer.getServerURL() + path;

TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();

BidirectionalStream stream =

- mTestFramework.mCronetEngine

+ mCronetEngine

.newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())

.setHttpMethod("GET")

.build();

@@ -97,9 +97,9 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

callback.addWriteData("1234567890".getBytes());

callback.addWriteData("woot!".getBytes());

TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener();

- mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener);

+ mCronetEngine.addRequestFinishedListener(requestFinishedListener);

BidirectionalStream stream =

- mTestFramework.mCronetEngine

+ mCronetEngine

.newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())

.addHeader("foo", "bar")

.addHeader("empty", "")

@@ -139,7 +139,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

callback.addWriteData("Test String".getBytes(), false);

callback.addWriteData("1234567890".getBytes(), false);

callback.addWriteData("woot!".getBytes(), true);

- BidirectionalStream stream = mTestFramework.mCronetEngine

+ BidirectionalStream stream = mCronetEngine

.newBidirectionalStreamBuilder(

quicURL, callback, callback.getExecutor())

.delayRequestHeadersUntilFirstFlush(i == 0)

@@ -175,7 +175,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

callback.addWriteData("Test String".getBytes(), false);

callback.addWriteData("1234567890".getBytes(), false);

callback.addWriteData("woot!".getBytes(), true);

- BidirectionalStream stream = mTestFramework.mCronetEngine

+ BidirectionalStream stream = mCronetEngine

.newBidirectionalStreamBuilder(

quicURL, callback, callback.getExecutor())

.delayRequestHeadersUntilFirstFlush(i == 0)

@@ -212,7 +212,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

}

};

BidirectionalStream stream =

- mTestFramework.mCronetEngine

+ mCronetEngine

.newBidirectionalStreamBuilder(url, callback, callback.getExecutor())

.setHttpMethod("GET")

.delayRequestHeadersUntilFirstFlush(i == 0)

@@ -250,7 +250,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();

callback.addWriteData("Test String".getBytes(), true);

BidirectionalStream stream =

- mTestFramework.mCronetEngine

+ mCronetEngine

.newBidirectionalStreamBuilder(url, callback, callback.getExecutor())

.delayRequestHeadersUntilFirstFlush(i == 0)

.addHeader("foo", "bar")

@@ -278,7 +278,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();

BidirectionalStream stream =

- mTestFramework.mCronetEngine

+ mCronetEngine

.newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())

.setHttpMethod("GET")

.build();

@@ -318,7 +318,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

callback.addWriteData("woot!".getBytes());

BidirectionalStream stream =

- mTestFramework.mCronetEngine

+ mCronetEngine

.newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())

.addHeader("foo", "bar")

.addHeader("empty", "")

@@ -346,7 +346,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

String quicURL = QuicTestServer.getServerURL() + path;

TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback();

BidirectionalStream stream =

- mTestFramework.mCronetEngine

+ mCronetEngine

.newBidirectionalStreamBuilder(quicURL, callback, callback.getExecutor())

.setHttpMethod("GET")

.build();

@@ -357,7 +357,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

assertEquals("This is a simple text file served by QUIC.\n", callback.mResponseAsString);

assertEquals("quic/1+spdy/3", callback.mResponseInfo.getNegotiatedProtocol());

- String serialized_data = mTestFramework.mCronetEngine.getCertVerifierData(100);

+ String serialized_data = mCronetEngine.getCertVerifierData(100);

assertFalse(serialized_data.isEmpty());

// Create a new builder and verify that the |serialized_data| is deserialized correctly.

@@ -369,7 +369,7 @@ public class BidirectionalStreamQuicTest extends CronetTestBase {

builder.setCertVerifierData(serialized_data);

CronetTestFramework testFramework =

- startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);

+ startCronetTestFrameworkWithCronetEngineBuilder(builder);

mgersh 2017/05/23 18:12:12 Why does this one still need the framework?

pauljensen 2017/05/25 15:15:14 Done.

String deserialized_data = testFramework.mCronetEngine.getCertVerifierData(100);

assertEquals(deserialized_data, serialized_data);

}