Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / http / tests / inspector / console-test.js

diff --git a/src/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js b/src/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
index 3f2a47f..94e26a2 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
+++ b/src/third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js
@@ -6,13 +6,17 @@ InspectorTest.showConsolePanel = function()
     WebInspector.inspectorView.showPanel("console");
 }
 
-InspectorTest.prepareConsoleMessageText = function(messageElement)
+InspectorTest.prepareConsoleMessageText = function(messageElement, consoleMessage)
 {
     var messageText = messageElement.textContent.replace(/\u200b/g, "");
     // Replace scriptIds with generic scriptId string to avoid flakiness.
-    messageText = messageText.replace(/VM\d+/g, "VM");
+    messageText = messageText.replace(/\bVM\d+/g, "VM");
     // Strip out InjectedScript from stack traces to avoid rebaselining each time InjectedScriptSource is edited.
     messageText = messageText.replace(/InjectedScript[\.a-zA-Z_]+ VM:\d+/g, "");
+    // Strip out InjectedScript line numbers from console message anchor.
+    var functionName = consoleMessage && consoleMessage.stackTrace && consoleMessage.stackTrace[0] && consoleMessage.stackTrace[0].functionName || "";
+    if (functionName.indexOf("InjectedScript") !== -1)
+        messageText = messageText.replace(/\bVM:\d+/, ""); // Only first replace.
     // The message might be extremely long in case of dumping stack overflow message.
     messageText = messageText.substring(0, 1024);
     return messageText;
@@ -56,7 +60,7 @@ InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
             if (dumpClassNames)
                 InspectorTest.addResult(classNames.join(" > "));
         } else {
-            var messageText = formatter(element);
+            var messageText = formatter(element, message);
             InspectorTest.addResult(messageText + (dumpClassNames ? " " + classNames.join(" > ") : ""));
         }
 
@@ -177,7 +181,7 @@ InspectorTest.checkConsoleMessagesDontHaveParameters = function()
 
 InspectorTest.waitUntilMessageReceived = function(callback)
 {
-    InspectorTest.addSniffer(WebInspector.console, "addMessage", callback, false);
+    InspectorTest.addSniffer(WebInspector.consoleModel, "addMessage", callback, false);
 }
 
 InspectorTest.waitUntilNthMessageReceived = function(count, callback)
@@ -187,9 +191,9 @@ InspectorTest.waitUntilNthMessageReceived = function(count, callback)
         if (--count === 0)
             InspectorTest.safeWrap(callback)();
         else
-            InspectorTest.addSniffer(WebInspector.console, "addMessage", override, false);
+            InspectorTest.addSniffer(WebInspector.consoleModel, "addMessage", override, false);
     }
-    InspectorTest.addSniffer(WebInspector.console, "addMessage", override, false);
+    InspectorTest.addSniffer(WebInspector.consoleModel, "addMessage", override, false);
 }
 
 InspectorTest.changeExecutionContext = function(namePrefix)
@@ -210,5 +214,4 @@ InspectorTest.changeExecutionContext = function(namePrefix)
     WebInspector.ConsolePanel._view()._executionContextChanged();
 }
 
-
 }