Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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.content.Context; | 7 import android.content.Context; |
| 8 import android.content.ContextWrapper; | 8 import android.content.ContextWrapper; |
| 9 import android.os.ConditionVariable; | 9 import android.os.ConditionVariable; |
| 10 import android.os.Handler; | 10 import android.os.Handler; |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 156 | 156 |
| 157 @SmallTest | 157 @SmallTest |
| 158 @Feature({"Cronet"}) | 158 @Feature({"Cronet"}) |
| 159 @SuppressWarnings("deprecation") | 159 @SuppressWarnings("deprecation") |
| 160 public void testConfigUserAgent() throws Exception { | 160 public void testConfigUserAgent() throws Exception { |
| 161 String userAgentName = "User-Agent"; | 161 String userAgentName = "User-Agent"; |
| 162 String userAgentValue = "User-Agent-Value"; | 162 String userAgentValue = "User-Agent-Value"; |
| 163 ExperimentalCronetEngine.Builder cronetEngineBuilder = | 163 ExperimentalCronetEngine.Builder cronetEngineBuilder = |
| 164 new ExperimentalCronetEngine.Builder(getContext()); | 164 new ExperimentalCronetEngine.Builder(getContext()); |
| 165 if (testingJavaImpl()) { | 165 if (testingJavaImpl()) { |
| 166 cronetEngineBuilder.enableLegacyMode(true); | 166 cronetEngineBuilder = createJavaEngineBuilder(); |
| 167 } | 167 } |
| 168 cronetEngineBuilder.setUserAgent(userAgentValue); | 168 cronetEngineBuilder.setUserAgent(userAgentValue); |
| 169 final CronetTestFramework testFramework = | 169 final CronetTestFramework testFramework = |
| 170 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(mUrl, cron etEngineBuilder); | 170 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(mUrl, cron etEngineBuilder); |
| 171 NativeTestServer.shutdownNativeTestServer(); // startNativeTestServer re turns false if it's | 171 NativeTestServer.shutdownNativeTestServer(); // startNativeTestServer re turns false if it's |
| 172 // already running | 172 // already running |
| 173 assertTrue(NativeTestServer.startNativeTestServer(getContext())); | 173 assertTrue(NativeTestServer.startNativeTestServer(getContext())); |
| 174 TestUrlRequestCallback callback = new TestUrlRequestCallback(); | 174 TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
| 175 UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUr lRequestBuilder( | 175 UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUr lRequestBuilder( |
| 176 NativeTestServer.getEchoHeaderURL(userAgentName), callback, call back.getExecutor()); | 176 NativeTestServer.getEchoHeaderURL(userAgentName), callback, call back.getExecutor()); |
| (...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1361 assertTrue(delta2.length != 0); | 1361 assertTrue(delta2.length != 0); |
| 1362 assertFalse(Arrays.equals(delta1, delta2)); | 1362 assertFalse(Arrays.equals(delta1, delta2)); |
| 1363 } | 1363 } |
| 1364 | 1364 |
| 1365 @SmallTest | 1365 @SmallTest |
| 1366 @Feature({"Cronet"}) | 1366 @Feature({"Cronet"}) |
| 1367 public void testCronetEngineBuilderConfig() throws Exception { | 1367 public void testCronetEngineBuilderConfig() throws Exception { |
| 1368 // This is to prompt load of native library. | 1368 // This is to prompt load of native library. |
| 1369 startCronetTestFramework(); | 1369 startCronetTestFramework(); |
| 1370 // Verify CronetEngine.Builder config is passed down accurately to nativ e code. | 1370 // Verify CronetEngine.Builder config is passed down accurately to nativ e code. |
| 1371 CronetEngineBuilderImpl builder = new CronetEngineBuilderImpl(getContext ()); | 1371 CronetEngineBuilderImpl builder = |
|
mef
2017/01/18 20:57:54
nit: Can we make |builder| be a CronetEngine.Build
kapishnikov
2017/01/19 01:25:25
Good idea. Done!
| |
| 1372 (CronetEngineBuilderImpl) new CronetEngine.Builder(getContext()) .mBuilderDelegate; | |
| 1372 builder.enableHttp2(false); | 1373 builder.enableHttp2(false); |
| 1373 builder.enableQuic(true); | 1374 builder.enableQuic(true); |
| 1374 builder.enableSdch(true); | 1375 builder.enableSdch(true); |
| 1375 builder.addQuicHint("example.com", 12, 34); | 1376 builder.addQuicHint("example.com", 12, 34); |
| 1376 builder.setCertVerifierData("test_cert_verifier_data"); | 1377 builder.setCertVerifierData("test_cert_verifier_data"); |
| 1377 builder.enableHttpCache(HTTP_CACHE_IN_MEMORY, 54321); | 1378 builder.enableHttpCache(HTTP_CACHE_IN_MEMORY, 54321); |
| 1378 builder.enableDataReductionProxy("abcd"); | 1379 builder.enableDataReductionProxy("abcd"); |
| 1379 builder.setUserAgent("efgh"); | 1380 builder.setUserAgent("efgh"); |
| 1380 builder.setExperimentalOptions("ijkl"); | 1381 builder.setExperimentalOptions("ijkl"); |
| 1381 builder.setDataReductionProxyOptions("mnop", "qrst", "uvwx"); | 1382 builder.setDataReductionProxyOptions("mnop", "qrst", "uvwx"); |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 1400 | 1401 |
| 1401 boolean wasCalled() { | 1402 boolean wasCalled() { |
| 1402 return mWasCalled; | 1403 return mWasCalled; |
| 1403 } | 1404 } |
| 1404 } | 1405 } |
| 1405 | 1406 |
| 1406 @SmallTest | 1407 @SmallTest |
| 1407 @Feature({"Cronet"}) | 1408 @Feature({"Cronet"}) |
| 1408 @OnlyRunNativeCronet | 1409 @OnlyRunNativeCronet |
| 1409 public void testSkipLibraryLoading() throws Exception { | 1410 public void testSkipLibraryLoading() throws Exception { |
| 1410 CronetEngineBuilderImpl builder = new CronetEngineBuilderImpl(getContext ()); | 1411 CronetEngineBuilderImpl builder = |
|
mef
2017/01/18 20:57:54
nit: Can we make |builder| be a CronetEngine.Build
| |
| 1412 (CronetEngineBuilderImpl) new CronetEngine.Builder(getContext()) .mBuilderDelegate; | |
| 1411 TestBadLibraryLoader loader = new TestBadLibraryLoader(); | 1413 TestBadLibraryLoader loader = new TestBadLibraryLoader(); |
| 1412 builder.setLibraryLoader(loader); | 1414 builder.setLibraryLoader(loader); |
| 1413 try { | 1415 try { |
| 1414 // ensureInitialized() calls native code to check the version right after library load | 1416 // ensureInitialized() calls native code to check the version right after library load |
| 1415 // and will error with the message below if library loading was skip ped | 1417 // and will error with the message below if library loading was skip ped |
| 1416 CronetLibraryLoader.ensureInitialized(getContext().getApplicationCon text(), builder); | 1418 CronetLibraryLoader.ensureInitialized(getContext().getApplicationCon text(), builder); |
| 1417 fail("Native library should not be loaded"); | 1419 fail("Native library should not be loaded"); |
| 1418 } catch (UnsatisfiedLinkError e) { | 1420 } catch (UnsatisfiedLinkError e) { |
| 1419 assertTrue(loader.wasCalled()); | 1421 assertTrue(loader.wasCalled()); |
| 1420 } | 1422 } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1464 TestUrlRequestCallback callback = new TestUrlRequestCallback(); | 1466 TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
| 1465 URL requestUrl = | 1467 URL requestUrl = |
| 1466 new URL("http", resolverTestHostname, testUrl.getPort(), testUrl .getFile()); | 1468 new URL("http", resolverTestHostname, testUrl.getPort(), testUrl .getFile()); |
| 1467 UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUr lRequestBuilder( | 1469 UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUr lRequestBuilder( |
| 1468 requestUrl.toString(), callback, callback.getExecutor()); | 1470 requestUrl.toString(), callback, callback.getExecutor()); |
| 1469 urlRequestBuilder.build().start(); | 1471 urlRequestBuilder.build().start(); |
| 1470 callback.blockForDone(); | 1472 callback.blockForDone(); |
| 1471 assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); | 1473 assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); |
| 1472 } | 1474 } |
| 1473 } | 1475 } |
| OLD | NEW |