Commit bd9a2c80 authored by Marshall Greenblatt's avatar Marshall Greenblatt

Rename unittests to ceftests (issue #1632)

parent 8fee8ed0
......@@ -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()
This diff is collapsed.
......@@ -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>
......
// 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
......
......@@ -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 {
......