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

Side by Side Diff: components/cronet/android/test/javatests/src/org/chromium/net/PkpTest.java

Issue 1580583002: Add a whitelist for QUIC hosts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comments Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.net; 5 package org.chromium.net;
6 6
7 import android.test.suitebuilder.annotation.SmallTest; 7 import android.test.suitebuilder.annotation.SmallTest;
8 8
9 import org.chromium.base.test.util.Feature; 9 import org.chromium.base.test.util.Feature;
10 import org.chromium.net.test.util.CertTestUtil; 10 import org.chromium.net.test.util.CertTestUtil;
11 import org.json.JSONObject;
11 12
12 import java.io.ByteArrayInputStream; 13 import java.io.ByteArrayInputStream;
13 import java.security.cert.CertificateFactory; 14 import java.security.cert.CertificateFactory;
14 import java.security.cert.X509Certificate; 15 import java.security.cert.X509Certificate;
15 import java.util.Arrays; 16 import java.util.Arrays;
16 import java.util.Calendar; 17 import java.util.Calendar;
17 import java.util.Date; 18 import java.util.Date;
18 import java.util.HashSet; 19 import java.util.HashSet;
19 import java.util.Set; 20 import java.util.Set;
20 21
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 * Asserts a successful response with response code 200. 331 * Asserts a successful response with response code 200.
331 */ 332 */
332 private void assertSuccessfulResponse() { 333 private void assertSuccessfulResponse() {
333 if (mListener.mError != null) { 334 if (mListener.mError != null) {
334 fail("Did not expect an error but got error code " + mListener.mErro r.mNetError); 335 fail("Did not expect an error but got error code " + mListener.mErro r.mNetError);
335 } 336 }
336 assertNotNull("Expected non-null response from the server", mListener.mR esponseInfo); 337 assertNotNull("Expected non-null response from the server", mListener.mR esponseInfo);
337 assertEquals(200, mListener.mResponseInfo.getHttpStatusCode()); 338 assertEquals(200, mListener.mResponseInfo.getHttpStatusCode());
338 } 339 }
339 340
340 private void createCronetEngineBuilder() { 341 private void createCronetEngineBuilder() throws Exception {
341 // Set common CronetEngine parameters 342 // Set common CronetEngine parameters
342 mBuilder = new CronetEngine.Builder(getContext()); 343 mBuilder = new CronetEngine.Builder(getContext());
343 mBuilder.enableQUIC(true); 344 mBuilder.enableQUIC(true);
344 mBuilder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getS erverPort(), 345 mBuilder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getS erverPort(),
345 QuicTestServer.getServerPort()); 346 QuicTestServer.getServerPort());
347 JSONObject quicParams = new JSONObject().put("host_whitelist", "test.exa mple.com");
348 JSONObject experimentalOptions = new JSONObject().put("QUIC", quicParams );
349 mBuilder.setExperimentalOptions(experimentalOptions.toString());
346 mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()) ); 350 mBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()) );
347 mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1 000 * 1024); 351 mBuilder.enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK_NO_HTTP, 1 000 * 1024);
348 mBuilder.setMockCertVerifierForTesting(MockCertVerifier.createMockCertVe rifier(CERTS_USED)); 352 mBuilder.setMockCertVerifierForTesting(MockCertVerifier.createMockCertVe rifier(CERTS_USED));
349 } 353 }
350 354
351 private void startCronetFramework() { 355 private void startCronetFramework() {
352 mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(n ull, mBuilder); 356 mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(n ull, mBuilder);
353 } 357 }
354 358
355 private void shutdownCronetEngine() { 359 private void shutdownCronetEngine() {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 if (!shouldThrowNpe) { 429 if (!shouldThrowNpe) {
426 fail("Null pointer exception was not expected: " + ex.toString() ); 430 fail("Null pointer exception was not expected: " + ex.toString() );
427 } 431 }
428 return; 432 return;
429 } 433 }
430 if (shouldThrowNpe) { 434 if (shouldThrowNpe) {
431 fail("NullPointerException was expected"); 435 fail("NullPointerException was expected");
432 } 436 }
433 } 437 }
434 } 438 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698