third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html - Issue 2536733004: [DevTools] Remove workspace-test.js part4.

Unified Diff: third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

Issue 2536733004: [DevTools] Remove workspace-test.js part4. (Closed)

Patch Set: Created 4 years, 1 month 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

« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/inspector/compiler-script-mapping-expected.txt ('k') | third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

diff --git a/third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html b/third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

index b77f31cfa916f2e583ddfe12141e04d6653b2233..e9f9a910353a7b5e1a8fa8e445cb4d1ece972193 100644

--- a/third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

+++ b/third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

@@ -2,7 +2,6 @@

<head>

-<script src="../../../http/tests/inspector/workspace-test.js"></script>

function test()

{

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

function createNavigatorView()

{

- var workspace = Workspace.workspace;

- Workspace.workspace = InspectorTest.testWorkspace;

var navigatorView = new Sources.SourcesNavigatorView();

- Workspace.workspace = workspace;

navigatorView.show(UI.inspectorView.element);

return navigatorView;

}

@@ -33,37 +29,23 @@ function test()

return contentProvider;

}

- function createMockWorkspace()

+ function addNetworkFile(url)

{

- InspectorTest.createWorkspaceWithTarget(true);

- InspectorTest.testDebuggerProject = new Bindings.ContentProviderBasedProject(InspectorTest.testWorkspace, "", Workspace.projectTypes.Debugger, "");

- return InspectorTest.testWorkspace;

- }

- function addNetworkFile(workspace, url)

- {

- return InspectorTest.testNetworkProject.addFile(createContentProvider(url), InspectorTest.mainFrame());

- }

- function addDebuggerFile(workspace, url)

- {

- var uiSourceCode = InspectorTest.testDebuggerProject.createUISourceCode(url, Common.resourceTypes.Script);

- InspectorTest.testDebuggerProject.addUISourceCodeWithProvider(uiSourceCode, createContentProvider(url));

- return uiSourceCode;

+ var networkProject = Bindings.NetworkProject.forTarget(InspectorTest.mainTarget);

+ return networkProject.addFile(createContentProvider(url), InspectorTest.mainFrame());

}

InspectorTest.runTestSuite([

function testInitialLoad(next)

{

- var workspace = createMockWorkspace();

- addNetworkFile(workspace, "foobar.js");

+ Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

+ addNetworkFile("foobar.js");

var sourcesNavigatorView = createNavigatorView();

- addNetworkFile(workspace, "foo.js");

- addNetworkFile(workspace, "bar.js");

- var uiSourceCode = addNetworkFile(workspace, "baz.js");

+ addNetworkFile("foo.js");

+ addNetworkFile("bar.js");

+ var uiSourceCode = addNetworkFile("baz.js");

sourcesNavigatorView.revealUISourceCode(uiSourceCode);

dumpNavigator(sourcesNavigatorView);

@@ -72,21 +54,21 @@ function test()

function testReset(next)

{

- var workspace = createMockWorkspace();

+ Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

var sourcesNavigatorView = createNavigatorView();

- var uiSourceCode = addNetworkFile(workspace, "foo.js");

- addNetworkFile(workspace, "bar.js");

- addNetworkFile(workspace, "baz.js");

+ var uiSourceCode = addNetworkFile("foo.js");

+ addNetworkFile("bar.js");

+ addNetworkFile("baz.js");

dumpNavigator(sourcesNavigatorView);

InspectorTest.addResult("Revealing in navigator.");

sourcesNavigatorView.revealUISourceCode(uiSourceCode);

dumpNavigator(sourcesNavigatorView);

- InspectorTest.testNetworkProject._reset();

+ Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

dumpNavigator(sourcesNavigatorView);

- uiSourceCode = addNetworkFile(workspace, "bar.js");

+ uiSourceCode = addNetworkFile("bar.js");

sourcesNavigatorView.revealUISourceCode(uiSourceCode);

dumpNavigator(sourcesNavigatorView);

@@ -95,20 +77,25 @@ function test()

function testDebuggerUISourceCodeAddedAndRemoved(next)

{

- var workspace = createMockWorkspace();

+ Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

var sourcesNavigatorView = createNavigatorView();

- var uiSourceCode = addNetworkFile(workspace, "foo.js");

- var debuggerUISourceCode = addDebuggerFile(workspace, "compiled.js");

- sourcesNavigatorView.revealUISourceCode(uiSourceCode);

- sourcesNavigatorView.revealUISourceCode(debuggerUISourceCode);

- dumpNavigator(sourcesNavigatorView);

+ var uiSourceCode = addNetworkFile("foo.js");

+ InspectorTest.waitForUISourceCode(onUISourceCode);

+ InspectorTest.evaluateInPage("function foo() {}");

- // Plug compiler source mapping.

- addNetworkFile(workspace, "source.js");

+ function onUISourceCode(debuggerUISourceCode)

+ {

+ sourcesNavigatorView.revealUISourceCode(uiSourceCode);

+ sourcesNavigatorView.revealUISourceCode(debuggerUISourceCode);

+ dumpNavigator(sourcesNavigatorView);

- dumpNavigator(sourcesNavigatorView);

- next();

+ // Plug compiler source mapping.

+ addNetworkFile("source.js");

+ dumpNavigator(sourcesNavigatorView);

+ next();

+ }

}

]);

};