Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move tor related tests out of test/BUILD.gn

Browse Source 
and fix minor deps issues
This commit is contained in:
Anthony Tseng
2020-10-27 16:27:23 -07:00
parent eb844a44e2
commit 4e658bdccb
9 changed files with 109 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/tor/BUILD.gn
+61 -6
View File
@@ -3,6 +3,14 @@ import("//brave/components/tor/buildflags/buildflags.gni")
source_set("tor") {
# Remove when https://github.com/brave/brave-browser/issues/10655 is resolved
check_includes = false
visibility = [
"//brave/browser:browser_process",
"//brave/browser/profiles",
"//brave/browser/ui",
":browser_tests",
":unit_tests",
]
sources = [
"tor_profile_service_factory.cc",
"tor_profile_service_factory.h",
@@ -11,15 +19,10 @@ source_set("tor") {
deps = [
"//base",
"//brave/components/tor",
"//brave/components/tor:pref_names",
"//chrome/common",
"//components/keyed_service/content",
"//components/keyed_service/core",
"//content/public/browser",
"//mojo/public/cpp/bindings",
]
public_deps = [
"//brave/components/tor/buildflags",
]
if (enable_tor) {
@@ -42,3 +45,55 @@ source_set("tor") {
]
}
}
source_set("unit_tests") {
testonly = true
if (enable_tor) {
sources = [
"tor_navigation_throttle_unittest.cc",
]
deps = [
"//base",
"//brave/browser/profiles",
"//brave/browser/tor",
"//base/test:test_support",
"//brave/test:test_support",
"//brave/components/tor",
"//chrome/test:test_support",
"//content/public/browser",
"//content/test:test_support",
"//testing/gtest",
"//url",
]
}
}
source_set("browser_tests") {
testonly = true
if (enable_tor) {
sources = [
"brave_tor_client_updater_browsertest.cc",
"onion_location_navigation_throttle_browsertest.cc",
]
deps = [
"//base",
"//brave/app:brave_generated_resources_grit",
"//brave/browser:browser_process",
"//brave/browser/profiles",
"//brave/browser/tor",
"//brave/browser/ui",
"//brave/common",
"//brave/components/tor",
"//brave/components/tor:pref_names",
"//chrome/browser",
"//chrome/test:test_support",
"//chrome/test:test_support_ui",
"//content/public/browser",
"//content/test:test_support",
"//net:test_support",
]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
}
}
browser/extensions/brave_tor_client_updater_browsertest.cc → browser/tor/brave_tor_client_updater_browsertest.cc
View File
browser/tor/tor_profile_service_factory.cc
+1 -2
View File
@@ -12,7 +12,6 @@
#include "brave/browser/brave_browser_process_impl.h"
#include "brave/components/tor/buildflags/buildflags.h"
#include "brave/components/tor/pref_names.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/common/chrome_paths.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/prefs/pref_service.h"
@@ -100,7 +99,7 @@ content::BrowserContext* TorProfileServiceFactory::GetBrowserContextToUse(
content::BrowserContext* context) const {
// Not shared with our dummy regular Tor profile because we want to trigger
// LaunchTor when a new Tor window is created.
return chrome::GetBrowserContextOwnInstanceInIncognito(context);
return context;
}
void TorProfileServiceFactory::BrowserContextShutdown(
common/tor/tor_test_constants.cc
-17
View File
@@ -1,17 +0,0 @@
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "brave/common/tor/tor_test_constants.h"
#define FPL FILE_PATH_LITERAL
namespace tor {
const char kTestTorProxy[] = "socks5://127.0.0.1:9999";
const char kTestTorPacString[] = "SOCKS5 127.0.0.1:9999";
const base::FilePath::CharType kTestTorPath[] = FPL(".");
const base::FilePath::CharType kTestBrokenTorPath[] = FPL("");
} // namespace tor
common/tor/tor_test_constants.h
-20
View File
@@ -1,20 +0,0 @@
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef BRAVE_COMMON_TOR_TOR_TEST_CONSTANTS_H_
#define BRAVE_COMMON_TOR_TOR_TEST_CONSTANTS_H_
#include "base/files/file_path.h"
namespace tor {
extern const char kTestTorProxy[];
extern const char kTestTorPacString[];
extern const base::FilePath::CharType kTestTorPath[];
extern const base::FilePath::CharType kTestBrokenTorPath[];
} // namespace tor
#endif // BRAVE_COMMON_TOR_TOR_TEST_CONSTANTS_H_
components/tor/BUILD.gn
+20
View File
@@ -46,7 +46,9 @@ source_set("tor") {
deps += [
"//brave/app:brave_generated_resources_grit",
"//brave/components/brave_component_updater/browser",
"//brave/components/services/tor/public/interfaces",
"//components/pref_registry",
"//components/prefs",
"//components/user_prefs",
"//content/public/browser",
@@ -71,3 +73,21 @@ source_set("switches") {
"tor_switches.h",
]
}
source_set("tor_unit_tests") {
testonly = true
if (enable_tor) {
sources = [
"tor_control_unittest.cc",
]
deps = [
"//base/test:test_support",
"//brave/components/tor",
"//brave/test:test_support",
"//content/public/browser",
"//content/test:test_support",
"//testing/gtest",
]
}
}
browser/tor/tor_control_unittest.cc → components/tor/tor_control_unittest.cc
View File
net/proxy_resolution/BUILD.gn
+23
View File
@@ -0,0 +1,23 @@
import("//brave/components/tor/buildflags/buildflags.gni")
source_set("unit_tests") {
testonly = true
if (enable_tor) {
sources = [
"configured_proxy_resolution_service_unittest.cc",
"proxy_config_service_tor_unittest.cc",
]
deps = [
"//base",
"//base/test:test_support",
"//brave/test:test_support",
"//content/public/browser",
"//content/test:test_support",
"//net",
"//net:test_support",
"//testing/gtest",
"//url",
]
}
}
test/BUILD.gn
+4 -15
View File
@@ -145,6 +145,7 @@ test("brave_unit_tests") {
":test_support",
"//brave/base:base_unittests",
"//brave/browser/safebrowsing",
"//brave/browser/tor:unit_tests",
"//brave/components/brave_ads/test:brave_ads_unit_tests",
"//brave/components/brave_private_cdn",
"//brave/components/brave_referrals/common",
@@ -152,6 +153,8 @@ test("brave_unit_tests") {
"//brave/components/ipfs/test:brave_ipfs_unit_tests",
"//brave/components/ntp_background_images/browser",
"//brave/components/ntp_widget_utils/browser",
"//brave/components/tor:tor_unit_tests",
"//brave/net/proxy_resolution:unit_tests",
"//brave/vendor/brave_base",
"//chrome:browser_dependencies",
"//chrome:child_dependencies",
@@ -356,12 +359,6 @@ test("brave_unit_tests") {
sources += [
# TODO(darkdh): move these out and use buildflag guard once it contains non tor specifics
"//brave/browser/profiles/brave_profile_manager_unittest.cc",
"//brave/browser/tor/tor_control_unittest.cc",
"//brave/browser/tor/tor_navigation_throttle_unittest.cc",
"//brave/common/tor/tor_test_constants.cc",
"//brave/common/tor/tor_test_constants.h",
"//brave/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc",
"//brave/net/proxy_resolution/proxy_config_service_tor_unittest.cc",
]
deps += [ "//third_party/blink/public/common" ]
@@ -535,7 +532,6 @@ if (!is_android) {
"//brave/browser/search_engines/search_engine_tracker_browsertest.cc",
"//brave/browser/themes/brave_dark_mode_prefs_migration_browsertest.cc",
"//brave/browser/themes/brave_theme_service_browsertest.cc",
"//brave/browser/tor/onion_location_navigation_throttle_browsertest.cc",
"//brave/browser/ui/bookmark/bookmark_tab_helper_browsertest.cc",
"//brave/browser/ui/brave_browser_command_controller_browsertest.cc",
"//brave/browser/ui/content_settings/brave_autoplay_blocked_image_model_browsertest.cc",
@@ -599,6 +595,7 @@ if (!is_android) {
}
deps = [
"//brave/browser/tor:browser_tests",
"//brave/components/ipfs/test:brave_ipfs_browser_tests",
"//brave/browser/ui/tabs/test:browser_tests",
]
@@ -697,12 +694,6 @@ if (!is_android) {
configs += [ "//brave/vendor/bat-native-ledger:internal_config" ]
}
if (enable_tor) {
sources += [
"//brave/browser/extensions/brave_tor_client_updater_browsertest.cc",
]
}
if (enable_brave_wayback_machine) {
sources += [ "//brave/components/brave_wayback_machine/brave_wayback_machine_browsertest.cc" ]
}
@@ -749,8 +740,6 @@ if (!is_android) {
"//brave/components/brave_sync/buildflags:buildflags",
"//brave/components/brave_wallet/buildflags:buildflags",
"//brave/components/ipfs/buildflags:buildflags",
"//brave/components/tor/buildflags",
"//brave/components/tor:pref_names",
"//chrome/browser/ui",
"//chrome/test:test_support_ui",
"//components/embedder_support",