LayoutTests/inspector/sources/debugger/breakpoint-manager.html - Issue 299443016: DevTools: Decouple debugger model from UI entities

Unified Diff: LayoutTests/inspector/sources/debugger/breakpoint-manager.html

Issue 299443016: DevTools: Decouple debugger model from UI entities (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Merge DebuggerScriptMapping into DebuggerWorkspaceBinding Created 6 years, 5 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/http/tests/inspector/compiler-script-mapping.html ('K') | « LayoutTests/inspector-enabled/sources/debugger/linkifier.html ('k') | LayoutTests/inspector/sources/debugger/breakpoint-manager.js » ('j') | LayoutTests/inspector/sources/debugger/breakpoint-manager.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/inspector/sources/debugger/breakpoint-manager.html

diff --git a/LayoutTests/inspector/sources/debugger/breakpoint-manager.html b/LayoutTests/inspector/sources/debugger/breakpoint-manager.html

index 57ecd5c364a21af4ef89bb036496b0dd11970de5..0a151446d72a0d8233c60eb3f542257acea0d464 100644

--- a/LayoutTests/inspector/sources/debugger/breakpoint-manager.html

+++ b/LayoutTests/inspector/sources/debugger/breakpoint-manager.html

@@ -1,17 +1,28 @@

<html>

<head>

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

function test()

{

+ var mockTarget;

function resetWorkspace(breakpointManager)

vsevik 2014/08/04 09:05:14 Can we split this into create and reset workspace

apavlov 2014/08/04 10:04:34 Done.

{

- InspectorTest.addResult(" Resetting workspace.");

- breakpointManager._networkWorkspaceBinding.reset();

- breakpointManager._debuggerProjectDelegate.reset();

+ if (breakpointManager) {

+ mockTarget.debuggerModel.reset();

+ InspectorTest.addResult(" Resetting workspace.");

+ breakpointManager._debuggerWorkspaceBinding._reset(mockTarget);

+ breakpointManager._debuggerWorkspaceBinding._networkWorkspaceBinding.reset();

+ return;

+ }

+ InspectorTest.createWorkspace(true);

+ mockTarget = InspectorTest.createMockTarget(1);

+ InspectorTest.testTargetManager.addTarget(mockTarget);

+ if (breakpointManager)

+ breakpointManager._debuggerWorkspaceBinding = InspectorTest.testDebuggerWorkspaceBinding;

}

function createBreakpoint(uiSourceCodeId, lineNumber, condition, enabled)

@@ -24,13 +35,16 @@ function test()

serializedBreakpoints.push(createBreakpoint("a.js", 20, "", false));

serializedBreakpoints.push(createBreakpoint("b.js", 3, "", true));

- var targetManager = new WebInspector.TargetManager();

- var mockTarget = InspectorTest.createMockTarget(targetManager, 1);

- targetManager._targets.push(mockTarget);

+ resetWorkspace();

InspectorTest.setupLiveLocationSniffers();

- var addUISourceCode = InspectorTest.addUISourceCode.bind(null, mockTarget);

- var createBreakpointManager = InspectorTest.createBreakpointManager.bind(null, targetManager);

+ var addUISourceCode = function() {

+ var args = [mockTarget].concat(Array.prototype.slice.call(arguments));

+ return InspectorTest.addUISourceCode.apply(null, args);

+ }

+ var createBreakpointManager = function(serializedBreakpoints) {

+ return InspectorTest.createBreakpointManager(InspectorTest.testTargetManager, InspectorTest.testDebuggerWorkspaceBinding, serializedBreakpoints);

+ }

InspectorTest.runTestSuite([

function testSetBreakpoint(next)

@@ -71,6 +85,7 @@ function test()

function testRestoreBreakpoints(next)

{

+ resetWorkspace();

var breakpointManager = createBreakpointManager(serializedBreakpoints);

addUISourceCode(breakpointManager, "a.js");

InspectorTest.finishBreakpointTest(breakpointManager, next);

@@ -78,6 +93,7 @@ function test()

function testRestoreBreakpointsTwice(next)

{

+ resetWorkspace();

var breakpointManager = createBreakpointManager(serializedBreakpoints);

addUISourceCode(breakpointManager, "a.js");

@@ -86,6 +102,7 @@ function test()

function testRemoveBreakpoints(next)

{

+ resetWorkspace();

var breakpointManager = createBreakpointManager(serializedBreakpoints);

var uiSourceCode = addUISourceCode(breakpointManager, "a.js");

window.setBreakpointCallback = step2.bind(this);

@@ -108,6 +125,7 @@ function test()

function testSetBreakpointThatShifts(next)

{

+ resetWorkspace();

var breakpointManager = createBreakpointManager();

var uiSourceCode = addUISourceCode(breakpointManager, "a.js");

InspectorTest.setBreakpoint(breakpointManager, uiSourceCode, 1015, 0, "", true);

@@ -116,6 +134,7 @@ function test()

function testSetBreakpointThatShiftsTwice(next)

{

+ resetWorkspace();

var breakpointManager = createBreakpointManager();

var uiSourceCode = addUISourceCode(breakpointManager, "a.js");

InspectorTest.setBreakpoint(breakpointManager, uiSourceCode, 1015, 0, "", true, step2);

@@ -130,6 +149,7 @@ function test()

function testSetBreakpointOutsideScript(next)

{

+ resetWorkspace();

var breakpointManager = createBreakpointManager();

var uiSourceCode = addUISourceCode(breakpointManager, "a.js");

breakpointManager.setBreakpoint(uiSourceCode, 2500, 0, "", true);

@@ -138,6 +158,7 @@ function test()

function testNavigation(next)

{

+ resetWorkspace();

var breakpointManager = createBreakpointManager(serializedBreakpoints);

var uiSourceCodeA = addUISourceCode(breakpointManager, "a.js");

window.setBreakpointCallback = step2.bind(this);

@@ -146,7 +167,6 @@ function test()

{

InspectorTest.dumpBreakpointLocations(breakpointManager);

InspectorTest.addResult("\n Navigating to B.");

- mockTarget.debuggerModel.reset();

resetWorkspace(breakpointManager);

var uiSourceCodeB = addUISourceCode(breakpointManager, "b.js");

window.setBreakpointCallback = step3.bind(this);

@@ -156,11 +176,10 @@ function test()

{

InspectorTest.dumpBreakpointLocations(breakpointManager);

InspectorTest.addResult("\n Navigating back to A.");

- mockTarget.debuggerModel.reset();

resetWorkspace(breakpointManager);

InspectorTest.addResult(" Resolving provisional breakpoint.");

InspectorTest.addScript(mockTarget, breakpointManager, "a.js");

- mockTarget.debuggerModel._breakpointResolved("a.js:10", new WebInspector.DebuggerModel.Location(mockTarget, "a.js", 10, 5));

+ mockTarget.debuggerModel._breakpointResolved("a.js:10", new WebInspector.DebuggerModel.Location(mockTarget, "a.js", 10, 0));

addUISourceCode(breakpointManager, "a.js", false, true);

InspectorTest.finishBreakpointTest(breakpointManager, next);

}

@@ -192,6 +211,7 @@ function test()

serializedBreakpoints.push(createBreakpoint("a.js", 10, "foo == bar", true));

serializedBreakpoints.push(createBreakpoint("a.js", 20, "", true));

+ resetWorkspace();

var breakpointManager = createBreakpointManager(serializedBreakpoints);

var uiSourceCodeA = addUISourceCode(breakpointManager, "a.js");

window.setBreakpointCallback = step2.bind(this);

@@ -219,6 +239,7 @@ function test()

var serializedBreakpoints = [];

serializedBreakpoints.push(createBreakpoint("a.js", 10, "foo == bar", true));

+ resetWorkspace();

var breakpointManager = createBreakpointManager(serializedBreakpoints);

var uiSourceCode = addUISourceCode(breakpointManager, "a.js");

window.setBreakpointCallback = step2.bind(this);

@@ -226,13 +247,12 @@ function test()

function step2()

{

InspectorTest.dumpBreakpointLocations(breakpointManager);

- mockTarget.debuggerModel.reset();

resetWorkspace(breakpointManager);

InspectorTest.addResult(" Resolving provisional breakpoint.");

InspectorTest.addScript(mockTarget, breakpointManager, "a.js");

- mockTarget.debuggerModel._breakpointResolved("a.js:10", new WebInspector.DebuggerModel.Location(mockTarget, "a.js", 11, 5));

+ mockTarget.debuggerModel._breakpointResolved("a.js:10", new WebInspector.DebuggerModel.Location(mockTarget, "a.js", 11, 0));

var breakpoints = breakpointManager.allBreakpoints();

- InspectorTest.assertEquals(breakpoints.length, 1, "Exactly one provisional breakpoint should be registered in breakpoint manager.");

+ InspectorTest.assertEquals(1, breakpoints.length, "Exactly one provisional breakpoint should be registered in breakpoint manager.");

InspectorTest.finishBreakpointTest(breakpointManager, next);

}

@@ -264,6 +284,7 @@ function test()

}

// Source mapping will shift everthing 10 lines ahead.

var serializedBreakpoints = [createBreakpoint("b.js", 20, "foo == bar", true)];

+ resetWorkspace();

var breakpointManager = createBreakpointManager(serializedBreakpoints);

InspectorTest.addResult("\n Adding files:");

var uiSourceCodeA = addUISourceCode(breakpointManager, "a.js");

@@ -279,12 +300,11 @@ function test()

{

InspectorTest.dumpBreakpointLocations(breakpointManager);

InspectorTest.addResult("\n Reloading:");

- mockTarget.debuggerModel.reset();

resetWorkspace(breakpointManager);

InspectorTest.addResult("\n Adding files:");

InspectorTest.addScript(mockTarget, breakpointManager, "a.js");

- mockTarget.debuggerModel._breakpointResolved("a.js:10", new WebInspector.DebuggerModel.Location(mockTarget, "a.js", 10, 5));

+ mockTarget.debuggerModel._breakpointResolved("a.js:10", new WebInspector.DebuggerModel.Location(mockTarget, "a.js", 10, 0));

uiSourceCodeA = addUISourceCode(breakpointManager, "a.js", false, true);

uiSourceCodeB = addUISourceCode(breakpointManager, "b.js", true, true);

@@ -303,6 +323,7 @@ function test()

function testBreakpointInCollectedReload(next)

{

+ resetWorkspace();

var breakpointManager = createBreakpointManager();

InspectorTest.addResult("\n Adding file without script:");

var uiSourceCode = addUISourceCode(breakpointManager, "a.js", true, true);

@@ -314,14 +335,13 @@ function test()

{

InspectorTest.dumpBreakpointLocations(breakpointManager);

InspectorTest.addResult("\n Reloading:");

- mockTarget.debuggerModel.reset();

resetWorkspace(breakpointManager);

InspectorTest.addResult("\n Adding file with script:");

var uiSourceCode = addUISourceCode(breakpointManager, "a.js");

InspectorTest.addResult("\n Emulating breakpoint resolved event:");

- mockTarget.debuggerModel._breakpointResolved("a.js:10", new WebInspector.DebuggerModel.Location(mockTarget, "a.js", 10, 5));

+ mockTarget.debuggerModel._breakpointResolved("a.js:10", new WebInspector.DebuggerModel.Location(mockTarget, "a.js", 10, 0));

InspectorTest.addResult("\n Make sure we don't do any unnecessary breakpoint actions:");

InspectorTest.runAfterPendingBreakpointUpdates(breakpointManager, breakpointActionsPerformed.bind(this));