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

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

Issue 2339223002: Cronet API Refactoring (Closed)
Patch Set: Javadoc + 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
Index: components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
index 55bb669a4533d577e9cc1e6155183aa7dfe494fd..51c7ff65cfa887f8eeeb423cad11193fa444b1db 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java
@@ -6,19 +6,16 @@ package org.chromium.net;
import android.os.ConditionVariable;
import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.base.Log;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.test.util.Feature;
-import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
import org.json.JSONObject;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.HashMap;
import java.util.concurrent.Executors;
/**
@@ -27,7 +24,7 @@ import java.util.concurrent.Executors;
public class QuicTest extends CronetTestBase {
private static final String TAG = "cr.QuicTest";
private CronetTestFramework mTestFramework;
- private CronetEngine.Builder mBuilder;
+ private ExperimentalCronetEngine.Builder mBuilder;
@Override
protected void setUp() throws Exception {
@@ -36,8 +33,8 @@ public class QuicTest extends CronetTestBase {
System.loadLibrary("cronet_tests");
QuicTestServer.startQuicTestServer(getContext());
- mBuilder = new CronetEngine.Builder(getContext());
- mBuilder.enableQuic(true).enableNetworkQualityEstimator(true);
+ mBuilder = new ExperimentalCronetEngine.Builder(getContext());
+ mBuilder.enableNetworkQualityEstimator(true).enableQuic(true);
mBuilder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getServerPort(),
QuicTestServer.getServerPort());
@@ -57,9 +54,10 @@ public class QuicTest extends CronetTestBase {
.put("QUIC", quicParams)
.put("HostResolverRules", hostResolverParams);
mBuilder.setExperimentalOptions(experimentalOptions.toString());
- mBuilder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier());
mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1000 * 1024);
+ CronetTestUtil.setMockCertVerifierForTesting(
+ mBuilder, QuicTestServer.createMockCertVerifier());
}
@Override
@@ -68,34 +66,6 @@ public class QuicTest extends CronetTestBase {
super.tearDown();
}
- @SmallTest
- @Feature({"Cronet"})
- @SuppressWarnings("deprecation")
- @OnlyRunNativeCronet
- public void testQuicLoadUrl_LegacyAPI() throws Exception {
- String[] commandLineArgs = {
- CronetTestFramework.LIBRARY_INIT_KEY, CronetTestFramework.LibraryInitType.LEGACY};
- mTestFramework = new CronetTestFramework(null, commandLineArgs, getContext(), mBuilder);
- String quicURL = QuicTestServer.getServerURL() + "/simple.txt";
-
- HashMap<String, String> headers = new HashMap<String, String>();
- TestHttpUrlRequestListener listener = new TestHttpUrlRequestListener();
-
- // Although the native stack races QUIC and SPDY for the first request,
- // since there is no http server running on the corresponding TCP port,
- // QUIC will always succeed with a 200 (see
- // net::HttpStreamFactoryImpl::Request::OnStreamFailed).
- HttpUrlRequest request = mTestFramework.mRequestFactory.createRequest(
- quicURL, HttpUrlRequest.REQUEST_PRIORITY_MEDIUM, headers, listener);
- request.start();
- listener.blockForComplete();
- assertEquals(200, listener.mHttpStatusCode);
- assertEquals(
- "This is a simple text file served by QUIC.\n",
- listener.mResponseAsString);
- assertEquals("quic/1+spdy/3", listener.mNegotiatedProtocol);
- }
-
@LargeTest
@Feature({"Cronet"})
@OnlyRunNativeCronet
@@ -108,8 +78,8 @@ public class QuicTest extends CronetTestBase {
// since there is no http server running on the corresponding TCP port,
// QUIC will always succeed with a 200 (see
// net::HttpStreamFactoryImpl::Request::OnStreamFailed).
- UrlRequest.Builder requestBuilder = new UrlRequest.Builder(
- quicURL, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
+ UrlRequest.Builder requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
+ quicURL, callback, callback.getExecutor());
requestBuilder.build().start();
callback.blockForDone();
@@ -138,7 +108,8 @@ public class QuicTest extends CronetTestBase {
mTestFramework.mCronetEngine.shutdown();
// Make another request using a new context but with no QUIC hints.
- CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
+ ExperimentalCronetEngine.Builder builder =
+ new ExperimentalCronetEngine.Builder(getContext());
builder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
builder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, 1000 * 1024);
builder.enableQuic(true);
@@ -148,11 +119,12 @@ public class QuicTest extends CronetTestBase {
.put("QUIC", quicParams)
.put("HostResolverRules", hostResolverParams);
builder.setExperimentalOptions(experimentalOptions.toString());
- builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerifier());
+ CronetTestUtil.setMockCertVerifierForTesting(
+ builder, QuicTestServer.createMockCertVerifier());
mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, builder);
TestUrlRequestCallback callback2 = new TestUrlRequestCallback();
- requestBuilder = new UrlRequest.Builder(
- quicURL, callback2, callback2.getExecutor(), mTestFramework.mCronetEngine);
+ requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
+ quicURL, callback2, callback2.getExecutor());
requestBuilder.build().start();
callback2.blockForDone();
assertEquals(200, callback2.mResponseInfo.getHttpStatusCode());
@@ -200,8 +172,8 @@ public class QuicTest extends CronetTestBase {
// since there is no http server running on the corresponding TCP port,
// QUIC will always succeed with a 200 (see
// net::HttpStreamFactoryImpl::Request::OnStreamFailed).
- UrlRequest.Builder requestBuilder = new UrlRequest.Builder(
- quicURL, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
+ UrlRequest.Builder requestBuilder = mTestFramework.mCronetEngine.newUrlRequestBuilder(
+ quicURL, callback, callback.getExecutor());
requestBuilder.build().start();
callback.blockForDone();

Powered by Google App Engine
This is Rietveld 408576698