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

Unified Diff: chrome/test/data/webui/net_internals/log_view_painter.js

Issue 10825116: net-internals: Display time log dump was created at end of printed logs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Response to comments - [dt=blah+], new timeutil method Created 8 years, 5 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 | « chrome/browser/resources/net_internals/time_util.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/net_internals/log_view_painter.js
===================================================================
--- chrome/test/data/webui/net_internals/log_view_painter.js (revision 148858)
+++ chrome/test/data/webui/net_internals/log_view_painter.js (working copy)
@@ -101,7 +101,8 @@
div.innerHTML = '';
timeutil.setTimeTickOffset(testCase.tickOffset);
printLogEntriesAsText(testCase.logEntries, div,
- testCase.enableSecurityStripping);
+ testCase.enableSecurityStripping,
+ testCase.logCreationTime);
// Strip any trailing newlines, since the whitespace when using innerText
// can be a bit unpredictable.
@@ -112,6 +113,8 @@
}
runTestCase(painterTestURLRequest());
+ runTestCase(painterTestURLRequestIncomplete());
+ runTestCase(painterTestURLRequestIncompleteFromLoadedLog());
runTestCase(painterTestNetError());
runTestCase(painterTestHexEncodedBytes());
runTestCase(painterTestCertVerifierJob());
@@ -130,11 +133,13 @@
/**
* Test case for a URLRequest. This includes custom formatting for load flags,
* request/response HTTP headers, dependent sources, as well as basic
- * indentation and grouping.
+ * indentation and grouping. Also makes sure that no extra event is logged
+ * for finished sources when there's a logCreationTime.
*/
function painterTestURLRequest() {
var testCase = {};
testCase.tickOffset = '1337911098446';
+ testCase.logCreationTime = 1338864634013;
testCase.logEntries = [
{
@@ -746,6 +751,74 @@
}
/**
+ * Test case for a URLRequest that was not completed that did not come from a
+ * loaded log file.
+ */
+function painterTestURLRequestIncomplete() {
+ var testCase = {};
+ testCase.tickOffset = '1337911098446';
+
+ testCase.logEntries = [
+ {
+ 'phase': EventPhase.PHASE_BEGIN,
+ 'source': {
+ 'id': 146,
+ 'type': EventSourceType.URL_REQUEST
+ },
+ 'time': '953534778',
+ 'type': EventType.REQUEST_ALIVE
+ },
+ {
+ 'params': {
+ 'load_flags': 128,
+ 'method': 'GET',
+ 'priority': 4,
+ 'url': 'http://www.google.com/'
+ },
+ 'phase': EventPhase.PHASE_BEGIN,
+ 'source': {
+ 'id': 146,
+ 'type': EventSourceType.URL_REQUEST
+ },
+ 'time': '953534910',
+ 'type': EventType.URL_REQUEST_START_JOB
+ },
+ {
+ 'phase': EventPhase.PHASE_END,
+ 'source': {
+ 'id': 146,
+ 'type': EventSourceType.URL_REQUEST
+ },
+ 'time': '953534970',
+ 'type': EventType.URL_REQUEST_START_JOB
+ },
+ ];
+
+ testCase.expectedText =
+'t=1338864633224 [st= 0] +REQUEST_ALIVE [dt=?]\n' +
+'t=1338864633356 [st=132] URL_REQUEST_START_JOB [dt=60]\n' +
+' --> load_flags = 128 (ENABLE_LOAD_TIMING)\n' +
+' --> method = "GET"\n' +
+' --> priority = 4\n' +
+' --> url = "http://www.google.com/"';
+
+ return testCase;
+}
+
+/**
+ * Test case for a URLRequest that was not completed that came from a loaded
+ * log file.
+ */
+function painterTestURLRequestIncompleteFromLoadedLog() {
+ var testCase = painterTestURLRequestIncomplete();
+ testCase.logCreationTime = 1338864634013;
+ testCase.expectedText =
+ testCase.expectedText.replace('[dt=?]', '[dt=789+]') + '\n' +
eroman 2012/07/31 21:53:43 optional: I think it would be more readable to jus
mmenke 2012/07/31 22:53:16 Done.
+ 't=1338864634013 [st=789]';
+ return testCase;
+}
+
+/**
* Tests the custom formatting of net_errors across several different event
* types.
*/
@@ -1294,7 +1367,7 @@
var testCase = painterTestDontStripCookiesURLRequest();
testCase.enableSecurityStripping = true;
testCase.expectedText =
- testCase.expectedText.replace(/MyMagicPony/g, '[value was stripped]');
+ testCase.expectedText.replace(/MyMagicPony/g, '[value was stripped]');
return testCase;
}
« no previous file with comments | « chrome/browser/resources/net_internals/time_util.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698