| OLD | NEW |
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <script src="../../http/tests/inspector/inspector-test.js"></script> | 3 <script src="../../http/tests/inspector/inspector-test.js"></script> |
| 4 <script src="../../http/tests/inspector/network-test.js"></script> | 4 <script src="../../http/tests/inspector/network-test.js"></script> |
| 5 <script> | 5 <script> |
| 6 function test() | 6 function test() |
| 7 { | 7 { |
| 8 var requestsToWatch = /\/network-test\.js$|\/non-existent-file.js$|^data:app
lication\/javascript,|/; | 8 var requestsToWatch = /\/network-test\.js$|\/non-existent-file.js$|^data:app
lication\/javascript,|/; |
| 9 var seenRequests = 0; | 9 var seenRequests = 0; |
| 10 | 10 |
| 11 function dumpRequests() | 11 function dumpRequests() |
| 12 { | 12 { |
| 13 var logView = WebInspector.panels.network._networkLogView; | 13 var logView = UI.panels.network._networkLogView; |
| 14 logView._refresh(); | 14 logView._refresh(); |
| 15 var dataGrid = logView.element.querySelector("table.data"); | 15 var dataGrid = logView.element.querySelector("table.data"); |
| 16 var urls = document.evaluate("//tbody/tr/td[position()=1]/@title", dataG
rid, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); | 16 var urls = document.evaluate("//tbody/tr/td[position()=1]/@title", dataG
rid, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null); |
| 17 var outputStrings = []; | 17 var outputStrings = []; |
| 18 | 18 |
| 19 for (var request of WebInspector.NetworkLog.fromTarget(WebInspector.targ
etManager.mainTarget())._requests) { | 19 for (var request of SDK.NetworkLog.fromTarget(SDK.targetManager.mainTarg
et())._requests) { |
| 20 var line = request.displayName + ":" + request.statusCode + " " + re
quest.statusText | 20 var line = request.displayName + ":" + request.statusCode + " " + re
quest.statusText |
| 21 if (request.failed) | 21 if (request.failed) |
| 22 line += "(failed)"; | 22 line += "(failed)"; |
| 23 else if (request.finished) | 23 else if (request.finished) |
| 24 line += "Finished"; | 24 line += "Finished"; |
| 25 InspectorTest.addResult(line); | 25 InspectorTest.addResult(line); |
| 26 } | 26 } |
| 27 InspectorTest.completeTest(); | 27 InspectorTest.completeTest(); |
| 28 } | 28 } |
| 29 | 29 |
| 30 function onRequestFinished(request) | 30 function onRequestFinished(request) |
| 31 { | 31 { |
| 32 if (!requestsToWatch.test(request.url)) | 32 if (!requestsToWatch.test(request.url)) |
| 33 return; | 33 return; |
| 34 if (++seenRequests === 3) | 34 if (++seenRequests === 3) |
| 35 setTimeout(dumpRequests); | 35 setTimeout(dumpRequests); |
| 36 } | 36 } |
| 37 | 37 |
| 38 InspectorTest.networkManager.addEventListener(WebInspector.NetworkManager.Ev
ents.RequestFinished, onRequestFinished); | 38 InspectorTest.networkManager.addEventListener(SDK.NetworkManager.Events.Requ
estFinished, onRequestFinished); |
| 39 InspectorTest.recordNetwork(); | 39 InspectorTest.recordNetwork(); |
| 40 InspectorTest.evaluateInPage("loadResources()"); | 40 InspectorTest.evaluateInPage("loadResources()"); |
| 41 } | 41 } |
| 42 | 42 |
| 43 function addScriptElement(src) | 43 function addScriptElement(src) |
| 44 { | 44 { |
| 45 var element = document.createElement("script"); | 45 var element = document.createElement("script"); |
| 46 element.src = src; | 46 element.src = src; |
| 47 document.body.appendChild(element); | 47 document.body.appendChild(element); |
| 48 } | 48 } |
| 49 | 49 |
| 50 function loadResources() | 50 function loadResources() |
| 51 { | 51 { |
| 52 addScriptElement("../../http/tests/inspector/network-test.js"); | 52 addScriptElement("../../http/tests/inspector/network-test.js"); |
| 53 addScriptElement("non-existent-file.js"); | 53 addScriptElement("non-existent-file.js"); |
| 54 | 54 |
| 55 // Test that data-url doesn't appear in network panel. | 55 // Test that data-url doesn't appear in network panel. |
| 56 addScriptElement("data:application/javascript,var x = 0;"); | 56 addScriptElement("data:application/javascript,var x = 0;"); |
| 57 } | 57 } |
| 58 | 58 |
| 59 </script> | 59 </script> |
| 60 </head> | 60 </head> |
| 61 <body onload="runTest()"> | 61 <body onload="runTest()"> |
| 62 </body> | 62 </body> |
| 63 </html> | 63 </html> |
| OLD | NEW |