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

Unified Diff: components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc

Issue 1143323005: Refactor AO2TS to make it easier to componentize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address final comments Created 5 years, 6 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
Index: components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
diff --git a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc b/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
deleted file mode 100644
index 34d5c60dceaf56f4e60f2b759104213da23319fb..0000000000000000000000000000000000000000
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
+++ /dev/null
@@ -1,482 +0,0 @@
-// Copyright 2014 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 "components/signin/core/browser/mutable_profile_oauth2_token_service.h"
-
-#include "base/run_loop.h"
-#include "components/signin/core/browser/profile_oauth2_token_service.h"
-#include "components/signin/core/browser/signin_error_controller.h"
-#include "components/signin/core/browser/test_signin_client.h"
-#include "components/signin/core/browser/webdata/token_web_data.h"
-#include "google_apis/gaia/gaia_constants.h"
-#include "google_apis/gaia/gaia_urls.h"
-#include "google_apis/gaia/google_service_auth_error.h"
-#include "google_apis/gaia/oauth2_access_token_consumer.h"
-#include "google_apis/gaia/oauth2_token_service_test_util.h"
-#include "net/http/http_status_code.h"
-#include "net/url_request/test_url_fetcher_factory.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(OS_MACOSX)
-#include "components/os_crypt/os_crypt.h"
-#endif
-
-// Defining constant here to handle backward compatiblity tests, but this
-// constant is no longer used in current versions of chrome.
-static const char kLSOService[] = "lso";
-static const char kEmail[] = "user@gmail.com";
-
-class MutableProfileOAuth2TokenServiceTest
- : public testing::Test,
- public OAuth2AccessTokenConsumer,
- public OAuth2TokenService::Observer {
- public:
- MutableProfileOAuth2TokenServiceTest()
- : factory_(NULL),
- access_token_success_count_(0),
- access_token_failure_count_(0),
- access_token_failure_(GoogleServiceAuthError::NONE),
- token_available_count_(0),
- token_revoked_count_(0),
- tokens_loaded_count_(0),
- start_batch_changes_(0),
- end_batch_changes_(0) {}
-
- void SetUp() override {
-#if defined(OS_MACOSX)
- OSCrypt::UseMockKeychain(true);
-#endif
-
- factory_.SetFakeResponse(GaiaUrls::GetInstance()->oauth2_revoke_url(),
- "",
- net::HTTP_OK,
- net::URLRequestStatus::SUCCESS);
- oauth2_service_.Initialize(&client_, &signin_error_controller_);
- // Make sure PO2TS has a chance to load itself before continuing.
- base::RunLoop().RunUntilIdle();
- oauth2_service_.AddObserver(this);
- }
-
- void TearDown() override {
- oauth2_service_.RemoveObserver(this);
- oauth2_service_.Shutdown();
- }
-
- void AddAuthTokenManually(const std::string& service,
- const std::string& value) {
- scoped_refptr<TokenWebData> token_web_data = client_.GetDatabase();
- if (token_web_data.get())
- token_web_data->SetTokenForService(service, value);
- }
-
- // OAuth2AccessTokenConusmer implementation
- void OnGetTokenSuccess(const std::string& access_token,
- const base::Time& expiration_time) override {
- ++access_token_success_count_;
- }
-
- void OnGetTokenFailure(const GoogleServiceAuthError& error) override {
- ++access_token_failure_count_;
- access_token_failure_ = error;
- }
-
- // OAuth2TokenService::Observer implementation.
- void OnRefreshTokenAvailable(const std::string& account_id) override {
- ++token_available_count_;
- }
- void OnRefreshTokenRevoked(const std::string& account_id) override {
- ++token_revoked_count_;
- }
- void OnRefreshTokensLoaded() override { ++tokens_loaded_count_; }
-
- void OnStartBatchChanges() override { ++start_batch_changes_; }
-
- void OnEndBatchChanges() override { ++end_batch_changes_; }
-
- void ResetObserverCounts() {
- token_available_count_ = 0;
- token_revoked_count_ = 0;
- tokens_loaded_count_ = 0;
- start_batch_changes_ = 0;
- end_batch_changes_ = 0;
- }
-
- void ExpectNoNotifications() {
- EXPECT_EQ(0, token_available_count_);
- EXPECT_EQ(0, token_revoked_count_);
- EXPECT_EQ(0, tokens_loaded_count_);
- ResetObserverCounts();
- }
-
- void ExpectOneTokenAvailableNotification() {
- EXPECT_EQ(1, token_available_count_);
- EXPECT_EQ(0, token_revoked_count_);
- EXPECT_EQ(0, tokens_loaded_count_);
- ResetObserverCounts();
- }
-
- void ExpectOneTokenRevokedNotification() {
- EXPECT_EQ(0, token_available_count_);
- EXPECT_EQ(1, token_revoked_count_);
- EXPECT_EQ(0, tokens_loaded_count_);
- ResetObserverCounts();
- }
-
- void ExpectOneTokensLoadedNotification() {
- EXPECT_EQ(0, token_available_count_);
- EXPECT_EQ(0, token_revoked_count_);
- EXPECT_EQ(1, tokens_loaded_count_);
- ResetObserverCounts();
- }
-
- protected:
- base::MessageLoop message_loop_;
- net::FakeURLFetcherFactory factory_;
- TestSigninClient client_;
- MutableProfileOAuth2TokenService oauth2_service_;
- TestingOAuth2TokenServiceConsumer consumer_;
- SigninErrorController signin_error_controller_;
- int access_token_success_count_;
- int access_token_failure_count_;
- GoogleServiceAuthError access_token_failure_;
- int token_available_count_;
- int token_revoked_count_;
- int tokens_loaded_count_;
- int start_batch_changes_;
- int end_batch_changes_;
-};
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, PersistenceDBUpgrade) {
- std::string main_account_id(kEmail);
- std::string main_refresh_token("old_refresh_token");
-
- // Populate DB with legacy tokens.
- AddAuthTokenManually(GaiaConstants::kSyncService, "syncServiceToken");
- AddAuthTokenManually(kLSOService, "lsoToken");
- AddAuthTokenManually(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
- main_refresh_token);
-
- // Force LoadCredentials.
- oauth2_service_.LoadCredentials(main_account_id);
- base::RunLoop().RunUntilIdle();
-
- // Legacy tokens get discarded, but the old refresh token is kept.
- EXPECT_EQ(1, tokens_loaded_count_);
- EXPECT_EQ(1, token_available_count_);
- EXPECT_EQ(1, start_batch_changes_);
- EXPECT_EQ(1, end_batch_changes_);
- EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable(main_account_id));
- EXPECT_EQ(1U, oauth2_service_.refresh_tokens().size());
- EXPECT_EQ(main_refresh_token,
- oauth2_service_.refresh_tokens()[main_account_id]->refresh_token());
-
- // Add an old legacy token to the DB, to ensure it will not overwrite existing
- // credentials for main account.
- AddAuthTokenManually(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
- "secondOldRefreshToken");
- // Add some other legacy token. (Expected to get discarded).
- AddAuthTokenManually(kLSOService, "lsoToken");
- // Also add a token using PO2TS.UpdateCredentials and make sure upgrade does
- // not wipe it.
- std::string other_account_id("other_account_id");
- std::string other_refresh_token("other_refresh_token");
- oauth2_service_.UpdateCredentials(other_account_id, other_refresh_token);
- ResetObserverCounts();
-
- // Force LoadCredentials.
- oauth2_service_.LoadCredentials(main_account_id);
- base::RunLoop().RunUntilIdle();
-
- // Again legacy tokens get discarded, but since the main porfile account
- // token is present it is not overwritten.
- EXPECT_EQ(2, token_available_count_);
- EXPECT_EQ(1, tokens_loaded_count_);
- EXPECT_EQ(1, start_batch_changes_);
- EXPECT_EQ(1, end_batch_changes_);
- EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable(main_account_id));
- // TODO(fgorski): cover both using RefreshTokenIsAvailable() and then get the
- // tokens using GetRefreshToken()
- EXPECT_EQ(2U, oauth2_service_.refresh_tokens().size());
- EXPECT_EQ(main_refresh_token,
- oauth2_service_.refresh_tokens()[main_account_id]->refresh_token());
- EXPECT_EQ(
- other_refresh_token,
- oauth2_service_.refresh_tokens()[other_account_id]->refresh_token());
-
- oauth2_service_.RevokeAllCredentials();
- EXPECT_EQ(2, start_batch_changes_);
- EXPECT_EQ(2, end_batch_changes_);
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, PersistenceRevokeCredentials) {
- std::string account_id_1 = "account_id_1";
- std::string refresh_token_1 = "refresh_token_1";
- std::string account_id_2 = "account_id_2";
- std::string refresh_token_2 = "refresh_token_2";
-
- // TODO(fgorski): Enable below when implemented:
- // EXPECT_FALSE(oauth2_servive_->RefreshTokenIsAvailable(account_id_1));
- // EXPECT_FALSE(oauth2_servive_->RefreshTokenIsAvailable(account_id_2));
-
- oauth2_service_.UpdateCredentials(account_id_1, refresh_token_1);
- oauth2_service_.UpdateCredentials(account_id_2, refresh_token_2);
- EXPECT_EQ(2, start_batch_changes_);
- EXPECT_EQ(2, end_batch_changes_);
-
- // TODO(fgorski): Enable below when implemented:
- // EXPECT_TRUE(oauth2_servive_->RefreshTokenIsAvailable(account_id_1));
- // EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable(account_id_2));
-
- ResetObserverCounts();
- oauth2_service_.RevokeCredentials(account_id_1);
- EXPECT_EQ(1, start_batch_changes_);
- EXPECT_EQ(1, end_batch_changes_);
- ExpectOneTokenRevokedNotification();
-
- // TODO(fgorski): Enable below when implemented:
- // EXPECT_FALSE(oauth2_servive_->RefreshTokenIsAvailable(account_id_1));
- // EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable(account_id_2));
-
- oauth2_service_.RevokeAllCredentials();
- EXPECT_EQ(0, token_available_count_);
- EXPECT_EQ(1, token_revoked_count_);
- EXPECT_EQ(0, tokens_loaded_count_);
- EXPECT_EQ(1, start_batch_changes_);
- EXPECT_EQ(1, end_batch_changes_);
- ResetObserverCounts();
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, PersistenceLoadCredentials) {
- // Ensure DB is clean.
- oauth2_service_.RevokeAllCredentials();
- ResetObserverCounts();
- // Perform a load from an empty DB.
- oauth2_service_.LoadCredentials("account_id");
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(1, start_batch_changes_);
- EXPECT_EQ(1, end_batch_changes_);
- ExpectOneTokensLoadedNotification();
- // LoadCredentials() guarantees that the account given to it as argument
- // is in the refresh_token map.
- EXPECT_EQ(1U, oauth2_service_.refresh_tokens().size());
- EXPECT_TRUE(
- oauth2_service_.refresh_tokens()["account_id"]->refresh_token().empty());
- // Setup a DB with tokens that don't require upgrade and clear memory.
- oauth2_service_.UpdateCredentials("account_id", "refresh_token");
- oauth2_service_.UpdateCredentials("account_id2", "refresh_token2");
- oauth2_service_.refresh_tokens().clear();
- EXPECT_EQ(2, start_batch_changes_);
- EXPECT_EQ(2, end_batch_changes_);
- ResetObserverCounts();
-
- oauth2_service_.LoadCredentials("account_id");
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(2, token_available_count_);
- EXPECT_EQ(0, token_revoked_count_);
- EXPECT_EQ(1, tokens_loaded_count_);
- EXPECT_EQ(1, start_batch_changes_);
- EXPECT_EQ(1, end_batch_changes_);
- ResetObserverCounts();
-
- // TODO(fgorski): Enable below when implemented:
- // EXPECT_TRUE(oauth2_servive_->RefreshTokenIsAvailable("account_id"));
- // EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable("account_id2"));
-
- oauth2_service_.RevokeAllCredentials();
- EXPECT_EQ(0, token_available_count_);
- EXPECT_EQ(2, token_revoked_count_);
- EXPECT_EQ(0, tokens_loaded_count_);
- EXPECT_EQ(1, start_batch_changes_);
- EXPECT_EQ(1, end_batch_changes_);
- ResetObserverCounts();
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, PersistanceNotifications) {
- EXPECT_EQ(0, oauth2_service_.cache_size_for_testing());
- oauth2_service_.UpdateCredentials("account_id", "refresh_token");
- ExpectOneTokenAvailableNotification();
-
- oauth2_service_.UpdateCredentials("account_id", "refresh_token");
- ExpectNoNotifications();
-
- oauth2_service_.UpdateCredentials("account_id", "refresh_token2");
- ExpectOneTokenAvailableNotification();
-
- oauth2_service_.RevokeCredentials("account_id");
- ExpectOneTokenRevokedNotification();
-
- oauth2_service_.UpdateCredentials("account_id", "refresh_token2");
- ExpectOneTokenAvailableNotification();
-
- oauth2_service_.RevokeAllCredentials();
- ResetObserverCounts();
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, GetAccounts) {
- EXPECT_TRUE(oauth2_service_.GetAccounts().empty());
- oauth2_service_.UpdateCredentials("account_id1", "refresh_token1");
- oauth2_service_.UpdateCredentials("account_id2", "refresh_token2");
- std::vector<std::string> accounts = oauth2_service_.GetAccounts();
- EXPECT_EQ(2u, accounts.size());
- EXPECT_EQ(1, count(accounts.begin(), accounts.end(), "account_id1"));
- EXPECT_EQ(1, count(accounts.begin(), accounts.end(), "account_id2"));
- oauth2_service_.RevokeCredentials("account_id2");
- accounts = oauth2_service_.GetAccounts();
- EXPECT_EQ(1u, oauth2_service_.GetAccounts().size());
- EXPECT_EQ(1, count(accounts.begin(), accounts.end(), "account_id1"));
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, TokenServiceUpdateClearsCache) {
- EXPECT_EQ(0, oauth2_service_.cache_size_for_testing());
- std::set<std::string> scope_list;
- scope_list.insert("scope");
- oauth2_service_.UpdateCredentials(kEmail, "refreshToken");
- ExpectOneTokenAvailableNotification();
- factory_.SetFakeResponse(GaiaUrls::GetInstance()->oauth2_token_url(),
- GetValidTokenResponse("token", 3600),
- net::HTTP_OK,
- net::URLRequestStatus::SUCCESS);
-
- scoped_ptr<OAuth2TokenService::Request> request(
- oauth2_service_.StartRequest(kEmail, scope_list, &consumer_));
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(1, consumer_.number_of_successful_tokens_);
- EXPECT_EQ(0, consumer_.number_of_errors_);
- EXPECT_EQ("token", consumer_.last_token_);
- EXPECT_EQ(1, oauth2_service_.cache_size_for_testing());
-
- // Signs out and signs in
- oauth2_service_.RevokeCredentials(kEmail);
- ExpectOneTokenRevokedNotification();
-
- EXPECT_EQ(0, oauth2_service_.cache_size_for_testing());
- oauth2_service_.UpdateCredentials(kEmail, "refreshToken");
- ExpectOneTokenAvailableNotification();
- factory_.SetFakeResponse(GaiaUrls::GetInstance()->oauth2_token_url(),
- GetValidTokenResponse("another token", 3600),
- net::HTTP_OK,
- net::URLRequestStatus::SUCCESS);
-
- request = oauth2_service_.StartRequest(kEmail, scope_list, &consumer_);
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(2, consumer_.number_of_successful_tokens_);
- EXPECT_EQ(0, consumer_.number_of_errors_);
- EXPECT_EQ("another token", consumer_.last_token_);
- EXPECT_EQ(1, oauth2_service_.cache_size_for_testing());
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, FetchTransientError) {
- factory_.SetFakeResponse(GaiaUrls::GetInstance()->oauth2_token_url(),
- "",
- net::HTTP_FORBIDDEN,
- net::URLRequestStatus::FAILED);
-
- EXPECT_EQ(0, oauth2_service_.cache_size_for_testing());
- std::set<std::string> scope_list;
- scope_list.insert("scope");
- oauth2_service_.set_max_authorization_token_fetch_retries_for_testing(0);
- oauth2_service_.UpdateCredentials(kEmail, "refreshToken");
- ExpectOneTokenAvailableNotification();
-
- scoped_ptr<OAuth2TokenService::Request> request(
- oauth2_service_.StartRequest(kEmail, scope_list, &consumer_));
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(GoogleServiceAuthError::AuthErrorNone(),
- signin_error_controller_.auth_error());
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, FetchPersistentError) {
- oauth2_service_.UpdateCredentials(kEmail, "refreshToken");
- EXPECT_EQ(GoogleServiceAuthError::AuthErrorNone(),
- signin_error_controller_.auth_error());
-
- GoogleServiceAuthError authfail(GoogleServiceAuthError::ACCOUNT_DELETED);
- oauth2_service_.UpdateAuthError(kEmail, authfail);
- EXPECT_NE(GoogleServiceAuthError::AuthErrorNone(),
- signin_error_controller_.auth_error());
-
- // Create a "success" fetch we don't expect to get called.
- factory_.SetFakeResponse(GaiaUrls::GetInstance()->oauth2_token_url(),
- GetValidTokenResponse("token", 3600),
- net::HTTP_OK,
- net::URLRequestStatus::SUCCESS);
-
- EXPECT_EQ(0, access_token_success_count_);
- EXPECT_EQ(0, access_token_failure_count_);
- std::vector<std::string> scope_list;
- scope_list.push_back("scope");
- scoped_ptr<OAuth2AccessTokenFetcher> fetcher(
- oauth2_service_.CreateAccessTokenFetcher(
- kEmail, oauth2_service_.GetRequestContext(), this));
- fetcher->Start("foo", "bar", scope_list);
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(0, access_token_success_count_);
- EXPECT_EQ(1, access_token_failure_count_);
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, RetryBackoff) {
- oauth2_service_.UpdateCredentials(kEmail, "refreshToken");
- EXPECT_EQ(GoogleServiceAuthError::AuthErrorNone(),
- signin_error_controller_.auth_error());
-
- GoogleServiceAuthError authfail(GoogleServiceAuthError::SERVICE_UNAVAILABLE);
- oauth2_service_.UpdateAuthError(kEmail, authfail);
- EXPECT_EQ(GoogleServiceAuthError::AuthErrorNone(),
- signin_error_controller_.auth_error());
-
- // Create a "success" fetch we don't expect to get called just yet.
- factory_.SetFakeResponse(GaiaUrls::GetInstance()->oauth2_token_url(),
- GetValidTokenResponse("token", 3600),
- net::HTTP_OK,
- net::URLRequestStatus::SUCCESS);
-
- // Transient error will repeat until backoff period expires.
- EXPECT_EQ(0, access_token_success_count_);
- EXPECT_EQ(0, access_token_failure_count_);
- std::vector<std::string> scope_list;
- scope_list.push_back("scope");
- scoped_ptr<OAuth2AccessTokenFetcher> fetcher1(
- oauth2_service_.CreateAccessTokenFetcher(
- kEmail, oauth2_service_.GetRequestContext(), this));
- fetcher1->Start("foo", "bar", scope_list);
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(0, access_token_success_count_);
- EXPECT_EQ(1, access_token_failure_count_);
-
- // Pretend that backoff has expired and try again.
- oauth2_service_.backoff_entry_.SetCustomReleaseTime(base::TimeTicks());
- scoped_ptr<OAuth2AccessTokenFetcher> fetcher2(
- oauth2_service_.CreateAccessTokenFetcher(
- kEmail, oauth2_service_.GetRequestContext(), this));
- fetcher2->Start("foo", "bar", scope_list);
- base::RunLoop().RunUntilIdle();
- EXPECT_EQ(1, access_token_success_count_);
- EXPECT_EQ(1, access_token_failure_count_);
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, CanonicalizeAccountId) {
- std::map<std::string, std::string> tokens;
- tokens["AccountId-user@gmail.com"] = "refresh_token";
- tokens["AccountId-Foo.Bar@gmail.com"] = "refresh_token";
- tokens["AccountId-12345"] = "refresh_token";
-
- oauth2_service_.LoadAllCredentialsIntoMemory(tokens);
-
- EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable("user@gmail.com"));
- EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable("foobar@gmail.com"));
- EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable("12345"));
-}
-
-TEST_F(MutableProfileOAuth2TokenServiceTest, CanonAndNonCanonAccountId) {
- std::map<std::string, std::string> tokens;
- tokens["AccountId-Foo.Bar@gmail.com"] = "bad_token";
- tokens["AccountId-foobar@gmail.com"] = "good_token";
-
- oauth2_service_.LoadAllCredentialsIntoMemory(tokens);
-
- EXPECT_EQ(1u, oauth2_service_.GetAccounts().size());
- EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable("foobar@gmail.com"));
- EXPECT_STREQ("good_token",
- oauth2_service_.GetRefreshToken("foobar@gmail.com").c_str());
-}

Powered by Google App Engine
This is Rietveld 408576698