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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/signin_manager_unittest.cc

Issue 8698001: sync: change semantics (and name) of SigninManager::GetUsername (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: first Created 9 years, 1 month 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/sync/signin_manager.cc ('K') | « chrome/browser/sync/signin_manager.cc ('k') | chrome/browser/sync/test_profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/signin_manager_unittest.cc
diff --git a/chrome/browser/sync/signin_manager_unittest.cc b/chrome/browser/sync/signin_manager_unittest.cc
index 14f51ecbc6d26d7e705dfe48712b550f9570c7dc..fdfe44084dfe0c6424405ba96a8ab12da39622fc 100644
--- a/chrome/browser/sync/signin_manager_unittest.cc
+++ b/chrome/browser/sync/signin_manager_unittest.cc
@@ -98,12 +98,13 @@ class SigninManagerTest : public TokenServiceTestHarness {
TEST_F(SigninManagerTest, SignInClientLogin) {
browser_sync::SetIsUsingOAuthForTest(false);
manager_->Initialize(profile_.get());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
manager_->StartSignIn("username", "password", "", "");
- EXPECT_FALSE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
SimulateValidResponseClientLogin();
+ EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
// Should go into token service and stop.
EXPECT_EQ(1U, google_login_success_.size());
@@ -112,16 +113,16 @@ TEST_F(SigninManagerTest, SignInClientLogin) {
// Should persist across resets.
manager_.reset(new SigninManager());
manager_->Initialize(profile_.get());
- EXPECT_EQ("user@gmail.com", manager_->GetUsername());
+ EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
}
-TEST_F(SigninManagerTest, ClearInMemoryData) {
+TEST_F(SigninManagerTest, ClearTransientSigninData) {
browser_sync::SetIsUsingOAuthForTest(false);
manager_->Initialize(profile_.get());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
manager_->StartSignIn("username", "password", "", "");
- EXPECT_FALSE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
SimulateValidResponseClientLogin();
@@ -129,11 +130,12 @@ TEST_F(SigninManagerTest, ClearInMemoryData) {
EXPECT_EQ(1U, google_login_success_.size());
EXPECT_EQ(0U, google_login_failure_.size());
- EXPECT_EQ("user@gmail.com", manager_->GetUsername());
+ EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
// Now clear the in memory data.
- manager_->ClearInMemoryData();
- EXPECT_TRUE(manager_->GetUsername().empty());
+ manager_->ClearTransientSigninData();
+ EXPECT_TRUE(manager_->last_result_.data.empty());
+ EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
// Ensure preferences are not modified.
EXPECT_FALSE(
@@ -144,19 +146,18 @@ TEST_F(SigninManagerTest, ClearInMemoryData) {
manager_->Initialize(profile_.get());
// Now make sure we have the right user name.
- EXPECT_EQ("user@gmail.com", manager_->GetUsername());
+ EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
}
-
// NOTE: OAuth's "StartOAuthSignIn" is called before collecting credentials
// from the user. See also SigninManagerTest::SignInClientLogin.
TEST_F(SigninManagerTest, SignInOAuth) {
browser_sync::SetIsUsingOAuthForTest(true);
manager_->Initialize(profile_.get());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
SimulateValidSigninOAuth();
- EXPECT_FALSE(manager_->GetUsername().empty());
+ EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
// Should go into token service and stop.
EXPECT_EQ(1U, google_login_success_.size());
@@ -165,7 +166,7 @@ TEST_F(SigninManagerTest, SignInOAuth) {
// Should persist across resets.
manager_.reset(new SigninManager());
manager_->Initialize(profile_.get());
- EXPECT_EQ("user-xZIuqTKu@gmail.com", manager_->GetUsername());
+ EXPECT_EQ("user-xZIuqTKu@gmail.com", manager_->GetAuthenticatedUsername());
}
TEST_F(SigninManagerTest, SignOutClientLogin) {
@@ -175,13 +176,13 @@ TEST_F(SigninManagerTest, SignOutClientLogin) {
SimulateValidResponseClientLogin();
manager_->OnClientLoginSuccess(credentials_);
- EXPECT_EQ("user@gmail.com", manager_->GetUsername());
+ EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
manager_->SignOut();
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
// Should not be persisted anymore
manager_.reset(new SigninManager());
manager_->Initialize(profile_.get());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
}
TEST_F(SigninManagerTest, SignOutOAuth) {
@@ -189,16 +190,16 @@ TEST_F(SigninManagerTest, SignOutOAuth) {
manager_->Initialize(profile_.get());
SimulateValidSigninOAuth();
- EXPECT_FALSE(manager_->GetUsername().empty());
+ EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
- EXPECT_EQ("user-xZIuqTKu@gmail.com", manager_->GetUsername());
+ EXPECT_EQ("user-xZIuqTKu@gmail.com", manager_->GetAuthenticatedUsername());
manager_->SignOut();
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
// Should not be persisted anymore
manager_.reset(new SigninManager());
manager_->Initialize(profile_.get());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
}
TEST_F(SigninManagerTest, SignInFailureClientLogin) {
@@ -211,12 +212,12 @@ TEST_F(SigninManagerTest, SignInFailureClientLogin) {
EXPECT_EQ(0U, google_login_success_.size());
EXPECT_EQ(1U, google_login_failure_.size());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
// Should not be persisted
manager_.reset(new SigninManager());
manager_->Initialize(profile_.get());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
}
TEST_F(SigninManagerTest, ProvideSecondFactorSuccess) {
@@ -229,7 +230,8 @@ TEST_F(SigninManagerTest, ProvideSecondFactorSuccess) {
EXPECT_EQ(0U, google_login_success_.size());
EXPECT_EQ(1U, google_login_failure_.size());
- EXPECT_FALSE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+ EXPECT_FALSE(manager_->possibly_invalid_username_.empty());
manager_->ProvideSecondFactorAccessCode("access");
SimulateValidResponseClientLogin();
@@ -248,7 +250,8 @@ TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
EXPECT_EQ(0U, google_login_success_.size());
EXPECT_EQ(1U, google_login_failure_.size());
- EXPECT_FALSE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+ EXPECT_FALSE(manager_->possibly_invalid_username_.empty());
manager_->ProvideSecondFactorAccessCode("badaccess");
GoogleServiceAuthError error2(
@@ -257,7 +260,7 @@ TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
EXPECT_EQ(0U, google_login_success_.size());
EXPECT_EQ(2U, google_login_failure_.size());
- EXPECT_FALSE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
manager_->ProvideSecondFactorAccessCode("badaccess");
GoogleServiceAuthError error3(GoogleServiceAuthError::CONNECTION_FAILED);
@@ -265,7 +268,7 @@ TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
EXPECT_EQ(0U, google_login_success_.size());
EXPECT_EQ(3U, google_login_failure_.size());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
}
TEST_F(SigninManagerTest, SignOutMidConnect) {
@@ -276,16 +279,16 @@ TEST_F(SigninManagerTest, SignOutMidConnect) {
EXPECT_EQ(0U, google_login_success_.size());
EXPECT_EQ(0U, google_login_failure_.size());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
}
TEST_F(SigninManagerTest, SignOutOnUserInfoSucessRaceTest) {
browser_sync::SetIsUsingOAuthForTest(true);
manager_->Initialize(profile_.get());
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
SimulateSigninStartOAuth();
manager_->SignOut();
SimulateOAuthUserInfoSuccess();
- EXPECT_TRUE(manager_->GetUsername().empty());
+ EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
}
« chrome/browser/sync/signin_manager.cc ('K') | « chrome/browser/sync/signin_manager.cc ('k') | chrome/browser/sync/test_profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698