Skip to content

GitLab

T
tangled
Commit ab7f8ce7 authored by Eric Roman's avatar Eric Roman
Browse files
Options

Fix cronet bounded NetLog integration tests. 

Bug: 679030
Change-Id: I431e32e5287602fe3321e0ae803a0314e3d87ea2
Reviewed-on: https://chromium-review.googlesource.com/576364Reviewed-by: default avatarHelen Li <xunjieli@chromium.org>
Commit-Queue: Helen Li <xunjieli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487618}
parent 64c1fc11
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
View file @ ab7f8ce7
...@@ -366,7 +366,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -366,7 +366,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File netLogDir = new File(directory, "NetLog"); File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir()); assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json"); File logFile = new File(netLogDir, "netlog.json");
ExperimentalCronetEngine cronetEngine = ExperimentalCronetEngine cronetEngine =
new ExperimentalCronetEngine.Builder(context).build(); new ExperimentalCronetEngine.Builder(context).build();
// Start NetLog immediately after the request context is created to make // Start NetLog immediately after the request context is created to make
...@@ -381,9 +381,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -381,9 +381,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
urlRequestBuilder.build().start(); urlRequestBuilder.build().start();
callback.blockForDone(); callback.blockForDone();
cronetEngine.stopNetLog(); cronetEngine.stopNetLog();
assertTrue(eventFile.exists()); assertTrue(logFile.exists());
assertTrue(eventFile.length() != 0); assertTrue(logFile.length() != 0);
assertFalse(hasBytesInNetLog(eventFile)); assertFalse(hasBytesInNetLog(logFile));
FileUtils.recursivelyDeleteFile(netLogDir); FileUtils.recursivelyDeleteFile(netLogDir);
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
} }
...@@ -426,7 +426,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -426,7 +426,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File netLogDir = new File(directory, "NetLog"); File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir()); assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json"); File logFile = new File(netLogDir, "netlog.json");
ExperimentalCronetEngine cronetEngine = ExperimentalCronetEngine cronetEngine =
new ExperimentalCronetEngine.Builder(context).build(); new ExperimentalCronetEngine.Builder(context).build();
cronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE); cronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE);
...@@ -439,8 +439,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -439,8 +439,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
callback.blockForDone(); callback.blockForDone();
// Shut down the engine without calling stopNetLog. // Shut down the engine without calling stopNetLog.
cronetEngine.shutdown(); cronetEngine.shutdown();
assertTrue(eventFile.exists()); assertTrue(logFile.exists());
assertTrue(eventFile.length() != 0); assertTrue(logFile.length() != 0);
FileUtils.recursivelyDeleteFile(netLogDir); FileUtils.recursivelyDeleteFile(netLogDir);
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
...@@ -499,8 +499,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -499,8 +499,8 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File netLogDir2 = new File(directory, "NetLog2"); File netLogDir2 = new File(directory, "NetLog2");
assertFalse(netLogDir2.exists()); assertFalse(netLogDir2.exists());
assertTrue(netLogDir2.mkdir()); assertTrue(netLogDir2.mkdir());
File eventFile1 = new File(netLogDir1, "event_file_0.json"); File logFile1 = new File(netLogDir1, "netlog.json");
File eventFile2 = new File(netLogDir2, "event_file_0.json"); File logFile2 = new File(netLogDir2, "netlog.json");
ExperimentalCronetEngine cronetEngine1 = ExperimentalCronetEngine cronetEngine1 =
new ExperimentalCronetEngine.Builder(context).build(); new ExperimentalCronetEngine.Builder(context).build();
...@@ -524,17 +524,17 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -524,17 +524,17 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
cronetEngine1.stopNetLog(); cronetEngine1.stopNetLog();
cronetEngine2.stopNetLog(); cronetEngine2.stopNetLog();
assertTrue(eventFile1.exists()); assertTrue(logFile1.exists());
assertTrue(eventFile2.exists()); assertTrue(logFile2.exists());
assertTrue(eventFile1.length() != 0); assertTrue(logFile1.length() != 0);
assertTrue(eventFile2.length() != 0); assertTrue(logFile2.length() != 0);
// Make sure both files contain the two requests made separately using // Make sure both files contain the two requests made separately using
// different engines. // different engines.
assertTrue(containsStringInNetLog(eventFile1, mUrl404)); assertTrue(containsStringInNetLog(logFile1, mUrl404));
assertTrue(containsStringInNetLog(eventFile1, mUrl500)); assertTrue(containsStringInNetLog(logFile1, mUrl500));
assertTrue(containsStringInNetLog(eventFile2, mUrl404)); assertTrue(containsStringInNetLog(logFile2, mUrl404));
assertTrue(containsStringInNetLog(eventFile2, mUrl500)); assertTrue(containsStringInNetLog(logFile2, mUrl500));
FileUtils.recursivelyDeleteFile(netLogDir1); FileUtils.recursivelyDeleteFile(netLogDir1);
assertFalse(netLogDir1.exists()); assertFalse(netLogDir1.exists());
...@@ -698,7 +698,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -698,7 +698,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File netLogDir = new File(directory, "NetLog"); File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir()); assertTrue(netLogDir.mkdir());
File constantsFile = new File(netLogDir, "constants.json"); File logFile = new File(netLogDir, "netlog.json");
try { try {
testFramework.mCronetEngine.startNetLogToDisk( testFramework.mCronetEngine.startNetLogToDisk(
netLogDir.getPath(), false, MAX_FILE_SIZE); netLogDir.getPath(), false, MAX_FILE_SIZE);
...@@ -706,7 +706,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -706,7 +706,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
} catch (Exception e) { } catch (Exception e) {
assertEquals("Engine is shut down.", e.getMessage()); assertEquals("Engine is shut down.", e.getMessage());
} }
assertFalse(constantsFile.exists()); assertFalse(logFile.exists());
FileUtils.recursivelyDeleteFile(netLogDir); FileUtils.recursivelyDeleteFile(netLogDir);
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
} }
...@@ -744,7 +744,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -744,7 +744,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File netLogDir = new File(directory, "NetLog"); File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir()); assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json"); File logFile = new File(netLogDir, "netlog.json");
// Start NetLog multiple times. This should be equivalent to starting NetLog // Start NetLog multiple times. This should be equivalent to starting NetLog
// once. Each subsequent start (without calling stopNetLog) should be a no-op. // once. Each subsequent start (without calling stopNetLog) should be a no-op.
testFramework.mCronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE); testFramework.mCronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE);
...@@ -758,9 +758,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -758,9 +758,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
urlRequestBuilder.build().start(); urlRequestBuilder.build().start();
callback.blockForDone(); callback.blockForDone();
testFramework.mCronetEngine.stopNetLog(); testFramework.mCronetEngine.stopNetLog();
assertTrue(eventFile.exists()); assertTrue(logFile.exists());
assertTrue(eventFile.length() != 0); assertTrue(logFile.length() != 0);
assertFalse(hasBytesInNetLog(eventFile)); assertFalse(hasBytesInNetLog(logFile));
FileUtils.recursivelyDeleteFile(netLogDir); FileUtils.recursivelyDeleteFile(netLogDir);
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
} }
...@@ -799,7 +799,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -799,7 +799,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File netLogDir = new File(directory, "NetLog"); File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir()); assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json"); File logFile = new File(netLogDir, "netlog.json");
testFramework.mCronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE); testFramework.mCronetEngine.startNetLogToDisk(netLogDir.getPath(), false, MAX_FILE_SIZE);
// Start a request. // Start a request.
TestUrlRequestCallback callback = new TestUrlRequestCallback(); TestUrlRequestCallback callback = new TestUrlRequestCallback();
...@@ -814,9 +814,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -814,9 +814,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
testFramework.mCronetEngine.stopNetLog(); testFramework.mCronetEngine.stopNetLog();
testFramework.mCronetEngine.stopNetLog(); testFramework.mCronetEngine.stopNetLog();
testFramework.mCronetEngine.stopNetLog(); testFramework.mCronetEngine.stopNetLog();
assertTrue(eventFile.exists()); assertTrue(logFile.exists());
assertTrue(eventFile.length() != 0); assertTrue(logFile.length() != 0);
assertFalse(hasBytesInNetLog(eventFile)); assertFalse(hasBytesInNetLog(logFile));
FileUtils.recursivelyDeleteFile(netLogDir); FileUtils.recursivelyDeleteFile(netLogDir);
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
} }
...@@ -854,7 +854,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -854,7 +854,7 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
File netLogDir = new File(directory, "NetLog"); File netLogDir = new File(directory, "NetLog");
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
assertTrue(netLogDir.mkdir()); assertTrue(netLogDir.mkdir());
File eventFile = new File(netLogDir, "event_file_0.json"); File logFile = new File(netLogDir, "netlog.json");
ExperimentalCronetEngine cronetEngine = ExperimentalCronetEngine cronetEngine =
new ExperimentalCronetEngine.Builder(context).build(); new ExperimentalCronetEngine.Builder(context).build();
// Start NetLog with logAll as true. // Start NetLog with logAll as true.
...@@ -867,9 +867,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -867,9 +867,9 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
callback.blockForDone(); callback.blockForDone();
cronetEngine.stopNetLog(); cronetEngine.stopNetLog();
assertTrue(eventFile.exists()); assertTrue(logFile.exists());
assertTrue(eventFile.length() != 0); assertTrue(logFile.length() != 0);
assertTrue(hasBytesInNetLog(eventFile)); assertTrue(hasBytesInNetLog(logFile));
FileUtils.recursivelyDeleteFile(netLogDir); FileUtils.recursivelyDeleteFile(netLogDir);
assertFalse(netLogDir.exists()); assertFalse(netLogDir.exists());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment