| 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; |
| 11 import android.os.Looper; | 11 import android.os.Looper; |
| 12 import android.os.StrictMode; | 12 import android.os.StrictMode; |
| 13 import android.support.test.filters.SmallTest; | 13 import android.support.test.filters.SmallTest; |
| 14 | 14 |
| 15 import org.json.JSONObject; | 15 import org.json.JSONObject; |
| 16 | 16 |
| 17 import static org.chromium.net.CronetEngine.Builder.HTTP_CACHE_IN_MEMORY; | 17 import static org.chromium.net.CronetEngine.Builder.HTTP_CACHE_IN_MEMORY; |
| 18 | 18 |
| 19 import org.chromium.base.FileUtils; | 19 import org.chromium.base.FileUtils; |
| 20 import org.chromium.base.Log; | 20 import org.chromium.base.Log; |
| 21 import org.chromium.base.PathUtils; | 21 import org.chromium.base.PathUtils; |
| 22 import org.chromium.base.annotations.JNINamespace; | 22 import org.chromium.base.annotations.JNINamespace; |
| 23 import org.chromium.base.annotations.SuppressFBWarnings; | 23 import org.chromium.base.annotations.SuppressFBWarnings; |
| 24 import org.chromium.base.test.util.DisabledTest; |
| 24 import org.chromium.base.test.util.Feature; | 25 import org.chromium.base.test.util.Feature; |
| 25 import org.chromium.base.test.util.MetricsUtils.HistogramDelta; | 26 import org.chromium.base.test.util.MetricsUtils.HistogramDelta; |
| 26 import org.chromium.net.MetricsTestUtil.TestExecutor; | 27 import org.chromium.net.MetricsTestUtil.TestExecutor; |
| 27 import org.chromium.net.TestUrlRequestCallback.ResponseStep; | 28 import org.chromium.net.TestUrlRequestCallback.ResponseStep; |
| 28 import org.chromium.net.impl.CronetEngineBase; | 29 import org.chromium.net.impl.CronetEngineBase; |
| 29 import org.chromium.net.impl.CronetEngineBuilderImpl; | 30 import org.chromium.net.impl.CronetEngineBuilderImpl; |
| 30 import org.chromium.net.impl.CronetLibraryLoader; | 31 import org.chromium.net.impl.CronetLibraryLoader; |
| 31 import org.chromium.net.impl.CronetUrlRequestContext; | 32 import org.chromium.net.impl.CronetUrlRequestContext; |
| 32 import org.chromium.net.test.EmbeddedTestServer; | 33 import org.chromium.net.test.EmbeddedTestServer; |
| 33 | 34 |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 // Verify that the request is successful and that the Data Reduction | 226 // Verify that the request is successful and that the Data Reduction |
| 226 // Proxy logic configured to use the test server as its proxy. | 227 // Proxy logic configured to use the test server as its proxy. |
| 227 assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); | 228 assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); |
| 228 assertEquals(serverHostPort, callback.mResponseInfo.getProxyServer()); | 229 assertEquals(serverHostPort, callback.mResponseInfo.getProxyServer()); |
| 229 assertEquals("http://DomainThatDoesnt.Resolve/datareductionproxysuccess.
txt", | 230 assertEquals("http://DomainThatDoesnt.Resolve/datareductionproxysuccess.
txt", |
| 230 callback.mResponseInfo.getUrl()); | 231 callback.mResponseInfo.getUrl()); |
| 231 } | 232 } |
| 232 | 233 |
| 233 @SmallTest | 234 @SmallTest |
| 234 @Feature({"Cronet"}) | 235 @Feature({"Cronet"}) |
| 236 @DisabledTest(message = "Disabled due to flaky assert. See crbug.com/710626"
) |
| 235 public void testRealTimeNetworkQualityObservationsNotEnabled() throws Except
ion { | 237 public void testRealTimeNetworkQualityObservationsNotEnabled() throws Except
ion { |
| 236 ExperimentalCronetEngine.Builder mCronetEngineBuilder = | 238 ExperimentalCronetEngine.Builder mCronetEngineBuilder = |
| 237 new ExperimentalCronetEngine.Builder(getContext()); | 239 new ExperimentalCronetEngine.Builder(getContext()); |
| 238 final CronetTestFramework testFramework = | 240 final CronetTestFramework testFramework = |
| 239 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCro
netEngineBuilder); | 241 startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCro
netEngineBuilder); |
| 240 Executor networkQualityExecutor = Executors.newSingleThreadExecutor(); | 242 Executor networkQualityExecutor = Executors.newSingleThreadExecutor(); |
| 241 TestNetworkQualityRttListener rttListener = | 243 TestNetworkQualityRttListener rttListener = |
| 242 new TestNetworkQualityRttListener(networkQualityExecutor); | 244 new TestNetworkQualityRttListener(networkQualityExecutor); |
| 243 TestNetworkQualityThroughputListener throughputListener = | 245 TestNetworkQualityThroughputListener throughputListener = |
| 244 new TestNetworkQualityThroughputListener(networkQualityExecutor,
null); | 246 new TestNetworkQualityThroughputListener(networkQualityExecutor,
null); |
| (...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1503 TestUrlRequestCallback callback = new TestUrlRequestCallback(); | 1505 TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
| 1504 URL requestUrl = | 1506 URL requestUrl = |
| 1505 new URL("http", resolverTestHostname, testUrl.getPort(), testUrl
.getFile()); | 1507 new URL("http", resolverTestHostname, testUrl.getPort(), testUrl
.getFile()); |
| 1506 UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUr
lRequestBuilder( | 1508 UrlRequest.Builder urlRequestBuilder = testFramework.mCronetEngine.newUr
lRequestBuilder( |
| 1507 requestUrl.toString(), callback, callback.getExecutor()); | 1509 requestUrl.toString(), callback, callback.getExecutor()); |
| 1508 urlRequestBuilder.build().start(); | 1510 urlRequestBuilder.build().start(); |
| 1509 callback.blockForDone(); | 1511 callback.blockForDone(); |
| 1510 assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); | 1512 assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); |
| 1511 } | 1513 } |
| 1512 } | 1514 } |
| OLD | NEW |