Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1363723002: [Cronet] Create Builders, rename UrlRequestContext to CronetEngine (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address mef's comments Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/cronet/android/java/src/org/chromium/net/UrlRequest.java ('K') | « components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6eae9aec804b12375059608ea3bc3bb2fe1b75c4..750605a629c752ba209a11780ccb5333cbfb707f 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
@@ -17,8 +17,10 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -44,7 +46,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Override
protected void tearDown() throws Exception {
NativeTestServer.shutdownNativeTestServer();
- mActivity.mUrlRequestContext.shutdown();
+ mActivity.mCronetEngine.shutdown();
super.tearDown();
}
@@ -52,9 +54,8 @@ public class CronetUrlRequestTest extends CronetTestBase {
throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
// Create request.
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- url, listener, listener.getExecutor());
- urlRequest.start();
+ UrlRequest.Builder builder = new UrlRequest.Builder(url, listener, listener.getExecutor());
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertTrue(urlRequest.isDone());
return listener;
@@ -107,9 +108,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
// Start the request and wait to see the redirect.
TestUrlRequestListener listener = new TestUrlRequestListener();
listener.setAutoAdvance(false);
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
- urlRequest.start();
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
listener.waitForNextStep();
// Check the redirect.
@@ -217,25 +218,18 @@ public class CronetUrlRequestTest extends CronetTestBase {
public void testSetHttpMethod() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
String methodName = "HEAD";
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- NativeTestServer.getEchoMethodURL(), listener,
- listener.getExecutor());
+ UrlRequest.Builder builder = new UrlRequest.Builder(
+ NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
// Try to set 'null' method.
try {
- urlRequest.setHttpMethod(null);
+ builder.setHttpMethod(null);
fail("Exception not thrown");
} catch (NullPointerException e) {
assertEquals("Method is required.", e.getMessage());
}
- urlRequest.setHttpMethod(methodName);
- urlRequest.start();
- try {
- urlRequest.setHttpMethod("toolate");
- fail("Exception not thrown");
- } catch (IllegalStateException e) {
- assertEquals("Request is already started.", e.getMessage());
- }
+ builder.setHttpMethod(methodName);
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
assertEquals(0, listener.mHttpResponseDataLength);
@@ -245,11 +239,11 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testBadMethod() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- TEST_URL, listener, listener.getExecutor());
+ UrlRequest.Builder builder =
+ new UrlRequest.Builder(TEST_URL, listener, listener.getExecutor());
try {
- urlRequest.setHttpMethod("bad:method!");
- urlRequest.start();
+ builder.setHttpMethod("bad:method!");
+ mActivity.mCronetEngine.executeRequest(builder);
fail("IllegalArgumentException not thrown.");
} catch (IllegalArgumentException e) {
assertEquals("Invalid http method bad:method!",
@@ -261,11 +255,11 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testBadHeaderName() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- TEST_URL, listener, listener.getExecutor());
+ UrlRequest.Builder builder =
+ new UrlRequest.Builder(TEST_URL, listener, listener.getExecutor());
try {
- urlRequest.addHeader("header:name", "headervalue");
- urlRequest.start();
+ builder.addHeader("header:name", "headervalue");
+ mActivity.mCronetEngine.executeRequest(builder);
fail("IllegalArgumentException not thrown.");
} catch (IllegalArgumentException e) {
assertEquals("Invalid header header:name=headervalue",
@@ -277,11 +271,11 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testBadHeaderValue() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- TEST_URL, listener, listener.getExecutor());
+ UrlRequest.Builder builder =
+ new UrlRequest.Builder(TEST_URL, listener, listener.getExecutor());
try {
- urlRequest.addHeader("headername", "bad header\r\nvalue");
- urlRequest.start();
+ builder.addHeader("headername", "bad header\r\nvalue");
+ mActivity.mCronetEngine.executeRequest(builder);
fail("IllegalArgumentException not thrown.");
} catch (IllegalArgumentException e) {
assertEquals("Invalid header headername=bad header\r\nvalue",
@@ -295,18 +289,11 @@ public class CronetUrlRequestTest extends CronetTestBase {
TestUrlRequestListener listener = new TestUrlRequestListener();
String headerName = "header-name";
String headerValue = "header-value";
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- NativeTestServer.getEchoHeaderURL(headerName), listener,
- listener.getExecutor());
+ UrlRequest.Builder builder = new UrlRequest.Builder(
+ NativeTestServer.getEchoHeaderURL(headerName), listener, listener.getExecutor());
- urlRequest.addHeader(headerName, headerValue);
- urlRequest.start();
- try {
- urlRequest.addHeader("header2", "value");
- fail("Exception not thrown");
- } catch (IllegalStateException e) {
- assertEquals("Request is already started.", e.getMessage());
- }
+ builder.addHeader(headerName, headerValue);
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
assertEquals(headerValue, listener.mResponseAsString);
@@ -319,12 +306,11 @@ public class CronetUrlRequestTest extends CronetTestBase {
String headerName = "header-name";
String headerValue1 = "header-value1";
String headerValue2 = "header-value2";
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- NativeTestServer.getEchoAllHeadersURL(), listener,
- listener.getExecutor());
- urlRequest.addHeader(headerName, headerValue1);
- urlRequest.addHeader(headerName, headerValue2);
- urlRequest.start();
+ UrlRequest.Builder builder = new UrlRequest.Builder(
+ NativeTestServer.getEchoAllHeadersURL(), listener, listener.getExecutor());
+ builder.addHeader(headerName, headerValue1);
+ builder.addHeader(headerName, headerValue2);
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
String headers = listener.mResponseAsString;
@@ -344,11 +330,10 @@ public class CronetUrlRequestTest extends CronetTestBase {
TestUrlRequestListener listener = new TestUrlRequestListener();
String userAgentName = "User-Agent";
String userAgentValue = "User-Agent-Value";
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- NativeTestServer.getEchoHeaderURL(userAgentName), listener,
- listener.getExecutor());
- urlRequest.addHeader(userAgentName, userAgentValue);
- urlRequest.start();
+ UrlRequest.Builder builder = new UrlRequest.Builder(
+ NativeTestServer.getEchoHeaderURL(userAgentName), listener, listener.getExecutor());
+ builder.addHeader(userAgentName, userAgentValue);
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
assertEquals(userAgentValue, listener.mResponseAsString);
@@ -359,10 +344,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
public void testDefaultUserAgent() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
String headerName = "User-Agent";
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- NativeTestServer.getEchoHeaderURL(headerName), listener,
- listener.getExecutor());
- urlRequest.start();
+ UrlRequest.Builder builder = new UrlRequest.Builder(
+ NativeTestServer.getEchoHeaderURL(headerName), listener, listener.getExecutor());
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
assertTrue("Default User-Agent should contain Cronet/n.n.n.n but is "
@@ -540,10 +524,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
listener.setAutoAdvance(false);
// Since the default method is "GET", the expected response body is also
// "GET".
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- NativeTestServer.getEchoMethodURL(),
- listener, listener.getExecutor());
- urlRequest.start();
+ UrlRequest.Builder builder = new UrlRequest.Builder(
+ NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
listener.waitForNextStep();
ByteBuffer readBuffer = ByteBuffer.allocateDirect(5);
@@ -627,9 +610,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
listener.setAutoAdvance(false);
// Since the default method is "GET", the expected response body is also
// "GET".
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
- urlRequest.start();
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
listener.waitForNextStep();
ByteBuffer readBuffer = ByteBuffer.allocateDirect(5);
@@ -708,10 +691,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
public void testBadBuffers() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
listener.setAutoAdvance(false);
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
- NativeTestServer.getEchoMethodURL(), listener,
- listener.getExecutor());
- urlRequest.start();
+ UrlRequest.Builder builder = new UrlRequest.Builder(
+ NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
listener.waitForNextStep();
// Try to read using a full buffer.
@@ -749,25 +731,16 @@ public class CronetUrlRequestTest extends CronetTestBase {
public void testUnexpectedReads() throws Exception {
final TestUrlRequestListener listener = new TestUrlRequestListener();
listener.setAutoAdvance(false);
- final UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ final UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
- // Try to read before starting request.
- try {
- listener.startNextRead(urlRequest);
- fail("Exception not thrown");
- } catch (IllegalStateException e) {
- assertEquals("Unexpected read attempt.",
- e.getMessage());
- }
-
// Verify reading right after start throws an assertion. Both must be
// invoked on the Executor thread, to prevent receiving data until after
// startNextRead has been invoked.
- Runnable startAndRead = new Runnable() {
+ Callable<UrlRequest> startAndRead = new Callable<UrlRequest>() {
@Override
- public void run() {
- urlRequest.start();
+ public UrlRequest call() {
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
try {
listener.startNextRead(urlRequest);
fail("Exception not thrown");
@@ -775,10 +748,12 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals("Unexpected read attempt.",
e.getMessage());
}
+ return urlRequest;
}
};
- listener.getExecutor().execute(startAndRead);
+ Future<UrlRequest> future = listener.getExecutorService().submit(startAndRead);
listener.waitForNextStep();
+ final UrlRequest urlRequest = future.get();
assertEquals(listener.mResponseStep, ResponseStep.ON_RECEIVED_REDIRECT);
// Try to read after the redirect.
@@ -832,24 +807,15 @@ public class CronetUrlRequestTest extends CronetTestBase {
public void testUnexpectedFollowRedirects() throws Exception {
final TestUrlRequestListener listener = new TestUrlRequestListener();
listener.setAutoAdvance(false);
- final UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ final UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
- // Try to follow a redirect before starting the request.
- try {
- urlRequest.followRedirect();
- fail("Exception not thrown");
- } catch (IllegalStateException e) {
- assertEquals("No redirect to follow.",
- e.getMessage());
- }
-
// Try to follow a redirect just after starting the request. Has to be
// done on the executor thread to avoid a race.
- Runnable startAndRead = new Runnable() {
+ Callable<UrlRequest> startAndRead = new Callable<UrlRequest>() {
@Override
- public void run() {
- urlRequest.start();
+ public UrlRequest call() {
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
try {
urlRequest.followRedirect();
fail("Exception not thrown");
@@ -857,10 +823,12 @@ public class CronetUrlRequestTest extends CronetTestBase {
assertEquals("No redirect to follow.",
e.getMessage());
}
+ return urlRequest;
}
};
- listener.getExecutor().execute(startAndRead);
+ Future<UrlRequest> future = listener.getExecutorService().submit(startAndRead);
listener.waitForNextStep();
+ final UrlRequest urlRequest = future.get();
assertEquals(listener.mResponseStep, ResponseStep.ON_RECEIVED_REDIRECT);
// Try to follow the redirect twice. Second attempt should fail.
@@ -912,11 +880,11 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadSetDataProvider() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
try {
- urlRequest.setUploadDataProvider(null, listener.getExecutor());
+ builder.setUploadDataProvider(null, listener.getExecutor());
fail("Exception not thrown");
} catch (NullPointerException e) {
assertEquals("Invalid UploadDataProvider.", e.getMessage());
@@ -924,9 +892,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
try {
- urlRequest.start();
+ mActivity.mCronetEngine.executeRequest(builder);
fail("Exception not thrown");
} catch (IllegalArgumentException e) {
assertEquals("Requests with upload data must have a Content-Type.", e.getMessage());
@@ -937,14 +905,14 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadEmptyBodySync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(0, dataProvider.getLength());
@@ -959,15 +927,15 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadSync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(4, dataProvider.getLength());
@@ -982,7 +950,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadMultiplePiecesSync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
@@ -992,9 +960,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
dataProvider.addRead("another ".getBytes());
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(16, dataProvider.getLength());
@@ -1009,7 +977,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadMultiplePiecesAsync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
@@ -1019,9 +987,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
dataProvider.addRead("another ".getBytes());
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(16, dataProvider.getLength());
@@ -1036,15 +1004,15 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadChangesDefaultMethod() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
@@ -1055,18 +1023,18 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadWithSetMethod() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoMethodURL(), listener, listener.getExecutor());
final String method = "PUT";
- urlRequest.setHttpMethod(method);
+ builder.setHttpMethod(method);
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(200, listener.mResponseInfo.getHttpStatusCode());
@@ -1077,15 +1045,15 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadRedirectSync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
// 1 read call before the rewind, 1 after.
@@ -1100,15 +1068,15 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadRedirectAsync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.ASYNC, listener.getExecutor());
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
// 1 read call before the rewind, 1 after.
@@ -1123,7 +1091,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadReadFailSync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
@@ -1132,9 +1100,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
// This will never be read, but if the length is 0, read may never be
// called.
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(1, dataProvider.getNumReadCalls());
@@ -1149,7 +1117,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadReadFailAsync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
@@ -1158,9 +1126,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
// This will never be read, but if the length is 0, read may never be
// called.
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(1, dataProvider.getNumReadCalls());
@@ -1175,7 +1143,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadReadFailThrown() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
@@ -1184,9 +1152,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
// This will never be read, but if the length is 0, read may never be
// called.
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(1, dataProvider.getNumReadCalls());
@@ -1201,16 +1169,16 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadRewindFailSync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
dataProvider.setRewindFailure(TestUploadDataProvider.FailMode.CALLBACK_SYNC);
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(1, dataProvider.getNumReadCalls());
@@ -1225,16 +1193,16 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadRewindFailAsync() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.ASYNC, listener.getExecutor());
dataProvider.setRewindFailure(TestUploadDataProvider.FailMode.CALLBACK_ASYNC);
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(1, dataProvider.getNumReadCalls());
@@ -1249,16 +1217,16 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadRewindFailThrown() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectToEchoBody(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
dataProvider.setRewindFailure(TestUploadDataProvider.FailMode.THROWN);
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(1, dataProvider.getNumReadCalls());
@@ -1273,19 +1241,19 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadChunked() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
dataProvider.addRead("test hello".getBytes());
dataProvider.setChunked(true);
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
assertEquals(-1, dataProvider.getLength());
- urlRequest.start();
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
// 1 read call for one data chunk.
@@ -1297,7 +1265,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadChunkedLastReadZeroLengthBody() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
@@ -1307,12 +1275,12 @@ public class CronetUrlRequestTest extends CronetTestBase {
dataProvider.addRead("!".getBytes());
dataProvider.addRead("".getBytes());
dataProvider.setChunked(true);
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
assertEquals(-1, dataProvider.getLength());
- urlRequest.start();
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
// 2 read call for the first two data chunks, and 1 for final chunk.
@@ -1326,7 +1294,7 @@ public class CronetUrlRequestTest extends CronetTestBase {
@Feature({"Cronet"})
public void testUploadFailsWithoutInitializingStream() throws Exception {
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
// Shut down the test server, so connecting to it fails. Note that
// calling shutdown again during teardown is safe.
@@ -1335,9 +1303,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
TestUploadDataProvider dataProvider = new TestUploadDataProvider(
TestUploadDataProvider.SuccessCallbackMode.SYNC, listener.getExecutor());
dataProvider.addRead("test".getBytes());
- urlRequest.setUploadDataProvider(dataProvider, listener.getExecutor());
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, listener.getExecutor());
+ builder.addHeader("Content-Type", "useless/string");
+ mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertNull(listener.mResponseInfo);
@@ -1349,9 +1317,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
boolean expectResponseInfo, boolean expectError) {
TestUrlRequestListener listener = new TestUrlRequestListener();
listener.setFailure(failureType, failureStep);
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
- urlRequest.start();
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(1, listener.mRedirectCount);
assertEquals(listener.mResponseStep, failureStep);
@@ -1397,9 +1365,9 @@ public class CronetUrlRequestTest extends CronetTestBase {
public void testThrowON_SUCCEEDED() {
TestUrlRequestListener listener = new TestUrlRequestListener();
listener.setFailure(FailureType.THROW_SYNC, ResponseStep.ON_SUCCEEDED);
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getRedirectURL(), listener, listener.getExecutor());
- urlRequest.start();
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
listener.blockForDone();
assertEquals(1, listener.mRedirectCount);
assertEquals(listener.mResponseStep, ResponseStep.ON_SUCCEEDED);
@@ -1415,10 +1383,10 @@ public class CronetUrlRequestTest extends CronetTestBase {
TestUrlRequestListener listener = new TestUrlRequestListener();
listener.setAutoAdvance(false);
- CronetUrlRequest urlRequest =
- (CronetUrlRequest) mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
- urlRequest.start();
+ CronetUrlRequest urlRequest =
+ (CronetUrlRequest) mActivity.mCronetEngine.executeRequest(builder);
listener.waitForNextStep();
assertFalse(listener.isDone());
assertFalse(urlRequest.isDone());
@@ -1470,14 +1438,14 @@ public class CronetUrlRequestTest extends CronetTestBase {
}
TestUrlRequestListener listener = new TestUrlRequestListener();
- UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest(
+ UrlRequest.Builder builder = new UrlRequest.Builder(
NativeTestServer.getEchoBodyURL(), listener, listener.getExecutor());
ExecutorService uploadExecutor = Executors.newSingleThreadExecutor();
HangingUploadDataProvider dataProvider = new HangingUploadDataProvider();
- urlRequest.setUploadDataProvider(dataProvider, uploadExecutor);
- urlRequest.addHeader("Content-Type", "useless/string");
- urlRequest.start();
+ builder.setUploadDataProvider(dataProvider, uploadExecutor);
+ builder.addHeader("Content-Type", "useless/string");
+ UrlRequest urlRequest = mActivity.mCronetEngine.executeRequest(builder);
// Wait for read to be called on executor.
dataProvider.mReadCalled.block();
// Shutdown the executor, so posting next task will throw an exception.
« components/cronet/android/java/src/org/chromium/net/UrlRequest.java ('K') | « components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698