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

Side by Side Diff: third_party/WebKit/LayoutTests/http/tests/inspector/network-test.js

Issue 2914033002: [Devtools] NetworkLogView now uses NetworkLog as source of truth. (Closed)
Patch Set: Merge branch 'master' into MOVE_NETWORK_STUFF_AROUND Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // This goes before everything else to keep console message line number invarian t. 1 // This goes before everything else to keep console message line number invarian t.
2 var lastXHRIndex = 0; 2 var lastXHRIndex = 0;
3 function xhrLoadedCallback() 3 function xhrLoadedCallback()
4 { 4 {
5 // We need to make sure the console message text is unique so that we don't end up with repeat count update only. 5 // We need to make sure the console message text is unique so that we don't end up with repeat count update only.
6 console.log("XHR loaded: " + (++lastXHRIndex)); 6 console.log("XHR loaded: " + (++lastXHRIndex));
7 } 7 }
8 8
9 function makeSimpleXHR(method, url, async, callback) 9 function makeSimpleXHR(method, url, async, callback)
10 { 10 {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 updateRequest => updateRequest === request && request.responseReceivedTi me !== -1); 68 updateRequest => updateRequest === request && request.responseReceivedTi me !== -1);
69 } 69 }
70 70
71 /** 71 /**
72 * @param {!SDK.NetworkRequest} request 72 * @param {!SDK.NetworkRequest} request
73 * @return {!Promise<!Network.NetworkRequestNode>} 73 * @return {!Promise<!Network.NetworkRequestNode>}
74 */ 74 */
75 InspectorTest.waitForNetworkLogViewNodeForRequest = function(request) 75 InspectorTest.waitForNetworkLogViewNodeForRequest = function(request)
76 { 76 {
77 var networkLogView = UI.panels.network._networkLogView; 77 var networkLogView = UI.panels.network._networkLogView;
78 var node = networkLogView._nodesByRequestId.get(request.requestId()); 78 var node = networkLogView.nodeForRequest(request);
79 if (node) 79 if (node)
80 return Promise.resolve(node); 80 return Promise.resolve(node);
81 81
82 var promise = InspectorTest.waitForEvent(Network.NetworkLogView.Events.Updat eRequest, networkLogView, 82 console.assert(networkLogView._staleRequests.has(request));
83 updateRequest => updateRequest === request); 83
84 return promise.then(() => { 84 return InspectorTest.addSnifferPromise(networkLogView, '_didRefreshForTest') .then(() => {
85 var node = networkLogView._nodesByRequestId.get(request.requestId()); 85 var node = networkLogView.nodeForRequest(request);
86 console.assert(node); 86 console.assert(node);
87 return node; 87 return node;
88 }); 88 });
89 } 89 }
90 90
91 /** 91 /**
92 * @param {!SDK.NetworkRequest} wsRequest 92 * @param {!SDK.NetworkRequest} wsRequest
93 * @param {string} message 93 * @param {string} message
94 * @return {!Promise<!SDK.NetworkRequest.WebSocketFrame>} 94 * @return {!Promise<!SDK.NetworkRequest.WebSocketFrame>}
95 */ 95 */
(...skipping 10 matching lines...) Expand all
106 } 106 }
107 } 107 }
108 108
109 InspectorTest.recordNetwork = function() 109 InspectorTest.recordNetwork = function()
110 { 110 {
111 UI.panels.network._networkLogView.setRecording(true); 111 UI.panels.network._networkLogView.setRecording(true);
112 } 112 }
113 113
114 InspectorTest.networkRequests = function() 114 InspectorTest.networkRequests = function()
115 { 115 {
116 return NetworkLog.networkLog.requests().slice(); 116 return Array.from(NetworkLog.networkLog.requests());
117 } 117 }
118 118
119 InspectorTest.dumpNetworkRequests = function() 119 InspectorTest.dumpNetworkRequests = function()
120 { 120 {
121 var requests = InspectorTest.networkRequests(); 121 var requests = InspectorTest.networkRequests();
122 requests.sort(function(a, b) {return a.url().localeCompare(b.url());}); 122 requests.sort(function(a, b) {return a.url().localeCompare(b.url());});
123 InspectorTest.addResult("resources count = " + requests.length); 123 InspectorTest.addResult("resources count = " + requests.length);
124 for (i = 0; i < requests.length; i++) 124 for (i = 0; i < requests.length; i++)
125 InspectorTest.addResult(requests[i].url()); 125 InspectorTest.addResult(requests[i].url());
126 } 126 }
(...skipping 25 matching lines...) Expand all
152 args.user = user; 152 args.user = user;
153 args.password = password; 153 args.password = password;
154 args.headers = headers; 154 args.headers = headers;
155 args.withCredentials = withCredentials; 155 args.withCredentials = withCredentials;
156 args.payload = payload; 156 args.payload = payload;
157 args.type = type; 157 args.type = type;
158 var jsonArgs = JSON.stringify(args).replace(/\"/g, "\\\""); 158 var jsonArgs = JSON.stringify(args).replace(/\"/g, "\\\"");
159 159
160 function innerCallback(msg) 160 function innerCallback(msg)
161 { 161 {
162 if (msg.messageText.indexOf("XHR loaded") !== -1) 162 if (msg.messageText.indexOf("XHR loaded") !== -1) {
163 callback(); 163 if (callback)
164 else 164 callback();
165 } else {
165 InspectorTest.addConsoleSniffer(innerCallback); 166 InspectorTest.addConsoleSniffer(innerCallback);
167 }
166 } 168 }
167 169
168 InspectorTest.addConsoleSniffer(innerCallback); 170 InspectorTest.addConsoleSniffer(innerCallback);
169 InspectorTest.evaluateInPage("makeXHRForJSONArguments(\"" + jsonArgs + "\")" ); 171 InspectorTest.evaluateInPage("makeXHRForJSONArguments(\"" + jsonArgs + "\")" );
170 } 172 }
171 173
172 InspectorTest.makeFetch = function(url, requestInitializer, callback) 174 InspectorTest.makeFetch = function(url, requestInitializer, callback)
173 { 175 {
174 InspectorTest.callFunctionInPageAsync("makeFetch", [url, requestInitializer] ).then(callback); 176 InspectorTest.callFunctionInPageAsync("makeFetch", [url, requestInitializer] ).then(callback);
175 } 177 }
(...skipping 25 matching lines...) Expand all
201 version: "formatAsTypeName", 203 version: "formatAsTypeName",
202 wait: "formatAsTypeName", 204 wait: "formatAsTypeName",
203 _transferSize: "formatAsTypeName", 205 _transferSize: "formatAsTypeName",
204 _error: "skip" 206 _error: "skip"
205 }; 207 };
206 // addObject checks own properties only, so make a deep copy rather than use pro totype. 208 // addObject checks own properties only, so make a deep copy rather than use pro totype.
207 InspectorTest.HARPropertyFormattersWithSize = JSON.parse(JSON.stringify(Inspecto rTest.HARPropertyFormatters)); 209 InspectorTest.HARPropertyFormattersWithSize = JSON.parse(JSON.stringify(Inspecto rTest.HARPropertyFormatters));
208 InspectorTest.HARPropertyFormattersWithSize.size = "formatAsTypeName"; 210 InspectorTest.HARPropertyFormattersWithSize.size = "formatAsTypeName";
209 211
210 }; 212 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698