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

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

Issue 1817553002: Add host resolver rules experimental flag for Cronet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete unused definitions, rebase, and fix test Created 4 years, 4 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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.CronetTestBase.OnlyRunNativeCronet; 10 import org.chromium.net.CronetTestBase.OnlyRunNativeCronet;
(...skipping 16 matching lines...) Expand all
27 System.loadLibrary("cronet_tests"); 27 System.loadLibrary("cronet_tests");
28 CronetEngine.Builder builder = new CronetEngine.Builder(getContext()); 28 CronetEngine.Builder builder = new CronetEngine.Builder(getContext());
29 29
30 QuicTestServer.startQuicTestServer(getContext()); 30 QuicTestServer.startQuicTestServer(getContext());
31 31
32 builder.enableQuic(true); 32 builder.enableQuic(true);
33 JSONObject quicParams = new JSONObject().put("host_whitelist", "test.exa mple.com"); 33 JSONObject quicParams = new JSONObject().put("host_whitelist", "test.exa mple.com");
34 if (enabled == QuicBidirectionalStreams.DISABLED) { 34 if (enabled == QuicBidirectionalStreams.DISABLED) {
35 quicParams.put("quic_disable_bidirectional_streams", true); 35 quicParams.put("quic_disable_bidirectional_streams", true);
36 } 36 }
37 JSONObject experimentalOptions = new JSONObject().put("QUIC", quicParams ); 37 JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules ();
38 JSONObject experimentalOptions = new JSONObject()
39 .put("QUIC", quicParams)
40 .put("HostResolverRules", hostR esolverParams);
38 builder.setExperimentalOptions(experimentalOptions.toString()); 41 builder.setExperimentalOptions(experimentalOptions.toString());
39 42
40 builder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getSe rverPort(), 43 builder.addQuicHint(QuicTestServer.getServerHost(), QuicTestServer.getSe rverPort(),
41 QuicTestServer.getServerPort()); 44 QuicTestServer.getServerPort());
42 45
43 builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerif ier()); 46 builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerif ier());
44 47
45 mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(n ull, builder); 48 mTestFramework = startCronetTestFrameworkWithUrlAndCronetEngineBuilder(n ull, builder);
46 registerHostResolver(mTestFramework);
47 } 49 }
48 50
49 @Override 51 @Override
50 protected void tearDown() throws Exception { 52 protected void tearDown() throws Exception {
51 QuicTestServer.shutdownQuicTestServer(); 53 QuicTestServer.shutdownQuicTestServer();
52 super.tearDown(); 54 super.tearDown();
53 } 55 }
54 56
55 @SmallTest 57 @SmallTest
56 @Feature({"Cronet"}) 58 @Feature({"Cronet"})
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 builder.enableQuic(true); 343 builder.enableQuic(true);
342 builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerif ier()); 344 builder.setMockCertVerifierForTesting(QuicTestServer.createMockCertVerif ier());
343 builder.setCertVerifierData(serialized_data); 345 builder.setCertVerifierData(serialized_data);
344 346
345 CronetTestFramework testFramework = 347 CronetTestFramework testFramework =
346 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, buil der); 348 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, buil der);
347 String deserialized_data = testFramework.mCronetEngine.getCertVerifierDa ta(100); 349 String deserialized_data = testFramework.mCronetEngine.getCertVerifierDa ta(100);
348 assertEquals(deserialized_data, serialized_data); 350 assertEquals(deserialized_data, serialized_data);
349 } 351 }
350 } 352 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698