Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java

Issue 2262453002: Cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix stuff. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
index df1a146b69d0cef45e43d225595f643f07045649..736d6162dba642947468700618a440f2850b3b25 100644
--- a/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
@@ -4,7 +4,6 @@
package org.chromium.net;
-import android.content.Context;
import android.content.ContextWrapper;
import android.os.ConditionVariable;
import android.os.Handler;
@@ -536,11 +535,10 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
@OnlyRunNativeCronet // No netlogs for pure java impl
public void testNetLog() throws Exception {
- Context context = getContext();
- File directory = new File(PathUtils.getDataDirectory(context));
+ File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
// Start NetLog immediately after the request context is created to make
// sure that the call won't crash the app even when the native request
// context is not fully initialized. See crbug.com/470196.
@@ -564,14 +562,13 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
@OnlyRunNativeCronet // No netlogs for pure java impl
public void testBoundedFileNetLog() throws Exception {
- Context context = getContext();
- File directory = new File(PathUtils.getDataDirectory(context));
+ File directory = new File(PathUtils.getDataDirectory());
File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json");
CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
// Start NetLog immediately after the request context is created to make
// sure that the call won't crash the app even when the native request
// context is not fully initialized. See crbug.com/470196.
@@ -597,11 +594,10 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Tests that if stopNetLog is not explicity called, CronetEngine.shutdown()
// will take care of it. crbug.com/623701.
public void testNoStopNetLog() throws Exception {
- Context context = getContext();
- File directory = new File(PathUtils.getDataDirectory(context));
+ File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
cronetEngine.startNetLogToFile(file.getPath(), false);
// Start a request.
@@ -625,14 +621,13 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
// Tests that if stopNetLog is not explicity called, CronetEngine.shutdown()
// will take care of it. crbug.com/623701.
public void testNoStopBoundedFileNetLog() throws Exception {
- Context context = getContext();
- File directory = new File(PathUtils.getDataDirectory(context));
+ File directory = new File(PathUtils.getDataDirectory());
File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json");
CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
cronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE);
// Start a request.
@@ -655,14 +650,13 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@OnlyRunNativeCronet
// Tests that NetLog contains events emitted by all live CronetEngines.
public void testNetLogContainEventsFromAllLiveEngines() throws Exception {
- Context context = getContext();
- File directory = new File(PathUtils.getDataDirectory(context));
+ File directory = new File(PathUtils.getDataDirectory());
File file1 = File.createTempFile("cronet1", "json", directory);
File file2 = File.createTempFile("cronet2", "json", directory);
CronetEngine cronetEngine1 = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
CronetEngine cronetEngine2 = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
cronetEngine1.startNetLogToFile(file1.getPath(), false);
cronetEngine2.startNetLogToFile(file2.getPath(), false);
@@ -697,8 +691,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@OnlyRunNativeCronet
// Tests that NetLog contains events emitted by all live CronetEngines.
public void testBoundedFileNetLogContainEventsFromAllLiveEngines() throws Exception {
- Context context = getContext();
- File directory = new File(PathUtils.getDataDirectory(context));
+ File directory = new File(PathUtils.getDataDirectory());
File netLogDir1 = new File(directory, "NetLog1");
assertFalse(netLogDir1.exists());
assertTrue(netLogDir1.mkdir());
@@ -709,9 +702,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File eventFile2 = new File(netLogDir2, "event_file_0.json");
CronetUrlRequestContext cronetEngine1 = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
CronetUrlRequestContext cronetEngine2 = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
cronetEngine1.startNetLogToDisk(netLogDir1.getPath(), false, MAX_FILE_SIZE);
cronetEngine2.startNetLogToDisk(netLogDir2.getPath(), false, MAX_FILE_SIZE);
@@ -806,7 +799,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
callback.blockForDone();
testFramework.mCronetEngine.shutdown();
- File directory = new File(PathUtils.getDataDirectory(getContext()));
+ File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
try {
testFramework.mCronetEngine.startNetLogToFile(file.getPath(), false);
@@ -831,7 +824,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
callback.blockForDone();
testFramework.mCronetEngine.shutdown();
- File directory = new File(PathUtils.getDataDirectory(getContext()));
+ File directory = new File(PathUtils.getDataDirectory());
File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir());
@@ -852,7 +845,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
public void testNetLogStartMultipleTimes() throws Exception {
final CronetTestFramework testFramework = startCronetTestFramework();
- File directory = new File(PathUtils.getDataDirectory(getContext()));
+ File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
// Start NetLog multiple times.
testFramework.mCronetEngine.startNetLogToFile(file.getPath(), false);
@@ -877,7 +870,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
public void testBoundedFileNetLogStartMultipleTimes() throws Exception {
final CronetTestFramework testFramework = startCronetTestFramework();
- File directory = new File(PathUtils.getDataDirectory(getContext()));
+ File directory = new File(PathUtils.getDataDirectory());
File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir());
@@ -906,7 +899,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
public void testNetLogStopMultipleTimes() throws Exception {
final CronetTestFramework testFramework = startCronetTestFramework();
- File directory = new File(PathUtils.getDataDirectory(getContext()));
+ File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
testFramework.mCronetEngine.startNetLogToFile(file.getPath(), false);
// Start a request.
@@ -932,7 +925,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
public void testBoundedFileNetLogStopMultipleTimes() throws Exception {
final CronetTestFramework testFramework = startCronetTestFramework();
- File directory = new File(PathUtils.getDataDirectory(getContext()));
+ File directory = new File(PathUtils.getDataDirectory());
File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir());
@@ -962,11 +955,10 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
@OnlyRunNativeCronet
public void testNetLogWithBytes() throws Exception {
- Context context = getContext();
- File directory = new File(PathUtils.getDataDirectory(context));
+ File directory = new File(PathUtils.getDataDirectory());
File file = File.createTempFile("cronet", "json", directory);
CronetEngine cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
// Start NetLog with logAll as true.
cronetEngine.startNetLogToFile(file.getPath(), true);
// Start a request.
@@ -987,14 +979,13 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
@Feature({"Cronet"})
@OnlyRunNativeCronet
public void testBoundedFileNetLogWithBytes() throws Exception {
- Context context = getContext();
- File directory = new File(PathUtils.getDataDirectory(context));
+ File directory = new File(PathUtils.getDataDirectory());
File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json");
CronetUrlRequestContext cronetEngine = new CronetUrlRequestContext(
- new CronetEngine.Builder(context).setLibraryName("cronet_tests"));
+ new CronetEngine.Builder(getContext()).setLibraryName("cronet_tests"));
// Start NetLog with logAll as true.
cronetEngine.startNetLogToDisk(netLogDir.getPath(), true, MAX_FILE_SIZE);
// Start a request.
« no previous file with comments | « components/cronet/android/test/javatests/src/org/chromium/net/CronetTestBase.java ('k') | components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698