diff --git a/BUILD.gn b/BUILD.gn index 1d0333c93..059f542c9 100644 --- a/BUILD.gn +++ b/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/ cefclient cefsimple cef_unittests +# > ninja -C out/ 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", ] } diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in index 78fa16dfc..79df12b53 100644 --- a/CMakeLists.txt.in +++ b/CMakeLists.txt.in @@ -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() diff --git a/cef_paths2.gypi b/cef_paths2.gypi index a4c9a7d72..379f982b7 100644 --- a/cef_paths2.gypi +++ b/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', ], }, } diff --git a/tests/unittests/CMakeLists.txt.in b/tests/ceftests/CMakeLists.txt.in similarity index 89% rename from tests/unittests/CMakeLists.txt.in rename to tests/ceftests/CMakeLists.txt.in index fee20b1e6..8c50d85e0 100644 --- a/tests/unittests/CMakeLists.txt.in +++ b/tests/ceftests/CMakeLists.txt.in @@ -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") diff --git a/tests/unittests/browser_info_map_unittest.cc b/tests/ceftests/browser_info_map_unittest.cc similarity index 100% rename from tests/unittests/browser_info_map_unittest.cc rename to tests/ceftests/browser_info_map_unittest.cc diff --git a/tests/unittests/client_app_delegates.cc b/tests/ceftests/client_app_delegates.cc similarity index 100% rename from tests/unittests/client_app_delegates.cc rename to tests/ceftests/client_app_delegates.cc diff --git a/tests/unittests/command_line_unittest.cc b/tests/ceftests/command_line_unittest.cc similarity index 100% rename from tests/unittests/command_line_unittest.cc rename to tests/ceftests/command_line_unittest.cc diff --git a/tests/unittests/cookie_unittest.cc b/tests/ceftests/cookie_unittest.cc similarity index 99% rename from tests/unittests/cookie_unittest.cc rename to tests/ceftests/cookie_unittest.cc index 342945d49..22bf2b928 100644 --- a/tests/unittests/cookie_unittest.cc +++ b/tests/ceftests/cookie_unittest.cc @@ -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 { diff --git a/tests/unittests/dialog_unittest.cc b/tests/ceftests/dialog_unittest.cc similarity index 99% rename from tests/unittests/dialog_unittest.cc rename to tests/ceftests/dialog_unittest.cc index b72e550b1..64f9841a1 100644 --- a/tests/unittests/dialog_unittest.cc +++ b/tests/ceftests/dialog_unittest.cc @@ -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 { diff --git a/tests/unittests/display_unittest.cc b/tests/ceftests/display_unittest.cc similarity index 99% rename from tests/unittests/display_unittest.cc rename to tests/ceftests/display_unittest.cc index 0fdc30965..a940c61d2 100644 --- a/tests/unittests/display_unittest.cc +++ b/tests/ceftests/display_unittest.cc @@ -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 { diff --git a/tests/unittests/dom_unittest.cc b/tests/ceftests/dom_unittest.cc similarity index 99% rename from tests/unittests/dom_unittest.cc rename to tests/ceftests/dom_unittest.cc index f7fec6c3a..90fd6200d 100644 --- a/tests/unittests/dom_unittest.cc +++ b/tests/ceftests/dom_unittest.cc @@ -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; diff --git a/tests/unittests/download_unittest.cc b/tests/ceftests/download_unittest.cc similarity index 99% rename from tests/unittests/download_unittest.cc rename to tests/ceftests/download_unittest.cc index 2c700318c..24a3ccd9a 100644 --- a/tests/unittests/download_unittest.cc +++ b/tests/ceftests/download_unittest.cc @@ -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 { diff --git a/tests/unittests/draggable_regions_unittest.cc b/tests/ceftests/draggable_regions_unittest.cc similarity index 99% rename from tests/unittests/draggable_regions_unittest.cc rename to tests/ceftests/draggable_regions_unittest.cc index 75bae8d20..aedf220fb 100644 --- a/tests/unittests/draggable_regions_unittest.cc +++ b/tests/ceftests/draggable_regions_unittest.cc @@ -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 { diff --git a/tests/unittests/file_util.cc b/tests/ceftests/file_util.cc similarity index 98% rename from tests/unittests/file_util.cc rename to tests/ceftests/file_util.cc index 3969afa2d..ad1913aad 100644 --- a/tests/unittests/file_util.cc +++ b/tests/ceftests/file_util.cc @@ -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" diff --git a/tests/unittests/file_util.h b/tests/ceftests/file_util.h similarity index 100% rename from tests/unittests/file_util.h rename to tests/ceftests/file_util.h diff --git a/tests/unittests/file_util_unittest.cc b/tests/ceftests/file_util_unittest.cc similarity index 97% rename from tests/unittests/file_util_unittest.cc rename to tests/ceftests/file_util_unittest.cc index 09003a21e..fe4a34678 100644 --- a/tests/unittests/file_util_unittest.cc +++ b/tests/ceftests/file_util_unittest.cc @@ -5,8 +5,8 @@ #include #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. diff --git a/tests/unittests/frame_unittest.cc b/tests/ceftests/frame_unittest.cc similarity index 99% rename from tests/unittests/frame_unittest.cc rename to tests/ceftests/frame_unittest.cc index 7317a1a28..faa5e68be 100644 --- a/tests/unittests/frame_unittest.cc +++ b/tests/ceftests/frame_unittest.cc @@ -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; diff --git a/tests/unittests/geolocation_unittest.cc b/tests/ceftests/geolocation_unittest.cc similarity index 98% rename from tests/unittests/geolocation_unittest.cc rename to tests/ceftests/geolocation_unittest.cc index 4ca3e3904..3b4653a42 100644 --- a/tests/unittests/geolocation_unittest.cc +++ b/tests/ceftests/geolocation_unittest.cc @@ -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. diff --git a/tests/unittests/image_unittest.cc b/tests/ceftests/image_unittest.cc similarity index 99% rename from tests/unittests/image_unittest.cc rename to tests/ceftests/image_unittest.cc index 187845e6d..473d69518 100644 --- a/tests/unittests/image_unittest.cc +++ b/tests/ceftests/image_unittest.cc @@ -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 { diff --git a/tests/unittests/image_util.cc b/tests/ceftests/image_util.cc similarity index 96% rename from tests/unittests/image_util.cc rename to tests/ceftests/image_util.cc index 0c4e84354..29b7618ed 100644 --- a/tests/unittests/image_util.cc +++ b/tests/ceftests/image_util.cc @@ -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" diff --git a/tests/unittests/image_util.h b/tests/ceftests/image_util.h similarity index 100% rename from tests/unittests/image_util.h rename to tests/ceftests/image_util.h diff --git a/tests/unittests/jsdialog_unittest.cc b/tests/ceftests/jsdialog_unittest.cc similarity index 99% rename from tests/unittests/jsdialog_unittest.cc rename to tests/ceftests/jsdialog_unittest.cc index e3793b740..45e00f48e 100644 --- a/tests/unittests/jsdialog_unittest.cc +++ b/tests/ceftests/jsdialog_unittest.cc @@ -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 { diff --git a/tests/unittests/life_span_unittest.cc b/tests/ceftests/life_span_unittest.cc similarity index 99% rename from tests/unittests/life_span_unittest.cc rename to tests/ceftests/life_span_unittest.cc index 0081a85cb..d4ba74bd6 100644 --- a/tests/unittests/life_span_unittest.cc +++ b/tests/ceftests/life_span_unittest.cc @@ -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 { diff --git a/tests/unittests/message_router_unittest.cc b/tests/ceftests/message_router_unittest.cc similarity index 99% rename from tests/unittests/message_router_unittest.cc rename to tests/ceftests/message_router_unittest.cc index e86fee9d0..28ff3c067 100644 --- a/tests/unittests/message_router_unittest.cc +++ b/tests/ceftests/message_router_unittest.cc @@ -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; diff --git a/tests/unittests/navigation_unittest.cc b/tests/ceftests/navigation_unittest.cc similarity index 99% rename from tests/unittests/navigation_unittest.cc rename to tests/ceftests/navigation_unittest.cc index d9d5ce350..21b8eb014 100644 --- a/tests/unittests/navigation_unittest.cc +++ b/tests/ceftests/navigation_unittest.cc @@ -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; diff --git a/tests/unittests/os_rendering_unittest.cc b/tests/ceftests/os_rendering_unittest.cc similarity index 99% rename from tests/unittests/os_rendering_unittest.cc rename to tests/ceftests/os_rendering_unittest.cc index f6808c788..f7703fe20 100644 --- a/tests/unittests/os_rendering_unittest.cc +++ b/tests/ceftests/os_rendering_unittest.cc @@ -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 // For character codes. -#include "tests/unittests/os_rendering_unittest_mac.h" +#include "tests/ceftests/os_rendering_unittest_mac.h" #elif defined(OS_LINUX) #include #elif defined(OS_WIN) diff --git a/tests/unittests/os_rendering_unittest_mac.h b/tests/ceftests/os_rendering_unittest_mac.h similarity index 100% rename from tests/unittests/os_rendering_unittest_mac.h rename to tests/ceftests/os_rendering_unittest_mac.h diff --git a/tests/unittests/os_rendering_unittest_mac.mm b/tests/ceftests/os_rendering_unittest_mac.mm similarity index 90% rename from tests/unittests/os_rendering_unittest_mac.mm rename to tests/ceftests/os_rendering_unittest_mac.mm index 6c9f84485..cab1da3ef 100644 --- a/tests/unittests/os_rendering_unittest_mac.mm +++ b/tests/ceftests/os_rendering_unittest_mac.mm @@ -4,7 +4,7 @@ #import -#include "tests/unittests/os_rendering_unittest_mac.h" +#include "tests/ceftests/os_rendering_unittest_mac.h" namespace osr_unittests { diff --git a/tests/unittests/parser_unittest.cc b/tests/ceftests/parser_unittest.cc similarity index 100% rename from tests/unittests/parser_unittest.cc rename to tests/ceftests/parser_unittest.cc diff --git a/tests/unittests/plugin_unittest.cc b/tests/ceftests/plugin_unittest.cc similarity index 99% rename from tests/unittests/plugin_unittest.cc rename to tests/ceftests/plugin_unittest.cc index 4bb770481..c8eec34b3 100644 --- a/tests/unittests/plugin_unittest.cc +++ b/tests/ceftests/plugin_unittest.cc @@ -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 { diff --git a/tests/unittests/preference_unittest.cc b/tests/ceftests/preference_unittest.cc similarity index 99% rename from tests/unittests/preference_unittest.cc rename to tests/ceftests/preference_unittest.cc index c942cac90..7074f994f 100644 --- a/tests/unittests/preference_unittest.cc +++ b/tests/ceftests/preference_unittest.cc @@ -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 { diff --git a/tests/unittests/print_unittest.cc b/tests/ceftests/print_unittest.cc similarity index 100% rename from tests/unittests/print_unittest.cc rename to tests/ceftests/print_unittest.cc diff --git a/tests/unittests/process_message_unittest.cc b/tests/ceftests/process_message_unittest.cc similarity index 98% rename from tests/unittests/process_message_unittest.cc rename to tests/ceftests/process_message_unittest.cc index 95260f2c0..bbb7b53dc 100644 --- a/tests/unittests/process_message_unittest.cc +++ b/tests/ceftests/process_message_unittest.cc @@ -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; diff --git a/tests/unittests/request_context_unittest.cc b/tests/ceftests/request_context_unittest.cc similarity index 99% rename from tests/unittests/request_context_unittest.cc rename to tests/ceftests/request_context_unittest.cc index 2aa51a191..9c16d5ea2 100644 --- a/tests/unittests/request_context_unittest.cc +++ b/tests/ceftests/request_context_unittest.cc @@ -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 context1 = diff --git a/tests/unittests/request_handler_unittest.cc b/tests/ceftests/request_handler_unittest.cc similarity index 99% rename from tests/unittests/request_handler_unittest.cc rename to tests/ceftests/request_handler_unittest.cc index 17108ca7d..8e67a5952 100644 --- a/tests/unittests/request_handler_unittest.cc +++ b/tests/ceftests/request_handler_unittest.cc @@ -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; diff --git a/tests/unittests/request_unittest.cc b/tests/ceftests/request_unittest.cc similarity index 99% rename from tests/unittests/request_unittest.cc rename to tests/ceftests/request_unittest.cc index 1cebd4fa2..6ee44d2cf 100644 --- a/tests/unittests/request_unittest.cc +++ b/tests/ceftests/request_unittest.cc @@ -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; diff --git a/tests/unittests/resource.h b/tests/ceftests/resource.h similarity index 100% rename from tests/unittests/resource.h rename to tests/ceftests/resource.h diff --git a/tests/unittests/resource_manager_unittest.cc b/tests/ceftests/resource_manager_unittest.cc similarity index 99% rename from tests/unittests/resource_manager_unittest.cc rename to tests/ceftests/resource_manager_unittest.cc index cb81bc4d4..02312e869 100644 --- a/tests/unittests/resource_manager_unittest.cc +++ b/tests/ceftests/resource_manager_unittest.cc @@ -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 { diff --git a/tests/unittests/resource_util_linux.cc b/tests/ceftests/resource_util_linux.cc similarity index 88% rename from tests/unittests/resource_util_linux.cc rename to tests/ceftests/resource_util_linux.cc index e43a4adb8..742d454c5 100644 --- a/tests/unittests/resource_util_linux.cc +++ b/tests/ceftests/resource_util_linux.cc @@ -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; } diff --git a/tests/unittests/resource_util_win_idmap.cc b/tests/ceftests/resource_util_win_idmap.cc similarity index 95% rename from tests/unittests/resource_util_win_idmap.cc rename to tests/ceftests/resource_util_win_idmap.cc index d888612b5..dc648f387 100644 --- a/tests/unittests/resource_util_win_idmap.cc +++ b/tests/ceftests/resource_util_win_idmap.cc @@ -4,7 +4,7 @@ #include -#include "tests/unittests/resource.h" +#include "tests/ceftests/resource.h" namespace client { diff --git a/tests/unittests/resources/mac/English.lproj/InfoPlist.strings b/tests/ceftests/resources/mac/English.lproj/InfoPlist.strings similarity index 100% rename from tests/unittests/resources/mac/English.lproj/InfoPlist.strings rename to tests/ceftests/resources/mac/English.lproj/InfoPlist.strings diff --git a/tests/unittests/resources/mac/English.lproj/MainMenu.xib b/tests/ceftests/resources/mac/English.lproj/MainMenu.xib similarity index 100% rename from tests/unittests/resources/mac/English.lproj/MainMenu.xib rename to tests/ceftests/resources/mac/English.lproj/MainMenu.xib diff --git a/tests/unittests/resources/mac/Info.plist b/tests/ceftests/resources/mac/Info.plist similarity index 91% rename from tests/unittests/resources/mac/Info.plist rename to tests/ceftests/resources/mac/Info.plist index 3d5f27c20..ad1297110 100644 --- a/tests/unittests/resources/mac/Info.plist +++ b/tests/ceftests/resources/mac/Info.plist @@ -7,9 +7,9 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile - unittests.icns + ceftests.icns CFBundleIdentifier - org.cef.unittests + org.cef.ceftests CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/unittests/resources/mac/unittests.icns b/tests/ceftests/resources/mac/ceftests.icns similarity index 100% rename from tests/unittests/resources/mac/unittests.icns rename to tests/ceftests/resources/mac/ceftests.icns diff --git a/tests/unittests/resources/mac/helper-Info.plist b/tests/ceftests/resources/mac/helper-Info.plist similarity index 95% rename from tests/unittests/resources/mac/helper-Info.plist rename to tests/ceftests/resources/mac/helper-Info.plist index 727f4ff7c..a2f80cbd1 100644 --- a/tests/unittests/resources/mac/helper-Info.plist +++ b/tests/ceftests/resources/mac/helper-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - org.cef.unittests.helper + org.cef.ceftests.helper CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/tests/unittests/resources/win/cef_unittests.exe.manifest b/tests/ceftests/resources/win/ceftests.exe.manifest similarity index 100% rename from tests/unittests/resources/win/cef_unittests.exe.manifest rename to tests/ceftests/resources/win/ceftests.exe.manifest diff --git a/tests/unittests/resources/win/small.ico b/tests/ceftests/resources/win/ceftests.ico similarity index 100% rename from tests/unittests/resources/win/small.ico rename to tests/ceftests/resources/win/ceftests.ico diff --git a/tests/unittests/resources/win/unittests.rc b/tests/ceftests/resources/win/ceftests.rc similarity index 93% rename from tests/unittests/resources/win/unittests.rc rename to tests/ceftests/resources/win/ceftests.rc index 2a7d1bf37..5611e6d5a 100644 --- a/tests/unittests/resources/win/unittests.rc +++ b/tests/ceftests/resources/win/ceftests.rc @@ -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 diff --git a/tests/unittests/resources/win/unittests.ico b/tests/ceftests/resources/win/small.ico similarity index 100% rename from tests/unittests/resources/win/unittests.ico rename to tests/ceftests/resources/win/small.ico diff --git a/tests/unittests/routing_test_handler.cc b/tests/ceftests/routing_test_handler.cc similarity index 98% rename from tests/unittests/routing_test_handler.cc rename to tests/ceftests/routing_test_handler.cc index 111b772b0..2f7f1249d 100644 --- a/tests/unittests/routing_test_handler.cc +++ b/tests/ceftests/routing_test_handler.cc @@ -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; diff --git a/tests/unittests/routing_test_handler.h b/tests/ceftests/routing_test_handler.h similarity index 97% rename from tests/unittests/routing_test_handler.h rename to tests/ceftests/routing_test_handler.h index d8b411a52..261aea08a 100644 --- a/tests/unittests/routing_test_handler.h +++ b/tests/ceftests/routing_test_handler.h @@ -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 diff --git a/tests/unittests/run_all_unittests.cc b/tests/ceftests/run_all_unittests.cc similarity index 98% rename from tests/unittests/run_all_unittests.cc rename to tests/ceftests/run_all_unittests.cc index b23be9791..7069efaf2 100644 --- a/tests/unittests/run_all_unittests.cc +++ b/tests/ceftests/run_all_unittests.cc @@ -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" diff --git a/tests/unittests/run_all_unittests_mac.mm b/tests/ceftests/run_all_unittests_mac.mm similarity index 100% rename from tests/unittests/run_all_unittests_mac.mm rename to tests/ceftests/run_all_unittests_mac.mm diff --git a/tests/unittests/scheme_handler_unittest.cc b/tests/ceftests/scheme_handler_unittest.cc similarity index 99% rename from tests/unittests/scheme_handler_unittest.cc rename to tests/ceftests/scheme_handler_unittest.cc index 254d9d16d..48495e372 100644 --- a/tests/unittests/scheme_handler_unittest.cc +++ b/tests/ceftests/scheme_handler_unittest.cc @@ -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 { diff --git a/tests/unittests/scoped_temp_dir_unittest.cc b/tests/ceftests/scoped_temp_dir_unittest.cc similarity index 100% rename from tests/unittests/scoped_temp_dir_unittest.cc rename to tests/ceftests/scoped_temp_dir_unittest.cc diff --git a/tests/unittests/stream_resource_handler_unittest.cc b/tests/ceftests/stream_resource_handler_unittest.cc similarity index 99% rename from tests/unittests/stream_resource_handler_unittest.cc rename to tests/ceftests/stream_resource_handler_unittest.cc index 3543190da..9896889d4 100644 --- a/tests/unittests/stream_resource_handler_unittest.cc +++ b/tests/ceftests/stream_resource_handler_unittest.cc @@ -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 { diff --git a/tests/unittests/stream_unittest.cc b/tests/ceftests/stream_unittest.cc similarity index 100% rename from tests/unittests/stream_unittest.cc rename to tests/ceftests/stream_unittest.cc diff --git a/tests/unittests/string_unittest.cc b/tests/ceftests/string_unittest.cc similarity index 100% rename from tests/unittests/string_unittest.cc rename to tests/ceftests/string_unittest.cc diff --git a/tests/unittests/task_unittest.cc b/tests/ceftests/task_unittest.cc similarity index 99% rename from tests/unittests/task_unittest.cc rename to tests/ceftests/task_unittest.cc index 31649e2bb..25c523f52 100644 --- a/tests/unittests/task_unittest.cc +++ b/tests/ceftests/task_unittest.cc @@ -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 { diff --git a/tests/unittests/test_handler.cc b/tests/ceftests/test_handler.cc similarity index 99% rename from tests/unittests/test_handler.cc rename to tests/ceftests/test_handler.cc index 27cef83d0..94f8e262e 100644 --- a/tests/unittests/test_handler.cc +++ b/tests/ceftests/test_handler.cc @@ -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" diff --git a/tests/unittests/test_handler.h b/tests/ceftests/test_handler.h similarity index 99% rename from tests/unittests/test_handler.h rename to tests/ceftests/test_handler.h index 5b579dc07..6ddae4ffd 100644 --- a/tests/unittests/test_handler.h +++ b/tests/ceftests/test_handler.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: diff --git a/tests/unittests/test_suite.cc b/tests/ceftests/test_suite.cc similarity index 99% rename from tests/unittests/test_suite.cc rename to tests/ceftests/test_suite.cc index d77635275..eb39e43e7 100644 --- a/tests/unittests/test_suite.cc +++ b/tests/ceftests/test_suite.cc @@ -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" diff --git a/tests/unittests/test_suite.h b/tests/ceftests/test_suite.h similarity index 100% rename from tests/unittests/test_suite.h rename to tests/ceftests/test_suite.h diff --git a/tests/unittests/test_util.cc b/tests/ceftests/test_util.cc similarity index 99% rename from tests/unittests/test_util.cc rename to tests/ceftests/test_util.cc index cd8f11cd8..b7040e39c 100644 --- a/tests/unittests/test_util.cc +++ b/tests/ceftests/test_util.cc @@ -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, diff --git a/tests/unittests/test_util.h b/tests/ceftests/test_util.h similarity index 100% rename from tests/unittests/test_util.h rename to tests/ceftests/test_util.h diff --git a/tests/unittests/thread_helper.cc b/tests/ceftests/thread_helper.cc similarity index 97% rename from tests/unittests/thread_helper.cc rename to tests/ceftests/thread_helper.cc index 711858107..71c23f657 100644 --- a/tests/unittests/thread_helper.cc +++ b/tests/ceftests/thread_helper.cc @@ -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" diff --git a/tests/unittests/thread_helper.h b/tests/ceftests/thread_helper.h similarity index 100% rename from tests/unittests/thread_helper.h rename to tests/ceftests/thread_helper.h diff --git a/tests/unittests/thread_unittest.cc b/tests/ceftests/thread_unittest.cc similarity index 99% rename from tests/unittests/thread_unittest.cc rename to tests/ceftests/thread_unittest.cc index c25330ed0..a0f9e91d2 100644 --- a/tests/unittests/thread_unittest.cc +++ b/tests/ceftests/thread_unittest.cc @@ -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; diff --git a/tests/unittests/tracing_unittest.cc b/tests/ceftests/tracing_unittest.cc similarity index 99% rename from tests/unittests/tracing_unittest.cc rename to tests/ceftests/tracing_unittest.cc index 7a9d54308..76389b81f 100644 --- a/tests/unittests/tracing_unittest.cc +++ b/tests/ceftests/tracing_unittest.cc @@ -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 diff --git a/tests/unittests/translator_unittest.cc b/tests/ceftests/translator_unittest.cc similarity index 100% rename from tests/unittests/translator_unittest.cc rename to tests/ceftests/translator_unittest.cc diff --git a/tests/unittests/urlrequest_unittest.cc b/tests/ceftests/urlrequest_unittest.cc similarity index 99% rename from tests/unittests/urlrequest_unittest.cc rename to tests/ceftests/urlrequest_unittest.cc index ef0dbece7..e4637a677 100644 --- a/tests/unittests/urlrequest_unittest.cc +++ b/tests/ceftests/urlrequest_unittest.cc @@ -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; diff --git a/tests/unittests/v8_unittest.cc b/tests/ceftests/v8_unittest.cc similarity index 99% rename from tests/unittests/v8_unittest.cc rename to tests/ceftests/v8_unittest.cc index 0ad8b4e0e..a8d10988f 100644 --- a/tests/unittests/v8_unittest.cc +++ b/tests/ceftests/v8_unittest.cc @@ -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; diff --git a/tests/unittests/values_unittest.cc b/tests/ceftests/values_unittest.cc similarity index 99% rename from tests/unittests/values_unittest.cc rename to tests/ceftests/values_unittest.cc index a25c47dba..061569634 100644 --- a/tests/unittests/values_unittest.cc +++ b/tests/ceftests/values_unittest.cc @@ -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 { diff --git a/tests/unittests/version_unittest.cc b/tests/ceftests/version_unittest.cc similarity index 100% rename from tests/unittests/version_unittest.cc rename to tests/ceftests/version_unittest.cc diff --git a/tests/unittests/views/button_unittest.cc b/tests/ceftests/views/button_unittest.cc similarity index 99% rename from tests/unittests/views/button_unittest.cc rename to tests/ceftests/views/button_unittest.cc index 0a38fbdde..65b123885 100644 --- a/tests/unittests/views/button_unittest.cc +++ b/tests/ceftests/views/button_unittest.cc @@ -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) diff --git a/tests/unittests/views/panel_unittest.cc b/tests/ceftests/views/panel_unittest.cc similarity index 99% rename from tests/unittests/views/panel_unittest.cc rename to tests/ceftests/views/panel_unittest.cc index 0e593bdb6..96c233cf6 100644 --- a/tests/unittests/views/panel_unittest.cc +++ b/tests/ceftests/views/panel_unittest.cc @@ -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) diff --git a/tests/unittests/views/scroll_view_unittest.cc b/tests/ceftests/views/scroll_view_unittest.cc similarity index 98% rename from tests/unittests/views/scroll_view_unittest.cc rename to tests/ceftests/views/scroll_view_unittest.cc index 68df588a0..87d911930 100644 --- a/tests/unittests/views/scroll_view_unittest.cc +++ b/tests/ceftests/views/scroll_view_unittest.cc @@ -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) \ diff --git a/tests/unittests/views/test_window_delegate.cc b/tests/ceftests/views/test_window_delegate.cc similarity index 97% rename from tests/unittests/views/test_window_delegate.cc rename to tests/ceftests/views/test_window_delegate.cc index 73c243452..d8780552f 100644 --- a/tests/unittests/views/test_window_delegate.cc +++ b/tests/ceftests/views/test_window_delegate.cc @@ -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 { diff --git a/tests/unittests/views/test_window_delegate.h b/tests/ceftests/views/test_window_delegate.h similarity index 100% rename from tests/unittests/views/test_window_delegate.h rename to tests/ceftests/views/test_window_delegate.h diff --git a/tests/unittests/views/textfield_unittest.cc b/tests/ceftests/views/textfield_unittest.cc similarity index 98% rename from tests/unittests/views/textfield_unittest.cc rename to tests/ceftests/views/textfield_unittest.cc index 2a3060dfe..1fda6094e 100644 --- a/tests/unittests/views/textfield_unittest.cc +++ b/tests/ceftests/views/textfield_unittest.cc @@ -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 diff --git a/tests/unittests/views/window_unittest.cc b/tests/ceftests/views/window_unittest.cc similarity index 98% rename from tests/unittests/views/window_unittest.cc rename to tests/ceftests/views/window_unittest.cc index 68218c808..0bf3a8c1c 100644 --- a/tests/unittests/views/window_unittest.cc +++ b/tests/ceftests/views/window_unittest.cc @@ -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) diff --git a/tests/unittests/waitable_event_unittest.cc b/tests/ceftests/waitable_event_unittest.cc similarity index 100% rename from tests/unittests/waitable_event_unittest.cc rename to tests/ceftests/waitable_event_unittest.cc diff --git a/tests/unittests/webui_unittest.cc b/tests/ceftests/webui_unittest.cc similarity index 99% rename from tests/unittests/webui_unittest.cc rename to tests/ceftests/webui_unittest.cc index f9941e947..83ca24e09 100644 --- a/tests/unittests/webui_unittest.cc +++ b/tests/ceftests/webui_unittest.cc @@ -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 { diff --git a/tests/unittests/xml_reader_unittest.cc b/tests/ceftests/xml_reader_unittest.cc similarity index 100% rename from tests/unittests/xml_reader_unittest.cc rename to tests/ceftests/xml_reader_unittest.cc diff --git a/tests/unittests/zip_reader_unittest.cc b/tests/ceftests/zip_reader_unittest.cc similarity index 100% rename from tests/unittests/zip_reader_unittest.cc rename to tests/ceftests/zip_reader_unittest.cc diff --git a/tests/shared/browser/main_message_loop_external_pump.h b/tests/shared/browser/main_message_loop_external_pump.h index 891eadc9f..a25af462d 100644 --- a/tests/shared/browser/main_message_loop_external_pump.h +++ b/tests/shared/browser/main_message_loop_external_pump.h @@ -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: diff --git a/tools/automate/automate-git.py b/tools/automate/automate-git.py index d5e75ae90..7fa62d346 100644 --- a/tools/automate/automate-git.py +++ b/tools/automate/automate-git.py @@ -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' diff --git a/tools/distrib/linux/README.standard.txt b/tools/distrib/linux/README.standard.txt index ce9a7ae5f..c433e1499 100644 --- a/tools/distrib/linux/README.standard.txt +++ b/tools/distrib/linux/README.standard.txt @@ -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 diff --git a/tools/distrib/mac/README.standard.txt b/tools/distrib/mac/README.standard.txt index 6d8fb7161..4de70c205 100644 --- a/tools/distrib/mac/README.standard.txt +++ b/tools/distrib/mac/README.standard.txt @@ -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 diff --git a/tools/distrib/win/README.standard.txt b/tools/distrib/win/README.standard.txt index 79d6f4725..92d77972d 100644 --- a/tools/distrib/win/README.standard.txt +++ b/tools/distrib/win/README.standard.txt @@ -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 diff --git a/tools/distrib/win/transfer_standard.cfg b/tools/distrib/win/transfer_standard.cfg index 6047d9876..589485185 100644 --- a/tools/distrib/win/transfer_standard.cfg +++ b/tools/distrib/win/transfer_standard.cfg @@ -20,6 +20,6 @@ }, { 'source' : '../build/win/compatibility.manifest', - 'target' : 'tests/unittests/resources/win/compatibility.manifest', + 'target' : 'tests/ceftests/resources/win/compatibility.manifest', }, ] diff --git a/tools/make_distrib.py b/tools/make_distrib.py index f30e66278..e9cf51c06 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -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