| 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 static org.chromium.base.CollectionUtil.newHashSet; | 7 import static org.chromium.base.CollectionUtil.newHashSet; |
| 8 | 8 |
| 9 import android.content.Context; | 9 import android.content.Context; |
| 10 import android.content.ContextWrapper; | 10 import android.content.ContextWrapper; |
| 11 import android.os.ConditionVariable; | 11 import android.os.ConditionVariable; |
| 12 import android.os.Handler; | 12 import android.os.Handler; |
| 13 import android.os.Looper; | 13 import android.os.Looper; |
| 14 import android.test.FlakyTest; |
| 14 import android.test.suitebuilder.annotation.SmallTest; | 15 import android.test.suitebuilder.annotation.SmallTest; |
| 15 | 16 |
| 16 import org.chromium.base.PathUtils; | 17 import org.chromium.base.PathUtils; |
| 17 import org.chromium.base.annotations.JNINamespace; | 18 import org.chromium.base.annotations.JNINamespace; |
| 18 import org.chromium.base.test.util.DisabledTest; | 19 import org.chromium.base.test.util.DisabledTest; |
| 19 import org.chromium.base.test.util.Feature; | 20 import org.chromium.base.test.util.Feature; |
| 20 import org.chromium.net.CronetEngine.UrlRequestInfo; | 21 import org.chromium.net.CronetEngine.UrlRequestInfo; |
| 21 import org.chromium.net.TestUrlRequestCallback.ResponseStep; | 22 import org.chromium.net.TestUrlRequestCallback.ResponseStep; |
| 22 | 23 |
| 23 import java.io.BufferedReader; | 24 import java.io.BufferedReader; |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 assertEquals(newHashSet("request annotation", this), // Use sets for uno
rdered comparison. | 314 assertEquals(newHashSet("request annotation", this), // Use sets for uno
rdered comparison. |
| 314 new HashSet<Object>(requestInfo.getAnnotations())); | 315 new HashSet<Object>(requestInfo.getAnnotations())); |
| 315 CronetEngine.UrlRequestMetrics metrics = requestInfo.getMetrics(); | 316 CronetEngine.UrlRequestMetrics metrics = requestInfo.getMetrics(); |
| 316 assertNotNull("UrlRequestInfo.getMetrics() must not be null", metrics); | 317 assertNotNull("UrlRequestInfo.getMetrics() must not be null", metrics); |
| 317 assertTrue(metrics.getTotalTimeMs() > 0); | 318 assertTrue(metrics.getTotalTimeMs() > 0); |
| 318 assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs()); | 319 assertTrue(metrics.getTotalTimeMs() >= metrics.getTtfbMs()); |
| 319 assertTrue(metrics.getReceivedBytesCount() > 0); | 320 assertTrue(metrics.getReceivedBytesCount() > 0); |
| 320 mTestFramework.mCronetEngine.shutdown(); | 321 mTestFramework.mCronetEngine.shutdown(); |
| 321 } | 322 } |
| 322 | 323 |
| 324 /* |
| 323 @SmallTest | 325 @SmallTest |
| 324 @Feature({"Cronet"}) | 326 @Feature({"Cronet"}) |
| 325 @SuppressWarnings("deprecation") | 327 @SuppressWarnings("deprecation") |
| 328 https://crbug.com/592444 |
| 329 */ |
| 330 @FlakyTest |
| 326 public void testRequestFinishedListenerFailedRequest() throws Exception { | 331 public void testRequestFinishedListenerFailedRequest() throws Exception { |
| 327 String connectionRefusedUrl = "http://127.0.0.1:3"; | 332 String connectionRefusedUrl = "http://127.0.0.1:3"; |
| 328 mTestFramework = startCronetTestFramework(); | 333 mTestFramework = startCronetTestFramework(); |
| 329 TestExecutor testExecutor = new TestExecutor(); | 334 TestExecutor testExecutor = new TestExecutor(); |
| 330 TestRequestFinishedListener requestFinishedListener = new TestRequestFin
ishedListener(); | 335 TestRequestFinishedListener requestFinishedListener = new TestRequestFin
ishedListener(); |
| 331 mTestFramework.mCronetEngine.enableNetworkQualityEstimator(testExecutor)
; | 336 mTestFramework.mCronetEngine.enableNetworkQualityEstimator(testExecutor)
; |
| 332 mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedL
istener); | 337 mTestFramework.mCronetEngine.addRequestFinishedListener(requestFinishedL
istener); |
| 333 TestUrlRequestCallback callback = new TestUrlRequestCallback(); | 338 TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
| 334 UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(connection
RefusedUrl, | 339 UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(connection
RefusedUrl, |
| 335 callback, callback.getExecutor(), mTestFramework.mCronetEngine); | 340 callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 mTestFramework = startCronetTestFramework(); | 526 mTestFramework = startCronetTestFramework(); |
| 522 try { | 527 try { |
| 523 mTestFramework.mCronetEngine.shutdown(); | 528 mTestFramework.mCronetEngine.shutdown(); |
| 524 mTestFramework.mCronetEngine.shutdown(); | 529 mTestFramework.mCronetEngine.shutdown(); |
| 525 fail("Should throw an exception"); | 530 fail("Should throw an exception"); |
| 526 } catch (Exception e) { | 531 } catch (Exception e) { |
| 527 assertEquals("Engine is shut down.", e.getMessage()); | 532 assertEquals("Engine is shut down.", e.getMessage()); |
| 528 } | 533 } |
| 529 } | 534 } |
| 530 | 535 |
| 536 /* |
| 531 @SmallTest | 537 @SmallTest |
| 532 @Feature({"Cronet"}) | 538 @Feature({"Cronet"}) |
| 539 https://crbug.com/592444 |
| 540 */ |
| 541 @FlakyTest |
| 533 public void testShutdownAfterError() throws Exception { | 542 public void testShutdownAfterError() throws Exception { |
| 534 mTestFramework = startCronetTestFramework(); | 543 mTestFramework = startCronetTestFramework(); |
| 535 TestUrlRequestCallback callback = new ShutdownTestUrlRequestCallback(); | 544 TestUrlRequestCallback callback = new ShutdownTestUrlRequestCallback(); |
| 536 UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(MOCK_CRONE
T_TEST_FAILED_URL, | 545 UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(MOCK_CRONE
T_TEST_FAILED_URL, |
| 537 callback, callback.getExecutor(), mTestFramework.mCronetEngine); | 546 callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
| 538 urlRequestBuilder.build().start(); | 547 urlRequestBuilder.build().start(); |
| 539 callback.blockForDone(); | 548 callback.blockForDone(); |
| 540 assertTrue(callback.mOnErrorCalled); | 549 assertTrue(callback.mOnErrorCalled); |
| 541 } | 550 } |
| 542 | 551 |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 988 try { | 997 try { |
| 989 // ensureInitialized() calls native code to check the version right
after library load | 998 // ensureInitialized() calls native code to check the version right
after library load |
| 990 // and will error with the message below if library loading was skip
ped | 999 // and will error with the message below if library loading was skip
ped |
| 991 CronetLibraryLoader.ensureInitialized(getContext(), builder); | 1000 CronetLibraryLoader.ensureInitialized(getContext(), builder); |
| 992 fail("Native library should not be loaded"); | 1001 fail("Native library should not be loaded"); |
| 993 } catch (UnsatisfiedLinkError e) { | 1002 } catch (UnsatisfiedLinkError e) { |
| 994 assertTrue(loader.wasCalled()); | 1003 assertTrue(loader.wasCalled()); |
| 995 } | 1004 } |
| 996 } | 1005 } |
| 997 } | 1006 } |
| OLD | NEW |