| Index: third_party/WebKit/LayoutTests/http/tests/inspector/search/sources-search-scope.html
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/search/sources-search-scope.html b/third_party/WebKit/LayoutTests/http/tests/inspector/search/sources-search-scope.html
|
| index 8e6bbaaf34ae31ee8fbf7c15f0597bd4ffd14cbe..190412d437955cbe701617b856fa051d48a3369b 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/inspector/search/sources-search-scope.html
|
| +++ b/third_party/WebKit/LayoutTests/http/tests/inspector/search/sources-search-scope.html
|
| @@ -9,8 +9,8 @@
|
| <script>
|
| function test()
|
| {
|
| - WebInspector.viewManager.showView("sources.search");
|
| - var scope = new WebInspector.SourcesSearchScope();
|
| + UI.viewManager.showView("sources.search");
|
| + var scope = new Sources.SourcesSearchScope();
|
| InspectorTest.runAfterResourcesAreFinished(["search.html", "search.js", "search.css"], step2)
|
|
|
| function step2()
|
| @@ -19,91 +19,91 @@ function test()
|
| function testIgnoreCase(next)
|
| {
|
| var query = "searchTest" + "UniqueString";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testCaseSensitive(next)
|
| {
|
| var query = "searchTest" + "UniqueString";
|
| - var searchConfig = new WebInspector.SearchConfig(query, false, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, false, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testFileHTML(next)
|
| {
|
| var query = "searchTest" + "UniqueString" + " file:html";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testFileJS(next)
|
| {
|
| var query = "file:js " + "searchTest" + "UniqueString";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testFileHTMLJS(next)
|
| {
|
| var query = "file:js " + "searchTest" + "UniqueString" + " file:html";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testSpaceQueries(next)
|
| {
|
| var query = "searchTest" + "Unique" + " space" + " String";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testSpaceQueriesFileHTML(next)
|
| {
|
| var query = "file:html " + "searchTest" + "Unique" + " space" + " String";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testSpaceQueriesFileHTML_SEARCH(next)
|
| {
|
| var query = "file:html " + "searchTest" + "Unique" + " space" + " String" + " file:search";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testSpaceQueriesFileJS_SEARCH_HTML(next)
|
| {
|
| var query = "file:js " + "searchTest" + "Unique" + " space" + " String" + " file:search file:html";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testSeveralQueriesFileHTML(next)
|
| {
|
| var query = "searchTest" + "Unique" + " file:html" + " space" + " String";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testSeveralQueriesFileHTML_SEARCH(next)
|
| {
|
| var query = "searchTest" + "Unique" + " file:html" + " space" + " String" + " file:search";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testSeveralQueriesFileJS_SEARCH_HTML(next)
|
| {
|
| var query = "file:js " + "searchTest" + "Unique" + " file:html" + " space" + " String" + " file:search";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| function testSeveralQueriesFileNotCSS(next)
|
| {
|
| var query = "searchTest" + "Unique" + " -file:css" + " space" + " String";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| },
|
|
|
| @@ -111,14 +111,14 @@ function test()
|
| {
|
| InspectorTest.addResult("Running a file query with existing project name first:");
|
| var query = "searchTest" + "Unique" + " file:127.0.0.1";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, step2);
|
|
|
| function step2()
|
| {
|
| InspectorTest.addResult("Running a file query with non-existing project name now:");
|
| query = "searchTest" + "Unique" + " file:128.0.0.1";
|
| - searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| }
|
| },
|
| @@ -131,7 +131,7 @@ function test()
|
| {
|
| sourceFrame.uiSourceCode().setWorkingCopy("FOO " + "searchTest" + "UniqueString" + " BAR");
|
| var query = "searchTest" + "UniqueString";
|
| - var searchConfig = new WebInspector.SearchConfig(query, true, false);
|
| + var searchConfig = new Workspace.SearchConfig(query, true, false);
|
| InspectorTest.runSearchAndDumpResults(scope, searchConfig, true, next);
|
| }
|
| }
|
|
|