Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5616)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_downloader_unittest.cc

Issue 1091363002: Change ProfileDownloader to use AccountTrackerService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/profiles/profile_downloader.cc ('K') | « chrome/browser/profiles/profile_downloader.cc ('k') | chrome/browser/signin/fake_account_tracker_service.h » ('j') | components/signin/core/browser/account_tracker_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_downloader_unittest.cc
diff --git a/chrome/browser/profiles/profile_downloader_unittest.cc b/chrome/browser/profiles/profile_downloader_unittest.cc
index 00e3e3b070123a91ded94bb21a08dea3739d9782..74333ebe74ecb045fb2e9b59ecdeb224b18ca939 100644
--- a/chrome/browser/profiles/profile_downloader_unittest.cc
+++ b/chrome/browser/profiles/profile_downloader_unittest.cc
@@ -6,194 +6,99 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/profiles/profile_downloader_delegate.h"
+#include "chrome/browser/signin/account_tracker_service_factory.h"
+#include "chrome/browser/signin/chrome_signin_client_factory.h"
+#include "chrome/browser/signin/fake_account_tracker_service.h"
+#include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/signin/test_signin_client_builder.h"
+#include "chrome/test/base/testing_profile.h"
+#include "net/url_request/test_url_fetcher_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
-void GetJSonData(const std::string& full_name,
- const std::string& given_name,
- const std::string& url,
- const std::string& locale,
- const std::string& hosted_domain,
- bool include_empty_hosted_domain,
- base::DictionaryValue* dict) {
- if (!full_name.empty())
- dict->SetString("name", full_name);
-
- if (!given_name.empty())
- dict->SetString("given_name", given_name);
-
- if (!url.empty())
- dict->SetString("picture", url);
-
- if (!locale.empty())
- dict->SetString("locale", locale);
-
- if (!hosted_domain.empty() || include_empty_hosted_domain)
- dict->SetString("hd", hosted_domain);
-}
+const std::string kTestEmail = "test@example.com";
+const std::string kTestGaia = "gaia";
+const std::string kTestHostedDomain = "google.com";
+const std::string kTestFullName = "full_name";
+const std::string kTestGivenName = "given_name";
+const std::string kTestLocale = "locale";
+const std::string kTestPictureURL = "http://www.google.com";
} // namespace
-class ProfileDownloaderTest : public testing::Test {
+class ProfileDownloaderTest : public testing::Test,
+ public ProfileDownloaderDelegate {
protected:
- ProfileDownloaderTest() {
+ ProfileDownloaderTest() {}
+ ~ProfileDownloaderTest() override {}
+
+ void SetUp() override {
+ TestingProfile::Builder builder;
+ builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
+ &BuildAutoIssuingFakeProfileOAuth2TokenService);
+ builder.AddTestingFactory(AccountTrackerServiceFactory::GetInstance(),
+ FakeAccountTrackerService::Build);
+ builder.AddTestingFactory(ChromeSigninClientFactory::GetInstance(),
+ signin::BuildTestSigninClient);
+
+ profile_ = builder.Build();
+ account_tracker_service_ = static_cast<FakeAccountTrackerService*>(
+ AccountTrackerServiceFactory::GetForProfile(profile_.get()));
+ profile_downloader_.reset(new ProfileDownloader(this));
}
- ~ProfileDownloaderTest() override {}
+ bool NeedsProfilePicture() const override { return true; };
+ int GetDesiredImageSideLength() const override { return 128; };
+ std::string GetCachedPictureURL() const override { return ""; };
+ Profile* GetBrowserProfile() override { return profile_.get(); };
+ void OnProfileDownloadSuccess(ProfileDownloader* downloader) override {
- void VerifyWithAccountData(const std::string& full_name,
- const std::string& given_name,
- const std::string& url,
- const std::string& expected_url,
- const std::string& locale,
- const std::string& hosted_domain,
- bool include_empty_hosted_domain,
- bool is_valid) {
- base::string16 parsed_full_name;
- base::string16 parsed_given_name;
- std::string parsed_url;
- std::string parsed_locale;
- base::string16 parsed_hosted_domain;
- scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
- GetJSonData(full_name, given_name, url, locale, hosted_domain,
- include_empty_hosted_domain, dict.get());
- bool result = ProfileDownloader::ParseProfileJSON(
- dict.get(),
- &parsed_full_name,
- &parsed_given_name,
- &parsed_url,
- 32,
- &parsed_locale,
- &parsed_hosted_domain);
- EXPECT_EQ(is_valid, result);
- std::string parsed_full_name_utf8 = base::UTF16ToUTF8(parsed_full_name);
- std::string parsed_given_name_utf8 = base::UTF16ToUTF8(parsed_given_name);
- std::string parsed_hosted_domain_utf8 =
- base::UTF16ToUTF8(parsed_hosted_domain);
-
- EXPECT_EQ(full_name, parsed_full_name_utf8);
- EXPECT_EQ(given_name, parsed_given_name_utf8);
- EXPECT_EQ(expected_url, parsed_url);
- EXPECT_EQ(locale, parsed_locale);
- EXPECT_EQ(hosted_domain, parsed_hosted_domain_utf8);
}
+ void OnProfileDownloadFailure(
+ ProfileDownloader* downloader,
+ ProfileDownloaderDelegate::FailureReason reason) override {}
+
+ void SimulateUserInfoSuccess() {
+ account_tracker_service_->FakeUserInfoFetchSuccess(
+ kTestEmail,
+ kTestGaia,
+ kTestHostedDomain,
+ kTestFullName,
+ kTestGivenName,
+ kTestLocale,
+ kTestPictureURL);
+ }
+
+ FakeAccountTrackerService* account_tracker_service_;
+ scoped_ptr<Profile> profile_;
+ scoped_ptr<ProfileDownloader> profile_downloader_;
};
-TEST_F(ProfileDownloaderTest, ParseData) {
- // URL without size specified.
- VerifyWithAccountData(
- "Pat Smith",
- "Pat",
- "https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/photo.jpg",
- "https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s32-c/photo.jpg",
- "en-US",
- "google.com",
- false,
- true);
-
- // URL with size specified.
- VerifyWithAccountData(
- "Pat Smith",
- "Pat",
- "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/abc12/s64-c/1234567890.jpg",
- "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/abc12/s32-c/1234567890.jpg",
- "en-US",
- "google.com",
- false,
- true);
-
- // URL with unknown format.
- VerifyWithAccountData("Pat Smith",
- "Pat",
- "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",
- "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",
- "en-US",
- "google.com",
- false,
- true);
-
- // Try different locales. URL with size specified.
- VerifyWithAccountData(
- "Pat Smith",
- "Pat",
- "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/abc12/s64-c/1234567890.jpg",
- "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/abc12/s32-c/1234567890.jpg",
- "jp",
- "google.com",
- false,
- true);
-
- // URL with unknown format.
- VerifyWithAccountData("Pat Smith",
- "Pat",
- "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",
- "http://lh0.ggpht.com/-abcd1aBCDEf/AAAA/AAA_A/",
- "fr",
- "",
- false,
- true);
-
- // Data with only name.
- VerifyWithAccountData("Pat Smith",
- "Pat",
- std::string(),
- std::string(),
- std::string(),
- std::string(),
- false,
- true);
-
- // Data with only name and a blank but present hosted domain.
- VerifyWithAccountData("Pat Smith",
- "Pat",
- std::string(),
- std::string(),
- std::string(),
- std::string(),
- true,
- true);
-
- // Data with only URL.
- VerifyWithAccountData(
- std::string(),
- std::string(),
- "https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/photo.jpg",
- "https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s32-c/photo.jpg",
- std::string(),
- std::string(),
- false,
- true);
-
- // Data with only locale.
- VerifyWithAccountData(std::string(),
- std::string(),
- std::string(),
- std::string(),
- "fr",
- std::string(),
- false,
- false);
-
- // Data without name or URL or locale.
- VerifyWithAccountData(std::string(),
- std::string(),
- std::string(),
- std::string(),
- std::string(),
- std::string(),
- false,
- false);
-
- // Data with an invalid URL.
- VerifyWithAccountData(std::string(),
- std::string(),
- "invalid url",
- std::string(),
- std::string(),
- std::string(),
- false,
- false);
+TEST_F(ProfileDownloaderTest, AccountInfoReady) {
+ account_tracker_service_->SeedAccountInfo(kTestGaia, kTestEmail);
+ SimulateUserInfoSuccess();
+
+ ASSERT_EQ(ProfileDownloader::PICTURE_FAILED,
+ profile_downloader_->GetProfilePictureStatus());
+ profile_downloader_->StartForAccount(kTestEmail, account_tracker_service_);
+ profile_downloader_->StartFetchingImageForTesting(
+ new net::TestURLFetcher(0, GURL(kTestPictureURL), nullptr));
+ ASSERT_EQ(kTestPictureURL, profile_downloader_->GetProfilePictureURL());
+}
+
+TEST_F(ProfileDownloaderTest, AccountInfoNotReady) {
+ account_tracker_service_->SeedAccountInfo(kTestGaia, kTestEmail);
+
+ ASSERT_EQ(ProfileDownloader::PICTURE_FAILED,
+ profile_downloader_->GetProfilePictureStatus());
+ profile_downloader_->StartForAccount(kTestEmail, account_tracker_service_);
+ profile_downloader_->StartFetchingImageForTesting(
+ new net::TestURLFetcher(0, GURL(kTestPictureURL), nullptr));
+ SimulateUserInfoSuccess();
+ ASSERT_EQ(kTestPictureURL, profile_downloader_->GetProfilePictureURL());
}
TEST_F(ProfileDownloaderTest, DefaultURL) {
« chrome/browser/profiles/profile_downloader.cc ('K') | « chrome/browser/profiles/profile_downloader.cc ('k') | chrome/browser/signin/fake_account_tracker_service.h » ('j') | components/signin/core/browser/account_tracker_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698