Modified: trunk/LayoutTests/ChangeLog (94529 => 94530)
--- trunk/LayoutTests/ChangeLog 2011-09-05 14:40:00 UTC (rev 94529)
+++ trunk/LayoutTests/ChangeLog 2011-09-05 14:46:03 UTC (rev 94530)
@@ -1,3 +1,14 @@
+2011-09-02 Pavel Podivilov <[email protected]>
+
+ Web Inspector: cleanup scripts-panel.html test.
+ https://bugs.webkit.org/show_bug.cgi?id=67497
+
+ ScriptsPanel test should not depend on presentation model internals.
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/debugger/scripts-panel.html:
+
2011-09-05 Zsolt Fehér <[email protected]>
[Qt] Unreviewed gardening.
Modified: trunk/LayoutTests/inspector/debugger/scripts-panel.html (94529 => 94530)
--- trunk/LayoutTests/inspector/debugger/scripts-panel.html 2011-09-05 14:40:00 UTC (rev 94529)
+++ trunk/LayoutTests/inspector/debugger/scripts-panel.html 2011-09-05 14:46:03 UTC (rev 94530)
@@ -6,17 +6,25 @@
function test()
{
- function createMockScript(url, scriptId)
+ function createDebuggerPresentationModelMock()
{
- return {
- sourceURL: url,
- scriptId: scriptId,
- requestSource: function(callback)
+ var model = new WebInspector.Object();
+ model.breakpointsForUISourceCode = function() { return []; };
+ return model;
+ }
+ function addUISouceCode(model, url)
+ {
+ var uiSourceCode = {
+ url: url,
+ requestContent: function(callback)
{
InspectorTest.addResult("Source requested for " + url);
callback("");
- }
+ },
+ messages: []
};
+ model.dispatchEventToListeners(WebInspector.DebuggerPresentationModel.Events.UISourceCodeAdded, uiSourceCode);
+ return uiSourceCode;
}
function showSourceFrame(panel, fileName)
@@ -34,12 +42,12 @@
InspectorTest.runTestSuite([
function testInitialLoad(next)
{
- var model = new WebInspector.DebuggerPresentationModel();
+ var model = createDebuggerPresentationModelMock();
var panel = new WebInspector.ScriptsPanel(model);
- model._addScript(createMockScript("foo.js", "1"));
- model._addScript(createMockScript("bar.js", "2"));
- model._addScript(createMockScript("baz.js", "3"));
+ addUISouceCode(model, "foo.js");
+ addUISouceCode(model, "bar.js");
+ addUISouceCode(model, "baz.js");
InspectorTest.addResult("Dump files select:");
var select = panel._filesSelectElement;
@@ -59,12 +67,12 @@
function testHistory(next)
{
- var model = new WebInspector.DebuggerPresentationModel();
+ var model = createDebuggerPresentationModelMock();
var panel = new WebInspector.ScriptsPanel(model);
var files = ["index.html", "script1.js", "script2.js", "script3.js"];
for (var i = 0; i < files.length; ++i)
- model._addScript(createMockScript(files[i], (i + 1).toString()));
+ addUISouceCode(model, files[i]);
function checkCurrentlySelectedFileName(fileName)
{
@@ -115,7 +123,7 @@
function testFilesSelect(next)
{
- var model = new WebInspector.DebuggerPresentationModel();
+ var model = createDebuggerPresentationModelMock();
var panel = new WebInspector.ScriptsPanel(model);
var rootURL = "http://localhost:8080/LayoutTests/inspector/debugger/";
@@ -148,13 +156,12 @@
function testSourceReplaced(next)
{
- var model = new WebInspector.DebuggerPresentationModel();
+ var model = createDebuggerPresentationModelMock();
var panel = new WebInspector.ScriptsPanel(model);
- model._addScript(createMockScript("foo.js", "1"));
- model._addScript(createMockScript("bar.js", "2"));
- var sourceFile = model._rawSourceCodeForScript("bar.js");
- panel._uiSourceCodeReplaced({ data: { oldSourceCode: sourceFile, sourceCode: sourceFile }});
+ addUISouceCode(model, "foo.js");
+ var uiSourceCode = addUISouceCode(model, "bar.js");
+ panel._uiSourceCodeReplaced({ data: { oldSourceCode: uiSourceCode, sourceCode: uiSourceCode }});
showSourceFrame(panel, "bar.js");
next();
}
