| OLD | NEW |
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <title>Test search in sources.</title> | 3 <title>Test search in sources.</title> |
| 4 <script src="../inspector-test.js"></script> | 4 <script src="../inspector-test.js"></script> |
| 5 <script src="../isolated-filesystem-test.js"></script> | 5 <script src="../isolated-filesystem-test.js"></script> |
| 6 <script src="../debugger-test.js"></script> | 6 <script src="../debugger-test.js"></script> |
| 7 <script src="./search-test.js"></script> | 7 <script src="./search-test.js"></script> |
| 8 <script> | 8 <script> |
| 9 function test() | 9 function test() |
| 10 { | 10 { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 paths.push("/var/www/" + names[i]); | 67 paths.push("/var/www/" + names[i]); |
| 68 Workspace.isolatedFileSystemManager._onSearchCompleted({data: {reque
stId: requestId, fileSystemPath: path, files: paths}}); | 68 Workspace.isolatedFileSystemManager._onSearchCompleted({data: {reque
stId: requestId, fileSystemPath: path, files: paths}}); |
| 69 } | 69 } |
| 70 } | 70 } |
| 71 | 71 |
| 72 var testSuite = [ | 72 var testSuite = [ |
| 73 function testIgnoreCase(next) | 73 function testIgnoreCase(next) |
| 74 { | 74 { |
| 75 var query = "searchTest" + "UniqueString"; | 75 var query = "searchTest" + "UniqueString"; |
| 76 var searchConfig = new Workspace.SearchConfig(query, true, false); | 76 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 77 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 77 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 78 }, | 78 }, |
| 79 | 79 |
| 80 function testCaseSensitive(next) | 80 function testCaseSensitive(next) |
| 81 { | 81 { |
| 82 var query = "searchTest" + "UniqueString"; | 82 var query = "searchTest" + "UniqueString"; |
| 83 var searchConfig = new Workspace.SearchConfig(query, false, false); | 83 var searchConfig = new Workspace.SearchConfig(query, false, false); |
| 84 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 84 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 85 }, | 85 }, |
| 86 | 86 |
| 87 function testFileHTML(next) | 87 function testFileHTML(next) |
| 88 { | 88 { |
| 89 var query = "searchTest" + "UniqueString" + " file:html"; | 89 var query = "searchTest" + "UniqueString" + " file:html"; |
| 90 var searchConfig = new Workspace.SearchConfig(query, true, false); | 90 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 91 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 91 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 92 }, | 92 }, |
| 93 | 93 |
| 94 function testFileJS(next) | 94 function testFileJS(next) |
| 95 { | 95 { |
| 96 var query = "file:js " + "searchTest" + "UniqueString"; | 96 var query = "file:js " + "searchTest" + "UniqueString"; |
| 97 var searchConfig = new Workspace.SearchConfig(query, true, false); | 97 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 98 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 98 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 99 }, | 99 }, |
| 100 | 100 |
| 101 function testFileHTMLJS(next) | 101 function testFileHTMLJS(next) |
| 102 { | 102 { |
| 103 var query = "file:js " + "searchTest" + "UniqueString" + " file:html
"; | 103 var query = "file:js " + "searchTest" + "UniqueString" + " file:html
"; |
| 104 var searchConfig = new Workspace.SearchConfig(query, true, false); | 104 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 105 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 105 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 106 }, | 106 }, |
| 107 | 107 |
| 108 function testSpaceQueries(next) | 108 function testSpaceQueries(next) |
| 109 { | 109 { |
| 110 var query = "searchTest" + "Unique" + " space" + " String"; | 110 var query = "searchTest" + "Unique" + " space" + " String"; |
| 111 var searchConfig = new Workspace.SearchConfig(query, true, false); | 111 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 112 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 112 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 113 }, | 113 }, |
| 114 | 114 |
| 115 function testSpaceQueriesFileHTML(next) | 115 function testSpaceQueriesFileHTML(next) |
| 116 { | 116 { |
| 117 var query = "file:html " + "searchTest" + "Unique" + " space" + " St
ring"; | 117 var query = "file:html " + "searchTest" + "Unique" + " space" + " St
ring"; |
| 118 var searchConfig = new Workspace.SearchConfig(query, true, false); | 118 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 119 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 119 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 120 }, | 120 }, |
| 121 | 121 |
| 122 function testSpaceQueriesFileHTML_SEARCH(next) | 122 function testSpaceQueriesFileHTML_SEARCH(next) |
| 123 { | 123 { |
| 124 var query = "file:html " + "searchTest" + "Unique" + " space" + " St
ring" + " file:search"; | 124 var query = "file:html " + "searchTest" + "Unique" + " space" + " St
ring" + " file:search"; |
| 125 var searchConfig = new Workspace.SearchConfig(query, true, false); | 125 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 126 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 126 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 127 }, | 127 }, |
| 128 | 128 |
| 129 function testSpaceQueriesFileJS_SEARCH_HTML(next) | 129 function testSpaceQueriesFileJS_SEARCH_HTML(next) |
| 130 { | 130 { |
| 131 var query = "file:js " + "searchTest" + "Unique" + " space" + " Stri
ng" + " file:search file:html"; | 131 var query = "file:js " + "searchTest" + "Unique" + " space" + " Stri
ng" + " file:search file:html"; |
| 132 var searchConfig = new Workspace.SearchConfig(query, true, false); | 132 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 133 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 133 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 134 }, | 134 }, |
| 135 | 135 |
| 136 function testSeveralQueriesFileHTML(next) | 136 function testSeveralQueriesFileHTML(next) |
| 137 { | 137 { |
| 138 var query = "searchTest" + "Unique" + " file:html " + " space" + " S
tring"; | 138 var query = "searchTest" + "Unique" + " file:html " + " space" + " S
tring"; |
| 139 var searchConfig = new Workspace.SearchConfig(query, true, false); | 139 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 140 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 140 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 141 }, | 141 }, |
| 142 | 142 |
| 143 function testSeveralQueriesFileHTML_SEARCH(next) | 143 function testSeveralQueriesFileHTML_SEARCH(next) |
| 144 { | 144 { |
| 145 var query = "searchTest" + "Unique" + " file:html " + " space" + " S
tring" + " file:search"; | 145 var query = "searchTest" + "Unique" + " file:html " + " space" + " S
tring" + " file:search"; |
| 146 var searchConfig = new Workspace.SearchConfig(query, true, false); | 146 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 147 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 147 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 148 }, | 148 }, |
| 149 | 149 |
| 150 function testSeveralQueriesFileJS_SEARCH_HTML(next) | 150 function testSeveralQueriesFileJS_SEARCH_HTML(next) |
| 151 { | 151 { |
| 152 var query = "file:js " + "searchTest" + "Unique" + " file:html " + "
space" + " String" + " file:search"; | 152 var query = "file:js " + "searchTest" + "Unique" + " file:html " + "
space" + " String" + " file:search"; |
| 153 var searchConfig = new Workspace.SearchConfig(query, true, false); | 153 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 154 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 154 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 155 }, | 155 }, |
| 156 | 156 |
| 157 function testFileSEARCH_NOT_JS_NOT_CSS(next) | 157 function testFileSEARCH_NOT_JS_NOT_CSS(next) |
| 158 { | 158 { |
| 159 var query = "searchTest" + "UniqueString" + " file:search -file:js -
file:css"; | 159 var query = "searchTest" + "UniqueString" + " file:search -file:js -
file:css"; |
| 160 var searchConfig = new Workspace.SearchConfig(query, true, false); | 160 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 161 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 161 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 162 }, | 162 }, |
| 163 | 163 |
| 164 function testSeveralQueriesFileNotCSS(next) | 164 function testSeveralQueriesFileNotCSS(next) |
| 165 { | 165 { |
| 166 var query = "searchTest" + "Unique" + " -file:css " + " space" + " S
tring"; | 166 var query = "searchTest" + "Unique" + " -file:css " + " space" + " S
tring"; |
| 167 var searchConfig = new Workspace.SearchConfig(query, true, false); | 167 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 168 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 168 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 169 }, | 169 }, |
| 170 | 170 |
| 171 function testFileQueryWithProjectName(next) | 171 function testFileQueryWithProjectName(next) |
| 172 { | 172 { |
| 173 InspectorTest.addResult("Running a file query with existing project
name first:"); | 173 InspectorTest.addResult("Running a file query with existing project
name first:"); |
| 174 var query = "searchTest" + "Unique" + " file:www"; | 174 var query = "searchTest" + "Unique" + " file:www"; |
| 175 var searchConfig = new Workspace.SearchConfig(query, true, false); | 175 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 176 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, ste
p2); | 176 InspectorTest.runSearchAndDumpResults(scope, searchConfig, step2); |
| 177 | 177 |
| 178 function step2() | 178 function step2() |
| 179 { | 179 { |
| 180 InspectorTest.addResult("Running a file query with non-existing
project name now:"); | 180 InspectorTest.addResult("Running a file query with non-existing
project name now:"); |
| 181 query = "searchTest" + "Unique" + " file:zzz"; | 181 query = "searchTest" + "Unique" + " file:zzz"; |
| 182 searchConfig = new Workspace.SearchConfig(query, true, false); | 182 searchConfig = new Workspace.SearchConfig(query, true, false); |
| 183 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 183 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next)
; |
| 184 } | 184 } |
| 185 }, | 185 }, |
| 186 | 186 |
| 187 function testDirtyFiles(next) | 187 function testDirtyFiles(next) |
| 188 { | 188 { |
| 189 var uiSourceCode; | 189 var uiSourceCode; |
| 190 var uiSourceCodes = fileSystemUISourceCodes(); | 190 var uiSourceCodes = fileSystemUISourceCodes(); |
| 191 for (var i = 0; i < uiSourceCodes.length; ++i) { | 191 for (var i = 0; i < uiSourceCodes.length; ++i) { |
| 192 if (uiSourceCodes[i].name() === "search.js") { | 192 if (uiSourceCodes[i].name() === "search.js") { |
| 193 uiSourceCode = uiSourceCodes[i]; | 193 uiSourceCode = uiSourceCodes[i]; |
| 194 break; | 194 break; |
| 195 } | 195 } |
| 196 } | 196 } |
| 197 | 197 |
| 198 uiSourceCode.setWorkingCopy("FOO " + "searchTest" + "UniqueString" +
" BAR"); | 198 uiSourceCode.setWorkingCopy("FOO " + "searchTest" + "UniqueString" +
" BAR"); |
| 199 var query = "searchTest" + "UniqueString"; | 199 var query = "searchTest" + "UniqueString"; |
| 200 var searchConfig = new Workspace.SearchConfig(query, true, false); | 200 var searchConfig = new Workspace.SearchConfig(query, true, false); |
| 201 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, nex
t); | 201 InspectorTest.runSearchAndDumpResults(scope, searchConfig, next); |
| 202 } | 202 } |
| 203 ]; | 203 ]; |
| 204 } | 204 } |
| 205 | 205 |
| 206 </script> | 206 </script> |
| 207 </head> | 207 </head> |
| 208 <body onload="runTest()"> | 208 <body onload="runTest()"> |
| 209 <p>Tests that ScriptSearchScope performs search across all sources correctly.</p
> | 209 <p>Tests that ScriptSearchScope performs search across all sources correctly.</p
> |
| 210 See <a href="https://bugs.webkit.org/show_bug.cgi?id=41350">bug 41350</a>. | 210 See <a href="https://bugs.webkit.org/show_bug.cgi?id=41350">bug 41350</a>. |
| 211 </body> | 211 </body> |
| 212 </html> | 212 </html> |
| OLD | NEW |