OLD | NEW |
1 var initialize_ConsoleTest = function() { | 1 var initialize_ConsoleTest = function() { |
2 | 2 |
3 InspectorTest.preloadPanel("console"); | 3 InspectorTest.preloadPanel("console"); |
4 | 4 |
5 InspectorTest.evaluateInConsole = function(code, callback) | 5 InspectorTest.evaluateInConsole = function(code, callback) |
6 { | 6 { |
7 callback = InspectorTest.safeWrap(callback); | 7 callback = InspectorTest.safeWrap(callback); |
8 | 8 |
9 var consoleView = WebInspector.ConsolePanel._view(); | 9 var consoleView = WebInspector.ConsolePanel._view(); |
10 consoleView.visible = true; | 10 consoleView.visible = true; |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 { | 67 { |
68 var viewport = WebInspector.ConsolePanel._view()._viewport; | 68 var viewport = WebInspector.ConsolePanel._view()._viewport; |
69 viewport.element.style.width = width + "px"; | 69 viewport.element.style.width = width + "px"; |
70 viewport.element.style.height = height + "px"; | 70 viewport.element.style.height = height + "px"; |
71 viewport.element.style.position = "absolute"; | 71 viewport.element.style.position = "absolute"; |
72 viewport.invalidate(); | 72 viewport.invalidate(); |
73 } | 73 } |
74 | 74 |
75 InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
ames, formatter) | 75 InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
ames, formatter) |
76 { | 76 { |
| 77 InspectorTest.addResults(InspectorTest.dumpConsoleMessagesIntoArray(printOri
ginatingCommand, dumpClassNames, formatter)); |
| 78 } |
| 79 |
| 80 InspectorTest.dumpConsoleMessagesIntoArray = function(printOriginatingCommand, d
umpClassNames, formatter) |
| 81 { |
77 formatter = formatter || InspectorTest.prepareConsoleMessageText; | 82 formatter = formatter || InspectorTest.prepareConsoleMessageText; |
78 var result = []; | 83 var result = []; |
79 InspectorTest.disableConsoleViewport(); | 84 InspectorTest.disableConsoleViewport(); |
80 var consoleView = WebInspector.ConsolePanel._view(); | 85 var consoleView = WebInspector.ConsolePanel._view(); |
81 if (consoleView._needsFullUpdate) | 86 if (consoleView._needsFullUpdate) |
82 consoleView._updateMessageList(); | 87 consoleView._updateMessageList(); |
83 var viewMessages = consoleView._visibleViewMessages; | 88 var viewMessages = consoleView._visibleViewMessages; |
84 for (var i = 0; i < viewMessages.length; ++i) { | 89 for (var i = 0; i < viewMessages.length; ++i) { |
85 var uiMessage = viewMessages[i]; | 90 var uiMessage = viewMessages[i]; |
86 var message = uiMessage.consoleMessage(); | 91 var message = uiMessage.consoleMessage(); |
87 var element = uiMessage.contentElement(); | 92 var element = uiMessage.contentElement(); |
88 | 93 |
89 if (dumpClassNames) { | 94 if (dumpClassNames) { |
90 var classNames = []; | 95 var classNames = []; |
91 for (var node = element.firstChild; node; node = node.traverseNextNo
de(element)) { | 96 for (var node = element.firstChild; node; node = node.traverseNextNo
de(element)) { |
92 if (node.nodeType === Node.ELEMENT_NODE && node.className) | 97 if (node.nodeType === Node.ELEMENT_NODE && node.className) |
93 classNames.push(node.className); | 98 classNames.push(node.className); |
94 } | 99 } |
95 } | 100 } |
96 | 101 |
97 if (InspectorTest.dumpConsoleTableMessage(uiMessage, false)) { | 102 if (InspectorTest.dumpConsoleTableMessage(uiMessage, false, result)) { |
98 if (dumpClassNames) | 103 if (dumpClassNames) |
99 InspectorTest.addResult(classNames.join(" > ")); | 104 result.push(classNames.join(" > ")); |
100 } else { | 105 } else { |
101 var messageText = formatter(element, message); | 106 var messageText = formatter(element, message); |
102 InspectorTest.addResult(messageText + (dumpClassNames ? " " + classN
ames.join(" > ") : "")); | 107 result.push(messageText + (dumpClassNames ? " " + classNames.join("
> ") : "")); |
103 } | 108 } |
104 | 109 |
105 if (printOriginatingCommand && uiMessage.consoleMessage().originatingMes
sage()) | 110 if (printOriginatingCommand && uiMessage.consoleMessage().originatingMes
sage()) |
106 InspectorTest.addResult("Originating from: " + uiMessage.consoleMess
age().originatingMessage().messageText); | 111 result.push("Originating from: " + uiMessage.consoleMessage().origin
atingMessage().messageText); |
107 } | 112 } |
108 return result; | 113 return result; |
109 } | 114 } |
110 | 115 |
111 InspectorTest.dumpConsoleTableMessage = function(viewMessage, forceInvalidate) | 116 InspectorTest.dumpConsoleTableMessage = function(viewMessage, forceInvalidate, r
esults) |
112 { | 117 { |
113 if (forceInvalidate) | 118 if (forceInvalidate) |
114 WebInspector.ConsolePanel._view()._viewport.invalidate(); | 119 WebInspector.ConsolePanel._view()._viewport.invalidate(); |
115 var table = viewMessage.contentElement(); | 120 var table = viewMessage.contentElement(); |
116 var headers = table.querySelectorAll("th div"); | 121 var headers = table.querySelectorAll("th div"); |
117 if (!headers.length) | 122 if (!headers.length) |
118 return false; | 123 return false; |
119 | 124 |
120 var headerLine = ""; | 125 var headerLine = ""; |
121 for (var i = 0; i < headers.length; i++) | 126 for (var i = 0; i < headers.length; i++) |
122 headerLine += headers[i].textContent + " | "; | 127 headerLine += headers[i].textContent + " | "; |
123 | 128 |
124 InspectorTest.addResult("HEADER " + headerLine); | 129 addResult("HEADER " + headerLine); |
125 | 130 |
126 var rows = table.querySelectorAll(".data-container tr"); | 131 var rows = table.querySelectorAll(".data-container tr"); |
127 | 132 |
128 for (var i = 0; i < rows.length; i++) { | 133 for (var i = 0; i < rows.length; i++) { |
129 var row = rows[i]; | 134 var row = rows[i]; |
130 var rowLine = ""; | 135 var rowLine = ""; |
131 var items = row.querySelectorAll("td > span"); | 136 var items = row.querySelectorAll("td > span"); |
132 for (var j = 0; j < items.length; j++) | 137 for (var j = 0; j < items.length; j++) |
133 rowLine += items[j].textContent + " | "; | 138 rowLine += items[j].textContent + " | "; |
134 | 139 |
135 if (rowLine.trim()) | 140 if (rowLine.trim()) |
136 InspectorTest.addResult("ROW " + rowLine); | 141 addResult("ROW " + rowLine); |
137 } | 142 } |
| 143 |
| 144 function addResult(x) |
| 145 { |
| 146 if (results) |
| 147 results.push(x); |
| 148 else |
| 149 InspectorTest.addResult(x); |
| 150 } |
| 151 |
138 return true; | 152 return true; |
139 } | 153 } |
140 | 154 |
141 InspectorTest.dumpConsoleMessagesWithStyles = function(sortMessages) | 155 InspectorTest.dumpConsoleMessagesWithStyles = function(sortMessages) |
142 { | 156 { |
143 var result = []; | 157 var result = []; |
144 var messageViews = WebInspector.ConsolePanel._view()._visibleViewMessages; | 158 var messageViews = WebInspector.ConsolePanel._view()._visibleViewMessages; |
145 for (var i = 0; i < messageViews.length; ++i) { | 159 for (var i = 0; i < messageViews.length; ++i) { |
146 var element = messageViews[i].contentElement(); | 160 var element = messageViews[i].contentElement(); |
147 var messageText = InspectorTest.prepareConsoleMessageText(element) | 161 var messageText = InspectorTest.prepareConsoleMessageText(element) |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 } | 270 } |
257 if (!option) { | 271 if (!option) { |
258 InspectorTest.addResult("FAILED: context with prefix: " + namePrefix +
" not found in the context list"); | 272 InspectorTest.addResult("FAILED: context with prefix: " + namePrefix +
" not found in the context list"); |
259 return; | 273 return; |
260 } | 274 } |
261 option.selected = true; | 275 option.selected = true; |
262 WebInspector.ConsolePanel._view()._executionContextChanged(); | 276 WebInspector.ConsolePanel._view()._executionContextChanged(); |
263 } | 277 } |
264 | 278 |
265 } | 279 } |
OLD | NEW |