| 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 public void testNetLog() throws Exception { | 296 public void testNetLog() throws Exception { |
| 297 Context context = getInstrumentation().getTargetContext(); | 297 Context context = getInstrumentation().getTargetContext(); |
| 298 File directory = new File(PathUtils.getDataDirectory(context)); | 298 File directory = new File(PathUtils.getDataDirectory(context)); |
| 299 File file = File.createTempFile("cronet", "json", directory); | 299 File file = File.createTempFile("cronet", "json", directory); |
| 300 CronetUrlRequestContext requestContext = new CronetUrlRequestContext( | 300 CronetUrlRequestContext requestContext = new CronetUrlRequestContext( |
| 301 context, | 301 context, |
| 302 new UrlRequestContextConfig().setLibraryName("cronet_tests")); | 302 new UrlRequestContextConfig().setLibraryName("cronet_tests")); |
| 303 // Start NetLog immediately after the request context is created to make | 303 // Start NetLog immediately after the request context is created to make |
| 304 // sure that the call won't crash the app even when the native request | 304 // sure that the call won't crash the app even when the native request |
| 305 // context is not fully initialized. See crbug.com/470196. | 305 // context is not fully initialized. See crbug.com/470196. |
| 306 requestContext.startNetLogToFile(file.getPath()); | 306 requestContext.startNetLogToFile(file.getPath(), false); |
| 307 | 307 |
| 308 // Start a request. | 308 // Start a request. |
| 309 TestUrlRequestListener listener = new TestUrlRequestListener(); | 309 TestUrlRequestListener listener = new TestUrlRequestListener(); |
| 310 UrlRequest request = requestContext.createRequest( | 310 UrlRequest request = requestContext.createRequest( |
| 311 TEST_URL, listener, listener.getExecutor()); | 311 TEST_URL, listener, listener.getExecutor()); |
| 312 request.start(); | 312 request.start(); |
| 313 listener.blockForDone(); | 313 listener.blockForDone(); |
| 314 requestContext.stopNetLog(); | 314 requestContext.stopNetLog(); |
| 315 assertTrue(file.exists()); | 315 assertTrue(file.exists()); |
| 316 assertTrue(file.length() != 0); | 316 assertTrue(file.length() != 0); |
| 317 assertTrue(file.delete()); | 317 assertTrue(file.delete()); |
| 318 assertTrue(!file.exists()); | 318 assertTrue(!file.exists()); |
| 319 } | 319 } |
| 320 | 320 |
| 321 @SmallTest | 321 @SmallTest |
| 322 @Feature({"Cronet"}) | 322 @Feature({"Cronet"}) |
| 323 public void testNetLogAfterShutdown() throws Exception { | 323 public void testNetLogAfterShutdown() throws Exception { |
| 324 mActivity = launchCronetTestApp(); | 324 mActivity = launchCronetTestApp(); |
| 325 TestUrlRequestListener listener = new TestUrlRequestListener(); | 325 TestUrlRequestListener listener = new TestUrlRequestListener(); |
| 326 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( | 326 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( |
| 327 TEST_URL, listener, listener.getExecutor()); | 327 TEST_URL, listener, listener.getExecutor()); |
| 328 urlRequest.start(); | 328 urlRequest.start(); |
| 329 listener.blockForDone(); | 329 listener.blockForDone(); |
| 330 mActivity.mUrlRequestContext.shutdown(); | 330 mActivity.mUrlRequestContext.shutdown(); |
| 331 | 331 |
| 332 File directory = new File(PathUtils.getDataDirectory( | 332 File directory = new File(PathUtils.getDataDirectory( |
| 333 getInstrumentation().getTargetContext())); | 333 getInstrumentation().getTargetContext())); |
| 334 File file = File.createTempFile("cronet", "json", directory); | 334 File file = File.createTempFile("cronet", "json", directory); |
| 335 try { | 335 try { |
| 336 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 336 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), |
| 337 false); |
| 337 fail("Should throw an exception."); | 338 fail("Should throw an exception."); |
| 338 } catch (Exception e) { | 339 } catch (Exception e) { |
| 339 assertEquals("Context is shut down.", e.getMessage()); | 340 assertEquals("Context is shut down.", e.getMessage()); |
| 340 } | 341 } |
| 341 assertTrue(file.delete()); | 342 assertTrue(file.delete()); |
| 342 assertTrue(!file.exists()); | 343 assertTrue(!file.exists()); |
| 343 } | 344 } |
| 344 | 345 |
| 345 @SmallTest | 346 @SmallTest |
| 346 @Feature({"Cronet"}) | 347 @Feature({"Cronet"}) |
| 347 public void testNetLogStartMultipleTimes() throws Exception { | 348 public void testNetLogStartMultipleTimes() throws Exception { |
| 348 mActivity = launchCronetTestApp(); | 349 mActivity = launchCronetTestApp(); |
| 349 File directory = new File(PathUtils.getDataDirectory( | 350 File directory = new File(PathUtils.getDataDirectory( |
| 350 getInstrumentation().getTargetContext())); | 351 getInstrumentation().getTargetContext())); |
| 351 File file = File.createTempFile("cronet", "json", directory); | 352 File file = File.createTempFile("cronet", "json", directory); |
| 352 // Start NetLog multiple times. | 353 // Start NetLog multiple times. |
| 353 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 354 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 354 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 355 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 355 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 356 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 356 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 357 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 357 // Start a request. | 358 // Start a request. |
| 358 TestUrlRequestListener listener = new TestUrlRequestListener(); | 359 TestUrlRequestListener listener = new TestUrlRequestListener(); |
| 359 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( | 360 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( |
| 360 TEST_URL, listener, listener.getExecutor()); | 361 TEST_URL, listener, listener.getExecutor()); |
| 361 urlRequest.start(); | 362 urlRequest.start(); |
| 362 listener.blockForDone(); | 363 listener.blockForDone(); |
| 363 mActivity.mUrlRequestContext.stopNetLog(); | 364 mActivity.mUrlRequestContext.stopNetLog(); |
| 364 assertTrue(file.exists()); | 365 assertTrue(file.exists()); |
| 365 assertTrue(file.length() != 0); | 366 assertTrue(file.length() != 0); |
| 366 assertTrue(file.delete()); | 367 assertTrue(file.delete()); |
| 367 assertTrue(!file.exists()); | 368 assertTrue(!file.exists()); |
| 368 } | 369 } |
| 369 | 370 |
| 370 @SmallTest | 371 @SmallTest |
| 371 @Feature({"Cronet"}) | 372 @Feature({"Cronet"}) |
| 372 public void testNetLogStopMultipleTimes() throws Exception { | 373 public void testNetLogStopMultipleTimes() throws Exception { |
| 373 mActivity = launchCronetTestApp(); | 374 mActivity = launchCronetTestApp(); |
| 374 File directory = new File(PathUtils.getDataDirectory( | 375 File directory = new File(PathUtils.getDataDirectory( |
| 375 getInstrumentation().getTargetContext())); | 376 getInstrumentation().getTargetContext())); |
| 376 File file = File.createTempFile("cronet", "json", directory); | 377 File file = File.createTempFile("cronet", "json", directory); |
| 377 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath()); | 378 mActivity.mUrlRequestContext.startNetLogToFile(file.getPath(), false); |
| 378 // Start a request. | 379 // Start a request. |
| 379 TestUrlRequestListener listener = new TestUrlRequestListener(); | 380 TestUrlRequestListener listener = new TestUrlRequestListener(); |
| 380 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( | 381 UrlRequest urlRequest = mActivity.mUrlRequestContext.createRequest( |
| 381 TEST_URL, listener, listener.getExecutor()); | 382 TEST_URL, listener, listener.getExecutor()); |
| 382 urlRequest.start(); | 383 urlRequest.start(); |
| 383 listener.blockForDone(); | 384 listener.blockForDone(); |
| 384 // Stop NetLog multiple times. | 385 // Stop NetLog multiple times. |
| 385 mActivity.mUrlRequestContext.stopNetLog(); | 386 mActivity.mUrlRequestContext.stopNetLog(); |
| 386 mActivity.mUrlRequestContext.stopNetLog(); | 387 mActivity.mUrlRequestContext.stopNetLog(); |
| 387 mActivity.mUrlRequestContext.stopNetLog(); | 388 mActivity.mUrlRequestContext.stopNetLog(); |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 613 new CronetUrlRequestContext(mActivity, mActivity.getContextConfi
g()); | 614 new CronetUrlRequestContext(mActivity, mActivity.getContextConfi
g()); |
| 614 CronetUrlRequestContext secondContext = new CronetUrlRequestContext( | 615 CronetUrlRequestContext secondContext = new CronetUrlRequestContext( |
| 615 mActivity.getApplicationContext(), mActivity.getContextConfig())
; | 616 mActivity.getApplicationContext(), mActivity.getContextConfig())
; |
| 616 CronetUrlRequestContext thirdContext = new CronetUrlRequestContext( | 617 CronetUrlRequestContext thirdContext = new CronetUrlRequestContext( |
| 617 new ContextWrapper(mActivity), mActivity.getContextConfig()); | 618 new ContextWrapper(mActivity), mActivity.getContextConfig()); |
| 618 firstContext.shutdown(); | 619 firstContext.shutdown(); |
| 619 secondContext.shutdown(); | 620 secondContext.shutdown(); |
| 620 thirdContext.shutdown(); | 621 thirdContext.shutdown(); |
| 621 } | 622 } |
| 622 } | 623 } |
| OLD | NEW |