Modified: trunk/LayoutTests/ChangeLog (127003 => 127004)
--- trunk/LayoutTests/ChangeLog 2012-08-29 16:06:26 UTC (rev 127003)
+++ trunk/LayoutTests/ChangeLog 2012-08-29 16:12:42 UTC (rev 127004)
@@ -1,3 +1,18 @@
+2012-08-29 Vsevolod Vlasov <vse...@chromium.org>
+
+ Web Inspector: Minor debugger-test polish.
+ https://bugs.webkit.org/show_bug.cgi?id=95348
+
+ Reviewed by Alexander Pavlov.
+
+ Added meaningful assertion messages to facilitate debugging.
+ Added meaningful mimeType to script mock.
+
+ * http/tests/inspector/debugger-test.js:
+ (initialize_DebuggerTest.):
+ (initialize_DebuggerTest):
+ * inspector/debugger/raw-source-code-expected.txt:
+
2012-08-29 Alexander Pavlov <apav...@chromium.org>
Web Inspector: Page with @import and :last-child in an edited stylesheet will crash
Modified: trunk/LayoutTests/http/tests/inspector/debugger-test.js (127003 => 127004)
--- trunk/LayoutTests/http/tests/inspector/debugger-test.js 2012-08-29 16:06:26 UTC (rev 127003)
+++ trunk/LayoutTests/http/tests/inspector/debugger-test.js 2012-08-29 16:12:42 UTC (rev 127004)
@@ -291,7 +291,7 @@
var endLine = startLine + lineCount - 1;
var endColumn = lineCount === 1 ? startColumn + source.length : source.length - source.lineEndings()[lineCount - 2];
var script = new WebInspector.Script(scriptId, url, startLine, startColumn, endLine, endColumn, isContentScript);
- script.requestContent = function(callback) { callback(source); };
+ script.requestContent = function(callback) { callback(source, false, "text/_javascript_"); };
WebInspector.debuggerModel._registerScript(script);
return script;
}
@@ -300,16 +300,16 @@
InspectorTest.checkRawLocation = function(script, lineNumber, columnNumber, location)
{
- InspectorTest.assertEquals(script.scriptId, location.scriptId);
- InspectorTest.assertEquals(lineNumber, location.lineNumber);
- InspectorTest.assertEquals(columnNumber, location.columnNumber);
+ InspectorTest.assertEquals(script.scriptId, location.scriptId, "Incorrect scriptId");
+ InspectorTest.assertEquals(lineNumber, location.lineNumber, "Incorrect lineNumber");
+ InspectorTest.assertEquals(columnNumber, location.columnNumber, "Incorrect columnNumber");
};
InspectorTest.checkUILocation = function(uiSourceCode, lineNumber, columnNumber, location)
{
- InspectorTest.assertEquals(uiSourceCode, location.uiSourceCode);
- InspectorTest.assertEquals(lineNumber, location.lineNumber);
- InspectorTest.assertEquals(columnNumber, location.columnNumber);
+ InspectorTest.assertEquals(uiSourceCode, location.uiSourceCode, "Incorrect uiSourceCode");
+ InspectorTest.assertEquals(lineNumber, location.lineNumber, "Incorrect lineNumber");
+ InspectorTest.assertEquals(columnNumber, location.columnNumber, "Incorrect columnNumber");
};
};
Modified: trunk/LayoutTests/inspector/debugger/raw-source-code-expected.txt (127003 => 127004)
--- trunk/LayoutTests/inspector/debugger/raw-source-code-expected.txt 2012-08-29 16:06:26 UTC (rev 127003)
+++ trunk/LayoutTests/inspector/debugger/raw-source-code-expected.txt 2012-08-29 16:12:42 UTC (rev 127004)
@@ -4,7 +4,7 @@
Running: testScriptWithoutResource
UISourceCode: foo.js
UISourceCode is content script: true
-Mime type: undefined
+Mime type: text/_javascript_
Script source: <script source>
Running: testHTMLWithPendingResource
