| OLD | NEW |
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <title>Change inspected iframe's "src" attribute.</title> | 3 <title>Change inspected iframe's "src" attribute.</title> |
| 4 <script src="../../inspector/inspector-test.js"></script> | 4 <script src="../../inspector/inspector-test.js"></script> |
| 5 <script src="../../inspector/resources-test.js"></script> | 5 <script src="../../inspector/resources-test.js"></script> |
| 6 <script src="../../inspector/network-test.js"></script> | 6 <script src="../../inspector/network-test.js"></script> |
| 7 <script src="../../inspector/debugger-test.js"></script> | 7 <script src="../../inspector/debugger-test.js"></script> |
| 8 <script src="./search-test.js"></script> | 8 <script src="./search-test.js"></script> |
| 9 <script> | 9 <script> |
| 10 function test() | 10 function test() |
| 11 { | 11 { |
| 12 WebInspector.viewManager.showView("sources.search"); | 12 UI.viewManager.showView("sources.search"); |
| 13 var scope = new WebInspector.SourcesSearchScope(); | 13 var scope = new Sources.SourcesSearchScope(); |
| 14 InspectorTest.runAfterResourcesAreFinished(["search.html", "search.js", "sea
rch.css"], step2) | 14 InspectorTest.runAfterResourcesAreFinished(["search.html", "search.js", "sea
rch.css"], step2) |
| 15 | 15 |
| 16 function step2() | 16 function step2() |
| 17 { | 17 { |
| 18 InspectorTest.runTestSuite([ | 18 InspectorTest.runTestSuite([ |
| 19 function testIgnoreCase(next) | 19 function testIgnoreCase(next) |
| 20 { | 20 { |
| 21 var query = "searchTest" + "UniqueString"; | 21 var query = "searchTest" + "UniqueString"; |
| 22 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 22 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 23 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 23 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 24 }, | 24 }, |
| 25 | 25 |
| 26 function testCaseSensitive(next) | 26 function testCaseSensitive(next) |
| 27 { | 27 { |
| 28 var query = "searchTest" + "UniqueString"; | 28 var query = "searchTest" + "UniqueString"; |
| 29 var searchConfig = new WebInspector.SearchConfig(query, false, f
alse); | 29 var searchConfig = new Workspace.SearchConfig(query, false, fals
e); |
| 30 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 30 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 31 }, | 31 }, |
| 32 | 32 |
| 33 function testFileHTML(next) | 33 function testFileHTML(next) |
| 34 { | 34 { |
| 35 var query = "searchTest" + "UniqueString" + " file:html"; | 35 var query = "searchTest" + "UniqueString" + " file:html"; |
| 36 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 36 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 37 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 37 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 38 }, | 38 }, |
| 39 | 39 |
| 40 function testFileJS(next) | 40 function testFileJS(next) |
| 41 { | 41 { |
| 42 var query = "file:js " + "searchTest" + "UniqueString"; | 42 var query = "file:js " + "searchTest" + "UniqueString"; |
| 43 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 43 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 44 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 44 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 45 }, | 45 }, |
| 46 | 46 |
| 47 function testFileHTMLJS(next) | 47 function testFileHTMLJS(next) |
| 48 { | 48 { |
| 49 var query = "file:js " + "searchTest" + "UniqueString" + " file:
html"; | 49 var query = "file:js " + "searchTest" + "UniqueString" + " file:
html"; |
| 50 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 50 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 51 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 51 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 52 }, | 52 }, |
| 53 | 53 |
| 54 function testSpaceQueries(next) | 54 function testSpaceQueries(next) |
| 55 { | 55 { |
| 56 var query = "searchTest" + "Unique" + " space" + " String"; | 56 var query = "searchTest" + "Unique" + " space" + " String"; |
| 57 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 57 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 58 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 58 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 59 }, | 59 }, |
| 60 | 60 |
| 61 function testSpaceQueriesFileHTML(next) | 61 function testSpaceQueriesFileHTML(next) |
| 62 { | 62 { |
| 63 var query = "file:html " + "searchTest" + "Unique" + " space" +
" String"; | 63 var query = "file:html " + "searchTest" + "Unique" + " space" +
" String"; |
| 64 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 64 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 65 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 65 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 66 }, | 66 }, |
| 67 | 67 |
| 68 function testSpaceQueriesFileHTML_SEARCH(next) | 68 function testSpaceQueriesFileHTML_SEARCH(next) |
| 69 { | 69 { |
| 70 var query = "file:html " + "searchTest" + "Unique" + " space" +
" String" + " file:search"; | 70 var query = "file:html " + "searchTest" + "Unique" + " space" +
" String" + " file:search"; |
| 71 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 71 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 72 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 72 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 73 }, | 73 }, |
| 74 | 74 |
| 75 function testSpaceQueriesFileJS_SEARCH_HTML(next) | 75 function testSpaceQueriesFileJS_SEARCH_HTML(next) |
| 76 { | 76 { |
| 77 var query = "file:js " + "searchTest" + "Unique" + " space" + "
String" + " file:search file:html"; | 77 var query = "file:js " + "searchTest" + "Unique" + " space" + "
String" + " file:search file:html"; |
| 78 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 78 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 79 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 79 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 80 }, | 80 }, |
| 81 | 81 |
| 82 function testSeveralQueriesFileHTML(next) | 82 function testSeveralQueriesFileHTML(next) |
| 83 { | 83 { |
| 84 var query = "searchTest" + "Unique" + " file:html" + " space" +
" String"; | 84 var query = "searchTest" + "Unique" + " file:html" + " space" +
" String"; |
| 85 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 85 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 86 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 86 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 87 }, | 87 }, |
| 88 | 88 |
| 89 function testSeveralQueriesFileHTML_SEARCH(next) | 89 function testSeveralQueriesFileHTML_SEARCH(next) |
| 90 { | 90 { |
| 91 var query = "searchTest" + "Unique" + " file:html" + " space" +
" String" + " file:search"; | 91 var query = "searchTest" + "Unique" + " file:html" + " space" +
" String" + " file:search"; |
| 92 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 92 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 93 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 93 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 94 }, | 94 }, |
| 95 | 95 |
| 96 function testSeveralQueriesFileJS_SEARCH_HTML(next) | 96 function testSeveralQueriesFileJS_SEARCH_HTML(next) |
| 97 { | 97 { |
| 98 var query = "file:js " + "searchTest" + "Unique" + " file:html"
+ " space" + " String" + " file:search"; | 98 var query = "file:js " + "searchTest" + "Unique" + " file:html"
+ " space" + " String" + " file:search"; |
| 99 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 99 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 100 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 100 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 101 }, | 101 }, |
| 102 | 102 |
| 103 function testSeveralQueriesFileNotCSS(next) | 103 function testSeveralQueriesFileNotCSS(next) |
| 104 { | 104 { |
| 105 var query = "searchTest" + "Unique" + " -file:css" + " space" +
" String"; | 105 var query = "searchTest" + "Unique" + " -file:css" + " space" +
" String"; |
| 106 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 106 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 107 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); | 107 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
next); |
| 108 }, | 108 }, |
| 109 | 109 |
| 110 function testFileQueryWithProjectName(next) | 110 function testFileQueryWithProjectName(next) |
| 111 { | 111 { |
| 112 InspectorTest.addResult("Running a file query with existing proj
ect name first:"); | 112 InspectorTest.addResult("Running a file query with existing proj
ect name first:"); |
| 113 var query = "searchTest" + "Unique" + " file:127.0.0.1"; | 113 var query = "searchTest" + "Unique" + " file:127.0.0.1"; |
| 114 var searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 114 var searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 115 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
step2); | 115 InspectorTest.runSearchAndDumpResults(scope, searchConfig, true,
step2); |
| 116 | 116 |
| 117 function step2() | 117 function step2() |
| 118 { | 118 { |
| 119 InspectorTest.addResult("Running a file query with non-exist
ing project name now:"); | 119 InspectorTest.addResult("Running a file query with non-exist
ing project name now:"); |
| 120 query = "searchTest" + "Unique" + " file:128.0.0.1"; | 120 query = "searchTest" + "Unique" + " file:128.0.0.1"; |
| 121 searchConfig = new WebInspector.SearchConfig(query, true, fa
lse); | 121 searchConfig = new Workspace.SearchConfig(query, true, false
); |
| 122 InspectorTest.runSearchAndDumpResults(scope, searchConfig, t
rue, next); | 122 InspectorTest.runSearchAndDumpResults(scope, searchConfig, t
rue, next); |
| 123 } | 123 } |
| 124 }, | 124 }, |
| 125 | 125 |
| 126 function testDirtyFiles(next) | 126 function testDirtyFiles(next) |
| 127 { | 127 { |
| 128 InspectorTest.showScriptSource("search.js", step2); | 128 InspectorTest.showScriptSource("search.js", step2); |
| 129 | 129 |
| 130 function step2(sourceFrame) | 130 function step2(sourceFrame) |
| 131 { | 131 { |
| 132 sourceFrame.uiSourceCode().setWorkingCopy("FOO " + "searchTe
st" + "UniqueString" + " BAR"); | 132 sourceFrame.uiSourceCode().setWorkingCopy("FOO " + "searchTe
st" + "UniqueString" + " BAR"); |
| 133 var query = "searchTest" + "UniqueString"; | 133 var query = "searchTest" + "UniqueString"; |
| 134 var searchConfig = new WebInspector.SearchConfig(query, true
, false); | 134 var searchConfig = new Workspace.SearchConfig(query, true, f
alse); |
| 135 InspectorTest.runSearchAndDumpResults(scope, searchConfig, t
rue, next); | 135 InspectorTest.runSearchAndDumpResults(scope, searchConfig, t
rue, next); |
| 136 } | 136 } |
| 137 } | 137 } |
| 138 ]); | 138 ]); |
| 139 } | 139 } |
| 140 } | 140 } |
| 141 | 141 |
| 142 </script> | 142 </script> |
| 143 </head> | 143 </head> |
| 144 <body onload="runTest()"> | 144 <body onload="runTest()"> |
| 145 <iframe src="../../inspector/search/resources/search.html"> | 145 <iframe src="../../inspector/search/resources/search.html"> |
| 146 <p>Tests that ScriptSearchScope performs search across all sources correctly.</p
> | 146 <p>Tests that ScriptSearchScope performs search across all sources correctly.</p
> |
| 147 See <a href="https://bugs.webkit.org/show_bug.cgi?id=41350">bug 41350</a>. | 147 See <a href="https://bugs.webkit.org/show_bug.cgi?id=41350">bug 41350</a>. |
| 148 </body> | 148 </body> |
| 149 </html> | 149 </html> |
| OLD | NEW |