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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2339223002: Cronet API Refactoring (Closed)
Patch Set: Addressed Paul's comments + rebase Created 4 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/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java ('K') | « components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java » ('j') | components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index 1e433d90b421694647c8879178a37bb272a7adc3..a55968fb21ef8b3a05fbbb77fd99baa0168fcad5 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -5,7 +5,6 @@
package org.chromium.net;
import android.content.Context;
-import android.content.ContextWrapper;
import android.os.ConditionVariable;
import android.os.Handler;
import android.os.Looper;
@@ -18,6 +17,8 @@ import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.test.util.Feature;
import org.chromium.net.MetricsTestUtil.TestExecutor;
import org.chromium.net.TestUrlRequestCallback.ResponseStep;
+import org.chromium.net.impl.CronetEngineBase;
+import org.chromium.net.impl.CronetEngineBuilderImpl;
import org.chromium.net.impl.CronetLibraryLoader;
import org.chromium.net.impl.CronetUrlRequestContext;
import org.chromium.net.test.EmbeddedTestServer;
@@ -89,7 +90,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
CronetEngine cronetEngine = mTestFramework.initCronetEngine();
mCallback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, mCallback, mCallback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, mCallback, mCallback.getExecutor());
urlRequestBuilder.build().start();
mCallback.blockForDone();
}
@@ -155,21 +156,21 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
public void testConfigUserAgent() throws Exception {
String userAgentName = "User-Agent";
String userAgentValue = "User-Agent-Value";
- CronetEngine.Builder cronetEngineBuilder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder cronetEngineBuilder =
+ new ExperimentalCronetEngine.Builder(getContext());
if (testingJavaImpl()) {
cronetEngineBuilder.enableLegacyMode(true);
}
cronetEngineBuilder.setUserAgent(userAgentValue);
- cronetEngineBuilder.setLibraryName("cronet_tests");
+ CronetTestUtil.setLibraryName(cronetEngineBuilder, "cronet_tests");
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(mUrl, cronetEngineBuilder);
NativeTestServer.shutdownNativeTestServer(); // startNativeTestServer returns false if it's
// already running
assertTrue(NativeTestServer.startNativeTestServer(getContext()));
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(NativeTestServer.getEchoHeaderURL(userAgentName), callback,
- callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ NativeTestServer.getEchoHeaderURL(userAgentName), callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
assertEquals(userAgentValue, callback.mResponseAsString);
@@ -182,7 +183,10 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
// Ensure native code is loaded before trying to start test server.
- new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests").build().shutdown();
+ ExperimentalCronetEngine.Builder engineBuilder =
+ new ExperimentalCronetEngine.Builder(getContext());
+ CronetTestUtil.setLibraryName(engineBuilder, "cronet_tests");
+ engineBuilder.build().shutdown();
assertTrue(NativeTestServer.startNativeTestServer(getContext()));
if (!NativeTestServer.isDataReductionProxySupported()) {
@@ -193,20 +197,21 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Enable the Data Reduction Proxy and configure it to use the test
// server as its primary proxy, and to check successfully that this
// proxy is OK to use.
- CronetEngine.Builder cronetEngineBuilder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder cronetEngineBuilder =
+ new ExperimentalCronetEngine.Builder(getContext());
cronetEngineBuilder.enableDataReductionProxy("test-key");
cronetEngineBuilder.setDataReductionProxyOptions(serverHostPort, "unused.net:9999",
NativeTestServer.getFileURL("/secureproxychecksuccess.txt"));
- cronetEngineBuilder.setLibraryName("cronet_tests");
- testFramework.mCronetEngine = cronetEngineBuilder.build();
+ CronetTestUtil.setLibraryName(cronetEngineBuilder, "cronet_tests");
+ testFramework.mCronetEngine = (CronetEngineBase) cronetEngineBuilder.build();
TestUrlRequestCallback callback = new TestUrlRequestCallback();
// Construct and start a request that can only be returned by the test
// server. This request will fail if the configuration logic for the
// Data Reduction Proxy is not used.
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
"http://DomainThatDoesnt.Resolve/datareductionproxysuccess.txt", callback,
- callback.getExecutor(), testFramework.mCronetEngine);
+ callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
@@ -221,7 +226,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@SmallTest
@Feature({"Cronet"})
public void testRealTimeNetworkQualityObservationsNotEnabled() throws Exception {
- CronetEngine.Builder mCronetEngineBuilder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder mCronetEngineBuilder =
+ new ExperimentalCronetEngine.Builder(getContext());
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
Executor networkQualityExecutor = Executors.newSingleThreadExecutor();
@@ -240,8 +246,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
} catch (IllegalStateException e) {
}
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder builder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
@@ -254,7 +260,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@SmallTest
@Feature({"Cronet"})
public void testRealTimeNetworkQualityObservationsListenerRemoved() throws Exception {
- CronetEngine.Builder mCronetEngineBuilder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder mCronetEngineBuilder =
+ new ExperimentalCronetEngine.Builder(getContext());
TestExecutor networkQualityExecutor = new TestExecutor();
TestNetworkQualityRttListener rttListener =
new TestNetworkQualityRttListener(networkQualityExecutor);
@@ -266,8 +273,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
testFramework.mCronetEngine.addRttListener(rttListener);
testFramework.mCronetEngine.removeRttListener(rttListener);
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder builder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
callback.blockForDone();
@@ -279,15 +286,16 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@SmallTest
@Feature({"Cronet"})
public void testRealTimeNetworkQualityObservationsQuicDisabled() throws Exception {
- CronetEngine.Builder mCronetEngineBuilder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder mCronetEngineBuilder =
+ new ExperimentalCronetEngine.Builder(getContext());
Executor listenersExecutor = Executors.newSingleThreadExecutor(new ExecutorThreadFactory());
ConditionVariable waitForThroughput = new ConditionVariable();
TestNetworkQualityRttListener rttListener =
new TestNetworkQualityRttListener(listenersExecutor);
TestNetworkQualityThroughputListener throughputListener =
new TestNetworkQualityThroughputListener(listenersExecutor, waitForThroughput);
- mCronetEngineBuilder.enableHttp2(true).enableQuic(false).enableNetworkQualityEstimator(
- true);
+ mCronetEngineBuilder.enableNetworkQualityEstimator(true).enableHttp2(true).enableQuic(
+ false);
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
testFramework.mCronetEngine.configureNetworkQualityEstimatorForTesting(true, true);
@@ -296,8 +304,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
testFramework.mCronetEngine.addThroughputListener(throughputListener);
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder builder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
callback.blockForDone();
@@ -344,8 +352,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Block callback when response starts to verify that shutdown fails
// if there are active requests.
callback.setAutoAdvance(false);
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = urlRequestBuilder.build();
urlRequest.start();
try {
@@ -480,8 +488,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
final CronetTestFramework testFramework = startCronetTestFramework();
ShutdownTestUrlRequestCallback callback =
new ShutdownTestUrlRequestCallback(testFramework.mCronetEngine);
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(MOCK_CRONET_TEST_FAILED_URL,
- callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ MOCK_CRONET_TEST_FAILED_URL, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
assertTrue(callback.mOnErrorCalled);
@@ -497,8 +505,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Block callback when response starts to verify that shutdown fails
// if there are active requests.
callback.setAutoAdvance(false);
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = urlRequestBuilder.build();
urlRequest.start();
try {
@@ -522,7 +530,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
// Start NetLog immediately after the request context is created to make
// sure that the call won't crash the app even when the native request
// context is not fully initialized. See crbug.com/470196.
@@ -531,7 +539,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
cronetEngine.stopNetLog();
@@ -552,8 +560,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json");
- CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ CronetUrlRequestContext cronetEngine = new CronetUrlRequestContext(
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
// Start NetLog immediately after the request context is created to make
// sure that the call won't crash the app even when the native request
// context is not fully initialized. See crbug.com/470196.
@@ -562,7 +570,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
cronetEngine.stopNetLog();
@@ -582,14 +590,14 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
Context context = getContext();
File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
- CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ CronetUrlRequestContext cronetEngine = new CronetUrlRequestContext(
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
cronetEngine.startNetLogToFile(file.getPath(), false);
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
// Shut down the engine without calling stopNetLog.
@@ -613,14 +621,14 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json");
- CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ CronetUrlRequestContext cronetEngine = new CronetUrlRequestContext(
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
cronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE);
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
// Shut down the engine without calling stopNetLog.
@@ -642,9 +650,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File file1 = File.createTempFile("cronet1", "json", directory);
File file2 = File.createTempFile("cronet2", "json", directory);
CronetEngine cronetEngine1 = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
CronetEngine cronetEngine2 = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
cronetEngine1.startNetLogToFile(file1.getPath(), false);
cronetEngine2.startNetLogToFile(file2.getPath(), false);
@@ -691,9 +699,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File eventFile2 = new File(netLogDir2, "event_file_0.json");
CronetUrlRequestContext cronetEngine1 = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
CronetUrlRequestContext cronetEngine2 = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
cronetEngine1.startNetLogToDisk(netLogDir1.getPath(), false, MAX_FILE_SIZE);
cronetEngine2.startNetLogToDisk(netLogDir2.getPath(), false, MAX_FILE_SIZE);
@@ -779,7 +787,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
CancelUrlRequestCallback callback = new CancelUrlRequestCallback();
callback.setAllowDirectExecutor(true);
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(url, callback, directExecutor, testFramework.mCronetEngine);
+ testFramework.mCronetEngine.newUrlRequestBuilder(url, callback, directExecutor);
urlRequestBuilder.allowDirectExecutor();
urlRequestBuilder.build().start();
callback.blockForDone();
@@ -823,8 +831,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
}
}
CancelUrlRequestCallback callback = new CancelUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- url, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ url, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
@@ -838,8 +846,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
public void testNetLogAfterShutdown() throws Exception {
final CronetTestFramework testFramework = startCronetTestFramework();
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
testFramework.mCronetEngine.shutdown();
@@ -863,8 +871,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
public void testBoundedFileNetLogAfterShutdown() throws Exception {
final CronetTestFramework testFramework = startCronetTestFramework();
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
testFramework.mCronetEngine.shutdown();
@@ -899,8 +907,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
testFramework.mCronetEngine.startNetLogToFile(file.getPath(), false);
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
testFramework.mCronetEngine.stopNetLog();
@@ -928,8 +936,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
testFramework.mCronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE);
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
testFramework.mCronetEngine.stopNetLog();
@@ -949,8 +957,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
testFramework.mCronetEngine.startNetLogToFile(file.getPath(), false);
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
// Stop NetLog multiple times.
@@ -978,8 +986,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
testFramework.mCronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE);
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
// Stop NetLog multiple times. This should be equivalent to stopping NetLog once.
@@ -1004,13 +1012,13 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
// Start NetLog with logAll as true.
cronetEngine.startNetLogToFile(file.getPath(), true);
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
cronetEngine.stopNetLog();
@@ -1032,13 +1040,13 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json");
CronetUrlRequestContext cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngineBuilderImpl(context).setLibraryName("cronet_tests"));
// Start NetLog with logAll as true.
cronetEngine.startNetLogToDisk(netLogDir.getPath(), true, MAX_FILE_SIZE);
// Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
cronetEngine.stopNetLog();
@@ -1077,7 +1085,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
CronetEngine engine, String url, int expectedStatusCode) {
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest request =
- new UrlRequest.Builder(url, callback, callback.getExecutor(), engine).build();
+ engine.newUrlRequestBuilder(url, callback, callback.getExecutor()).build();
request.start();
callback.blockForDone();
assertEquals(expectedStatusCode, callback.mResponseInfo.getHttpStatusCode());
@@ -1108,7 +1116,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
CronetEngine engine, String url, boolean expectCached, boolean disableCache) {
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(url, callback, callback.getExecutor(), engine);
+ engine.newUrlRequestBuilder(url, callback, callback.getExecutor());
if (disableCache) {
urlRequestBuilder.disableCache();
}
@@ -1187,8 +1195,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Cache is disabled after server is shut down, request should fail.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
- url, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ url, callback, callback.getExecutor());
urlRequestBuilder.disableCache();
urlRequestBuilder.build().start();
callback.blockForDone();
@@ -1210,7 +1218,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Shutdown original context and create another that uses the same cache.
testFramework.mCronetEngine.shutdown();
- testFramework.mCronetEngine = testFramework.getCronetEngineBuilder().build();
+ testFramework.mCronetEngine =
+ (CronetEngineBase) testFramework.getCronetEngineBuilder().build();
checkRequestCaching(testFramework.mCronetEngine, url, true);
}
@@ -1223,7 +1232,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
CronetEngine cronetEngine = testFramework.initCronetEngine();
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
@@ -1235,10 +1244,10 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
// Immediately make a request after initializing the engine.
- CronetEngine cronetEngine = testFramework.initCronetEngine();
+ ExperimentalCronetEngine cronetEngine = testFramework.initCronetEngine();
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(mUrl, callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(mUrl, callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
@@ -1266,7 +1275,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
for (int i = 0; i < 2; i++) {
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder urlRequestBuilder =
- new UrlRequest.Builder(urls[i], callback, callback.getExecutor(), cronetEngine);
+ cronetEngine.newUrlRequestBuilder(urls[i], callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
statusCodes[i] = callback.mResponseInfo.getHttpStatusCode();
@@ -1319,11 +1328,14 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// like crbug.com/453845
final CronetTestFramework testFramework = startCronetTestFramework();
CronetEngine firstEngine =
- new CronetUrlRequestContext(testFramework.createCronetEngineBuilder(getContext()));
+ new CronetUrlRequestContext(CronetTestUtil.getCronetEngineBuilderImpl(
+ testFramework.createCronetEngineBuilder(getContext())));
CronetEngine secondEngine = new CronetUrlRequestContext(
- testFramework.createCronetEngineBuilder(getContext().getApplicationContext()));
- CronetEngine thirdEngine = new CronetUrlRequestContext(
- testFramework.createCronetEngineBuilder(new ContextWrapper(getContext())));
+ CronetTestUtil.getCronetEngineBuilderImpl(testFramework.createCronetEngineBuilder(
+ getContext().getApplicationContext())));
+ CronetEngine thirdEngine =
+ new CronetUrlRequestContext(CronetTestUtil.getCronetEngineBuilderImpl(
+ testFramework.createCronetEngineBuilder(getContext())));
pauljensen 2016/10/03 15:22:38 please add back "new ContextWrapper("
kapishnikov 2016/10/03 23:49:29 Done.
firstEngine.shutdown();
secondEngine.shutdown();
thirdEngine.shutdown();
@@ -1337,8 +1349,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
byte delta1[] = testFramework.mCronetEngine.getGlobalMetricsDeltas();
TestUrlRequestCallback callback = new TestUrlRequestCallback();
- UrlRequest.Builder builder = new UrlRequest.Builder(
- mUrl, callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ mUrl, callback, callback.getExecutor());
builder.build().start();
callback.blockForDone();
byte delta2[] = testFramework.mCronetEngine.getGlobalMetricsDeltas();
@@ -1352,13 +1364,13 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// This is to prompt load of native library.
startCronetTestFramework();
// Verify CronetEngine.Builder config is passed down accurately to native code.
- CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
+ CronetEngineBuilderImpl builder = new CronetEngineBuilderImpl(getContext());
builder.enableHttp2(false);
builder.enableQuic(true);
builder.enableSdch(true);
builder.addQuicHint("example.com", 12, 34);
builder.setCertVerifierData("test_cert_verifier_data");
- builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_IN_MEMORY, 54321);
+ builder.enableHttpCache(CronetEngineBuilderImpl.HTTP_CACHE_IN_MEMORY, 54321);
builder.enableDataReductionProxy("abcd");
builder.setUserAgent("efgh");
builder.setExperimentalOptions("ijkl");
@@ -1391,7 +1403,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
@OnlyRunNativeCronet
public void testSkipLibraryLoading() throws Exception {
- CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
+ CronetEngineBuilderImpl builder = new CronetEngineBuilderImpl(getContext());
TestBadLibraryLoader loader = new TestBadLibraryLoader();
builder.setLibraryLoader(loader).setLibraryName("cronet_tests");
try {
@@ -1413,8 +1425,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
final ConditionVariable uiThreadDone = new ConditionVariable();
new Handler(Looper.getMainLooper()).post(new Runnable() {
public void run() {
- final CronetEngine.Builder builder =
- new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests");
+ final ExperimentalCronetEngine.Builder builder =
+ new ExperimentalCronetEngine.Builder(getContext());
+ CronetTestUtil.setLibraryName(builder, "cronet_tests");
new Thread() {
public void run() {
CronetEngine cronetEngine = builder.build();
@@ -1435,7 +1448,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
public void testHostResolverRules() throws Exception {
String resolverTestHostname = "some-weird-hostname";
URL testUrl = new URL(mUrl);
- CronetEngine.Builder cronetEngineBuilder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder cronetEngineBuilder =
+ new ExperimentalCronetEngine.Builder(getContext());
JSONObject hostResolverRules = new JSONObject().put(
"host_resolver_rules", "MAP " + resolverTestHostname + " " + testUrl.getHost());
JSONObject experimentalOptions =
@@ -1447,8 +1461,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
TestUrlRequestCallback callback = new TestUrlRequestCallback();
URL requestUrl =
new URL("http", resolverTestHostname, testUrl.getPort(), testUrl.getFile());
- UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(requestUrl.toString(),
- callback, callback.getExecutor(), testFramework.mCronetEngine);
+ UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUrlRequestBuilder(
+ requestUrl.toString(), callback, callback.getExecutor());
urlRequestBuilder.build().start();
callback.blockForDone();
assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
« components/cronet/android/test/javatests/src/org/chromium/net/BidirectionalStreamTest.java ('K') | « components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestTest.java » ('j') | components/cronet/android/test/javatests/src/org/chromium/net/GetStatusTest.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698