Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java |
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java |
index b293107b28c92f997ba1237337a5874a9da19d93..694cfebd2e4f92811b71666414cce072878046a1 100644 |
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java |
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java |
@@ -59,8 +59,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
private TestUrlRequestCallback startAndWaitForComplete(String url) throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
// Create request. |
- UrlRequest.Builder builder = new UrlRequest.Builder( |
- url, callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ url, callback, callback.getExecutor()); |
UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
callback.blockForDone(); |
@@ -95,36 +95,29 @@ public class CronetUrlRequestTest extends CronetTestBase { |
public void testBuilderChecks() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
try { |
- new UrlRequest.Builder( |
- null, callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ null, callback, callback.getExecutor()); |
fail("URL not null-checked"); |
} catch (NullPointerException e) { |
assertEquals("URL is required.", e.getMessage()); |
} |
try { |
- new UrlRequest.Builder(NativeTestServer.getRedirectURL(), null, callback.getExecutor(), |
- mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectURL(), null, callback.getExecutor()); |
fail("Callback not null-checked"); |
} catch (NullPointerException e) { |
assertEquals("Callback is required.", e.getMessage()); |
} |
try { |
- new UrlRequest.Builder(NativeTestServer.getRedirectURL(), callback, null, |
- mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectURL(), callback, null); |
fail("Executor not null-checked"); |
} catch (NullPointerException e) { |
assertEquals("Executor is required.", e.getMessage()); |
} |
- try { |
- new UrlRequest.Builder( |
- NativeTestServer.getRedirectURL(), callback, callback.getExecutor(), null); |
- fail("CronetEngine not null-checked"); |
- } catch (NullPointerException e) { |
- assertEquals("CronetEngine is required.", e.getMessage()); |
- } |
// Verify successful creation doesn't throw. |
- new UrlRequest.Builder(NativeTestServer.getRedirectURL(), callback, callback.getExecutor(), |
- mTestFramework.mCronetEngine); |
+ mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectURL(), callback, callback.getExecutor()); |
} |
@SmallTest |
@@ -162,9 +155,10 @@ public class CronetUrlRequestTest extends CronetTestBase { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setAutoAdvance(false); |
// Create builder, start a request, and check if default load_flags are set correctly. |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getFileURL("/success.txt"), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ ExperimentalUrlRequest.Builder builder = |
+ (ExperimentalUrlRequest.Builder) mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getFileURL("/success.txt"), callback, |
+ callback.getExecutor()); |
// Disable connection migration. |
if (disableConnectionMigration) builder.disableConnectionMigration(); |
UrlRequest urlRequest = builder.build(); |
@@ -203,8 +197,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
// Start the request and wait to see the redirect. |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setAutoAdvance(false); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getRedirectURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectURL(), callback, callback.getExecutor()); |
UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
callback.waitForNextStep(); |
@@ -331,8 +325,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
} |
}; |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getMultiRedirectURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getMultiRedirectURL(), callback, callback.getExecutor()); |
final UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
@@ -387,8 +381,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
public void testSetHttpMethod() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
String methodName = "HEAD"; |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoMethodURL(), callback, callback.getExecutor()); |
// Try to set 'null' method. |
try { |
builder.setHttpMethod(null); |
@@ -408,8 +402,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testBadMethod() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder( |
- TEST_URL, callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ TEST_URL, callback, callback.getExecutor()); |
try { |
builder.setHttpMethod("bad:method!"); |
builder.build().start(); |
@@ -424,8 +418,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testBadHeaderName() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder( |
- TEST_URL, callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ TEST_URL, callback, callback.getExecutor()); |
try { |
builder.addHeader("header:name", "headervalue"); |
builder.build().start(); |
@@ -440,8 +434,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testAcceptEncodingIgnored() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoAllHeadersURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoAllHeadersURL(), callback, callback.getExecutor()); |
// This line should eventually throw an exception, once callers have migrated |
builder.addHeader("accept-encoding", "foozip"); |
builder.build().start(); |
@@ -453,8 +447,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testBadHeaderValue() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder( |
- TEST_URL, callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ TEST_URL, callback, callback.getExecutor()); |
try { |
builder.addHeader("headername", "bad header\r\nvalue"); |
builder.build().start(); |
@@ -471,9 +465,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
String headerName = "header-name"; |
String headerValue = "header-value"; |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getEchoHeaderURL(headerName), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoHeaderURL(headerName), callback, callback.getExecutor()); |
builder.addHeader(headerName, headerValue); |
builder.build().start(); |
@@ -489,8 +482,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
String headerName = "header-name"; |
String headerValue1 = "header-value1"; |
String headerValue2 = "header-value2"; |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoAllHeadersURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoAllHeadersURL(), callback, callback.getExecutor()); |
builder.addHeader(headerName, headerValue1); |
builder.addHeader(headerName, headerValue2); |
builder.build().start(); |
@@ -513,9 +506,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
String userAgentName = "User-Agent"; |
String userAgentValue = "User-Agent-Value"; |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getEchoHeaderURL(userAgentName), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoHeaderURL(userAgentName), callback, callback.getExecutor()); |
builder.addHeader(userAgentName, userAgentValue); |
builder.build().start(); |
callback.blockForDone(); |
@@ -528,9 +520,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
public void testDefaultUserAgent() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
String headerName = "User-Agent"; |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getEchoHeaderURL(headerName), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoHeaderURL(headerName), callback, callback.getExecutor()); |
builder.build().start(); |
callback.blockForDone(); |
assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); |
@@ -685,7 +676,7 @@ public class CronetUrlRequestTest extends CronetTestBase { |
} |
/** |
- * Tests that an SSL cert error will be reported via {@link UrlRequest#onFailed}. |
+ * Tests that an SSL cert error will be reported via {@link UrlRequest.Callback#onFailed}. |
*/ |
@SmallTest |
@Feature({"Cronet"}) |
@@ -712,8 +703,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
callback.setAutoAdvance(false); |
// Since the default method is "GET", the expected response body is also |
// "GET". |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoMethodURL(), callback, callback.getExecutor()); |
UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
callback.waitForNextStep(); |
@@ -794,8 +785,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
public void testBadBuffers() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setAutoAdvance(false); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoMethodURL(), callback, callback.getExecutor()); |
UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
callback.waitForNextStep(); |
@@ -836,9 +827,9 @@ public class CronetUrlRequestTest extends CronetTestBase { |
final TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setAutoAdvance(false); |
final UrlRequest urlRequest = |
- new UrlRequest |
- .Builder(NativeTestServer.getEchoHeaderURL("blah-header"), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine) |
+ mTestFramework.mCronetEngine |
+ .newUrlRequestBuilder(NativeTestServer.getEchoHeaderURL("blah-header"), |
+ callback, callback.getExecutor()) |
.addHeader("blah-header", "blahblahblah") |
.build(); |
urlRequest.start(); |
@@ -866,8 +857,9 @@ public class CronetUrlRequestTest extends CronetTestBase { |
final TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setAutoAdvance(false); |
final UrlRequest urlRequest = |
- new UrlRequest.Builder(NativeTestServer.getRedirectURL(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine) |
+ mTestFramework.mCronetEngine |
+ .newUrlRequestBuilder( |
+ NativeTestServer.getRedirectURL(), callback, callback.getExecutor()) |
.build(); |
// Try to read before starting request. |
@@ -941,8 +933,9 @@ public class CronetUrlRequestTest extends CronetTestBase { |
final TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setAutoAdvance(false); |
final UrlRequest urlRequest = |
- new UrlRequest.Builder(NativeTestServer.getRedirectURL(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine) |
+ mTestFramework.mCronetEngine |
+ .newUrlRequestBuilder( |
+ NativeTestServer.getRedirectURL(), callback, callback.getExecutor()) |
.build(); |
// Try to follow a redirect before starting the request. |
@@ -1012,8 +1005,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadSetDataProvider() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
try { |
builder.setUploadDataProvider(null, callback.getExecutor()); |
@@ -1036,8 +1029,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadEmptyBodySync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1059,8 +1052,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadSync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1083,8 +1076,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadMultiplePiecesSync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1111,8 +1104,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadMultiplePiecesAsync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.ASYNC, callback.getExecutor()); |
@@ -1139,8 +1132,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadChangesDefaultMethod() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoMethodURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1159,8 +1152,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadWithSetMethod() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoMethodURL(), callback, callback.getExecutor()); |
final String method = "PUT"; |
builder.setHttpMethod(method); |
@@ -1182,9 +1175,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadRedirectSync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1207,9 +1199,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadRedirectAsync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.ASYNC, callback.getExecutor()); |
@@ -1232,8 +1223,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadWithBadLength() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()) { |
@@ -1265,8 +1256,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadWithBadLengthBufferAligned() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()) { |
@@ -1298,8 +1289,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadReadFailSync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1325,8 +1316,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadLengthFailSync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1352,8 +1343,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadReadFailAsync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1387,8 +1378,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
command.run(); |
} |
}; |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, myExecutor); |
@@ -1422,8 +1413,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
command.run(); |
} |
}; |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, myExecutor, mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, myExecutor); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1458,8 +1449,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
command.run(); |
} |
}; |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, myExecutor, mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, myExecutor); |
UploadDataProvider dataProvider = UploadDataProviders.create("test".getBytes("UTF-8")); |
builder.setUploadDataProvider(dataProvider, myExecutor); |
builder.addHeader("Content-Type", "useless/string"); |
@@ -1479,8 +1470,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadReadFailThrown() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1506,9 +1497,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadRewindFailSync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1532,9 +1522,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadRewindFailAsync() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.ASYNC, callback.getExecutor()); |
@@ -1558,9 +1547,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadRewindFailThrown() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1584,8 +1572,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadChunked() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1609,8 +1597,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testUploadChunkedLastReadZeroLengthBody() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1640,8 +1628,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
public void testUploadFailsWithoutInitializingStream() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
// The port for PTP will always refuse a TCP connection |
- UrlRequest.Builder builder = new UrlRequest.Builder("http://127.0.0.1:319", callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ "http://127.0.0.1:319", callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |
@@ -1669,8 +1657,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
} |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setFailure(failureType, failureStep); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getRedirectURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectURL(), callback, callback.getExecutor()); |
UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
callback.blockForDone(); |
@@ -1731,8 +1719,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
for (FailureType type : testTypes) { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setFailure(type, ResponseStep.ON_SUCCEEDED); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoMethodURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoMethodURL(), callback, callback.getExecutor()); |
UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
callback.blockForDone(); |
@@ -1759,8 +1747,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
NativeTestServer.shutdownNativeTestServer(); |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setFailure(type, ResponseStep.ON_FAILED); |
- UrlRequest.Builder builder = new UrlRequest.Builder( |
- url, callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ url, callback, callback.getExecutor()); |
UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
callback.blockForDone(); |
@@ -1789,8 +1777,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
} |
}; |
callback.setFailure(type, ResponseStep.ON_CANCELED); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
UrlRequest urlRequest = builder.build(); |
urlRequest.start(); |
callback.blockForDone(); |
@@ -1811,8 +1799,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
callback.setAutoAdvance(false); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
CronetUrlRequest urlRequest = (CronetUrlRequest) builder.build(); |
urlRequest.start(); |
callback.waitForNextStep(); |
@@ -1866,8 +1854,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
} |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
ExecutorService uploadExecutor = Executors.newSingleThreadExecutor(); |
HangingUploadDataProvider dataProvider = new HangingUploadDataProvider(); |
@@ -1909,8 +1897,8 @@ public class CronetUrlRequestTest extends CronetTestBase { |
// Regression test for crbug.com/564946. |
public void testDestroyUploadDataStreamAdapterOnSucceededCallback() throws Exception { |
TestUrlRequestCallback callback = new QuitOnSuccessCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
TestUploadDataProvider dataProvider = new TestUploadDataProvider( |
TestUploadDataProvider.SuccessCallbackMode.SYNC, callback.getExecutor()); |