| OLD | NEW |
| 1 var initialize_WorkspaceTest = function() { | 1 var initialize_WorkspaceTest = function() { |
| 2 | 2 |
| 3 InspectorTest.createWorkspace = function(ignoreEvents) | 3 InspectorTest.createWorkspace = function(ignoreEvents) |
| 4 { | 4 { |
| 5 if (InspectorTest.testFileSystemWorkspaceBinding) | 5 if (InspectorTest.testFileSystemWorkspaceBinding) |
| 6 InspectorTest.testFileSystemWorkspaceBinding.dispose(); | 6 InspectorTest.testFileSystemWorkspaceBinding.dispose(); |
| 7 if (InspectorTest.testNetworkMapping) | 7 if (InspectorTest.testNetworkMapping) |
| 8 InspectorTest.testNetworkMapping.dispose(); | 8 InspectorTest.testNetworkMapping.dispose(); |
| 9 WebInspector.fileSystemMapping.resetForTesting(); | 9 Workspace.fileSystemMapping.resetForTesting(); |
| 10 | 10 |
| 11 InspectorTest.testTargetManager = new WebInspector.TargetManager(); | 11 InspectorTest.testTargetManager = new SDK.TargetManager(); |
| 12 InspectorTest.testWorkspace = new WebInspector.Workspace(); | 12 InspectorTest.testWorkspace = new Workspace.Workspace(); |
| 13 InspectorTest.testFileSystemWorkspaceBinding = new WebInspector.FileSystemWo
rkspaceBinding(WebInspector.isolatedFileSystemManager, InspectorTest.testWorkspa
ce); | 13 InspectorTest.testFileSystemWorkspaceBinding = new Bindings.FileSystemWorksp
aceBinding(Workspace.isolatedFileSystemManager, InspectorTest.testWorkspace); |
| 14 InspectorTest.testNetworkMapping = new WebInspector.NetworkMapping(Inspector
Test.testTargetManager, InspectorTest.testWorkspace, InspectorTest.testFileSyste
mWorkspaceBinding, WebInspector.fileSystemMapping); | 14 InspectorTest.testNetworkMapping = new Bindings.NetworkMapping(InspectorTest
.testTargetManager, InspectorTest.testWorkspace, InspectorTest.testFileSystemWor
kspaceBinding, Workspace.fileSystemMapping); |
| 15 InspectorTest.testNetworkProjectManager = new WebInspector.NetworkProjectMan
ager(InspectorTest.testTargetManager, InspectorTest.testWorkspace); | 15 InspectorTest.testNetworkProjectManager = new Bindings.NetworkProjectManager
(InspectorTest.testTargetManager, InspectorTest.testWorkspace); |
| 16 InspectorTest.testDebuggerWorkspaceBinding = new WebInspector.DebuggerWorksp
aceBinding(InspectorTest.testTargetManager, InspectorTest.testWorkspace, Inspect
orTest.testNetworkMapping); | 16 InspectorTest.testDebuggerWorkspaceBinding = new Bindings.DebuggerWorkspaceB
inding(InspectorTest.testTargetManager, InspectorTest.testWorkspace, InspectorTe
st.testNetworkMapping); |
| 17 InspectorTest.testCSSWorkspaceBinding = new WebInspector.CSSWorkspaceBinding
(InspectorTest.testTargetManager, InspectorTest.testWorkspace, InspectorTest.tes
tNetworkMapping); | 17 InspectorTest.testCSSWorkspaceBinding = new Bindings.CSSWorkspaceBinding(Ins
pectorTest.testTargetManager, InspectorTest.testWorkspace, InspectorTest.testNet
workMapping); |
| 18 | 18 |
| 19 InspectorTest.testTargetManager.observeTargets({ | 19 InspectorTest.testTargetManager.observeTargets({ |
| 20 targetAdded: function(target) | 20 targetAdded: function(target) |
| 21 { | 21 { |
| 22 InspectorTest.testNetworkProject = WebInspector.NetworkProject.forTa
rget(target); | 22 InspectorTest.testNetworkProject = Bindings.NetworkProject.forTarget
(target); |
| 23 }, | 23 }, |
| 24 | 24 |
| 25 targetRemoved: function(target) | 25 targetRemoved: function(target) |
| 26 { | 26 { |
| 27 } | 27 } |
| 28 }); | 28 }); |
| 29 | 29 |
| 30 if (ignoreEvents) | 30 if (ignoreEvents) |
| 31 return; | 31 return; |
| 32 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); | 32 InspectorTest.testWorkspace.addEventListener(Workspace.Workspace.Events.UISo
urceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); |
| 33 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); | 33 InspectorTest.testWorkspace.addEventListener(Workspace.Workspace.Events.UISo
urceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); |
| 34 } | 34 } |
| 35 | 35 |
| 36 InspectorTest._mockTargetId = 1; | 36 InspectorTest._mockTargetId = 1; |
| 37 InspectorTest._pageCapabilities = | 37 InspectorTest._pageCapabilities = |
| 38 WebInspector.Target.Capability.Browser | WebInspector.Target.Capability.DOM
| | 38 SDK.Target.Capability.Browser | SDK.Target.Capability.DOM | |
| 39 WebInspector.Target.Capability.JS | WebInspector.Target.Capability.Log | | 39 SDK.Target.Capability.JS | SDK.Target.Capability.Log | |
| 40 WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Work
er; | 40 SDK.Target.Capability.Network | SDK.Target.Capability.Worker; |
| 41 | 41 |
| 42 InspectorTest.createMockTarget = function(id, debuggerModelConstructor, capabili
ties) | 42 InspectorTest.createMockTarget = function(id, debuggerModelConstructor, capabili
ties) |
| 43 { | 43 { |
| 44 capabilities = capabilities || InspectorTest._pageCapabilities; | 44 capabilities = capabilities || InspectorTest._pageCapabilities; |
| 45 var MockTarget = class extends WebInspector.Target { | 45 var MockTarget = class extends SDK.Target { |
| 46 constructor(name, connectionFactory, callback) { | 46 constructor(name, connectionFactory, callback) { |
| 47 super(InspectorTest.testTargetManager, name, capabilities, connectio
nFactory, null, callback); | 47 super(InspectorTest.testTargetManager, name, capabilities, connectio
nFactory, null, callback); |
| 48 this._inspectedURL = InspectorTest.mainTarget.inspectedURL(); | 48 this._inspectedURL = InspectorTest.mainTarget.inspectedURL(); |
| 49 this.consoleModel = new WebInspector.ConsoleModel(this); | 49 this.consoleModel = new SDK.ConsoleModel(this); |
| 50 this.networkManager = new WebInspector.NetworkManager(this); | 50 this.networkManager = new SDK.NetworkManager(this); |
| 51 this.runtimeModel = new WebInspector.RuntimeModel(this); | 51 this.runtimeModel = new SDK.RuntimeModel(this); |
| 52 this.securityOriginManager = WebInspector.SecurityOriginManager.from
Target(this); | 52 this.securityOriginManager = SDK.SecurityOriginManager.fromTarget(th
is); |
| 53 this.resourceTreeModel = new WebInspector.ResourceTreeModel(this, th
is.networkManager, this.securityOriginManager); | 53 this.resourceTreeModel = new SDK.ResourceTreeModel(this, this.networ
kManager, this.securityOriginManager); |
| 54 this.resourceTreeModel._cachedResourcesProcessed = true; | 54 this.resourceTreeModel._cachedResourcesProcessed = true; |
| 55 this.resourceTreeModel._frameAttached("42", 0); | 55 this.resourceTreeModel._frameAttached("42", 0); |
| 56 this.debuggerModel = debuggerModelConstructor ? new debuggerModelCon
structor(this) : new WebInspector.DebuggerModel(this); | 56 this.debuggerModel = debuggerModelConstructor ? new debuggerModelCon
structor(this) : new SDK.DebuggerModel(this); |
| 57 this._modelByConstructor.set(WebInspector.DebuggerModel, this.debugg
erModel); | 57 this._modelByConstructor.set(SDK.DebuggerModel, this.debuggerModel); |
| 58 this.domModel = new WebInspector.DOMModel(this); | 58 this.domModel = new SDK.DOMModel(this); |
| 59 this.cssModel = new WebInspector.CSSModel(this, this.domModel); | 59 this.cssModel = new SDK.CSSModel(this, this.domModel); |
| 60 } | 60 } |
| 61 | 61 |
| 62 _loadedWithCapabilities() | 62 _loadedWithCapabilities() |
| 63 { | 63 { |
| 64 } | 64 } |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 var target = new MockTarget("mock-target-" + id, (params) => new WebInspecto
r.StubConnection(params)); | 67 var target = new MockTarget("mock-target-" + id, (params) => new SDK.StubCon
nection(params)); |
| 68 InspectorTest.testTargetManager.addTarget(target); | 68 InspectorTest.testTargetManager.addTarget(target); |
| 69 return target; | 69 return target; |
| 70 } | 70 } |
| 71 | 71 |
| 72 InspectorTest.createWorkspaceWithTarget = function(ignoreEvents) | 72 InspectorTest.createWorkspaceWithTarget = function(ignoreEvents) |
| 73 { | 73 { |
| 74 InspectorTest.createWorkspace(ignoreEvents); | 74 InspectorTest.createWorkspace(ignoreEvents); |
| 75 var target = InspectorTest.createMockTarget(InspectorTest._mockTargetId++); | 75 var target = InspectorTest.createMockTarget(InspectorTest._mockTargetId++); |
| 76 return target; | 76 return target; |
| 77 } | 77 } |
| 78 | 78 |
| 79 InspectorTest.waitForWorkspaceUISourceCodeAddedEvent = function(callback, count,
projectType) | 79 InspectorTest.waitForWorkspaceUISourceCodeAddedEvent = function(callback, count,
projectType) |
| 80 { | 80 { |
| 81 InspectorTest.uiSourceCodeAddedEventsLeft = count || 1; | 81 InspectorTest.uiSourceCodeAddedEventsLeft = count || 1; |
| 82 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspace.Event
s.UISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); | 82 InspectorTest.testWorkspace.removeEventListener(Workspace.Workspace.Events.U
ISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); |
| 83 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeAdded, uiSourceCodeAdded); | 83 InspectorTest.testWorkspace.addEventListener(Workspace.Workspace.Events.UISo
urceCodeAdded, uiSourceCodeAdded); |
| 84 | 84 |
| 85 function uiSourceCodeAdded(event) | 85 function uiSourceCodeAdded(event) |
| 86 { | 86 { |
| 87 if (projectType && event.data.project().type() !== projectType) | 87 if (projectType && event.data.project().type() !== projectType) |
| 88 return; | 88 return; |
| 89 if (!projectType && event.data.project().type() === WebInspector.project
Types.Service) | 89 if (!projectType && event.data.project().type() === Workspace.projectTyp
es.Service) |
| 90 return; | 90 return; |
| 91 if (!(--InspectorTest.uiSourceCodeAddedEventsLeft)) { | 91 if (!(--InspectorTest.uiSourceCodeAddedEventsLeft)) { |
| 92 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspa
ce.Events.UISourceCodeAdded, uiSourceCodeAdded); | 92 InspectorTest.testWorkspace.removeEventListener(Workspace.Workspace.
Events.UISourceCodeAdded, uiSourceCodeAdded); |
| 93 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.
Events.UISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); | 93 InspectorTest.testWorkspace.addEventListener(Workspace.Workspace.Eve
nts.UISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); |
| 94 } | 94 } |
| 95 callback(event.data); | 95 callback(event.data); |
| 96 } | 96 } |
| 97 } | 97 } |
| 98 | 98 |
| 99 InspectorTest.waitForWorkspaceUISourceCodeRemovedEvent = function(callback, coun
t) | 99 InspectorTest.waitForWorkspaceUISourceCodeRemovedEvent = function(callback, coun
t) |
| 100 { | 100 { |
| 101 InspectorTest.uiSourceCodeRemovedEventsLeft = count || 1; | 101 InspectorTest.uiSourceCodeRemovedEventsLeft = count || 1; |
| 102 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspace.Event
s.UISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); | 102 InspectorTest.testWorkspace.removeEventListener(Workspace.Workspace.Events.U
ISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); |
| 103 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeRemoved, uiSourceCodeRemoved); | 103 InspectorTest.testWorkspace.addEventListener(Workspace.Workspace.Events.UISo
urceCodeRemoved, uiSourceCodeRemoved); |
| 104 | 104 |
| 105 function uiSourceCodeRemoved(event) | 105 function uiSourceCodeRemoved(event) |
| 106 { | 106 { |
| 107 if (event.data.project().type() === WebInspector.projectTypes.Service) | 107 if (event.data.project().type() === Workspace.projectTypes.Service) |
| 108 return; | 108 return; |
| 109 if (!(--InspectorTest.uiSourceCodeRemovedEventsLeft)) { | 109 if (!(--InspectorTest.uiSourceCodeRemovedEventsLeft)) { |
| 110 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspa
ce.Events.UISourceCodeRemoved, uiSourceCodeRemoved); | 110 InspectorTest.testWorkspace.removeEventListener(Workspace.Workspace.
Events.UISourceCodeRemoved, uiSourceCodeRemoved); |
| 111 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.
Events.UISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); | 111 InspectorTest.testWorkspace.addEventListener(Workspace.Workspace.Eve
nts.UISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); |
| 112 } | 112 } |
| 113 callback(event.data); | 113 callback(event.data); |
| 114 } | 114 } |
| 115 } | 115 } |
| 116 | 116 |
| 117 InspectorTest.addMockUISourceCodeToWorkspace = function(url, type, content) | 117 InspectorTest.addMockUISourceCodeToWorkspace = function(url, type, content) |
| 118 { | 118 { |
| 119 var mockContentProvider = WebInspector.StaticContentProvider.fromString(url,
type, content); | 119 var mockContentProvider = Common.StaticContentProvider.fromString(url, type,
content); |
| 120 InspectorTest.testNetworkProject.addFile(mockContentProvider, null, false); | 120 InspectorTest.testNetworkProject.addFile(mockContentProvider, null, false); |
| 121 } | 121 } |
| 122 | 122 |
| 123 InspectorTest.addMockUISourceCodeViaNetwork = function(url, type, content, targe
t) | 123 InspectorTest.addMockUISourceCodeViaNetwork = function(url, type, content, targe
t) |
| 124 { | 124 { |
| 125 var mockContentProvider = WebInspector.StaticContentProvider.fromString(url,
type, content); | 125 var mockContentProvider = Common.StaticContentProvider.fromString(url, type,
content); |
| 126 InspectorTest.testNetworkProject.addFile(mockContentProvider, target.resourc
eTreeModel.mainFrame, false); | 126 InspectorTest.testNetworkProject.addFile(mockContentProvider, target.resourc
eTreeModel.mainFrame, false); |
| 127 } | 127 } |
| 128 | 128 |
| 129 InspectorTest._defaultWorkspaceEventHandler = function(event) | 129 InspectorTest._defaultWorkspaceEventHandler = function(event) |
| 130 { | 130 { |
| 131 var uiSourceCode = event.data; | 131 var uiSourceCode = event.data; |
| 132 if (uiSourceCode.project().type() === WebInspector.projectTypes.Service) | 132 if (uiSourceCode.project().type() === Workspace.projectTypes.Service) |
| 133 return; | 133 return; |
| 134 InspectorTest.addResult(`Workspace event: ${event.type.toString()}: ${uiSour
ceCode.url()}.`); | 134 InspectorTest.addResult(`Workspace event: ${event.type.toString()}: ${uiSour
ceCode.url()}.`); |
| 135 } | 135 } |
| 136 | 136 |
| 137 InspectorTest.uiSourceCodeURL = function(uiSourceCode) | 137 InspectorTest.uiSourceCodeURL = function(uiSourceCode) |
| 138 { | 138 { |
| 139 return uiSourceCode.url().replace(/.*LayoutTests/, "LayoutTests"); | 139 return uiSourceCode.url().replace(/.*LayoutTests/, "LayoutTests"); |
| 140 } | 140 } |
| 141 | 141 |
| 142 InspectorTest.dumpUISourceCode = function(uiSourceCode, callback) | 142 InspectorTest.dumpUISourceCode = function(uiSourceCode, callback) |
| 143 { | 143 { |
| 144 InspectorTest.addResult("UISourceCode: " + InspectorTest.uiSourceCodeURL(uiS
ourceCode)); | 144 InspectorTest.addResult("UISourceCode: " + InspectorTest.uiSourceCodeURL(uiS
ourceCode)); |
| 145 if (uiSourceCode.contentType() === WebInspector.resourceTypes.Script || uiSo
urceCode.contentType() === WebInspector.resourceTypes.Document) | 145 if (uiSourceCode.contentType() === Common.resourceTypes.Script || uiSourceCo
de.contentType() === Common.resourceTypes.Document) |
| 146 InspectorTest.addResult("UISourceCode is content script: " + (uiSourceCo
de.project().type() === WebInspector.projectTypes.ContentScripts)); | 146 InspectorTest.addResult("UISourceCode is content script: " + (uiSourceCo
de.project().type() === Workspace.projectTypes.ContentScripts)); |
| 147 uiSourceCode.requestContent().then(didRequestContent); | 147 uiSourceCode.requestContent().then(didRequestContent); |
| 148 | 148 |
| 149 function didRequestContent(content, contentEncoded) | 149 function didRequestContent(content, contentEncoded) |
| 150 { | 150 { |
| 151 InspectorTest.addResult("Highlighter type: " + WebInspector.NetworkProje
ct.uiSourceCodeMimeType(uiSourceCode)); | 151 InspectorTest.addResult("Highlighter type: " + Bindings.NetworkProject.u
iSourceCodeMimeType(uiSourceCode)); |
| 152 InspectorTest.addResult("UISourceCode content: " + content); | 152 InspectorTest.addResult("UISourceCode content: " + content); |
| 153 callback(); | 153 callback(); |
| 154 } | 154 } |
| 155 } | 155 } |
| 156 | 156 |
| 157 InspectorTest.fileSystemUISourceCodes = function() | 157 InspectorTest.fileSystemUISourceCodes = function() |
| 158 { | 158 { |
| 159 var uiSourceCodes = []; | 159 var uiSourceCodes = []; |
| 160 var fileSystemProjects = WebInspector.workspace.projectsForType(WebInspector
.projectTypes.FileSystem); | 160 var fileSystemProjects = Workspace.workspace.projectsForType(Workspace.proje
ctTypes.FileSystem); |
| 161 for (var project of fileSystemProjects) | 161 for (var project of fileSystemProjects) |
| 162 uiSourceCodes = uiSourceCodes.concat(project.uiSourceCodes()); | 162 uiSourceCodes = uiSourceCodes.concat(project.uiSourceCodes()); |
| 163 return uiSourceCodes; | 163 return uiSourceCodes; |
| 164 } | 164 } |
| 165 | 165 |
| 166 InspectorTest.refreshFileSystemProjects = function(callback) | 166 InspectorTest.refreshFileSystemProjects = function(callback) |
| 167 { | 167 { |
| 168 var barrier = new CallbackBarrier(); | 168 var barrier = new CallbackBarrier(); |
| 169 var projects = WebInspector.workspace.projects(); | 169 var projects = Workspace.workspace.projects(); |
| 170 for (var i = 0; i < projects.length; ++i) | 170 for (var i = 0; i < projects.length; ++i) |
| 171 projects[i].refresh("/", barrier.createCallback()); | 171 projects[i].refresh("/", barrier.createCallback()); |
| 172 barrier.callWhenDone(callback); | 172 barrier.callWhenDone(callback); |
| 173 } | 173 } |
| 174 | 174 |
| 175 InspectorTest.waitForGivenUISourceCode = function(name, callback) | 175 InspectorTest.waitForGivenUISourceCode = function(name, callback) |
| 176 { | 176 { |
| 177 var uiSourceCodes = WebInspector.workspace.uiSourceCodes(); | 177 var uiSourceCodes = Workspace.workspace.uiSourceCodes(); |
| 178 for (var i = 0; i < uiSourceCodes.length; ++i) { | 178 for (var i = 0; i < uiSourceCodes.length; ++i) { |
| 179 if (uiSourceCodes[i].name() === name) { | 179 if (uiSourceCodes[i].name() === name) { |
| 180 setImmediate(callback); | 180 setImmediate(callback); |
| 181 return; | 181 return; |
| 182 } | 182 } |
| 183 } | 183 } |
| 184 WebInspector.workspace.addEventListener(WebInspector.Workspace.Events.UISour
ceCodeAdded, uiSourceCodeAdded); | 184 Workspace.workspace.addEventListener(Workspace.Workspace.Events.UISourceCode
Added, uiSourceCodeAdded); |
| 185 | 185 |
| 186 function uiSourceCodeAdded(event) | 186 function uiSourceCodeAdded(event) |
| 187 { | 187 { |
| 188 if (event.data.name() === name) { | 188 if (event.data.name() === name) { |
| 189 WebInspector.workspace.removeEventListener(WebInspector.Workspace.Ev
ents.UISourceCodeAdded, uiSourceCodeAdded); | 189 Workspace.workspace.removeEventListener(Workspace.Workspace.Events.U
ISourceCodeAdded, uiSourceCodeAdded); |
| 190 setImmediate(callback); | 190 setImmediate(callback); |
| 191 } | 191 } |
| 192 } | 192 } |
| 193 } | 193 } |
| 194 | 194 |
| 195 }; | 195 }; |
| OLD | NEW |