LayoutTests/inspector/sources/debugger/script-snippet-model.html - Issue 313603003: Devtools: get rid of ProjectWillReset event, introduce ProjectRemoved instead of it

Unified Diff: LayoutTests/inspector/sources/debugger/script-snippet-model.html

Issue 313603003: Devtools: get rid of ProjectWillReset event, introduce ProjectRemoved instead of it (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/inspector/snippet-storage.html ('K') | « LayoutTests/inspector/sources/debugger/file-system-project-mapping-expected.txt ('k') | Source/devtools/front_end/sdk/BreakpointManager.js » ('j') | Source/devtools/front_end/sdk/ContentProviderBasedProjectDelegate.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/inspector/sources/debugger/script-snippet-model.html

diff --git a/LayoutTests/inspector/sources/debugger/script-snippet-model.html b/LayoutTests/inspector/sources/debugger/script-snippet-model.html

index 4e911dd8c458b13a294b201afa4b524d9e7792c2..eb026525d15020c7e718ada3fb5278a585677fe6 100644

--- a/LayoutTests/inspector/sources/debugger/script-snippet-model.html

+++ b/LayoutTests/inspector/sources/debugger/script-snippet-model.html

@@ -7,14 +7,13 @@ function test()

{

function resetSnippetsSettings()

{

- WebInspector.scriptSnippetModel._snippetStorage.reset();

+ WebInspector.scriptSnippetModel._snippetStorage._lastSnippetIdentifierSetting.set(0);

+ WebInspector.scriptSnippetModel._snippetStorage._snippetsSetting.set([]);

WebInspector.scriptSnippetModel._lastSnippetEvaluationIndexSetting.set(0);

- WebInspector.scriptSnippetModel.reset();

+ WebInspector.scriptSnippetModel = new WebInspector.ScriptSnippetModel(WebInspector.workspace);

}

var workspace = WebInspector.workspace;

- var snippetsProject = WebInspector.scriptSnippetModel.project();

- var snippetScriptMapping = WebInspector.scriptSnippetModel.snippetScriptMapping(WebInspector.targetManager.targets()[0]);

InspectorTest.runDebuggerTestSuite([

function testCreateEditRenameRemove(next)

{

@@ -65,11 +64,11 @@ function test()

resetSnippetsSettings();

- snippetsProject.createFile("", null, "", step2.bind(this));

+ WebInspector.scriptSnippetModel.project().createFile("", null, "", step2.bind(this));

function step2(path)

{

- uiSourceCode1 = snippetsProject.uiSourceCode(path);

+ uiSourceCode1 = WebInspector.scriptSnippetModel.project().uiSourceCode(path);

uiSourceCode1.requestContent(contentCallback);

uiSourceCode1.addRevision("<snippet content>");

@@ -79,12 +78,12 @@ function test()

uiSourceCode1.requestContent(contentCallback);

InspectorTest.addResult("Snippet1 created.");

- snippetsProject.createFile("", null, "", step3.bind(this));

+ WebInspector.scriptSnippetModel.project().createFile("", null, "", step3.bind(this));

}

function step3(path)

{

- var uiSourceCode2 = snippetsProject.uiSourceCode(path);

+ var uiSourceCode2 = WebInspector.scriptSnippetModel.project().uiSourceCode(path);

InspectorTest.addResult("Snippet2 created.");

renameSnippetAndCheckWorkspace(uiSourceCode1, "foo");

renameSnippetAndCheckWorkspace(uiSourceCode1, " ");

@@ -96,17 +95,17 @@ function test()

delete uiSourceCode1._contentLoaded;

uiSourceCode1.requestContent(contentCallback);

- snippetsProject.deleteFile(uiSourceCode1.path());

- snippetsProject.deleteFile(uiSourceCode2.path());

+ WebInspector.scriptSnippetModel.project().deleteFile(uiSourceCode1.path());

+ WebInspector.scriptSnippetModel.project().deleteFile(uiSourceCode2.path());

- snippetsProject.createFile("", null, "", step4.bind(this));

+ WebInspector.scriptSnippetModel.project().createFile("", null, "", step4.bind(this));

}

function step4(path)

{

- var uiSourceCode3 = snippetsProject.uiSourceCode(path);

+ var uiSourceCode3 = WebInspector.scriptSnippetModel.project().uiSourceCode(path);

InspectorTest.addResult("Snippet3 created.");

- snippetsProject.deleteFile(uiSourceCode3.path());

+ WebInspector.scriptSnippetModel.project().deleteFile(uiSourceCode3.path());

InspectorTest.addResult("Snippet3 deleted.");

InspectorTest.addResult("Number of uiSourceCodes in workspace: " + workspace.uiSourceCodes().filter(filterSnippet).length);

@@ -148,23 +147,24 @@ function test()

}

resetSnippetsSettings();

+ var snippetScriptMapping = WebInspector.scriptSnippetModel.snippetScriptMapping(WebInspector.targetManager.targets()[0]);

- snippetsProject.createFile("", null, "", step2.bind(this));

+ WebInspector.scriptSnippetModel.project().createFile("", null, "", step2.bind(this));

function step2(path)

{

- uiSourceCode1 = snippetsProject.uiSourceCode(path);

+ uiSourceCode1 = WebInspector.scriptSnippetModel.project().uiSourceCode(path);

uiSourceCode1.rename("Snippet1", function() { });

var content = "";

content += "// This snippet does nothing.\n";

content += "var i = 2+2;\n";

uiSourceCode1.setWorkingCopy(content);

- snippetsProject.createFile("", null, "", step3.bind(this));

+ WebInspector.scriptSnippetModel.project().createFile("", null, "", step3.bind(this));

}

function step3(path)

{

- uiSourceCode2 = snippetsProject.uiSourceCode(path);

+ uiSourceCode2 = WebInspector.scriptSnippetModel.project().uiSourceCode(path);

uiSourceCode2.rename("Snippet2", function() { });

content = "";

content += "// This snippet creates a function that does nothing and returns it.\n";

@@ -206,12 +206,13 @@ function test()

}

resetSnippetsSettings();

+ var snippetScriptMapping = WebInspector.scriptSnippetModel.snippetScriptMapping(WebInspector.targetManager.targets()[0]);

- snippetsProject.createFile("", null, "", step3.bind(this));

+ WebInspector.scriptSnippetModel.project().createFile("", null, "", step3.bind(this));

function step3(path)

{

- var uiSourceCode1 = snippetsProject.uiSourceCode(path);

+ var uiSourceCode1 = WebInspector.scriptSnippetModel.project().uiSourceCode(path);

uiSourceCode1.rename("Snippet1", function() { });

var content = "";

content += "// This snippet does nothing.\n";