Skip to content

GitLab

T
tangled
Commit b7153161 authored by dgozman's avatar dgozman Committed by Commit bot
Browse files
Options

[DevTools] Remove workspace-test.js part4. 

Migrated navigator tests and compiler-script-mapping away from mock workspace.

BUG=none

Review-Url: https://codereview.chromium.org/2536733004
Cr-Commit-Position: refs/heads/master@{#435043}
parent 05d8c5e2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 244 additions and 351 deletions
third_party/WebKit/LayoutTests/http/tests/inspector/compiler-script-mapping-expected.txt
View file @ b7153161
...@@ -114,33 +114,29 @@ cat.jpeg resolves to http://a/b/c/cat.jpeg===http://a/b/c/cat.jpeg passes: true ...@@ -114,33 +114,29 @@ cat.jpeg resolves to http://a/b/c/cat.jpeg===http://a/b/c/cat.jpeg passes: true
resolves to http://example.com/path.css?query===http://example.com/path.css?query passes: true resolves to http://example.com/path.css?query===http://example.com/path.css?query passes: true
Running: testCompilerScriptMapping Running: testCompilerScriptMapping
UISourceCodeAdded: [debugger] debugger:///VM1 compiled.js Adding compiled.js
UISourceCodeAdded: [network] compiled.js compiled.js UISourceCode arrived
UISourceCodeAdded: [service] compiled.js compiled.js script found
UISourceCodeRemoved: [service] compiled.js source1.js UISourceCode arrived
UISourceCodeAdded: [contentscripts] http://localhost:8000/inspector/resources/source1.js source2.js UISourceCode arrived
UISourceCodeAdded: [contentscripts] http://localhost:8000/inspector/resources/source2.js Location checks passed. Requesting content
afterScriptAdded Content1 arrived.
Content2 arrived.
Running: testCompilerScriptMappingWhenResourceWasLoadedAfterSource
UISourceCodeAdded: [debugger] debugger:///VM2 compiled.js
UISourceCodeAdded: [service] compiled.js
UISourceCodeAdded: [network] compiled.js
UISourceCodeRemoved: [service] compiled.js
UISourceCodeAdded: [contentscripts] http://localhost:8000/inspector/resources/source1.js
UISourceCodeAdded: [contentscripts] http://localhost:8000/inspector/resources/source2.js
Running: testInlinedSourceMap Running: testInlinedSourceMap
UISourceCodeAdded: [debugger] debugger:///VM3 compiled.js Adding compiled.js
UISourceCodeAdded: [service] http://example.com/compiled.js compiled.js UISourceCode arrived
UISourceCodeRemoved: [service] http://example.com/compiled.js compiled.js script found
UISourceCodeAdded: [contentscripts] http://example.com/source.js source3.js UISourceCode arrived
Location checks passed. Requesting content
<source content> === <source content> <source content> === <source content>
Running: testSourceMapCouldNotBeLoaded Running: testSourceMapCouldNotBeLoaded
UISourceCodeAdded: [debugger] debugger:///VM4 compiled.js Adding compiled.js
UISourceCodeAdded: [service] compiled.js compiled.js UISourceCode arrived
compiled.js compiled.js script found
source-map.json_ UISourceCode arrived
debugger:///VM
Running: testSourceRoot Running: testSourceRoot
/example.js === /example.js /example.js === /example.js
......
third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel-expected.txt
View file @ b7153161
...@@ -3,48 +3,41 @@ Tests that scripts panel UI elements work as intended. ...@@ -3,48 +3,41 @@ Tests that scripts panel UI elements work as intended.
Running: testInitialLoad Running: testInitialLoad
Navigator: Navigator:
mock-target-1 top
top (no domain)
(no domain) bar.js
bar.js baz.js
baz.js foo.js
foo.js foobar.js
foobar.js
Running: testReset Running: testReset
Navigator: Navigator:
mock-target-2 top
top (no domain)
(no domain) bar.js
bar.js baz.js
baz.js foo.js
foo.js
Revealing in navigator. Revealing in navigator.
Navigator: Navigator:
mock-target-2 top
top (no domain)
(no domain) bar.js
bar.js baz.js
baz.js foo.js
foo.js
Navigator: Navigator:
mock-target-2
Navigator: Navigator:
mock-target-2 top
top (no domain)
(no domain) bar.js
bar.js
Running: testDebuggerUISourceCodeAddedAndRemoved Running: testDebuggerUISourceCodeAddedAndRemoved
Navigator: Navigator:
mock-target-3 top
top (no domain)
(no domain) foo.js
foo.js
Navigator: Navigator:
mock-target-3 top
top (no domain)
(no domain) foo.js
foo.js source.js
source.js
third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html
View file @ b7153161
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<head> <head>
<script src="../../../http/tests/inspector/inspector-test.js"></script> <script src="../../../http/tests/inspector/inspector-test.js"></script>
<script src="../../../http/tests/inspector/debugger-test.js"></script> <script src="../../../http/tests/inspector/debugger-test.js"></script>
<script src="../../../http/tests/inspector/workspace-test.js"></script>
<script> <script>
function test() function test()
{ {
...@@ -14,10 +13,7 @@ function test() ...@@ -14,10 +13,7 @@ function test()
function createNavigatorView() function createNavigatorView()
{ {
var workspace = Workspace.workspace;
Workspace.workspace = InspectorTest.testWorkspace;
var navigatorView = new Sources.SourcesNavigatorView(); var navigatorView = new Sources.SourcesNavigatorView();
Workspace.workspace = workspace;
navigatorView.show(UI.inspectorView.element); navigatorView.show(UI.inspectorView.element);
return navigatorView; return navigatorView;
} }
...@@ -33,37 +29,23 @@ function test() ...@@ -33,37 +29,23 @@ function test()
return contentProvider; return contentProvider;
} }
function createMockWorkspace() function addNetworkFile(url)
{ {
InspectorTest.createWorkspaceWithTarget(true); var networkProject = Bindings.NetworkProject.forTarget(InspectorTest.mainTarget);
InspectorTest.testDebuggerProject = new Bindings.ContentProviderBasedProject(InspectorTest.testWorkspace, "", Workspace.projectTypes.Debugger, ""); return networkProject.addFile(createContentProvider(url), InspectorTest.mainFrame());
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;
} }
InspectorTest.runTestSuite([ InspectorTest.runTestSuite([
function testInitialLoad(next) function testInitialLoad(next)
{ {
var workspace = createMockWorkspace(); Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();
addNetworkFile("foobar.js");
addNetworkFile(workspace, "foobar.js");
var sourcesNavigatorView = createNavigatorView(); var sourcesNavigatorView = createNavigatorView();
addNetworkFile(workspace, "foo.js"); addNetworkFile("foo.js");
addNetworkFile(workspace, "bar.js"); addNetworkFile("bar.js");
var uiSourceCode = addNetworkFile(workspace, "baz.js"); var uiSourceCode = addNetworkFile("baz.js");
sourcesNavigatorView.revealUISourceCode(uiSourceCode); sourcesNavigatorView.revealUISourceCode(uiSourceCode);
dumpNavigator(sourcesNavigatorView); dumpNavigator(sourcesNavigatorView);
...@@ -72,21 +54,21 @@ function test() ...@@ -72,21 +54,21 @@ function test()
function testReset(next) function testReset(next)
{ {
var workspace = createMockWorkspace(); Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();
var sourcesNavigatorView = createNavigatorView(); var sourcesNavigatorView = createNavigatorView();
var uiSourceCode = addNetworkFile(workspace, "foo.js"); var uiSourceCode = addNetworkFile("foo.js");
addNetworkFile(workspace, "bar.js"); addNetworkFile("bar.js");
addNetworkFile(workspace, "baz.js"); addNetworkFile("baz.js");
dumpNavigator(sourcesNavigatorView); dumpNavigator(sourcesNavigatorView);
InspectorTest.addResult("Revealing in navigator."); InspectorTest.addResult("Revealing in navigator.");
sourcesNavigatorView.revealUISourceCode(uiSourceCode); sourcesNavigatorView.revealUISourceCode(uiSourceCode);
dumpNavigator(sourcesNavigatorView); dumpNavigator(sourcesNavigatorView);
InspectorTest.testNetworkProject._reset(); Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();
dumpNavigator(sourcesNavigatorView); dumpNavigator(sourcesNavigatorView);
uiSourceCode = addNetworkFile(workspace, "bar.js"); uiSourceCode = addNetworkFile("bar.js");
sourcesNavigatorView.revealUISourceCode(uiSourceCode); sourcesNavigatorView.revealUISourceCode(uiSourceCode);
dumpNavigator(sourcesNavigatorView); dumpNavigator(sourcesNavigatorView);
...@@ -95,20 +77,25 @@ function test() ...@@ -95,20 +77,25 @@ function test()
function testDebuggerUISourceCodeAddedAndRemoved(next) function testDebuggerUISourceCodeAddedAndRemoved(next)
{ {
var workspace = createMockWorkspace(); Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();
var sourcesNavigatorView = createNavigatorView(); var sourcesNavigatorView = createNavigatorView();
var uiSourceCode = addNetworkFile(workspace, "foo.js"); var uiSourceCode = addNetworkFile("foo.js");
var debuggerUISourceCode = addDebuggerFile(workspace, "compiled.js"); InspectorTest.waitForUISourceCode(onUISourceCode);
sourcesNavigatorView.revealUISourceCode(uiSourceCode); InspectorTest.evaluateInPage("function foo() {}");
sourcesNavigatorView.revealUISourceCode(debuggerUISourceCode);
dumpNavigator(sourcesNavigatorView);
// Plug compiler source mapping. function onUISourceCode(debuggerUISourceCode)
addNetworkFile(workspace, "source.js"); {
sourcesNavigatorView.revealUISourceCode(uiSourceCode);
sourcesNavigatorView.revealUISourceCode(debuggerUISourceCode);
dumpNavigator(sourcesNavigatorView);
dumpNavigator(sourcesNavigatorView); // Plug compiler source mapping.
next(); addNetworkFile("source.js");
dumpNavigator(sourcesNavigatorView);
next();
}
} }
]); ]);
}; };
......
third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-sorting.html
View file @ b7153161
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<head> <head>
<script src="../../../http/tests/inspector/inspector-test.js"></script> <script src="../../../http/tests/inspector/inspector-test.js"></script>
<script src="../../../http/tests/inspector/debugger-test.js"></script> <script src="../../../http/tests/inspector/debugger-test.js"></script>
<script src="../../../http/tests/inspector/workspace-test.js"></script>
<script> <script>
function test() function test()
...@@ -10,20 +9,25 @@ function test() ...@@ -10,20 +9,25 @@ function test()
function createNavigatorView(constructor) function createNavigatorView(constructor)
{ {
var navigatorView = new constructor(); var navigatorView = new constructor();
navigatorView._resetWorkspace(InspectorTest.testWorkspace);
navigatorView.show(UI.inspectorView.element); navigatorView.show(UI.inspectorView.element);
return navigatorView; return navigatorView;
} }
InspectorTest.createWorkspaceWithTarget(true);
sourcesNavigatorView = createNavigatorView(Sources.SourcesNavigatorView); sourcesNavigatorView = createNavigatorView(Sources.SourcesNavigatorView);
contentScriptsNavigatorView = createNavigatorView(Sources.ContentScriptsNavigatorView); contentScriptsNavigatorView = createNavigatorView(Sources.ContentScriptsNavigatorView);
Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();
var target2 = InspectorTest.createMockTarget("mock-target-1");
SDK.ResourceTreeModel.fromTarget(target2)._cachedResourcesProcessed = true;
SDK.ResourceTreeModel.fromTarget(target2)._frameAttached("42", 0);
var frame = SDK.ResourceTreeModel.fromTarget(target2).mainFrame;
var uiSourceCodes = []; var uiSourceCodes = [];
function addUISourceCode(url, isContentScript) function addUISourceCode(url, isContentScript)
{ {
var contentProvider = Common.StaticContentProvider.fromString(url, Common.resourceTypes.Script, ""); var contentProvider = Common.StaticContentProvider.fromString(url, Common.resourceTypes.Script, "");
var uiSourceCode = InspectorTest.testNetworkProject.addFile(contentProvider, InspectorTest.mainFrame(), isContentScript); var uiSourceCode = Bindings.NetworkProject.forTarget(target2).addFile(contentProvider, frame, isContentScript);
uiSourceCodes.push(uiSourceCode); uiSourceCodes.push(uiSourceCode);
} }
......
third_party/WebKit/LayoutTests/inspector/sources/debugger/navigator-view.html
View file @ b7153161
...@@ -2,42 +2,35 @@ ...@@ -2,42 +2,35 @@
<head> <head>
<script src="../../../http/tests/inspector/inspector-test.js"></script> <script src="../../../http/tests/inspector/inspector-test.js"></script>
<script src="../../../http/tests/inspector/debugger-test.js"></script> <script src="../../../http/tests/inspector/debugger-test.js"></script>
<script src="../../../http/tests/inspector/workspace-test.js"></script>
<script> <script>
function test() function test()
{ {
var target = InspectorTest.createWorkspaceWithTarget(true); var networkProject1 = Bindings.NetworkProject.forTarget(InspectorTest.mainTarget);
target.resourceTreeModel._frameAttached(239, target.resourceTreeModel.mainFrame.id); networkProject1._reset();
var mainFrame = target.resourceTreeModel.mainFrame; var target2 = InspectorTest.createMockTarget("mock-target-100");
target.resourceTreeModel._frameNavigated({id: 239, parentId: mainFrame.id, url:"iframeurl.html", name: "childframe"}); SDK.ResourceTreeModel.fromTarget(target2)._cachedResourcesProcessed = true;
var networkProject1 = InspectorTest.testNetworkProject; SDK.ResourceTreeModel.fromTarget(target2)._frameAttached("42", 0);
var networkProject2 = Bindings.NetworkProject.forTarget(target2);
var subframe = target.resourceTreeModel.frameForId(239); var subframe = InspectorTest.mainFrame().childFrames[0];
SDK.targetManager = InspectorTest.testTargetManager;
target2 = InspectorTest.createMockTarget(100);
var networkProject2 = InspectorTest.testNetworkProject;
var sourcesNavigatorView = new Sources.SourcesNavigatorView(); var sourcesNavigatorView = new Sources.SourcesNavigatorView();
sourcesNavigatorView._resetWorkspace(InspectorTest.testWorkspace);
sourcesNavigatorView.show(UI.inspectorView.element); sourcesNavigatorView.show(UI.inspectorView.element);
var contentScriptsNavigatorView = new Sources.ContentScriptsNavigatorView(); var contentScriptsNavigatorView = new Sources.ContentScriptsNavigatorView();
contentScriptsNavigatorView._resetWorkspace(InspectorTest.testWorkspace);
contentScriptsNavigatorView.show(UI.inspectorView.element); contentScriptsNavigatorView.show(UI.inspectorView.element);
var uiSourceCodes = []; var uiSourceCodes = [];
function addUISourceCode(url, isContentScript, frame) function addUISourceCode(url, isContentScript, frame)
{ {
var contentProvider = Common.StaticContentProvider.fromString(url, Common.resourceTypes.Script, ""); var contentProvider = Common.StaticContentProvider.fromString(url, Common.resourceTypes.Script, "");
var uiSourceCode = networkProject1.addFile(contentProvider, frame || mainFrame); var uiSourceCode = networkProject1.addFile(contentProvider, frame || InspectorTest.mainFrame());
uiSourceCodes.push(uiSourceCode); uiSourceCodes.push(uiSourceCode);
} }
function addUISourceCode2(url, isContentScript) function addUISourceCode2(url, isContentScript)
{ {
var contentProvider = Common.StaticContentProvider.fromString(url, Common.resourceTypes.Script, ""); var contentProvider = Common.StaticContentProvider.fromString(url, Common.resourceTypes.Script, "");
var uiSourceCode = networkProject2.addFile(contentProvider, target2.resourceTreeModel.mainFrame); var uiSourceCode = networkProject2.addFile(contentProvider, SDK.ResourceTreeModel.fromTarget(target2).mainFrame);
uiSourceCodes.push(uiSourceCode); uiSourceCodes.push(uiSourceCode);
} }
...@@ -126,7 +119,7 @@ function test() ...@@ -126,7 +119,7 @@ function test()
InspectorTest.addResult("\n\n================================================"); InspectorTest.addResult("\n\n================================================");
InspectorTest.addResult("Removing all resources:"); InspectorTest.addResult("Removing all resources:");
InspectorTest.testNetworkProject._reset(target); networkProject2._reset();
InspectorTest.dumpNavigatorViewInAllModes(sourcesNavigatorView); InspectorTest.dumpNavigatorViewInAllModes(sourcesNavigatorView);
InspectorTest.dumpNavigatorViewInAllModes(contentScriptsNavigatorView); InspectorTest.dumpNavigatorViewInAllModes(contentScriptsNavigatorView);
...@@ -135,10 +128,11 @@ function test() ...@@ -135,10 +128,11 @@ function test()
</script> </script>
</head> </head>
<body onload="runTest()"> <body>
<p> <p>
Tests scripts panel file selectors. Tests scripts panel file selectors.
</p> </p>
<iframe src="resources/post-message-listener.html" name="childframe" onload="runTest()"></iframe>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment