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

Remove TestBrowserContext and use TestingProfile instead in ipfs_redirect_network_delegate_helper_unittest.cc

Browse Source
This commit is contained in:
Jocelyn Liu
2021-03-04 17:19:41 -08:00
parent 52eb66234f
commit c2b3204ebb
1 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/net/ipfs_redirect_network_delegate_helper_unittest.cc
+15 -27
View File
@@ -19,11 +19,8 @@
#include "brave/components/ipfs/pref_names.h"
#include "chrome/common/channel_info.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/testing_pref_service.h"
#include "components/user_prefs/user_prefs.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/browser_task_environment.h"
#include "content/public/test/test_browser_context.h"
#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
#include "net/url_request/url_request_test_util.h"
#include "url/gurl.h"
@@ -47,34 +44,25 @@ namespace ipfs {
class IPFSRedirectNetworkDelegateHelperTest : public testing::Test {
public:
IPFSRedirectNetworkDelegateHelperTest()
: browser_context_(new content::TestBrowserContext()) {}
IPFSRedirectNetworkDelegateHelperTest() : profile_(new TestingProfile) {}
~IPFSRedirectNetworkDelegateHelperTest() override = default;
void SetUp() override {
feature_list_.InitAndEnableFeature(ipfs::features::kIpfsFeature);
prefs_.registry()->RegisterIntegerPref(
kIPFSResolveMethod, static_cast<int>(IPFSResolveMethodTypes::IPFS_ASK));
prefs_.registry()->RegisterStringPref(kIPFSPublicGatewayAddress,
kDefaultIPFSGateway);
user_prefs::UserPrefs::Set(browser_context_.get(), &prefs_);
}
content::TestBrowserContext* browser_context() {
return browser_context_.get();
}
TestingProfile* profile() { return profile_.get(); }
private:
content::BrowserTaskEnvironment task_environment_;
std::unique_ptr<content::TestBrowserContext> browser_context_;
TestingPrefServiceSimple prefs_;
std::unique_ptr<TestingProfile> profile_;
base::test::ScopedFeatureList feature_list_;
};
TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIHTTPScheme) {
GURL url("http://a.com/ipfs/QmfM2r8seH2GiRaC4esTjeraXEachRt8ZsSeGaWTPLyMoG");
auto brave_request_info = std::make_shared<brave::BraveRequestInfo>(url);
brave_request_info->browser_context = browser_context();
brave_request_info->browser_context = profile();
int rc = ipfs::OnBeforeURLRequest_IPFSRedirectWork(brave::ResponseCallback(),
brave_request_info);
EXPECT_EQ(rc, net::OK);
@@ -84,7 +72,7 @@ TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIHTTPScheme) {
TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIIPFSSchemeLocal) {
GURL url("ipfs://QmfM2r8seH2GiRaC4esTjeraXEachRt8ZsSeGaWTPLyMoG");
auto brave_request_info = std::make_shared<brave::BraveRequestInfo>(url);
brave_request_info->browser_context = browser_context();
brave_request_info->browser_context = profile();
brave_request_info->ipfs_gateway_url = GetLocalGateway();
brave_request_info->initiator_url = ipfs::GetIPFSGatewayURL(
initiator_cid, "",
@@ -100,10 +88,10 @@ TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIIPFSSchemeLocal) {
TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIIPFSScheme) {
GURL url("ipfs://QmfM2r8seH2GiRaC4esTjeraXEachRt8ZsSeGaWTPLyMoG");
auto brave_request_info = std::make_shared<brave::BraveRequestInfo>(url);
brave_request_info->browser_context = browser_context();
brave_request_info->browser_context = profile();
brave_request_info->ipfs_gateway_url = GetPublicGateway();
brave_request_info->initiator_url = ipfs::GetIPFSGatewayURL(
initiator_cid, "", ipfs::GetDefaultIPFSGateway(browser_context()));
initiator_cid, "", ipfs::GetDefaultIPFSGateway(profile()));
int rc = ipfs::OnBeforeURLRequest_IPFSRedirectWork(brave::ResponseCallback(),
brave_request_info);
EXPECT_EQ(rc, net::OK);
@@ -115,7 +103,7 @@ TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIIPFSScheme) {
TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIIPNSSchemeLocal) {
GURL url("ipns://QmSrPmbaUKA3ZodhzPWZnpFgcPMFWF4QsxXbkWfEptTBJd");
auto brave_request_info = std::make_shared<brave::BraveRequestInfo>(url);
brave_request_info->browser_context = browser_context();
brave_request_info->browser_context = profile();
brave_request_info->ipfs_gateway_url = GetLocalGateway();
brave_request_info->initiator_url = ipfs::GetIPFSGatewayURL(
initiator_cid, "",
@@ -131,10 +119,10 @@ TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIIPNSSchemeLocal) {
TEST_F(IPFSRedirectNetworkDelegateHelperTest, TranslateIPFSURIIPNSScheme) {
GURL url("ipns://QmSrPmbaUKA3ZodhzPWZnpFgcPMFWF4QsxXbkWfEptTBJd");
auto brave_request_info = std::make_shared<brave::BraveRequestInfo>(url);
brave_request_info->browser_context = browser_context();
brave_request_info->browser_context = profile();
brave_request_info->ipfs_gateway_url = GetPublicGateway();
brave_request_info->initiator_url = ipfs::GetIPFSGatewayURL(
initiator_cid, "", ipfs::GetDefaultIPFSGateway(browser_context()));
initiator_cid, "", ipfs::GetDefaultIPFSGateway(profile()));
int rc = ipfs::OnBeforeURLRequest_IPFSRedirectWork(brave::ResponseCallback(),
brave_request_info);
EXPECT_EQ(rc, net::OK);
@@ -148,10 +136,10 @@ TEST_F(IPFSRedirectNetworkDelegateHelperTest, HeadersIPFSWorkWithRedirect) {
"https://cloudflare-ipfs.com/ipfs/"
"QmSrPmbaUKA3ZodhzPWZnpFgcPMFWF4QsxXbkWfEptTBJd");
auto request_info = std::make_shared<brave::BraveRequestInfo>(url);
request_info->browser_context = browser_context();
request_info->browser_context = profile();
request_info->ipfs_gateway_url = GetPublicGateway();
request_info->initiator_url = ipfs::GetIPFSGatewayURL(
initiator_cid, "", ipfs::GetDefaultIPFSGateway(browser_context()));
initiator_cid, "", ipfs::GetDefaultIPFSGateway(profile()));
request_info->resource_type = blink::mojom::ResourceType::kImage;
request_info->ipfs_auto_fallback = true;
@@ -181,10 +169,10 @@ TEST_F(IPFSRedirectNetworkDelegateHelperTest, HeadersIPFSWorkNoRedirect) {
"https://cloudflare-ipfs.com/ipfs/"
"QmSrPmbaUKA3ZodhzPWZnpFgcPMFWF4QsxXbkWfEptTBJd");
auto request_info = std::make_shared<brave::BraveRequestInfo>(url);
request_info->browser_context = browser_context();
request_info->browser_context = profile();
request_info->ipfs_gateway_url = GetPublicGateway();
request_info->initiator_url = ipfs::GetIPFSGatewayURL(
initiator_cid, "", ipfs::GetDefaultIPFSGateway(browser_context()));
initiator_cid, "", ipfs::GetDefaultIPFSGateway(profile()));
request_info->resource_type = blink::mojom::ResourceType::kImage;
request_info->ipfs_auto_fallback = false;