| OLD | NEW |
| 1 var initialize_ConsoleTest = function() { | 1 var initialize_ConsoleTest = function() { |
| 2 | 2 |
| 3 InspectorTest.preloadModule("source_frame"); | 3 InspectorTest.preloadModule("source_frame"); |
| 4 InspectorTest.preloadPanel("console"); | 4 InspectorTest.preloadPanel("console"); |
| 5 | 5 |
| 6 InspectorTest.selectMainExecutionContext = function() | 6 InspectorTest.selectMainExecutionContext = function() |
| 7 { | 7 { |
| 8 var executionContexts = InspectorTest.mainTarget.runtimeModel.executionConte
xts(); | 8 var executionContexts = InspectorTest.mainTarget.runtimeModel.executionConte
xts(); |
| 9 for (var context of executionContexts) { | 9 for (var context of executionContexts) { |
| 10 if (context.isDefault) { | 10 if (context.isDefault) { |
| 11 WebInspector.context.setFlavor(WebInspector.ExecutionContext, contex
t); | 11 UI.context.setFlavor(SDK.ExecutionContext, context); |
| 12 return; | 12 return; |
| 13 } | 13 } |
| 14 } | 14 } |
| 15 } | 15 } |
| 16 | 16 |
| 17 InspectorTest.evaluateInConsole = function(code, callback, dontForceMainContext) | 17 InspectorTest.evaluateInConsole = function(code, callback, dontForceMainContext) |
| 18 { | 18 { |
| 19 if (!dontForceMainContext) | 19 if (!dontForceMainContext) |
| 20 InspectorTest.selectMainExecutionContext(); | 20 InspectorTest.selectMainExecutionContext(); |
| 21 callback = InspectorTest.safeWrap(callback); | 21 callback = InspectorTest.safeWrap(callback); |
| 22 | 22 |
| 23 var consoleView = WebInspector.ConsoleView.instance(); | 23 var consoleView = Console.ConsoleView.instance(); |
| 24 consoleView._prompt._appendCommand(code, true); | 24 consoleView._prompt._appendCommand(code, true); |
| 25 InspectorTest.addConsoleViewSniffer(function(commandResult) { | 25 InspectorTest.addConsoleViewSniffer(function(commandResult) { |
| 26 callback(commandResult.toMessageElement().deepTextContent()); | 26 callback(commandResult.toMessageElement().deepTextContent()); |
| 27 }); | 27 }); |
| 28 } | 28 } |
| 29 | 29 |
| 30 InspectorTest.addConsoleViewSniffer = function(override, opt_sticky) | 30 InspectorTest.addConsoleViewSniffer = function(override, opt_sticky) |
| 31 { | 31 { |
| 32 var sniffer = function (viewMessage) { | 32 var sniffer = function (viewMessage) { |
| 33 override(viewMessage); | 33 override(viewMessage); |
| 34 }; | 34 }; |
| 35 | 35 |
| 36 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "_consoleMessag
eAddedForTest", sniffer, opt_sticky); | 36 InspectorTest.addSniffer(Console.ConsoleView.prototype, "_consoleMessageAdde
dForTest", sniffer, opt_sticky); |
| 37 } | 37 } |
| 38 | 38 |
| 39 InspectorTest.evaluateInConsoleAndDump = function(code, callback, dontForceMainC
ontext) | 39 InspectorTest.evaluateInConsoleAndDump = function(code, callback, dontForceMainC
ontext) |
| 40 { | 40 { |
| 41 callback = InspectorTest.safeWrap(callback); | 41 callback = InspectorTest.safeWrap(callback); |
| 42 | 42 |
| 43 function mycallback(text) | 43 function mycallback(text) |
| 44 { | 44 { |
| 45 text = text.replace(/\bVM\d+/g, "VM"); | 45 text = text.replace(/\bVM\d+/g, "VM"); |
| 46 InspectorTest.addResult(code + " = " + text); | 46 InspectorTest.addResult(code + " = " + text); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 66 return messageText; | 66 return messageText; |
| 67 } | 67 } |
| 68 | 68 |
| 69 InspectorTest.disableConsoleViewport = function() | 69 InspectorTest.disableConsoleViewport = function() |
| 70 { | 70 { |
| 71 InspectorTest.fixConsoleViewportDimensions(600, 2000); | 71 InspectorTest.fixConsoleViewportDimensions(600, 2000); |
| 72 } | 72 } |
| 73 | 73 |
| 74 InspectorTest.fixConsoleViewportDimensions = function(width, height) | 74 InspectorTest.fixConsoleViewportDimensions = function(width, height) |
| 75 { | 75 { |
| 76 var viewport = WebInspector.ConsoleView.instance()._viewport; | 76 var viewport = Console.ConsoleView.instance()._viewport; |
| 77 viewport.element.style.width = width + "px"; | 77 viewport.element.style.width = width + "px"; |
| 78 viewport.element.style.height = height + "px"; | 78 viewport.element.style.height = height + "px"; |
| 79 viewport.element.style.position = "absolute"; | 79 viewport.element.style.position = "absolute"; |
| 80 viewport.invalidate(); | 80 viewport.invalidate(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 InspectorTest.consoleMessagesCount = function() | 83 InspectorTest.consoleMessagesCount = function() |
| 84 { | 84 { |
| 85 var consoleView = WebInspector.ConsoleView.instance(); | 85 var consoleView = Console.ConsoleView.instance(); |
| 86 return consoleView._consoleMessages.length; | 86 return consoleView._consoleMessages.length; |
| 87 } | 87 } |
| 88 | 88 |
| 89 InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
ames, formatter) | 89 InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
ames, formatter) |
| 90 { | 90 { |
| 91 InspectorTest.addResults(InspectorTest.dumpConsoleMessagesIntoArray(printOri
ginatingCommand, dumpClassNames, formatter)); | 91 InspectorTest.addResults(InspectorTest.dumpConsoleMessagesIntoArray(printOri
ginatingCommand, dumpClassNames, formatter)); |
| 92 } | 92 } |
| 93 | 93 |
| 94 InspectorTest.dumpConsoleMessagesIntoArray = function(printOriginatingCommand, d
umpClassNames, formatter) | 94 InspectorTest.dumpConsoleMessagesIntoArray = function(printOriginatingCommand, d
umpClassNames, formatter) |
| 95 { | 95 { |
| 96 formatter = formatter || InspectorTest.prepareConsoleMessageText; | 96 formatter = formatter || InspectorTest.prepareConsoleMessageText; |
| 97 var result = []; | 97 var result = []; |
| 98 InspectorTest.disableConsoleViewport(); | 98 InspectorTest.disableConsoleViewport(); |
| 99 var consoleView = WebInspector.ConsoleView.instance(); | 99 var consoleView = Console.ConsoleView.instance(); |
| 100 if (consoleView._needsFullUpdate) | 100 if (consoleView._needsFullUpdate) |
| 101 consoleView._updateMessageList(); | 101 consoleView._updateMessageList(); |
| 102 var viewMessages = consoleView._visibleViewMessages; | 102 var viewMessages = consoleView._visibleViewMessages; |
| 103 for (var i = 0; i < viewMessages.length; ++i) { | 103 for (var i = 0; i < viewMessages.length; ++i) { |
| 104 var uiMessage = viewMessages[i]; | 104 var uiMessage = viewMessages[i]; |
| 105 var message = uiMessage.consoleMessage(); | 105 var message = uiMessage.consoleMessage(); |
| 106 var element = uiMessage.element(); | 106 var element = uiMessage.element(); |
| 107 | 107 |
| 108 if (dumpClassNames) { | 108 if (dumpClassNames) { |
| 109 var classNames = []; | 109 var classNames = []; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 } | 153 } |
| 154 | 154 |
| 155 InspectorTest.dumpConsoleMessagesIgnoreErrorStackFrames = function(printOriginat
ingCommand, dumpClassNames, messageFormatter) | 155 InspectorTest.dumpConsoleMessagesIgnoreErrorStackFrames = function(printOriginat
ingCommand, dumpClassNames, messageFormatter) |
| 156 { | 156 { |
| 157 InspectorTest.addResults(InspectorTest.dumpConsoleMessagesIntoArray(printOri
ginatingCommand, dumpClassNames, InspectorTest.formatterIgnoreStackFrameUrls.bin
d(this, messageFormatter))); | 157 InspectorTest.addResults(InspectorTest.dumpConsoleMessagesIntoArray(printOri
ginatingCommand, dumpClassNames, InspectorTest.formatterIgnoreStackFrameUrls.bin
d(this, messageFormatter))); |
| 158 } | 158 } |
| 159 | 159 |
| 160 InspectorTest.dumpConsoleTableMessage = function(viewMessage, forceInvalidate, r
esults) | 160 InspectorTest.dumpConsoleTableMessage = function(viewMessage, forceInvalidate, r
esults) |
| 161 { | 161 { |
| 162 if (forceInvalidate) | 162 if (forceInvalidate) |
| 163 WebInspector.ConsoleView.instance()._viewport.invalidate(); | 163 Console.ConsoleView.instance()._viewport.invalidate(); |
| 164 var table = viewMessage.element(); | 164 var table = viewMessage.element(); |
| 165 var headers = table.querySelectorAll("th > div:first-child"); | 165 var headers = table.querySelectorAll("th > div:first-child"); |
| 166 if (!headers.length) | 166 if (!headers.length) |
| 167 return false; | 167 return false; |
| 168 | 168 |
| 169 var headerLine = ""; | 169 var headerLine = ""; |
| 170 for (var i = 0; i < headers.length; i++) | 170 for (var i = 0; i < headers.length; i++) |
| 171 headerLine += headers[i].textContent + " | "; | 171 headerLine += headers[i].textContent + " | "; |
| 172 | 172 |
| 173 addResult("HEADER " + headerLine); | 173 addResult("HEADER " + headerLine); |
| (...skipping 18 matching lines...) Expand all Loading... |
| 192 else | 192 else |
| 193 InspectorTest.addResult(x); | 193 InspectorTest.addResult(x); |
| 194 } | 194 } |
| 195 | 195 |
| 196 return true; | 196 return true; |
| 197 } | 197 } |
| 198 | 198 |
| 199 InspectorTest.dumpConsoleMessagesWithStyles = function(sortMessages) | 199 InspectorTest.dumpConsoleMessagesWithStyles = function(sortMessages) |
| 200 { | 200 { |
| 201 var result = []; | 201 var result = []; |
| 202 var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages; | 202 var messageViews = Console.ConsoleView.instance()._visibleViewMessages; |
| 203 for (var i = 0; i < messageViews.length; ++i) { | 203 for (var i = 0; i < messageViews.length; ++i) { |
| 204 var element = messageViews[i].element(); | 204 var element = messageViews[i].element(); |
| 205 var messageText = InspectorTest.prepareConsoleMessageText(element); | 205 var messageText = InspectorTest.prepareConsoleMessageText(element); |
| 206 InspectorTest.addResult(messageText); | 206 InspectorTest.addResult(messageText); |
| 207 var spans = element.querySelectorAll(".console-message-text *"); | 207 var spans = element.querySelectorAll(".console-message-text *"); |
| 208 for (var j = 0; j < spans.length; ++j) | 208 for (var j = 0; j < spans.length; ++j) |
| 209 InspectorTest.addResult("Styled text #" + j + ": " + (spans[j].style
.cssText || "NO STYLES DEFINED")); | 209 InspectorTest.addResult("Styled text #" + j + ": " + (spans[j].style
.cssText || "NO STYLES DEFINED")); |
| 210 } | 210 } |
| 211 } | 211 } |
| 212 | 212 |
| 213 InspectorTest.dumpConsoleMessagesWithClasses = function(sortMessages) { | 213 InspectorTest.dumpConsoleMessagesWithClasses = function(sortMessages) { |
| 214 var result = []; | 214 var result = []; |
| 215 var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages; | 215 var messageViews = Console.ConsoleView.instance()._visibleViewMessages; |
| 216 for (var i = 0; i < messageViews.length; ++i) { | 216 for (var i = 0; i < messageViews.length; ++i) { |
| 217 var element = messageViews[i].element(); | 217 var element = messageViews[i].element(); |
| 218 var contentElement = messageViews[i].contentElement(); | 218 var contentElement = messageViews[i].contentElement(); |
| 219 var messageText = InspectorTest.prepareConsoleMessageText(element); | 219 var messageText = InspectorTest.prepareConsoleMessageText(element); |
| 220 result.push(messageText + " " + element.getAttribute("class") + " > " +
contentElement.getAttribute("class")); | 220 result.push(messageText + " " + element.getAttribute("class") + " > " +
contentElement.getAttribute("class")); |
| 221 } | 221 } |
| 222 if (sortMessages) | 222 if (sortMessages) |
| 223 result.sort(); | 223 result.sort(); |
| 224 for (var i = 0; i < result.length; ++i) | 224 for (var i = 0; i < result.length; ++i) |
| 225 InspectorTest.addResult(result[i]); | 225 InspectorTest.addResult(result[i]); |
| 226 } | 226 } |
| 227 | 227 |
| 228 InspectorTest.dumpConsoleClassesBrief = function() | 228 InspectorTest.dumpConsoleClassesBrief = function() |
| 229 { | 229 { |
| 230 var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages; | 230 var messageViews = Console.ConsoleView.instance()._visibleViewMessages; |
| 231 for (var i = 0; i < messageViews.length; ++i) | 231 for (var i = 0; i < messageViews.length; ++i) |
| 232 InspectorTest.addResult(messageViews[i].toMessageElement().className); | 232 InspectorTest.addResult(messageViews[i].toMessageElement().className); |
| 233 } | 233 } |
| 234 | 234 |
| 235 InspectorTest.dumpConsoleCounters = function() | 235 InspectorTest.dumpConsoleCounters = function() |
| 236 { | 236 { |
| 237 var counter = WebInspector.Main.WarningErrorCounter._instanceForTest; | 237 var counter = Main.Main.WarningErrorCounter._instanceForTest; |
| 238 for (var index = 0; index < counter._titles.length; ++index) | 238 for (var index = 0; index < counter._titles.length; ++index) |
| 239 InspectorTest.addResult(counter._titles[index]); | 239 InspectorTest.addResult(counter._titles[index]); |
| 240 InspectorTest.dumpConsoleClassesBrief(); | 240 InspectorTest.dumpConsoleClassesBrief(); |
| 241 } | 241 } |
| 242 | 242 |
| 243 InspectorTest.expandConsoleMessages = function(callback, deepFilter, sectionFilt
er) | 243 InspectorTest.expandConsoleMessages = function(callback, deepFilter, sectionFilt
er) |
| 244 { | 244 { |
| 245 WebInspector.ConsoleView.instance()._viewportThrottler.flush(); | 245 Console.ConsoleView.instance()._viewportThrottler.flush(); |
| 246 var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages; | 246 var messageViews = Console.ConsoleView.instance()._visibleViewMessages; |
| 247 | 247 |
| 248 // Initiate round-trips to fetch necessary data for further rendering. | 248 // Initiate round-trips to fetch necessary data for further rendering. |
| 249 for (var i = 0; i < messageViews.length; ++i) | 249 for (var i = 0; i < messageViews.length; ++i) |
| 250 messageViews[i].element(); | 250 messageViews[i].element(); |
| 251 | 251 |
| 252 InspectorTest.deprecatedRunAfterPendingDispatches(expandTreeElements); | 252 InspectorTest.deprecatedRunAfterPendingDispatches(expandTreeElements); |
| 253 | 253 |
| 254 function expandTreeElements() | 254 function expandTreeElements() |
| 255 { | 255 { |
| 256 for (var i = 0; i < messageViews.length; ++i) { | 256 for (var i = 0; i < messageViews.length; ++i) { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 276 } | 276 } |
| 277 } | 277 } |
| 278 } | 278 } |
| 279 } | 279 } |
| 280 InspectorTest.deprecatedRunAfterPendingDispatches(callback); | 280 InspectorTest.deprecatedRunAfterPendingDispatches(callback); |
| 281 } | 281 } |
| 282 } | 282 } |
| 283 | 283 |
| 284 InspectorTest.expandGettersInConsoleMessages = function(callback) | 284 InspectorTest.expandGettersInConsoleMessages = function(callback) |
| 285 { | 285 { |
| 286 var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages; | 286 var messageViews = Console.ConsoleView.instance()._visibleViewMessages; |
| 287 var properties = []; | 287 var properties = []; |
| 288 var propertiesCount = 0; | 288 var propertiesCount = 0; |
| 289 InspectorTest.addSniffer(WebInspector.ObjectPropertyTreeElement.prototype, "
_updateExpandable", propertyExpandableUpdated); | 289 InspectorTest.addSniffer(Components.ObjectPropertyTreeElement.prototype, "_u
pdateExpandable", propertyExpandableUpdated); |
| 290 for (var i = 0; i < messageViews.length; ++i) { | 290 for (var i = 0; i < messageViews.length; ++i) { |
| 291 var element = messageViews[i].element(); | 291 var element = messageViews[i].element(); |
| 292 for (var node = element; node; node = node.traverseNextNode(element)) { | 292 for (var node = element; node; node = node.traverseNextNode(element)) { |
| 293 if (node.classList && node.classList.contains("object-value-calculat
e-value-button")) { | 293 if (node.classList && node.classList.contains("object-value-calculat
e-value-button")) { |
| 294 ++propertiesCount; | 294 ++propertiesCount; |
| 295 node.click(); | 295 node.click(); |
| 296 properties.push(node.parentElement.parentElement); | 296 properties.push(node.parentElement.parentElement); |
| 297 } | 297 } |
| 298 } | 298 } |
| 299 } | 299 } |
| 300 | 300 |
| 301 function propertyExpandableUpdated() | 301 function propertyExpandableUpdated() |
| 302 { | 302 { |
| 303 --propertiesCount; | 303 --propertiesCount; |
| 304 if (propertiesCount === 0) { | 304 if (propertiesCount === 0) { |
| 305 for (var i = 0; i < properties.length; ++i) | 305 for (var i = 0; i < properties.length; ++i) |
| 306 properties[i].click(); | 306 properties[i].click(); |
| 307 InspectorTest.deprecatedRunAfterPendingDispatches(callback); | 307 InspectorTest.deprecatedRunAfterPendingDispatches(callback); |
| 308 } else { | 308 } else { |
| 309 InspectorTest.addSniffer(WebInspector.ObjectPropertyTreeElement.prot
otype, "_updateExpandable", propertyExpandableUpdated); | 309 InspectorTest.addSniffer(Components.ObjectPropertyTreeElement.protot
ype, "_updateExpandable", propertyExpandableUpdated); |
| 310 } | 310 } |
| 311 } | 311 } |
| 312 } | 312 } |
| 313 | 313 |
| 314 InspectorTest.expandConsoleMessagesErrorParameters = function(callback) | 314 InspectorTest.expandConsoleMessagesErrorParameters = function(callback) |
| 315 { | 315 { |
| 316 var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages; | 316 var messageViews = Console.ConsoleView.instance()._visibleViewMessages; |
| 317 // Initiate round-trips to fetch necessary data for further rendering. | 317 // Initiate round-trips to fetch necessary data for further rendering. |
| 318 for (var i = 0; i < messageViews.length; ++i) | 318 for (var i = 0; i < messageViews.length; ++i) |
| 319 messageViews[i].element(); | 319 messageViews[i].element(); |
| 320 InspectorTest.deprecatedRunAfterPendingDispatches(callback); | 320 InspectorTest.deprecatedRunAfterPendingDispatches(callback); |
| 321 } | 321 } |
| 322 | 322 |
| 323 InspectorTest.waitForRemoteObjectsConsoleMessages = function(callback) | 323 InspectorTest.waitForRemoteObjectsConsoleMessages = function(callback) |
| 324 { | 324 { |
| 325 var messages = WebInspector.ConsoleView.instance()._visibleViewMessages; | 325 var messages = Console.ConsoleView.instance()._visibleViewMessages; |
| 326 for (var i = 0; i < messages.length; ++i) | 326 for (var i = 0; i < messages.length; ++i) |
| 327 messages[i].toMessageElement(); | 327 messages[i].toMessageElement(); |
| 328 InspectorTest.deprecatedRunAfterPendingDispatches(callback); | 328 InspectorTest.deprecatedRunAfterPendingDispatches(callback); |
| 329 } | 329 } |
| 330 | 330 |
| 331 InspectorTest.checkConsoleMessagesDontHaveParameters = function() | 331 InspectorTest.checkConsoleMessagesDontHaveParameters = function() |
| 332 { | 332 { |
| 333 var messageViews = WebInspector.ConsoleView.instance()._visibleViewMessages; | 333 var messageViews = Console.ConsoleView.instance()._visibleViewMessages; |
| 334 for (var i = 0; i < messageViews.length; ++i) { | 334 for (var i = 0; i < messageViews.length; ++i) { |
| 335 var m = messageViews[i].consoleMessage(); | 335 var m = messageViews[i].consoleMessage(); |
| 336 InspectorTest.addResult("Message[" + i + "]:"); | 336 InspectorTest.addResult("Message[" + i + "]:"); |
| 337 InspectorTest.addResult("Message: " + WebInspector.displayNameForURL(m.u
rl) + ":" + m.line + " " + m.message); | 337 InspectorTest.addResult("Message: " + Bindings.displayNameForURL(m.url)
+ ":" + m.line + " " + m.message); |
| 338 if ("_parameters" in m) { | 338 if ("_parameters" in m) { |
| 339 if (m._parameters) | 339 if (m._parameters) |
| 340 InspectorTest.addResult("FAILED: message parameters list is not
empty: " + m.parameters); | 340 InspectorTest.addResult("FAILED: message parameters list is not
empty: " + m.parameters); |
| 341 else | 341 else |
| 342 InspectorTest.addResult("SUCCESS: message parameters list is emp
ty. "); | 342 InspectorTest.addResult("SUCCESS: message parameters list is emp
ty. "); |
| 343 } else { | 343 } else { |
| 344 InspectorTest.addResult("FAILED: didn't find _parameters field in th
e message."); | 344 InspectorTest.addResult("FAILED: didn't find _parameters field in th
e message."); |
| 345 } | 345 } |
| 346 } | 346 } |
| 347 } | 347 } |
| 348 | 348 |
| 349 InspectorTest.waitUntilConsoleEditorLoaded = function() | 349 InspectorTest.waitUntilConsoleEditorLoaded = function() |
| 350 { | 350 { |
| 351 var fulfill; | 351 var fulfill; |
| 352 var promise = new Promise(x => fulfill = x); | 352 var promise = new Promise(x => fulfill = x); |
| 353 var editor = WebInspector.ConsoleView.instance()._prompt._editor; | 353 var editor = Console.ConsoleView.instance()._prompt._editor; |
| 354 if (editor) | 354 if (editor) |
| 355 fulfill(editor); | 355 fulfill(editor); |
| 356 else | 356 else |
| 357 InspectorTest.addSniffer(WebInspector.ConsolePrompt.prototype, "_editorS
etForTest", _ => fulfill(editor)) | 357 InspectorTest.addSniffer(Console.ConsolePrompt.prototype, "_editorSetFor
Test", _ => fulfill(editor)) |
| 358 return promise; | 358 return promise; |
| 359 } | 359 } |
| 360 | 360 |
| 361 InspectorTest.waitUntilMessageReceived = function(callback) | 361 InspectorTest.waitUntilMessageReceived = function(callback) |
| 362 { | 362 { |
| 363 InspectorTest.addSniffer(InspectorTest.consoleModel, "addMessage", callback,
false); | 363 InspectorTest.addSniffer(InspectorTest.consoleModel, "addMessage", callback,
false); |
| 364 } | 364 } |
| 365 | 365 |
| 366 InspectorTest.waitUntilMessageReceivedPromise = function() | 366 InspectorTest.waitUntilMessageReceivedPromise = function() |
| 367 { | 367 { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 386 InspectorTest.waitUntilNthMessageReceivedPromise = function(count) | 386 InspectorTest.waitUntilNthMessageReceivedPromise = function(count) |
| 387 { | 387 { |
| 388 var callback; | 388 var callback; |
| 389 var promise = new Promise((fullfill) => callback = fullfill); | 389 var promise = new Promise((fullfill) => callback = fullfill); |
| 390 InspectorTest.waitUntilNthMessageReceived(count, callback); | 390 InspectorTest.waitUntilNthMessageReceived(count, callback); |
| 391 return promise; | 391 return promise; |
| 392 } | 392 } |
| 393 | 393 |
| 394 InspectorTest.changeExecutionContext = function(namePrefix) | 394 InspectorTest.changeExecutionContext = function(namePrefix) |
| 395 { | 395 { |
| 396 var selector = WebInspector.ConsoleView.instance()._consoleContextSelector._
selectElement; | 396 var selector = Console.ConsoleView.instance()._consoleContextSelector._selec
tElement; |
| 397 var option = selector.firstChild; | 397 var option = selector.firstChild; |
| 398 while (option) { | 398 while (option) { |
| 399 if (option.textContent && option.textContent.startsWith(namePrefix)) | 399 if (option.textContent && option.textContent.startsWith(namePrefix)) |
| 400 break; | 400 break; |
| 401 option = option.nextSibling; | 401 option = option.nextSibling; |
| 402 } | 402 } |
| 403 if (!option) { | 403 if (!option) { |
| 404 InspectorTest.addResult("FAILED: context with prefix: " + namePrefix +
" not found in the context list"); | 404 InspectorTest.addResult("FAILED: context with prefix: " + namePrefix +
" not found in the context list"); |
| 405 return; | 405 return; |
| 406 } | 406 } |
| 407 option.selected = true; | 407 option.selected = true; |
| 408 WebInspector.ConsoleView.instance()._consoleContextSelector._executionContex
tChanged(); | 408 Console.ConsoleView.instance()._consoleContextSelector._executionContextChan
ged(); |
| 409 } | 409 } |
| 410 | 410 |
| 411 InspectorTest.waitForConsoleMessages = function(expectedCount, callback) | 411 InspectorTest.waitForConsoleMessages = function(expectedCount, callback) |
| 412 { | 412 { |
| 413 var consoleView = WebInspector.ConsoleView.instance(); | 413 var consoleView = Console.ConsoleView.instance(); |
| 414 checkAndReturn(); | 414 checkAndReturn(); |
| 415 | 415 |
| 416 function checkAndReturn() | 416 function checkAndReturn() |
| 417 { | 417 { |
| 418 if (consoleView._visibleViewMessages.length === expectedCount) { | 418 if (consoleView._visibleViewMessages.length === expectedCount) { |
| 419 InspectorTest.addResult("Message count: " + expectedCount); | 419 InspectorTest.addResult("Message count: " + expectedCount); |
| 420 callback(); | 420 callback(); |
| 421 } else { | 421 } else { |
| 422 InspectorTest.addSniffer(consoleView, "_messageAppendedForTests", ch
eckAndReturn); | 422 InspectorTest.addSniffer(consoleView, "_messageAppendedForTests", ch
eckAndReturn); |
| 423 } | 423 } |
| 424 } | 424 } |
| 425 } | 425 } |
| 426 | 426 |
| 427 } | 427 } |
| OLD | NEW |