| 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 public void testNetLog() throws Exception { | 270 public void testNetLog() throws Exception { |
| 271 Context context = getInstrumentation().getTargetContext(); | 271 Context context = getInstrumentation().getTargetContext(); |
| 272 File directory = new File(PathUtils.getDataDirectory(context)); | 272 File directory = new File(PathUtils.getDataDirectory(context)); |
| 273 File file = File.createTempFile("cronet", "json", directory); | 273 File file = File.createTempFile("cronet", "json", directory); |
| 274 CronetUrlRequestContext requestContext = new CronetUrlRequestContext( | 274 CronetUrlRequestContext requestContext = new CronetUrlRequestContext( |
| 275 context, | 275 context, |
| 276 new UrlRequestContextConfig().setLibraryName("cronet_tests")); | 276 new UrlRequestContextConfig().setLibraryName("cronet_tests")); |
| 277 // Start NetLog immediately after the request context is created to make | 277 // Start NetLog immediately after the request context is created to make |
| 278 // sure that the call won't crash the app even when the native request | 278 // sure that the call won't crash the app even when the native request |
| 279 // context is not fully initialized. See crbug.com/470196. | 279 // context is not fully initialized. See crbug.com/470196. |
| 280 requestContext.startNetLogToFile(file.getPath()); | 280 requestContext.startNetLogToFile(file.getPath(), false); |
| 281 | 281 |
| 282 // Start a request. | 282 // Start a request. |
| 283 TestUrlRequestListener listener = new TestUrlRequestListener(); | 283 TestUrlRequestListener listener = new TestUrlRequestListener(); |
| 284 UrlRequest request = requestContext.createRequest( | 284 UrlRequest request = requestContext.createRequest( |
| 285 TEST_URL, listener, listener.getExecutor()); | 285 TEST_URL, listener, listener.getExecutor()); |
| 286 request.start(); | 286 request.start(); |
| 287 listener.blockForDone(); | 287 listener.blockForDone(); |
| 288 requestContext.stopNetLog(); | 288 requestContext.stopNetLog(); |
| 289 assertTrue(file.exists()); | 289 assertTrue(file.exists()); |
| 290 assertTrue(file.length() != 0); | 290 assertTrue(file.length() != 0); |
| 291 assertTrue(file.delete()); | 291 assertTrue(file.delete()); |
| 292 assertTrue(!file.exists()); | 292 assertTrue(!file.exists()); |
| 293 } | 293 } |
| 294 | 294 |
| 295 @SmallTest | 295 @SmallTest |
| 296 @Feature({"Cronet"}) | 296 @Feature({"Cronet"}) |
| 297 public void testNetLogAfterShutdown() throws Exception { | 297 public void testNetLogAfterShutdown() throws Exception { |
| 298 mActivity = launchCronetTestApp(); | 298 mActivity = launchCronetTestApp(); |
| 299 TestUrlRequestListener listener = new TestUrlRequestListener(); | 299 TestUrlRequestListener listener = new TestUrlRequestListener(); |
| 300 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( | 300 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( |
| 301 TEST_URL, listener, listener.getExecutor()); | 301 TEST_URL, listener, listener.getExecutor()); |
| 302 urlRequest.start(); | 302 urlRequest.start(); |
| 303 listener.blockForDone(); | 303 listener.blockForDone(); |
| 304 mActivity.mUrlRequestContext.shutdown(); | 304 mActivity.mUrlRequestContext.shutdown(); |
| 305 | 305 |
| 306 File directory = new File(PathUtils.getDataDirectory( | 306 File directory = new File(PathUtils.getDataDirectory( |
| 307 getInstrumentation().getTargetContext())); | 307 getInstrumentation().getTargetContext())); |
| 308 File file = File.createTempFile("cronet", "json", directory); | 308 File file = File.createTempFile("cronet", "json", directory); |
| 309 try { | 309 try { |
| 310 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 310 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), |
| 311 false); |
| 311 fail("Should throw an exception."); | 312 fail("Should throw an exception."); |
| 312 } catch (Exception e) { | 313 } catch (Exception e) { |
| 313 assertEquals("Context is shut down.", e.getMessage()); | 314 assertEquals("Context is shut down.", e.getMessage()); |
| 314 } | 315 } |
| 315 assertTrue(file.delete()); | 316 assertTrue(file.delete()); |
| 316 assertTrue(!file.exists()); | 317 assertTrue(!file.exists()); |
| 317 } | 318 } |
| 318 | 319 |
| 319 @SmallTest | 320 @SmallTest |
| 320 @Feature({"Cronet"}) | 321 @Feature({"Cronet"}) |
| 321 public void testNetLogStartMultipleTimes() throws Exception { | 322 public void testNetLogStartMultipleTimes() throws Exception { |
| 322 mActivity = launchCronetTestApp(); | 323 mActivity = launchCronetTestApp(); |
| 323 File directory = new File(PathUtils.getDataDirectory( | 324 File directory = new File(PathUtils.getDataDirectory( |
| 324 getInstrumentation().getTargetContext())); | 325 getInstrumentation().getTargetContext())); |
| 325 File file = File.createTempFile("cronet", "json", directory); | 326 File file = File.createTempFile("cronet", "json", directory); |
| 326 // Start NetLog multiple times. | 327 // Start NetLog multiple times. |
| 327 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 328 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 328 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 329 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 329 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 330 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 330 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 331 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 331 // Start a request. | 332 // Start a request. |
| 332 TestUrlRequestListener listener = new TestUrlRequestListener(); | 333 TestUrlRequestListener listener = new TestUrlRequestListener(); |
| 333 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( | 334 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( |
| 334 TEST_URL, listener, listener.getExecutor()); | 335 TEST_URL, listener, listener.getExecutor()); |
| 335 urlRequest.start(); | 336 urlRequest.start(); |
| 336 listener.blockForDone(); | 337 listener.blockForDone(); |
| 337 mActivity.mUrlRequestContext.stopNetLog(); | 338 mActivity.mUrlRequestContext.stopNetLog(); |
| 338 assertTrue(file.exists()); | 339 assertTrue(file.exists()); |
| 339 assertTrue(file.length() != 0); | 340 assertTrue(file.length() != 0); |
| 340 assertTrue(file.delete()); | 341 assertTrue(file.delete()); |
| 341 assertTrue(!file.exists()); | 342 assertTrue(!file.exists()); |
| 342 } | 343 } |
| 343 | 344 |
| 344 @SmallTest | 345 @SmallTest |
| 345 @Feature({"Cronet"}) | 346 @Feature({"Cronet"}) |
| 346 public void testNetLogStopMultipleTimes() throws Exception { | 347 public void testNetLogStopMultipleTimes() throws Exception { |
| 347 mActivity = launchCronetTestApp(); | 348 mActivity = launchCronetTestApp(); |
| 348 File directory = new File(PathUtils.getDataDirectory( | 349 File directory = new File(PathUtils.getDataDirectory( |
| 349 getInstrumentation().getTargetContext())); | 350 getInstrumentation().getTargetContext())); |
| 350 File file = File.createTempFile("cronet", "json", directory); | 351 File file = File.createTempFile("cronet", "json", directory); |
| 351 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 352 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 352 // Start a request. | 353 // Start a request. |
| 353 TestUrlRequestListener listener = new TestUrlRequestListener(); | 354 TestUrlRequestListener listener = new TestUrlRequestListener(); |
| 354 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( | 355 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( |
| 355 TEST_URL, listener, listener.getExecutor()); | 356 TEST_URL, listener, listener.getExecutor()); |
| 356 urlRequest.start(); | 357 urlRequest.start(); |
| 357 listener.blockForDone(); | 358 listener.blockForDone(); |
| 358 // Stop NetLog multiple times. | 359 // Stop NetLog multiple times. |
| 359 mActivity.mUrlRequestContext.stopNetLog(); | 360 mActivity.mUrlRequestContext.stopNetLog(); |
| 360 mActivity.mUrlRequestContext.stopNetLog(); | 361 mActivity.mUrlRequestContext.stopNetLog(); |
| 361 mActivity.mUrlRequestContext.stopNetLog(); | 362 mActivity.mUrlRequestContext.stopNetLog(); |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 587 new CronetUrlRequestContext(mActivity, mActivity.getContextConfi
g()); | 588 new CronetUrlRequestContext(mActivity, mActivity.getContextConfi
g()); |
| 588 CronetUrlRequestContext secondContext = new CronetUrlRequestContext( | 589 CronetUrlRequestContext secondContext = new CronetUrlRequestContext( |
| 589 mActivity.getApplicationContext(), mActivity.getContextConfig())
; | 590 mActivity.getApplicationContext(), mActivity.getContextConfig())
; |
| 590 CronetUrlRequestContext thirdContext = new CronetUrlRequestContext( | 591 CronetUrlRequestContext thirdContext = new CronetUrlRequestContext( |
| 591 new ContextWrapper(mActivity), mActivity.getContextConfig()); | 592 new ContextWrapper(mActivity), mActivity.getContextConfig()); |
| 592 firstContext.shutdown(); | 593 firstContext.shutdown(); |
| 593 secondContext.shutdown(); | 594 secondContext.shutdown(); |
| 594 thirdContext.shutdown(); | 595 thirdContext.shutdown(); |
| 595 } | 596 } |
| 596 } | 597 } |
| OLD | NEW |