Rename unittests to ceftests (issue #1632)
This commit is contained in:
Marshall Greenblatt
parent
8fee8ed05d
commit
bd9a2c8069
54
BUILD.gn
54
BUILD.gn
|
|
@ -81,7 +81,7 @@
|
|||
# 2. Run Ninja from the command-line to build. If the build configuration has
|
||||
# changed it will automatically re-run `gn gen` with the same arguments.
|
||||
#
|
||||
# > ninja -C out/<build_dir> cefclient cefsimple cef_unittests
|
||||
# > ninja -C out/<build_dir> cefclient cefsimple ceftests
|
||||
#
|
||||
# GN Manual Packaging:
|
||||
#
|
||||
|
|
@ -186,7 +186,7 @@ group("cef") {
|
|||
deps = [
|
||||
":cefclient",
|
||||
":cefsimple",
|
||||
":cef_unittests",
|
||||
":ceftests",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -1535,12 +1535,12 @@ if (is_mac) {
|
|||
|
||||
|
||||
#
|
||||
# cef_unittests app targets.
|
||||
# ceftests app targets.
|
||||
#
|
||||
|
||||
bundle_data("cef_unittests_resources_bundle_data") {
|
||||
bundle_data("ceftests_resources_bundle_data") {
|
||||
sources = gypi_paths2.shared_sources_resources + [
|
||||
"tests/unittests/resources/mac/unittests.icns",
|
||||
"tests/ceftests/resources/mac/ceftests.icns",
|
||||
]
|
||||
|
||||
outputs = [
|
||||
|
|
@ -1548,9 +1548,9 @@ if (is_mac) {
|
|||
]
|
||||
}
|
||||
|
||||
bundle_data("cef_unittests_resources_bundle_data_english") {
|
||||
bundle_data("ceftests_resources_bundle_data_english") {
|
||||
sources = [
|
||||
"tests/unittests/resources/mac/English.lproj/InfoPlist.strings",
|
||||
"tests/ceftests/resources/mac/English.lproj/InfoPlist.strings",
|
||||
]
|
||||
|
||||
outputs = [
|
||||
|
|
@ -1558,40 +1558,40 @@ if (is_mac) {
|
|||
]
|
||||
}
|
||||
|
||||
mac_xib_bundle_data("cef_unittests_xibs") {
|
||||
mac_xib_bundle_data("ceftests_xibs") {
|
||||
sources = [
|
||||
"tests/unittests/resources/mac/English.lproj/MainMenu.xib",
|
||||
"tests/ceftests/resources/mac/English.lproj/MainMenu.xib",
|
||||
]
|
||||
|
||||
output_path = "{{bundle_resources_dir}}/English.lproj"
|
||||
}
|
||||
|
||||
cef_app("cef_unittests") {
|
||||
cef_app("ceftests") {
|
||||
testonly = true
|
||||
|
||||
helper_info_plist = "tests/unittests/resources/mac/helper-Info.plist"
|
||||
helper_info_plist = "tests/ceftests/resources/mac/helper-Info.plist"
|
||||
helper_sources = gypi_paths2.shared_sources_common +
|
||||
gypi_paths2.shared_sources_renderer +
|
||||
gypi_paths2.shared_sources_mac_helper +
|
||||
gypi_paths2.unittests_sources_mac_helper
|
||||
gypi_paths2.ceftests_sources_mac_helper
|
||||
helper_deps = [
|
||||
":libcef_dll_wrapper",
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
||||
info_plist = "tests/unittests/resources/mac/Info.plist"
|
||||
info_plist = "tests/ceftests/resources/mac/Info.plist"
|
||||
sources = gypi_paths2.includes_mac +
|
||||
gypi_paths2.includes_common +
|
||||
gypi_paths2.includes_wrapper +
|
||||
gypi_paths2.shared_sources_browser +
|
||||
gypi_paths2.shared_sources_common +
|
||||
gypi_paths2.shared_sources_mac +
|
||||
gypi_paths2.unittests_sources_common +
|
||||
gypi_paths2.unittests_sources_mac
|
||||
gypi_paths2.ceftests_sources_common +
|
||||
gypi_paths2.ceftests_sources_mac
|
||||
deps = [
|
||||
":cef_unittests_resources_bundle_data",
|
||||
":cef_unittests_resources_bundle_data_english",
|
||||
":cef_unittests_xibs",
|
||||
":ceftests_resources_bundle_data",
|
||||
":ceftests_resources_bundle_data_english",
|
||||
":ceftests_xibs",
|
||||
":libcef_dll_wrapper",
|
||||
"//testing/gtest",
|
||||
]
|
||||
|
|
@ -1765,17 +1765,17 @@ if (is_mac) {
|
|||
|
||||
|
||||
#
|
||||
# cef_unittests targets.
|
||||
# ceftests targets.
|
||||
#
|
||||
|
||||
if (is_linux) {
|
||||
copy("copy_cef_unittests_files") {
|
||||
copy("copy_ceftests_files") {
|
||||
sources = gypi_paths2.shared_sources_resources
|
||||
outputs = [ "${root_out_dir}/unittests_files/{{source_file_part}}" ]
|
||||
outputs = [ "${root_out_dir}/ceftests_files/{{source_file_part}}" ]
|
||||
}
|
||||
}
|
||||
|
||||
executable("cef_unittests") {
|
||||
executable("ceftests") {
|
||||
testonly = true
|
||||
|
||||
sources = gypi_paths2.includes_common +
|
||||
|
|
@ -1784,8 +1784,8 @@ if (is_mac) {
|
|||
gypi_paths2.shared_sources_common +
|
||||
gypi_paths2.shared_sources_renderer +
|
||||
gypi_paths2.shared_sources_resources +
|
||||
gypi_paths2.unittests_sources_common +
|
||||
gypi_paths2.unittests_sources_views
|
||||
gypi_paths2.ceftests_sources_common +
|
||||
gypi_paths2.ceftests_sources_views
|
||||
|
||||
deps = [
|
||||
":libcef",
|
||||
|
|
@ -1796,7 +1796,7 @@ if (is_mac) {
|
|||
|
||||
if (is_win) {
|
||||
sources += gypi_paths2.shared_sources_win +
|
||||
gypi_paths2.unittests_sources_win
|
||||
gypi_paths2.ceftests_sources_win
|
||||
|
||||
defines = [
|
||||
"CEF_USE_SANDBOX",
|
||||
|
|
@ -1810,14 +1810,14 @@ if (is_mac) {
|
|||
|
||||
if (is_linux) {
|
||||
sources += gypi_paths2.shared_sources_linux +
|
||||
gypi_paths2.unittests_sources_linux
|
||||
gypi_paths2.ceftests_sources_linux
|
||||
|
||||
libs = [
|
||||
"X11",
|
||||
]
|
||||
|
||||
deps += [
|
||||
":copy_cef_unittests_files",
|
||||
":copy_ceftests_files",
|
||||
]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
|
|||
add_subdirectory(tests/cefclient)
|
||||
add_subdirectory(tests/cefsimple)
|
||||
add_subdirectory(tests/gtest)
|
||||
add_subdirectory(tests/unittests)
|
||||
add_subdirectory(tests/ceftests)
|
||||
|
||||
# Display configuration settings.
|
||||
PRINT_CEF_CONFIG()
|
||||
|
|
|
|||
230
cef_paths2.gypi
230
cef_paths2.gypi
|
|
@ -378,131 +378,131 @@
|
|||
'tests/cefsimple/cefsimple_linux.cc',
|
||||
'tests/cefsimple/simple_handler_linux.cc',
|
||||
],
|
||||
'unittests_sources_common': [
|
||||
'tests/unittests/browser_info_map_unittest.cc',
|
||||
'tests/unittests/command_line_unittest.cc',
|
||||
'tests/unittests/cookie_unittest.cc',
|
||||
'tests/unittests/dialog_unittest.cc',
|
||||
'tests/unittests/display_unittest.cc',
|
||||
'tests/unittests/dom_unittest.cc',
|
||||
'tests/unittests/download_unittest.cc',
|
||||
'tests/unittests/draggable_regions_unittest.cc',
|
||||
'tests/unittests/file_util.cc',
|
||||
'tests/unittests/file_util.h',
|
||||
'tests/unittests/file_util_unittest.cc',
|
||||
'tests/unittests/frame_unittest.cc',
|
||||
'tests/unittests/geolocation_unittest.cc',
|
||||
'tests/unittests/image_unittest.cc',
|
||||
'tests/unittests/image_util.cc',
|
||||
'tests/unittests/image_util.h',
|
||||
'tests/unittests/jsdialog_unittest.cc',
|
||||
'tests/unittests/life_span_unittest.cc',
|
||||
'tests/unittests/message_router_unittest.cc',
|
||||
'tests/unittests/navigation_unittest.cc',
|
||||
'tests/unittests/os_rendering_unittest.cc',
|
||||
'tests/unittests/parser_unittest.cc',
|
||||
'tests/unittests/plugin_unittest.cc',
|
||||
'tests/unittests/preference_unittest.cc',
|
||||
'tests/unittests/print_unittest.cc',
|
||||
'tests/unittests/process_message_unittest.cc',
|
||||
'tests/unittests/request_context_unittest.cc',
|
||||
'tests/unittests/request_handler_unittest.cc',
|
||||
'tests/unittests/request_unittest.cc',
|
||||
'tests/unittests/resource.h',
|
||||
'tests/unittests/resource_manager_unittest.cc',
|
||||
'tests/unittests/routing_test_handler.cc',
|
||||
'tests/unittests/routing_test_handler.h',
|
||||
'tests/unittests/run_all_unittests.cc',
|
||||
'tests/unittests/scheme_handler_unittest.cc',
|
||||
'tests/unittests/scoped_temp_dir_unittest.cc',
|
||||
'tests/unittests/stream_unittest.cc',
|
||||
'tests/unittests/stream_resource_handler_unittest.cc',
|
||||
'tests/unittests/string_unittest.cc',
|
||||
'tests/unittests/client_app_delegates.cc',
|
||||
'tests/unittests/task_unittest.cc',
|
||||
'tests/unittests/test_handler.cc',
|
||||
'tests/unittests/test_handler.h',
|
||||
'tests/unittests/test_suite.cc',
|
||||
'tests/unittests/test_suite.h',
|
||||
'tests/unittests/test_util.cc',
|
||||
'tests/unittests/test_util.h',
|
||||
'tests/unittests/thread_helper.cc',
|
||||
'tests/unittests/thread_helper.h',
|
||||
'tests/unittests/thread_unittest.cc',
|
||||
'tests/unittests/tracing_unittest.cc',
|
||||
'tests/unittests/translator_unittest.cc',
|
||||
'tests/unittests/urlrequest_unittest.cc',
|
||||
'tests/unittests/v8_unittest.cc',
|
||||
'tests/unittests/values_unittest.cc',
|
||||
'tests/unittests/version_unittest.cc',
|
||||
'tests/unittests/waitable_event_unittest.cc',
|
||||
'tests/unittests/webui_unittest.cc',
|
||||
'tests/unittests/xml_reader_unittest.cc',
|
||||
'tests/unittests/zip_reader_unittest.cc',
|
||||
'ceftests_sources_common': [
|
||||
'tests/ceftests/browser_info_map_unittest.cc',
|
||||
'tests/ceftests/command_line_unittest.cc',
|
||||
'tests/ceftests/cookie_unittest.cc',
|
||||
'tests/ceftests/dialog_unittest.cc',
|
||||
'tests/ceftests/display_unittest.cc',
|
||||
'tests/ceftests/dom_unittest.cc',
|
||||
'tests/ceftests/download_unittest.cc',
|
||||
'tests/ceftests/draggable_regions_unittest.cc',
|
||||
'tests/ceftests/file_util.cc',
|
||||
'tests/ceftests/file_util.h',
|
||||
'tests/ceftests/file_util_unittest.cc',
|
||||
'tests/ceftests/frame_unittest.cc',
|
||||
'tests/ceftests/geolocation_unittest.cc',
|
||||
'tests/ceftests/image_unittest.cc',
|
||||
'tests/ceftests/image_util.cc',
|
||||
'tests/ceftests/image_util.h',
|
||||
'tests/ceftests/jsdialog_unittest.cc',
|
||||
'tests/ceftests/life_span_unittest.cc',
|
||||
'tests/ceftests/message_router_unittest.cc',
|
||||
'tests/ceftests/navigation_unittest.cc',
|
||||
'tests/ceftests/os_rendering_unittest.cc',
|
||||
'tests/ceftests/parser_unittest.cc',
|
||||
'tests/ceftests/plugin_unittest.cc',
|
||||
'tests/ceftests/preference_unittest.cc',
|
||||
'tests/ceftests/print_unittest.cc',
|
||||
'tests/ceftests/process_message_unittest.cc',
|
||||
'tests/ceftests/request_context_unittest.cc',
|
||||
'tests/ceftests/request_handler_unittest.cc',
|
||||
'tests/ceftests/request_unittest.cc',
|
||||
'tests/ceftests/resource.h',
|
||||
'tests/ceftests/resource_manager_unittest.cc',
|
||||
'tests/ceftests/routing_test_handler.cc',
|
||||
'tests/ceftests/routing_test_handler.h',
|
||||
'tests/ceftests/run_all_unittests.cc',
|
||||
'tests/ceftests/scheme_handler_unittest.cc',
|
||||
'tests/ceftests/scoped_temp_dir_unittest.cc',
|
||||
'tests/ceftests/stream_unittest.cc',
|
||||
'tests/ceftests/stream_resource_handler_unittest.cc',
|
||||
'tests/ceftests/string_unittest.cc',
|
||||
'tests/ceftests/client_app_delegates.cc',
|
||||
'tests/ceftests/task_unittest.cc',
|
||||
'tests/ceftests/test_handler.cc',
|
||||
'tests/ceftests/test_handler.h',
|
||||
'tests/ceftests/test_suite.cc',
|
||||
'tests/ceftests/test_suite.h',
|
||||
'tests/ceftests/test_util.cc',
|
||||
'tests/ceftests/test_util.h',
|
||||
'tests/ceftests/thread_helper.cc',
|
||||
'tests/ceftests/thread_helper.h',
|
||||
'tests/ceftests/thread_unittest.cc',
|
||||
'tests/ceftests/tracing_unittest.cc',
|
||||
'tests/ceftests/translator_unittest.cc',
|
||||
'tests/ceftests/urlrequest_unittest.cc',
|
||||
'tests/ceftests/v8_unittest.cc',
|
||||
'tests/ceftests/values_unittest.cc',
|
||||
'tests/ceftests/version_unittest.cc',
|
||||
'tests/ceftests/waitable_event_unittest.cc',
|
||||
'tests/ceftests/webui_unittest.cc',
|
||||
'tests/ceftests/xml_reader_unittest.cc',
|
||||
'tests/ceftests/zip_reader_unittest.cc',
|
||||
],
|
||||
'unittests_sources_views': [
|
||||
'tests/unittests/views/button_unittest.cc',
|
||||
'tests/unittests/views/panel_unittest.cc',
|
||||
'tests/unittests/views/scroll_view_unittest.cc',
|
||||
'tests/unittests/views/test_window_delegate.cc',
|
||||
'tests/unittests/views/test_window_delegate.h',
|
||||
'tests/unittests/views/textfield_unittest.cc',
|
||||
'tests/unittests/views/window_unittest.cc',
|
||||
'ceftests_sources_views': [
|
||||
'tests/ceftests/views/button_unittest.cc',
|
||||
'tests/ceftests/views/panel_unittest.cc',
|
||||
'tests/ceftests/views/scroll_view_unittest.cc',
|
||||
'tests/ceftests/views/test_window_delegate.cc',
|
||||
'tests/ceftests/views/test_window_delegate.h',
|
||||
'tests/ceftests/views/textfield_unittest.cc',
|
||||
'tests/ceftests/views/window_unittest.cc',
|
||||
],
|
||||
'unittests_sources_win': [
|
||||
'tests/unittests/resource_util_win_idmap.cc',
|
||||
'tests/unittests/resources/win/cef_unittests.exe.manifest',
|
||||
'tests/unittests/resources/win/unittests.ico',
|
||||
'tests/unittests/resources/win/unittests.rc',
|
||||
'tests/unittests/resources/win/small.ico',
|
||||
'ceftests_sources_win': [
|
||||
'tests/ceftests/resource_util_win_idmap.cc',
|
||||
'tests/ceftests/resources/win/ceftests.exe.manifest',
|
||||
'tests/ceftests/resources/win/ceftests.ico',
|
||||
'tests/ceftests/resources/win/ceftests.rc',
|
||||
'tests/ceftests/resources/win/small.ico',
|
||||
],
|
||||
'unittests_sources_mac': [
|
||||
'tests/unittests/os_rendering_unittest_mac.h',
|
||||
'tests/unittests/os_rendering_unittest_mac.mm',
|
||||
'tests/unittests/run_all_unittests_mac.mm',
|
||||
'ceftests_sources_mac': [
|
||||
'tests/ceftests/os_rendering_unittest_mac.h',
|
||||
'tests/ceftests/os_rendering_unittest_mac.mm',
|
||||
'tests/ceftests/run_all_unittests_mac.mm',
|
||||
],
|
||||
'unittests_sources_mac_helper': [
|
||||
'ceftests_sources_mac_helper': [
|
||||
'tests/shared/browser/resource_util.cc',
|
||||
'tests/shared/browser/resource_util.h',
|
||||
'tests/shared/browser/resource_util_mac.mm',
|
||||
'tests/shared/browser/resource_util_posix.cc',
|
||||
'tests/unittests/client_app_delegates.cc',
|
||||
'tests/unittests/cookie_unittest.cc',
|
||||
'tests/unittests/dom_unittest.cc',
|
||||
'tests/unittests/file_util.cc',
|
||||
'tests/unittests/file_util.h',
|
||||
'tests/unittests/frame_unittest.cc',
|
||||
'tests/unittests/message_router_unittest.cc',
|
||||
'tests/unittests/navigation_unittest.cc',
|
||||
'tests/unittests/plugin_unittest.cc',
|
||||
'tests/unittests/preference_unittest.cc',
|
||||
'tests/unittests/process_message_unittest.cc',
|
||||
'tests/unittests/request_handler_unittest.cc',
|
||||
'tests/unittests/request_unittest.cc',
|
||||
'tests/unittests/routing_test_handler.cc',
|
||||
'tests/unittests/routing_test_handler.h',
|
||||
'tests/unittests/scheme_handler_unittest.cc',
|
||||
'tests/unittests/urlrequest_unittest.cc',
|
||||
'tests/unittests/test_handler.cc',
|
||||
'tests/unittests/test_handler.h',
|
||||
'tests/unittests/test_suite.cc',
|
||||
'tests/unittests/test_suite.h',
|
||||
'tests/unittests/test_util.cc',
|
||||
'tests/unittests/test_util.h',
|
||||
'tests/unittests/thread_helper.cc',
|
||||
'tests/unittests/thread_helper.h',
|
||||
'tests/unittests/thread_unittest.cc',
|
||||
'tests/unittests/tracing_unittest.cc',
|
||||
'tests/unittests/v8_unittest.cc',
|
||||
'tests/ceftests/client_app_delegates.cc',
|
||||
'tests/ceftests/cookie_unittest.cc',
|
||||
'tests/ceftests/dom_unittest.cc',
|
||||
'tests/ceftests/file_util.cc',
|
||||
'tests/ceftests/file_util.h',
|
||||
'tests/ceftests/frame_unittest.cc',
|
||||
'tests/ceftests/message_router_unittest.cc',
|
||||
'tests/ceftests/navigation_unittest.cc',
|
||||
'tests/ceftests/plugin_unittest.cc',
|
||||
'tests/ceftests/preference_unittest.cc',
|
||||
'tests/ceftests/process_message_unittest.cc',
|
||||
'tests/ceftests/request_handler_unittest.cc',
|
||||
'tests/ceftests/request_unittest.cc',
|
||||
'tests/ceftests/routing_test_handler.cc',
|
||||
'tests/ceftests/routing_test_handler.h',
|
||||
'tests/ceftests/scheme_handler_unittest.cc',
|
||||
'tests/ceftests/urlrequest_unittest.cc',
|
||||
'tests/ceftests/test_handler.cc',
|
||||
'tests/ceftests/test_handler.h',
|
||||
'tests/ceftests/test_suite.cc',
|
||||
'tests/ceftests/test_suite.h',
|
||||
'tests/ceftests/test_util.cc',
|
||||
'tests/ceftests/test_util.h',
|
||||
'tests/ceftests/thread_helper.cc',
|
||||
'tests/ceftests/thread_helper.h',
|
||||
'tests/ceftests/thread_unittest.cc',
|
||||
'tests/ceftests/tracing_unittest.cc',
|
||||
'tests/ceftests/v8_unittest.cc',
|
||||
],
|
||||
'unittests_bundle_resources_mac': [
|
||||
'tests/unittests/resources/mac/unittests.icns',
|
||||
'tests/unittests/resources/mac/English.lproj/InfoPlist.strings',
|
||||
'tests/unittests/resources/mac/English.lproj/MainMenu.xib',
|
||||
'tests/unittests/resources/mac/Info.plist',
|
||||
'ceftests_bundle_resources_mac': [
|
||||
'tests/ceftests/resources/mac/ceftests.icns',
|
||||
'tests/ceftests/resources/mac/English.lproj/InfoPlist.strings',
|
||||
'tests/ceftests/resources/mac/English.lproj/MainMenu.xib',
|
||||
'tests/ceftests/resources/mac/Info.plist',
|
||||
],
|
||||
'unittests_sources_linux': [
|
||||
'tests/unittests/resource_util_linux.cc',
|
||||
'ceftests_sources_linux': [
|
||||
'tests/ceftests/resource_util_linux.cc',
|
||||
],
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
# Source files.
|
||||
#
|
||||
|
||||
# unittests sources.
|
||||
# ceftests sources.
|
||||
{{
|
||||
'prefix': 'unittests',
|
||||
'prefix': 'ceftests',
|
||||
'set': 'UNITTESTS_SRCS',
|
||||
'includes': [
|
||||
'shared_sources_browser',
|
||||
|
|
@ -18,34 +18,34 @@
|
|||
'shared_sources_renderer:WINDOWS',
|
||||
'shared_sources_renderer:LINUX',
|
||||
'shared_sources_win:WINDOWS',
|
||||
'unittests_sources_common',
|
||||
'unittests_sources_linux:LINUX',
|
||||
'unittests_sources_mac:MACOSX',
|
||||
'unittests_sources_views:WINDOWS',
|
||||
'unittests_sources_views:LINUX',
|
||||
'unittests_sources_win:WINDOWS',
|
||||
'ceftests_sources_common',
|
||||
'ceftests_sources_linux:LINUX',
|
||||
'ceftests_sources_mac:MACOSX',
|
||||
'ceftests_sources_views:WINDOWS',
|
||||
'ceftests_sources_views:LINUX',
|
||||
'ceftests_sources_win:WINDOWS',
|
||||
],
|
||||
}}
|
||||
|
||||
# unittests helper sources.
|
||||
# ceftests helper sources.
|
||||
{{
|
||||
'prefix': 'unittests_helper',
|
||||
'prefix': 'ceftests_helper',
|
||||
'set': 'UNITTESTS_HELPER_SRCS',
|
||||
'includes': [
|
||||
'shared_sources_common',
|
||||
'shared_sources_mac_helper:MACOSX',
|
||||
'shared_sources_renderer',
|
||||
'unittests_sources_mac_helper:MACOSX',
|
||||
'ceftests_sources_mac_helper:MACOSX',
|
||||
],
|
||||
}}
|
||||
|
||||
# unittests resources.
|
||||
# ceftests resources.
|
||||
{{
|
||||
'prefix': 'unittests_resources',
|
||||
'prefix': 'ceftests_resources',
|
||||
'set': 'UNITTESTS_RESOURCES_SRCS',
|
||||
'includes': [
|
||||
'shared_sources_resources',
|
||||
'unittests_bundle_resources_mac:MACOSX',
|
||||
'ceftests_bundle_resources_mac:MACOSX',
|
||||
],
|
||||
}}
|
||||
|
||||
|
|
@ -55,9 +55,9 @@
|
|||
#
|
||||
|
||||
# Target executable names.
|
||||
set(CEF_TARGET "cef_unittests")
|
||||
set(CEF_TARGET "ceftests")
|
||||
if(OS_MACOSX)
|
||||
set(CEF_HELPER_TARGET "cef_unittests Helper")
|
||||
set(CEF_HELPER_TARGET "ceftests Helper")
|
||||
endif()
|
||||
|
||||
# Logical target used to link the libcef library.
|
||||
|
|
@ -90,8 +90,8 @@ if(OS_LINUX)
|
|||
COPY_FILES("${CEF_TARGET}" "${CEF_BINARY_FILES}" "${CEF_BINARY_DIR}" "${CEF_TARGET_OUT_DIR}")
|
||||
COPY_FILES("${CEF_TARGET}" "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "${CEF_TARGET_OUT_DIR}")
|
||||
|
||||
# Copy unittests resource files to the target output directory.
|
||||
COPY_FILES("${CEF_TARGET}" "${UNITTESTS_RESOURCES_SRCS}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_TARGET_OUT_DIR}/unittests_files")
|
||||
# Copy ceftests resource files to the target output directory.
|
||||
COPY_FILES("${CEF_TARGET}" "${UNITTESTS_RESOURCES_SRCS}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_TARGET_OUT_DIR}/ceftests_files")
|
||||
|
||||
# Set SUID permissions on the chrome-sandbox target.
|
||||
SET_LINUX_SUID_PERMISSIONS("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/chrome-sandbox")
|
||||
|
|
@ -12,9 +12,9 @@
|
|||
#include "include/cef_waitable_event.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_scoped_temp_dir.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_suite.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_suite.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -3,9 +3,9 @@
|
|||
// can be found in the LICENSE file.
|
||||
|
||||
#include "include/cef_dom.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
using client::ClientAppRenderer;
|
||||
|
||||
|
|
@ -5,9 +5,9 @@
|
|||
#include "include/cef_scheme.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_scoped_temp_dir.h"
|
||||
#include "tests/ceftests/file_util.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/file_util.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
// can be found in the LICENSE file.
|
||||
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
// 2012 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.
|
||||
|
||||
#include "tests/unittests/file_util.h"
|
||||
#include "tests/ceftests/file_util.h"
|
||||
|
||||
#include "include/base/cef_build.h"
|
||||
#include "include/base/cef_scoped_ptr.h"
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
#include <string>
|
||||
|
||||
#include "include/wrapper/cef_scoped_temp_dir.h"
|
||||
#include "tests/ceftests/file_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/file_util.h"
|
||||
|
||||
TEST(FileUtil, JoinPath) {
|
||||
// Should return whichever path component is non-empty.
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
#include "include/base/cef_scoped_ptr.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_stream_resource_handler.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
using client::ClientAppBrowser;
|
||||
using client::ClientAppRenderer;
|
||||
|
|
@ -6,9 +6,9 @@
|
|||
#include "include/cef_geolocation.h"
|
||||
#include "include/cef_waitable_event.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
|
||||
// Comment in this define if you have configured API keys that enable Google
|
||||
// Maps Geolocation API support.
|
||||
|
|
@ -3,9 +3,9 @@
|
|||
// can be found in the LICENSE file.
|
||||
|
||||
#include "include/cef_image.h"
|
||||
#include "tests/ceftests/image_util.h"
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/image_util.h"
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
#include "tests/unittests/image_util.h"
|
||||
#include "tests/ceftests/image_util.h"
|
||||
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/resource_util.h"
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/routing_test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/routing_test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -11,9 +11,9 @@
|
|||
#include "include/base/cef_weak_ptr.h"
|
||||
#include "include/cef_v8.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/routing_test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/routing_test_handler.h"
|
||||
|
||||
using client::ClientAppRenderer;
|
||||
|
||||
|
|
@ -9,11 +9,11 @@
|
|||
#include "include/cef_callback.h"
|
||||
#include "include/cef_scheme.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
|
||||
using client::ClientAppBrowser;
|
||||
using client::ClientAppRenderer;
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
#include "include/cef_v8.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_stream_resource_handler.h"
|
||||
#include "tests/ceftests/routing_test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/geometry_util.h"
|
||||
#include "tests/shared/browser/resource_util.h"
|
||||
#include "tests/unittests/routing_test_handler.h"
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
#include <Carbon/Carbon.h> // For character codes.
|
||||
#include "tests/unittests/os_rendering_unittest_mac.h"
|
||||
#include "tests/ceftests/os_rendering_unittest_mac.h"
|
||||
#elif defined(OS_LINUX)
|
||||
#include <X11/keysym.h>
|
||||
#elif defined(OS_WIN)
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
|
||||
#include "tests/unittests/os_rendering_unittest_mac.h"
|
||||
#include "tests/ceftests/os_rendering_unittest_mac.h"
|
||||
|
||||
namespace osr_unittests {
|
||||
|
||||
|
|
@ -7,10 +7,10 @@
|
|||
#include "include/cef_resource_bundle.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_stream_resource_handler.h"
|
||||
#include "tests/ceftests/routing_test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
#include "tests/shared/browser/resource_util.h"
|
||||
#include "tests/unittests/routing_test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -5,10 +5,10 @@
|
|||
#include "include/base/cef_bind.h"
|
||||
#include "include/cef_waitable_event.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -4,10 +4,10 @@
|
|||
|
||||
#include "include/cef_process_message.h"
|
||||
#include "include/cef_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
|
||||
using client::ClientAppRenderer;
|
||||
|
||||
|
|
@ -7,8 +7,8 @@
|
|||
#include "include/cef_request_context_handler.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_scoped_temp_dir.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
TEST(RequestContextTest, GetGlobalContext) {
|
||||
CefRefPtr<CefRequestContext> context1 =
|
||||
|
|
@ -12,11 +12,11 @@
|
|||
#include "include/cef_cookie.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_stream_resource_handler.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
|
||||
using client::ClientAppBrowser;
|
||||
using client::ClientAppRenderer;
|
||||
|
|
@ -7,10 +7,10 @@
|
|||
#include "include/base/cef_bind.h"
|
||||
#include "include/cef_request.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
|
||||
using client::ClientAppRenderer;
|
||||
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
#include "include/wrapper/cef_resource_manager.h"
|
||||
#include "include/wrapper/cef_scoped_temp_dir.h"
|
||||
#include "include/wrapper/cef_stream_resource_handler.h"
|
||||
#include "tests/ceftests/file_util.h"
|
||||
#include "tests/ceftests/routing_test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/file_util.h"
|
||||
#include "tests/unittests/routing_test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -26,8 +26,8 @@ bool GetResourceDir(std::string& dir) {
|
|||
if (!pos)
|
||||
return false;
|
||||
|
||||
// Add "unittests_files" to the path.
|
||||
strcpy(pos+1, "unittests_files"); // NOLINT(runtime/printf)
|
||||
// Add "ceftests_files" to the path.
|
||||
strcpy(pos+1, "ceftests_files"); // NOLINT(runtime/printf)
|
||||
dir = std::string(buff);
|
||||
return true;
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include <cstring>
|
||||
|
||||
#include "tests/unittests/resource.h"
|
||||
#include "tests/ceftests/resource.h"
|
||||
|
||||
namespace client {
|
||||
|
||||
|
|
@ -7,9 +7,9 @@
|
|||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>unittests.icns</string>
|
||||
<string>ceftests.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.cef.unittests</string>
|
||||
<string>org.cef.ceftests</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<key>CFBundleExecutable</key>
|
||||
<string>${EXECUTABLE_NAME}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.cef.unittests.helper</string>
|
||||
<string>org.cef.ceftests.helper</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
|
@ -1,6 +1,6 @@
|
|||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "tests/unittests/resource.h"
|
||||
#include "tests/ceftests/resource.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -42,7 +42,7 @@ IDS_WINDOW_ICON_2X_PNG BINARY "..\\..\\..\\shared\\resources\\window_icon.2x.png
|
|||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
ICI_UNITTESTS ICON "unittests.ico"
|
||||
ICI_UNITTESTS ICON "ceftests.ico"
|
||||
IDI_SMALL ICON "small.ico"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -69,9 +69,9 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "FileDescription", "Chromium Embedded Framework (CEF) Unit Test Application"
|
||||
VALUE "FileVersion", CEF_VERSION
|
||||
VALUE "InternalName", "cef_unittests"
|
||||
VALUE "InternalName", "ceftests"
|
||||
VALUE "LegalCopyright", "Copyright (C) " MAKE_STRING(COPYRIGHT_YEAR) " The Chromium Embedded Framework Authors"
|
||||
VALUE "OriginalFilename", "cef_unittests.exe"
|
||||
VALUE "OriginalFilename", "ceftests.exe"
|
||||
VALUE "ProductName", "Chromium Embedded Framework (CEF) Unit Test Application"
|
||||
VALUE "ProductVersion", CEF_VERSION
|
||||
END
|
||||
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
|
@ -2,7 +2,7 @@
|
|||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
#include "tests/unittests/routing_test_handler.h"
|
||||
#include "tests/ceftests/routing_test_handler.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
|
||||
using client::ClientAppRenderer;
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "include/wrapper/cef_message_router.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
|
||||
// Extends TestHandler to provide message routing functionality. The
|
||||
// RoutingTestHandler implementation must be called from subclass
|
||||
|
|
@ -21,13 +21,13 @@
|
|||
#include "include/cef_thread.h"
|
||||
#include "include/wrapper/cef_helpers.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_suite.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
#include "tests/shared/browser/main_message_loop_external_pump.h"
|
||||
#include "tests/shared/browser/main_message_loop_std.h"
|
||||
#include "tests/shared/common/client_app_other.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_suite.h"
|
||||
|
||||
#if defined(OS_WIN)
|
||||
#include "include/cef_sandbox_win.h"
|
||||
|
|
@ -9,8 +9,8 @@
|
|||
#include "include/cef_callback.h"
|
||||
#include "include/cef_scheme.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_suite.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_suite.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
#include "include/cef_stream.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_stream_resource_handler.h"
|
||||
#include "tests/ceftests/routing_test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/routing_test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
#include "include/base/cef_bind.h"
|
||||
#include "include/cef_task.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
|
||||
#include "include/base/cef_bind.h"
|
||||
#include "include/cef_command_line.h"
|
||||
|
|
@ -18,8 +18,8 @@
|
|||
#include "include/cef_frame.h"
|
||||
#include "include/cef_task.h"
|
||||
#include "include/cef_waitable_event.h"
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
|
||||
class TrackCallback {
|
||||
public:
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
// 2012 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.
|
||||
|
||||
#include "tests/unittests/test_suite.h"
|
||||
#include "tests/ceftests/test_suite.h"
|
||||
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/common/client_switches.h"
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
#include "tests/unittests/test_util.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
|
||||
void TestMapEqual(const CefRequest::HeaderMap& map1,
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
#include "include/cef_task.h"
|
||||
#include "include/cef_thread.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
using client::ClientAppBrowser;
|
||||
using client::ClientAppRenderer;
|
||||
|
|
@ -8,9 +8,9 @@
|
|||
#include "include/cef_trace.h"
|
||||
#include "include/cef_waitable_event.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/file_util.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/file_util.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
// Use the CEF version of the TRACE_* macros instead of the Chromium version.
|
||||
#undef USING_CHROMIUM_INCLUDES
|
||||
|
|
@ -12,12 +12,12 @@
|
|||
#include "include/cef_waitable_event.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "include/wrapper/cef_scoped_temp_dir.h"
|
||||
#include "tests/ceftests/file_util.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_suite.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/file_util.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_suite.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
|
||||
using client::ClientAppRenderer;
|
||||
|
||||
|
|
@ -8,10 +8,10 @@
|
|||
#include "include/cef_task.h"
|
||||
#include "include/cef_v8.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/shared/browser/client_app_browser.h"
|
||||
#include "tests/shared/renderer/client_app_renderer.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
using client::ClientAppBrowser;
|
||||
using client::ClientAppRenderer;
|
||||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
#include "include/cef_task.h"
|
||||
#include "include/cef_values.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/ceftests/test_util.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
#include "tests/unittests/test_util.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -9,10 +9,9 @@
|
|||
#include "include/views/cef_menu_button.h"
|
||||
#include "include/views/cef_menu_button_delegate.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/unittests/image_util.h"
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
#include "tests/unittests/views/test_window_delegate.h"
|
||||
|
||||
#include "tests/ceftests/image_util.h"
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
#include "tests/ceftests/views/test_window_delegate.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
|
||||
#define BUTTON_TEST(name) UI_THREAD_TEST(ViewsButtonTest, name)
|
||||
|
|
@ -8,8 +8,7 @@
|
|||
#include "include/views/cef_panel_delegate.h"
|
||||
#include "include/views/cef_layout.h"
|
||||
#include "include/views/cef_window.h"
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
|
||||
#define PANEL_TEST(name) UI_THREAD_TEST(ViewsPanelTest, name)
|
||||
|
|
@ -8,9 +8,8 @@
|
|||
#include "include/views/cef_panel_delegate.h"
|
||||
#include "include/views/cef_scroll_view.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
#include "tests/unittests/views/test_window_delegate.h"
|
||||
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
#include "tests/ceftests/views/test_window_delegate.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
|
||||
#define SCROLL_VIEW_TEST_ASYNC(name) \
|
||||
|
|
@ -2,14 +2,13 @@
|
|||
// reserved. Use of this source code is governed by a BSD-style license that
|
||||
// can be found in the LICENSE file.
|
||||
|
||||
#include "tests/unittests/views/test_window_delegate.h"
|
||||
#include "tests/ceftests/views/test_window_delegate.h"
|
||||
|
||||
#include "include/cef_command_line.h"
|
||||
#include "include/views/cef_window.h"
|
||||
#include "include/views/cef_window_delegate.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
|
||||
namespace {
|
||||
|
|
@ -7,9 +7,8 @@
|
|||
#include "include/views/cef_textfield.h"
|
||||
#include "include/views/cef_textfield_delegate.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
#include "tests/unittests/views/test_window_delegate.h"
|
||||
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
#include "tests/ceftests/views/test_window_delegate.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
|
||||
// See ui/events/keycodes/keyboard_codes.h
|
||||
|
|
@ -7,10 +7,9 @@
|
|||
#include "include/views/cef_panel.h"
|
||||
#include "include/views/cef_layout.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/unittests/image_util.h"
|
||||
#include "tests/unittests/thread_helper.h"
|
||||
#include "tests/unittests/views/test_window_delegate.h"
|
||||
|
||||
#include "tests/ceftests/image_util.h"
|
||||
#include "tests/ceftests/thread_helper.h"
|
||||
#include "tests/ceftests/views/test_window_delegate.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
|
||||
#define WINDOW_TEST_ASYNC(name) UI_THREAD_TEST_ASYNC(ViewsWindowTest, name)
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
#include "include/cef_callback.h"
|
||||
#include "include/cef_parser.h"
|
||||
#include "include/wrapper/cef_closure_task.h"
|
||||
#include "tests/ceftests/test_handler.h"
|
||||
#include "tests/gtest/include/gtest/gtest.h"
|
||||
#include "tests/unittests/test_handler.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ namespace client {
|
|||
// correctly). See comments in Chromium's platform-specific
|
||||
// base/message_loop/message_pump_* source files for additional guidance when
|
||||
// implementing CefBrowserProcessHandler::OnScheduleMessagePumpWork() in your
|
||||
// application. Run cefclient or cef_unittests with the
|
||||
// application. Run cefclient or ceftests with the
|
||||
// "--external-message-pump" command-line flag to test this mode.
|
||||
class MainMessageLoopExternalPump : public MainMessageLoopStd {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -385,7 +385,7 @@ parser.add_option('--build-target', dest='buildtarget', default='cefclient',
|
|||
help='Target name(s) to build (defaults to "cefclient").')
|
||||
parser.add_option('--build-tests',
|
||||
action='store_true', dest='buildtests', default=False,
|
||||
help='Also build the cef_unittests target.')
|
||||
help='Also build the ceftests target.')
|
||||
parser.add_option('--no-debug-build',
|
||||
action='store_true', dest='nodebugbuild', default=False,
|
||||
help="Don't perform the CEF debug build.")
|
||||
|
|
@ -947,7 +947,7 @@ if not options.nobuild and (chromium_checkout_changed or \
|
|||
command = 'ninja -v -C'
|
||||
target = ' ' + options.buildtarget
|
||||
if options.buildtests:
|
||||
target = target + ' cef_unittests'
|
||||
target = target + ' ceftests'
|
||||
if platform == 'linux':
|
||||
target = target + ' chrome_sandbox'
|
||||
|
||||
|
|
|
|||
|
|
@ -32,12 +32,12 @@ tests/ Directory of tests that demonstrate CEF usage.
|
|||
using the files in this distribution. This application demonstrates
|
||||
the minimal functionality required to create a browser window.
|
||||
|
||||
gtest Contains the Google C++ Testing Framework used by the unittests
|
||||
ceftests Contains unit tests that exercise the CEF APIs.
|
||||
|
||||
gtest Contains the Google C++ Testing Framework used by the ceftests
|
||||
target.
|
||||
|
||||
shared Contains source code shared by the cefclient and unittests targets.
|
||||
|
||||
unittests Contains unit tests that exercise the CEF APIs.
|
||||
shared Contains source code shared by the cefclient and ceftests targets.
|
||||
|
||||
|
||||
USAGE
|
||||
|
|
|
|||
|
|
@ -26,12 +26,12 @@ tests/ Directory of tests that demonstrate CEF usage.
|
|||
using the files in this distribution. This application demonstrates
|
||||
the minimal functionality required to create a browser window.
|
||||
|
||||
gtest Contains the Google C++ Testing Framework used by the unittests
|
||||
ceftests Contains unit tests that exercise the CEF APIs.
|
||||
|
||||
gtest Contains the Google C++ Testing Framework used by the ceftests
|
||||
target.
|
||||
|
||||
shared Contains source code shared by the cefclient and unittests targets.
|
||||
|
||||
unittests Contains unit tests that exercise the CEF APIs.
|
||||
shared Contains source code shared by the cefclient and ceftests targets.
|
||||
|
||||
|
||||
USAGE
|
||||
|
|
|
|||
|
|
@ -32,12 +32,12 @@ tests/ Directory of tests that demonstrate CEF usage.
|
|||
using the files in this distribution. This application demonstrates
|
||||
the minimal functionality required to create a browser window.
|
||||
|
||||
gtest Contains the Google C++ Testing Framework used by the unittests
|
||||
ceftests Contains unit tests that exercise the CEF APIs.
|
||||
|
||||
gtest Contains the Google C++ Testing Framework used by the ceftests
|
||||
target.
|
||||
|
||||
shared Contains source code shared by the cefclient and unittests targets.
|
||||
|
||||
unittests Contains unit tests that exercise the CEF APIs.
|
||||
shared Contains source code shared by the cefclient and ceftests targets.
|
||||
|
||||
|
||||
USAGE
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@
|
|||
},
|
||||
{
|
||||
'source' : '../build/win/compatibility.manifest',
|
||||
'target' : 'tests/unittests/resources/win/compatibility.manifest',
|
||||
'target' : 'tests/ceftests/resources/win/compatibility.manifest',
|
||||
},
|
||||
]
|
||||
|
|
|
|||
|
|
@ -514,9 +514,9 @@ if mode == 'standard':
|
|||
cefsimple_dir = os.path.join(tests_dir, 'cefsimple')
|
||||
make_dir(cefsimple_dir, options.quiet)
|
||||
|
||||
# create the tests/unittests directory
|
||||
unittests_dir = os.path.join(tests_dir, 'unittests')
|
||||
make_dir(unittests_dir, options.quiet)
|
||||
# create the tests/ceftests directory
|
||||
ceftests_dir = os.path.join(tests_dir, 'ceftests')
|
||||
make_dir(ceftests_dir, options.quiet)
|
||||
|
||||
# transfer common shared files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['shared_sources_browser'], \
|
||||
|
|
@ -542,9 +542,9 @@ if mode == 'standard':
|
|||
transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_common'], \
|
||||
'tests/cefsimple/', cefsimple_dir, options.quiet)
|
||||
|
||||
# transfer common unittests files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_common'], \
|
||||
'tests/unittests/', unittests_dir, options.quiet)
|
||||
# transfer common ceftests files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_common'], \
|
||||
'tests/ceftests/', ceftests_dir, options.quiet)
|
||||
|
||||
# create the fuzed gtest version
|
||||
create_fuzed_gtest(tests_dir)
|
||||
|
|
@ -559,8 +559,8 @@ if mode == 'standard':
|
|||
process_cmake_template(os.path.join(cef_dir, 'tests', 'gtest', 'CMakeLists.txt.in'), \
|
||||
os.path.join(tests_dir, 'gtest', 'CMakeLists.txt'), \
|
||||
variables, options.quiet)
|
||||
process_cmake_template(os.path.join(cef_dir, 'tests', 'unittests', 'CMakeLists.txt.in'), \
|
||||
os.path.join(unittests_dir, 'CMakeLists.txt'), \
|
||||
process_cmake_template(os.path.join(cef_dir, 'tests', 'ceftests', 'CMakeLists.txt.in'), \
|
||||
os.path.join(ceftests_dir, 'CMakeLists.txt'), \
|
||||
variables, options.quiet)
|
||||
|
||||
# transfer gypi files
|
||||
|
|
@ -679,11 +679,11 @@ if platform == 'windows':
|
|||
transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_win'], \
|
||||
'tests/cefsimple/', cefsimple_dir, options.quiet)
|
||||
|
||||
# transfer unittests files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_win'], \
|
||||
'tests/unittests/', unittests_dir, options.quiet)
|
||||
transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_views'], \
|
||||
'tests/unittests/', unittests_dir, options.quiet)
|
||||
# transfer ceftests files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_win'], \
|
||||
'tests/ceftests/', ceftests_dir, options.quiet)
|
||||
transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_views'], \
|
||||
'tests/ceftests/', ceftests_dir, options.quiet)
|
||||
|
||||
if not options.nodocs:
|
||||
# generate doc files
|
||||
|
|
@ -780,15 +780,15 @@ elif platform == 'macosx':
|
|||
os.path.join(cefsimple_dir, 'mac'), \
|
||||
options.quiet)
|
||||
|
||||
# transfer unittests files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_mac'], \
|
||||
'tests/unittests/', unittests_dir, options.quiet)
|
||||
transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_mac_helper'], \
|
||||
'tests/unittests/', unittests_dir, options.quiet)
|
||||
# transfer ceftests files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_mac'], \
|
||||
'tests/ceftests/', ceftests_dir, options.quiet)
|
||||
transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_mac_helper'], \
|
||||
'tests/ceftests/', ceftests_dir, options.quiet)
|
||||
|
||||
# transfer unittests/resources/mac files
|
||||
copy_dir(os.path.join(cef_dir, 'tests/unittests/resources/mac'), \
|
||||
os.path.join(unittests_dir, 'resources/mac'), \
|
||||
# transfer ceftests/resources/mac files
|
||||
copy_dir(os.path.join(cef_dir, 'tests/ceftests/resources/mac'), \
|
||||
os.path.join(ceftests_dir, 'resources/mac'), \
|
||||
options.quiet)
|
||||
|
||||
elif platform == 'linux':
|
||||
|
|
@ -866,11 +866,11 @@ elif platform == 'linux':
|
|||
transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_linux'], \
|
||||
'tests/cefsimple/', cefsimple_dir, options.quiet)
|
||||
|
||||
# transfer unittests files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_linux'], \
|
||||
'tests/unittests/', unittests_dir, options.quiet)
|
||||
transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_views'], \
|
||||
'tests/unittests/', unittests_dir, options.quiet)
|
||||
# transfer ceftests files
|
||||
transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_linux'], \
|
||||
'tests/ceftests/', ceftests_dir, options.quiet)
|
||||
transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_views'], \
|
||||
'tests/ceftests/', ceftests_dir, options.quiet)
|
||||
|
||||
if not options.noarchive:
|
||||
# create an archive for each output directory
|
||||
|
|
|
|||
Loading…
Reference in New Issue