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 064ead0d2608e04eede130ebf8b0123b3463273e..38a0db36a5325922f30d89d0133e4b5f6843be30 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.TestExecutor; |
import org.chromium.net.MetricsTestUtil.TestRequestFinishedListener; |
import org.chromium.net.TestBidirectionalStreamCallback.FailureType; |
@@ -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,42 @@ public class BidirectionalStreamTest extends CronetTestBase { |
@SmallTest |
@Feature({"Cronet"}) |
- public void testBuilderChecks() throws Exception { |
+ @OnlyRunNativeCronet |
pauljensen
2016/10/03 15:22:38
remove
kapishnikov
2016/10/03 23:49:29
Done.
|
+ 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 +170,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 +189,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 +217,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()); |
@@ -232,15 +247,15 @@ public class BidirectionalStreamTest extends CronetTestBase { |
new TestRequestFinishedListener(testExecutor); |
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()) |
+ .addRequestAnnotation(this) |
+ .addRequestAnnotation("request annotation") |
+ .addHeader("foo", "bar") |
+ .addHeader("empty", "") |
+ .addHeader("Content-Type", "zebra") |
+ .build(); |
stream.start(); |
callback.blockForDone(); |
testExecutor.runAllTasks(); |
@@ -269,13 +284,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(); |
@@ -347,13 +362,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 |
@@ -406,14 +421,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(); |
@@ -441,14 +456,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()); |
@@ -476,14 +491,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()); |
@@ -518,13 +533,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()); |
@@ -558,13 +573,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()); |
@@ -585,8 +600,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(); |
@@ -601,8 +616,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(); |
@@ -618,8 +633,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"); |
@@ -637,8 +652,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(); |
@@ -656,8 +671,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(); |
@@ -675,8 +691,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"); |
@@ -702,8 +718,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(); |
@@ -722,8 +738,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(); |
@@ -738,15 +755,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(); |
@@ -761,8 +778,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(); |
@@ -784,12 +802,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()); |
@@ -809,10 +827,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()); |
@@ -839,10 +857,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()); |
@@ -874,10 +892,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()); |
@@ -905,10 +923,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(); |
@@ -934,10 +952,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 |
@@ -979,10 +997,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(); |
@@ -1019,8 +1037,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(); |
@@ -1112,8 +1130,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(); |
@@ -1156,8 +1174,8 @@ public class BidirectionalStreamTest extends CronetTestBase { |
TestBidirectionalStreamCallback callback = new TestBidirectionalStreamCallback(); |
callback.setFailure(failureType, failureStep); |
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(); |
@@ -1207,8 +1225,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(); |
@@ -1228,8 +1246,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(); |
@@ -1298,8 +1316,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(); |
@@ -1343,8 +1361,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(); |
@@ -1361,8 +1379,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(); |