diff options
Diffstat (limited to 'chrome/browser')
14 files changed, 173 insertions, 18 deletions
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp index 591fa22..6355356 100644 --- a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp +++ b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp @@ -5,7 +5,6 @@ { 'conditions': [ ['chromeos==1', { - 'includes': ['common.gypi'], 'variables': { # Whether to compress the 4 main ChromeVox scripts. Applicable if # use_migrated_chromevox is true. @@ -15,6 +14,10 @@ 'options_script_loader_file': 'chromevox/background/options_loader.js', 'kbexplorer_loader_file': 'chromevox/background/kbexplorer_loader.js', }, + 'includes': [ + 'chromevox_tests.gypi', + 'common.gypi', + ], 'targets': [ { 'target_name': 'chromevox', diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi new file mode 100644 index 0000000..3683db6 --- /dev/null +++ b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi @@ -0,0 +1,121 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'includes': [ + '../../../../js_unittest_vars.gypi', + ], + 'variables': { + 'chromevox_test_deps_js_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/chromevox/test_deps.js', + }, + 'targets': [ + { + 'target_name': 'chromevox_tests', + 'type': 'executable', + 'dependencies': [ + '<(DEPTH)/base/base.gyp:base', + '<(DEPTH)/base/base.gyp:base_i18n', + '<(DEPTH)/base/base.gyp:test_support_base', + '<(DEPTH)/chrome/chrome.gyp:browser', + '<(DEPTH)/chrome/chrome.gyp:renderer', + '<(DEPTH)/chrome/chrome.gyp:test_support_common', + '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources', + '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', + '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', + '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', + '<(DEPTH)/testing/gmock.gyp:gmock', + '<(DEPTH)/testing/gtest.gyp:gtest', + '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', + 'chromevox_test_deps_js', + ], + 'defines': [ + 'HAS_OUT_OF_PROC_TEST_RUNNER', + ], + 'include_dirs': [ + '<(DEPTH)', + '<(SHARED_INTERMEDIATE_DIR)', + ], + 'rules': [ + { + # A JavaScript test that runs in an environment similar to a webui + # browser test. + 'rule_name': 'js2webui', + 'extension': 'js', + 'msvs_external_rule': 1, + 'inputs': [ + '<(gypv8sh)', + '<(PRODUCT_DIR)/d8<(EXECUTABLE_SUFFIX)', + '<(mock_js)', + '<(test_api_js)', + '<(js2gtest)', + '<(chromevox_test_deps_js_file)', + 'testing/chromevox_unittest_base.js', + ], + 'outputs': [ + '<(INTERMEDIATE_DIR)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)-gen.cc', + '<(PRODUCT_DIR)/test_data/chrome/browser/resources/chromeos/chromevox/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', + ], + 'process_outputs_as_sources': 1, + 'action': [ + 'python', + '<(gypv8sh)', + '<(PRODUCT_DIR)/d8<(EXECUTABLE_SUFFIX)', + '--deps_js', '<(chromevox_test_deps_js_file)', + '<(mock_js)', + '<(test_api_js)', + '<(js2gtest)', + 'webui', + '<(RULE_INPUT_PATH)', + 'chrome/browser/resources/chromeos/chromevox/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', + '<@(_outputs)', + ], + }, + ], + 'sources': [ + '<(DEPTH)/chrome/browser/ui/webui/web_ui_test_handler.cc', + '<(DEPTH)/chrome/browser/ui/webui/web_ui_test_handler.h', + '<(DEPTH)/chrome/test/base/browser_tests_main.cc', + '<(DEPTH)/chrome/test/base/test_chrome_web_ui_controller_factory.cc', + '<(DEPTH)/chrome/test/base/test_chrome_web_ui_controller_factory.h', + '<(DEPTH)/chrome/test/base/web_ui_browser_test.cc', + '<(DEPTH)/chrome/test/base/web_ui_browser_test.h', + + 'common/aria_util_test.js', + ], + }, # target chromevox_tests + { + 'target_name': 'chromevox_test_deps_js', + 'type': 'none', + 'actions': [ + { + 'action_name': 'deps_js', + 'message': 'Generate <(_target_name)', + 'variables': { + # Closure library directory relative to source tree root. + 'closure_dir': 'chrome/third_party/chromevox/third_party/closure-library/closure/goog', + 'depswriter_path': 'tools/generate_deps.py', + 'js_files': [ + '<!@(python tools/find_js_files.py . <(DEPTH)/<(closure_dir))', + ], + }, + 'inputs': [ + '<@(js_files)', + '<(depswriter_path)', + ], + 'outputs': [ + '<(chromevox_test_deps_js_file)', + ], + 'action': [ + 'python', + '<(depswriter_path)', + '-w', '<(DEPTH)/<(closure_dir):<(closure_dir)', + '-w', ':chrome/browser/resources/chromeos/chromevox', + '-o', '<(chromevox_test_deps_js_file)', + '<@(js_files)', + ], + }, + ], + }, + ], +} diff --git a/chrome/browser/resources/chromeos/chromevox/common/aria_util_test.js b/chrome/browser/resources/chromeos/chromevox/common/aria_util_test.js index e6f1a26..0206ef9 100644 --- a/chrome/browser/resources/chromeos/chromevox/common/aria_util_test.js +++ b/chrome/browser/resources/chromeos/chromevox/common/aria_util_test.js @@ -16,12 +16,10 @@ CvoxAriaUtilUnitTest.prototype = { __proto__: ChromeVoxUnitTestBase.prototype, /** @override */ - extraLibraries: [ - 'aria_util.js', - 'dom_util.js', - 'node_state.js', - 'chromevox.js', - '../host/interface/abstract_earcons.js'] + closureModuleDeps: [ + 'cvox.AriaUtil', + 'cvox.ChromeVox', + 'cvox.DomUtil',] }; TEST_F('CvoxAriaUtilUnitTest', 'GetStateGridWithActiveCell', function() { diff --git a/chrome/browser/resources/chromeos/chromevox/tools/find_js_files.py b/chrome/browser/resources/chromeos/chromevox/tools/find_js_files.py new file mode 100755 index 0000000..6d459a3 --- /dev/null +++ b/chrome/browser/resources/chromeos/chromevox/tools/find_js_files.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python + +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +'''Scans one or more directory trees for .js files, printing filenames, +relative to the current directory on stdout. +''' + +import optparse +import os +import sys + +_SCRIPT_DIR = os.path.realpath(os.path.dirname(__file__)) +_CHROME_SOURCE = os.path.realpath( + os.path.join(_SCRIPT_DIR, *[os.path.pardir] * 6)) +sys.path.insert( + 0, os.path.join( + _CHROME_SOURCE, ('chrome/third_party/chromevox/third_party/' + + 'closure-library/closure/bin/build'))) +import treescan + + +def main(): + parser = optparse.OptionParser(description=__doc__) + parser.usage = '%prog <tree_root>...' + _, args = parser.parse_args() + for root in args: + print '\n'.join(treescan.ScanTreeForJsFiles(root)) + + +if __name__ == '__main__': + main() diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h index 0082e10..8a302b4 100644 --- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h +++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_BIDI_CHECKER_WEB_UI_TEST_H_ #include "base/command_line.h" -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" namespace base { class WaitableEvent; diff --git a/chrome/browser/ui/webui/downloads_ui_browsertest.h b/chrome/browser/ui/webui/downloads_ui_browsertest.h index 6272e87..4d35321 100644 --- a/chrome/browser/ui/webui/downloads_ui_browsertest.h +++ b/chrome/browser/ui/webui/downloads_ui_browsertest.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_BROWSERTEST_H_ #define CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_BROWSERTEST_H_ -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" // This is a helper class used by downloads_ui_browsertest.js. class DownloadsUIBrowserTest : public WebUIBrowserTest { diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h index dcbead3..09caa3e 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ #include "chrome/browser/extensions/extension_test_notification_observer.h" -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" #include "extensions/common/extension.h" class Profile; diff --git a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h index db19737..d2abf18 100644 --- a/chrome/browser/ui/webui/identity_internals_ui_browsertest.h +++ b/chrome/browser/ui/webui/identity_internals_ui_browsertest.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" class IdentityInternalsUIBrowserTest : public WebUIBrowserTest { public: @@ -30,4 +30,3 @@ class IdentityInternalsUIBrowserTest : public WebUIBrowserTest { }; #endif // CHROME_BROWSER_UI_WEBUI_IDENTITY_INTERNALS_UI_BROWSERTEST_H_ - diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc index e9d9683..c887f50 100644 --- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc +++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc index 44b5281..0b97eba 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc @@ -18,7 +18,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_manager_base.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h index 252a22c..e5e358c 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_NET_INTERNALS_NET_INTERNALS_UI_BROWSERTEST_H_ #include "base/memory/scoped_ptr.h" -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" class GURL; diff --git a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc index f3a90c4..e12465e 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_browsertest.cc @@ -5,7 +5,7 @@ #include "base/files/file_path.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" #include "url/gurl.h" class MostVisitedWebUITest : public WebUIBrowserTest { diff --git a/chrome/browser/ui/webui/options/options_browsertest.h b/chrome/browser/ui/webui/options/options_browsertest.h index 674cc9e..af953c9 100644 --- a/chrome/browser/ui/webui/options/options_browsertest.h +++ b/chrome/browser/ui/webui/options/options_browsertest.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" #include "content/public/browser/web_ui_message_handler.h" // This is a helper class used by options_browsertest.js to feed the navigation diff --git a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc index b424ac1..ff6d812 100644 --- a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" -#include "chrome/test/base/web_ui_browsertest.h" +#include "chrome/test/base/web_ui_browser_test.h" #include "components/password_manager/content/browser/password_manager_internals_service_factory.h" #include "components/password_manager/core/browser/password_manager_internals_service.h" #include "components/password_manager/core/common/password_manager_switches.h" |