Index: components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java |
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java |
index 57b4dc4a3641bb956d70cda730aae1070f96e746..1f5737be50e3df32e7c1034d09397ce6ce5cf26c 100644 |
--- a/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java |
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java |
@@ -11,7 +11,6 @@ import android.test.suitebuilder.annotation.SmallTest; |
import org.chromium.base.test.util.DisabledTest; |
import org.chromium.base.test.util.Feature; |
-import org.chromium.net.CronetTestBase.OnlyRunNativeCronet; |
import org.chromium.net.MetricsTestUtil.TestRequestFinishedListener; |
import org.chromium.net.TestBidirectionalStreamCallback.FailureType; |
import org.chromium.net.TestBidirectionalStreamCallback.ResponseStep; |
@@ -39,8 +38,10 @@ public class BidirectionalStreamTest extends CronetTestBase { |
super.setUp(); |
// Load library first to create MockCertVerifier. |
System.loadLibrary("cronet_tests"); |
- CronetEngine.Builder builder = new CronetEngine.Builder(getContext()); |
- builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier()); |
+ ExperimentalCronetEngine.Builder builder = |
+ new ExperimentalCronetEngine.Builder(getContext()); |
+ CronetTestUtil.setMockCertVerifierForTesting( |
+ builder, QuicTestServer.createMockCertVerifier()); |
mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder); |
assertTrue(Http2TestServer.startHttp2TestServer( |
@@ -94,11 +95,11 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String url = Http2TestServer.getEchoMethodUrl(); |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .setHttpMethod("GET") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .setHttpMethod("GET") |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -113,40 +114,41 @@ public class BidirectionalStreamTest extends CronetTestBase { |
@SmallTest |
@Feature({"Cronet"}) |
- public void testBuilderChecks() throws Exception { |
+ public void testBuilderCheck() throws Exception { |
+ if (testingJavaImpl()) { |
+ testBuilderCheckJavaImpl(); |
+ } else { |
+ testBuilderCheckNativeImpl(); |
+ } |
+ } |
+ |
+ private void testBuilderCheckNativeImpl() throws Exception { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
try { |
- new BidirectionalStream.Builder( |
- null, callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ null, callback, callback.getExecutor()); |
fail("URL not null-checked"); |
} catch (NullPointerException e) { |
assertEquals("URL is required.", e.getMessage()); |
} |
try { |
- new BidirectionalStream.Builder(Http2TestServer.getServerUrl(), null, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getServerUrl(), null, callback.getExecutor()); |
fail("Callback not null-checked"); |
} catch (NullPointerException e) { |
assertEquals("Callback is required.", e.getMessage()); |
} |
try { |
- new BidirectionalStream.Builder( |
- Http2TestServer.getServerUrl(), callback, null, mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getServerUrl(), callback, null); |
fail("Executor not null-checked"); |
} catch (NullPointerException e) { |
assertEquals("Executor is required.", e.getMessage()); |
} |
- try { |
- new BidirectionalStream.Builder( |
- Http2TestServer.getServerUrl(), callback, callback.getExecutor(), null); |
- fail("CronetEngine not null-checked"); |
- } catch (NullPointerException e) { |
- assertEquals("CronetEngine is required.", e.getMessage()); |
- } |
// Verify successful creation doesn't throw. |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getServerUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getServerUrl(), callback, callback.getExecutor()); |
try { |
builder.addHeader(null, "value"); |
fail("Header name is not null-checked"); |
@@ -167,6 +169,18 @@ public class BidirectionalStreamTest extends CronetTestBase { |
} |
} |
+ private void testBuilderCheckJavaImpl() { |
+ try { |
+ TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getServerUrl(), callback, callback.getExecutor()); |
+ fail("JavaCronetEngine doesn't support BidirectionalStream." |
+ + " Expected UnsupportedOperationException"); |
+ } catch (UnsupportedOperationException e) { |
+ // Expected. |
+ } |
+ } |
+ |
@SmallTest |
@Feature({"Cronet"}) |
@OnlyRunNativeCronet |
@@ -174,10 +188,10 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String url = "http://example.com"; |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -202,11 +216,11 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String url = Http2TestServer.getEchoMethodUrl(); |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .setHttpMethod("HEAD") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .setHttpMethod("HEAD") |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -230,15 +244,15 @@ public class BidirectionalStreamTest extends CronetTestBase { |
TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener(); |
mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener); |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .addHeader("foo", "bar") |
- .addHeader("empty", "") |
- .addHeader("Content-Type", "zebra") |
- .addRequestAnnotation(this) |
- .addRequestAnnotation("request annotation") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .addHeader("Content-Type", "zebra") |
+ .addRequestAnnotation(this) |
+ .addRequestAnnotation("request annotation") |
+ .build(); |
Date startTime = new Date(); |
stream.start(); |
callback.blockForDone(); |
@@ -268,13 +282,13 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("Test String".getBytes(), false); |
callback.addWriteData("1234567890".getBytes(), false); |
callback.addWriteData("woot!".getBytes(), true); |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .addHeader("foo", "bar") |
- .addHeader("empty", "") |
- .addHeader("Content-Type", "zebra") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .addHeader("Content-Type", "zebra") |
+ .build(); |
// Flush before stream is started should not crash. |
stream.flush(); |
@@ -346,13 +360,13 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("4".getBytes(), false); |
callback.addWriteData("5".getBytes(), true); |
callback.addWriteData("6".getBytes(), false); |
- CronetBidirectionalStream stream = (CronetBidirectionalStream) new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .addHeader("foo", "bar") |
- .addHeader("empty", "") |
- .addHeader("Content-Type", "zebra") |
- .build(); |
+ CronetBidirectionalStream stream = |
+ (CronetBidirectionalStream) mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .addHeader("Content-Type", "zebra") |
+ .build(); |
callback.setAutoAdvance(false); |
stream.start(); |
callback.waitForNextWriteStep(); // onStreamReady |
@@ -405,14 +419,14 @@ public class BidirectionalStreamTest extends CronetTestBase { |
} |
} |
}; |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .setHttpMethod("GET") |
- .delayRequestHeadersUntilFirstFlush(i == 0) |
- .addHeader("foo", "bar") |
- .addHeader("empty", "") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .setHttpMethod("GET") |
+ .delayRequestHeadersUntilFirstFlush(i == 0) |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .build(); |
// Flush before stream is started should not crash. |
stream.flush(); |
@@ -440,14 +454,14 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String url = Http2TestServer.getEchoStreamUrl(); |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
callback.addWriteData("Test String".getBytes(), true); |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .delayRequestHeadersUntilFirstFlush(i == 0) |
- .addHeader("foo", "bar") |
- .addHeader("empty", "") |
- .addHeader("Content-Type", "zebra") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .delayRequestHeadersUntilFirstFlush(i == 0) |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .addHeader("Content-Type", "zebra") |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -475,14 +489,14 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("Test String".getBytes(), false); |
callback.addWriteData("1234567890".getBytes(), false); |
callback.addWriteData("woot!".getBytes(), true); |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .delayRequestHeadersUntilFirstFlush(i == 0) |
- .addHeader("foo", "bar") |
- .addHeader("empty", "") |
- .addHeader("Content-Type", "zebra") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .delayRequestHeadersUntilFirstFlush(i == 0) |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .addHeader("Content-Type", "zebra") |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -517,13 +531,13 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("Test String".getBytes()); |
callback.addWriteData("1234567890".getBytes()); |
callback.addWriteData("woot!".getBytes()); |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .addHeader("foo", "bar") |
- .addHeader("empty", "") |
- .addHeader("Content-Type", "zebra") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .addHeader("Content-Type", "zebra") |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -557,13 +571,13 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("Test String".getBytes(), false); |
callback.addWriteData("1234567890".getBytes(), false); |
callback.addWriteData("woot!".getBytes(), true); |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .addHeader("foo", "bar") |
- .addHeader("empty", "") |
- .addHeader("Content-Type", "zebra") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .addHeader("Content-Type", "zebra") |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -584,8 +598,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("Put This Data!".getBytes()); |
String methodName = "PUT"; |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getServerUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getServerUrl(), callback, callback.getExecutor()); |
builder.setHttpMethod(methodName); |
builder.build().start(); |
callback.blockForDone(); |
@@ -600,8 +614,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
public void testBadMethod() throws Exception { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getServerUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getServerUrl(), callback, callback.getExecutor()); |
try { |
builder.setHttpMethod("bad:method!"); |
builder.build().start(); |
@@ -617,8 +631,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
public void testBadHeaderName() throws Exception { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getServerUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getServerUrl(), callback, callback.getExecutor()); |
try { |
builder.addHeader("goodheader1", "headervalue"); |
builder.addHeader("header:name", "headervalue"); |
@@ -636,8 +650,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
public void testBadHeaderValue() throws Exception { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getServerUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getServerUrl(), callback, callback.getExecutor()); |
try { |
builder.addHeader("headername", "bad header\r\nvalue"); |
builder.build().start(); |
@@ -655,8 +669,9 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String headerName = "header-name"; |
String headerValue = "header-value"; |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoHeaderUrl(headerName), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoHeaderUrl(headerName), callback, |
+ callback.getExecutor()); |
builder.addHeader(headerName, headerValue); |
builder.setHttpMethod("GET"); |
builder.build().start(); |
@@ -674,8 +689,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String headerValue1 = "header-value1"; |
String headerValue2 = "header-value2"; |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoAllHeadersUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoAllHeadersUrl(), callback, callback.getExecutor()); |
builder.addHeader(headerName, headerValue1); |
builder.addHeader(headerName, headerValue2); |
builder.setHttpMethod("GET"); |
@@ -701,8 +716,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String headerName = "header-name"; |
String headerValue = "header-value"; |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoTrailersUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoTrailersUrl(), callback, callback.getExecutor()); |
builder.addHeader(headerName, headerValue); |
builder.setHttpMethod("GET"); |
builder.build().start(); |
@@ -721,8 +736,9 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String userAgentValue = "User-Agent-Value"; |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoHeaderUrl(userAgentName), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoHeaderUrl(userAgentName), callback, |
+ callback.getExecutor()); |
builder.setHttpMethod("GET"); |
builder.addHeader(userAgentName, userAgentValue); |
builder.build().start(); |
@@ -737,15 +753,15 @@ public class BidirectionalStreamTest extends CronetTestBase { |
public void testCustomCronetEngineUserAgent() throws Exception { |
String userAgentName = "User-Agent"; |
String userAgentValue = "User-Agent-Value"; |
- CronetEngine engine = |
- new CronetEngine.Builder(getContext()) |
- .setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier()) |
- .setUserAgent(userAgentValue) |
- .build(); |
+ ExperimentalCronetEngine.Builder engineBuilder = |
+ new ExperimentalCronetEngine.Builder(getContext()); |
+ engineBuilder.setUserAgent(userAgentValue); |
+ CronetTestUtil.setMockCertVerifierForTesting( |
+ engineBuilder, QuicTestServer.createMockCertVerifier()); |
+ ExperimentalCronetEngine engine = engineBuilder.build(); |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
- BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoHeaderUrl(userAgentName), |
- callback, callback.getExecutor(), engine); |
+ BidirectionalStream.Builder builder = engine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoHeaderUrl(userAgentName), callback, callback.getExecutor()); |
builder.setHttpMethod("GET"); |
builder.build().start(); |
callback.blockForDone(); |
@@ -760,8 +776,9 @@ public class BidirectionalStreamTest extends CronetTestBase { |
String userAgentName = "User-Agent"; |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoHeaderUrl(userAgentName), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoHeaderUrl(userAgentName), callback, |
+ callback.getExecutor()); |
builder.setHttpMethod("GET"); |
builder.build().start(); |
callback.blockForDone(); |
@@ -783,12 +800,12 @@ public class BidirectionalStreamTest extends CronetTestBase { |
stringData.append(writeData); |
} |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .addHeader("foo", "Value with Spaces") |
- .addHeader("Content-Type", "zebra") |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .addHeader("foo", "Value with Spaces") |
+ .addHeader("Content-Type", "zebra") |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -808,10 +825,10 @@ public class BidirectionalStreamTest extends CronetTestBase { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
callback.addWriteData(new byte[0]); |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -838,10 +855,10 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("1".getBytes()); |
callback.addWriteData("2".getBytes()); |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -873,10 +890,10 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("1".getBytes()); |
callback.addWriteData("2".getBytes()); |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
assertTrue(stream.isDone()); |
@@ -904,10 +921,10 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.addWriteData("1".getBytes()); |
callback.addWriteData("2".getBytes()); |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .build(); |
stream.start(); |
callback.waitForNextWriteStep(); |
callback.waitForNextReadStep(); |
@@ -933,10 +950,10 @@ public class BidirectionalStreamTest extends CronetTestBase { |
stringData.append(writeData); |
} |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .build(); |
stream.start(); |
// Write first. |
callback.waitForNextWriteStep(); // onStreamReady |
@@ -978,10 +995,10 @@ public class BidirectionalStreamTest extends CronetTestBase { |
stringData.append(writeData); |
} |
// Create stream. |
- BidirectionalStream stream = new BidirectionalStream |
- .Builder(url, callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine) |
- .build(); |
+ BidirectionalStream stream = |
+ mTestFramework.mCronetEngine |
+ .newBidirectionalStreamBuilder(url, callback, callback.getExecutor()) |
+ .build(); |
stream.start(); |
callback.waitForNextWriteStep(); |
callback.waitForNextReadStep(); |
@@ -1018,8 +1035,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
callback.setAutoAdvance(false); |
// Since the method is "GET", the expected response body is also "GET". |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoMethodUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); |
BidirectionalStream stream = builder.setHttpMethod("GET").build(); |
stream.start(); |
callback.waitForNextReadStep(); |
@@ -1111,8 +1128,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
callback.setAutoAdvance(false); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoMethodUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); |
BidirectionalStream stream = builder.setHttpMethod("GET").build(); |
stream.start(); |
callback.waitForNextReadStep(); |
@@ -1153,16 +1170,18 @@ public class BidirectionalStreamTest extends CronetTestBase { |
private void throwOrCancel( |
FailureType failureType, ResponseStep failureStep, boolean expectError) { |
// Use a fresh CronetEngine each time so Http2 session is not reused. |
- CronetEngine.Builder builder = new CronetEngine.Builder(getContext()); |
- builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier()); |
+ ExperimentalCronetEngine.Builder builder = |
+ new ExperimentalCronetEngine.Builder(getContext()); |
+ CronetTestUtil.setMockCertVerifierForTesting( |
+ builder, QuicTestServer.createMockCertVerifier()); |
mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder); |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
callback.setFailure(failureType, failureStep); |
TestRequestFinishedListener requestFinishedListener = new TestRequestFinishedListener(); |
mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedListener); |
BidirectionalStream.Builder streamBuilder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoMethodUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); |
BidirectionalStream stream = streamBuilder.setHttpMethod("GET").build(); |
Date startTime = new Date(); |
stream.start(); |
@@ -1243,8 +1262,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
callback.setFailure(FailureType.THROW_SYNC, ResponseStep.ON_SUCCEEDED); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoMethodUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); |
BidirectionalStream stream = builder.setHttpMethod("GET").build(); |
stream.start(); |
callback.blockForDone(); |
@@ -1264,8 +1283,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
callback.setAutoAdvance(false); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoMethodUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); |
CronetBidirectionalStream stream = |
(CronetBidirectionalStream) builder.setHttpMethod("GET").build(); |
stream.start(); |
@@ -1334,8 +1353,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
// if there are active streams. |
callback.setAutoAdvance(false); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoMethodUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); |
CronetBidirectionalStream stream = |
(CronetBidirectionalStream) builder.setHttpMethod("GET").build(); |
stream.start(); |
@@ -1379,8 +1398,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
// Test that CronetEngine can be shut down after stream reports a failure. |
TestBidirectionalStreamCallback callback = new ShutdownTestBidirectionalStreamCallback(); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoMethodUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); |
CronetBidirectionalStream stream = |
(CronetBidirectionalStream) builder.setHttpMethod("GET").build(); |
stream.start(); |
@@ -1397,8 +1416,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
// Test that CronetEngine can be shut down after stream is canceled. |
TestBidirectionalStreamCallback callback = new ShutdownTestBidirectionalStreamCallback(); |
BidirectionalStream.Builder builder = |
- new BidirectionalStream.Builder(Http2TestServer.getEchoMethodUrl(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newBidirectionalStreamBuilder( |
+ Http2TestServer.getEchoMethodUrl(), callback, callback.getExecutor()); |
CronetBidirectionalStream stream = |
(CronetBidirectionalStream) builder.setHttpMethod("GET").build(); |