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 WebInspector.settings.createSetting("fileSystemMapping", {}).set({}); | 5 WebInspector.settings.createSetting("fileSystemMapping", {}).set({}); |
6 InspectorTest.testFileSystemMapping = new WebInspector.FileSystemMapping(); | 6 InspectorTest.testFileSystemMapping = new WebInspector.FileSystemMapping(); |
7 InspectorTest.testFileSystemMapping._fileSystemMappingSetting = new Inspecto
rTest.MockSetting({}); | 7 InspectorTest.testFileSystemMapping._fileSystemMappingSetting = new Inspecto
rTest.MockSetting({}); |
8 InspectorTest.testFileSystemMapping._excludedFoldersSetting = new InspectorT
est.MockSetting({}); | 8 InspectorTest.testFileSystemMapping._excludedFoldersSetting = new InspectorT
est.MockSetting({}); |
9 | 9 |
10 InspectorTest.testTargetManager = new WebInspector.TargetManager(); | 10 InspectorTest.testTargetManager = new WebInspector.TargetManager(); |
11 InspectorTest.testWorkspace = new WebInspector.Workspace(InspectorTest.testF
ileSystemMapping); | 11 InspectorTest.testWorkspace = new WebInspector.Workspace(InspectorTest.testF
ileSystemMapping); |
12 InspectorTest.testNetworkWorkspaceBinding = new WebInspector.NetworkWorkspac
eBinding(InspectorTest.testWorkspace); | 12 InspectorTest.testNetworkWorkspaceBinding = new WebInspector.NetworkWorkspac
eBinding(InspectorTest.testWorkspace); |
13 InspectorTest.testDebuggerWorkspaceBinding = new WebInspector.DebuggerWorksp
aceBinding(InspectorTest.testTargetManager, InspectorTest.testWorkspace, Inspect
orTest.testNetworkWorkspaceBinding); | 13 InspectorTest.testDebuggerWorkspaceBinding = new WebInspector.DebuggerWorksp
aceBinding(InspectorTest.testTargetManager, InspectorTest.testWorkspace, Inspect
orTest.testNetworkWorkspaceBinding); |
14 if (ignoreEvents) | 14 if (ignoreEvents) |
15 return; | 15 return; |
16 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); | 16 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); |
17 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); | 17 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); |
18 } | 18 } |
19 | 19 |
20 InspectorTest.waitForWorkspaceUISourceCodeAddedEvent = function(callback, count) | 20 InspectorTest.waitForWorkspaceUISourceCodeAddedEvent = function(callback, count,
projectType) |
21 { | 21 { |
22 InspectorTest.uiSourceCodeAddedEventsLeft = count || 1; | 22 InspectorTest.uiSourceCodeAddedEventsLeft = count || 1; |
23 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspace.Event
s.UISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); | 23 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspace.Event
s.UISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); |
24 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeAdded, uiSourceCodeAdded); | 24 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeAdded, uiSourceCodeAdded); |
25 | 25 |
26 function uiSourceCodeAdded(event) | 26 function uiSourceCodeAdded(event) |
27 { | 27 { |
| 28 if (projectType && event.data.project().type() !== projectType) |
| 29 return; |
| 30 if (!projectType && event.data.project().type() === WebInspector.project
Types.Service) |
| 31 return; |
28 if (!(--InspectorTest.uiSourceCodeAddedEventsLeft)) { | 32 if (!(--InspectorTest.uiSourceCodeAddedEventsLeft)) { |
29 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspa
ce.Events.UISourceCodeAdded, uiSourceCodeAdded); | 33 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspa
ce.Events.UISourceCodeAdded, uiSourceCodeAdded); |
30 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.
Events.UISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); | 34 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.
Events.UISourceCodeAdded, InspectorTest._defaultWorkspaceEventHandler); |
31 } | 35 } |
32 callback(event.data); | 36 callback(event.data); |
33 } | 37 } |
34 } | 38 } |
35 | 39 |
36 InspectorTest.waitForWorkspaceUISourceCodeRemovedEvent = function(callback, coun
t) | 40 InspectorTest.waitForWorkspaceUISourceCodeRemovedEvent = function(callback, coun
t) |
37 { | 41 { |
38 InspectorTest.uiSourceCodeRemovedEventsLeft = count || 1; | 42 InspectorTest.uiSourceCodeRemovedEventsLeft = count || 1; |
39 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspace.Event
s.UISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); | 43 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspace.Event
s.UISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); |
40 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeRemoved, uiSourceCodeAdded); | 44 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.Events.U
ISourceCodeRemoved, uiSourceCodeRemoved); |
41 | 45 |
42 function uiSourceCodeAdded(event) | 46 function uiSourceCodeRemoved(event) |
43 { | 47 { |
| 48 if (event.data.project().type() === WebInspector.projectTypes.Service) |
| 49 return; |
44 if (!(--InspectorTest.uiSourceCodeRemovedEventsLeft)) { | 50 if (!(--InspectorTest.uiSourceCodeRemovedEventsLeft)) { |
45 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspa
ce.Events.UISourceCodeRemoved, uiSourceCodeAdded); | 51 InspectorTest.testWorkspace.removeEventListener(WebInspector.Workspa
ce.Events.UISourceCodeRemoved, uiSourceCodeRemoved); |
46 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.
Events.UISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); | 52 InspectorTest.testWorkspace.addEventListener(WebInspector.Workspace.
Events.UISourceCodeRemoved, InspectorTest._defaultWorkspaceEventHandler); |
47 } | 53 } |
48 callback(event.data); | 54 callback(event.data); |
49 } | 55 } |
50 } | 56 } |
51 | 57 |
52 InspectorTest.addMockUISourceCodeToWorkspace = function(url, type, content) | 58 InspectorTest.addMockUISourceCodeToWorkspace = function(url, type, content) |
53 { | 59 { |
54 var mockContentProvider = new WebInspector.StaticContentProvider(type, conte
nt); | 60 var mockContentProvider = new WebInspector.StaticContentProvider(type, conte
nt); |
55 InspectorTest.testNetworkWorkspaceBinding.addFileForURL(url, mockContentProv
ider); | 61 InspectorTest.testNetworkWorkspaceBinding.addFileForURL(url, mockContentProv
ider); |
56 } | 62 } |
57 | 63 |
58 InspectorTest._defaultWorkspaceEventHandler = function(event) | 64 InspectorTest._defaultWorkspaceEventHandler = function(event) |
59 { | 65 { |
60 var uiSourceCode = event.data; | 66 var uiSourceCode = event.data; |
61 if (uiSourceCode.project().type() === WebInspector.projectTypes.Debugger &&
!uiSourceCode.url) | 67 if (uiSourceCode.project().type() === WebInspector.projectTypes.Debugger &&
!uiSourceCode.url) |
62 return; | 68 return; |
| 69 if (uiSourceCode.project().type() === WebInspector.projectTypes.Service) |
| 70 return; |
63 throw new Error("Unexpected Workspace event: " + event.type + ": " + uiSourc
eCode.uri() + "."); | 71 throw new Error("Unexpected Workspace event: " + event.type + ": " + uiSourc
eCode.uri() + "."); |
64 } | 72 } |
65 | 73 |
66 InspectorTest.uiSourceCodeURL = function(uiSourceCode) | 74 InspectorTest.uiSourceCodeURL = function(uiSourceCode) |
67 { | 75 { |
68 return uiSourceCode.originURL().replace(/.*LayoutTests/, "LayoutTests"); | 76 return uiSourceCode.originURL().replace(/.*LayoutTests/, "LayoutTests"); |
69 } | 77 } |
70 | 78 |
71 InspectorTest.dumpUISourceCode = function(uiSourceCode, callback) | 79 InspectorTest.dumpUISourceCode = function(uiSourceCode, callback) |
72 { | 80 { |
73 InspectorTest.addResult("UISourceCode: " + InspectorTest.uiSourceCodeURL(uiS
ourceCode)); | 81 InspectorTest.addResult("UISourceCode: " + InspectorTest.uiSourceCodeURL(uiS
ourceCode)); |
74 if (uiSourceCode.contentType() === WebInspector.resourceTypes.Script || uiSo
urceCode.contentType() === WebInspector.resourceTypes.Document) | 82 if (uiSourceCode.contentType() === WebInspector.resourceTypes.Script || uiSo
urceCode.contentType() === WebInspector.resourceTypes.Document) |
75 InspectorTest.addResult("UISourceCode is content script: " + (uiSourceCo
de.project().type() === WebInspector.projectTypes.ContentScripts)); | 83 InspectorTest.addResult("UISourceCode is content script: " + (uiSourceCo
de.project().type() === WebInspector.projectTypes.ContentScripts)); |
76 uiSourceCode.requestContent(didRequestContent); | 84 uiSourceCode.requestContent(didRequestContent); |
77 | 85 |
78 function didRequestContent(content, contentEncoded) | 86 function didRequestContent(content, contentEncoded) |
79 { | 87 { |
80 InspectorTest.addResult("Highlighter type: " + WebInspector.SourcesView.
uiSourceCodeHighlighterType(uiSourceCode)); | 88 InspectorTest.addResult("Highlighter type: " + WebInspector.SourcesView.
uiSourceCodeHighlighterType(uiSourceCode)); |
81 InspectorTest.addResult("UISourceCode content: " + content); | 89 InspectorTest.addResult("UISourceCode content: " + content); |
82 callback(); | 90 callback(); |
83 } | 91 } |
84 } | 92 } |
85 | 93 |
86 }; | 94 }; |
OLD | NEW |