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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Fixed tests. Created 5 years, 2 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
« ash/test/test_session_state_delegate.cc ('K') | « chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc ('k') | chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
diff --git a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
index c82a398527e186847fceb99997862475f7a39127..bf8fbfe2ec74c4fa1b4892329ff766646b3385cf 100644
--- a/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
+++ b/chrome/browser/chromeos/login/saml/saml_offline_signin_limiter_unittest.cc
@@ -46,6 +46,9 @@ class SAMLOfflineSigninLimiterTest : public testing::Test {
void CreateLimiter();
void SetUpUserManager();
+
+ const AccountId test_account_id_ = AccountId::FromUserEmail(kTestUser);
+
TestingPrefServiceSimple* GetTestingLocalState();
scoped_refptr<base::TestSimpleTaskRunner> runner_;
@@ -69,8 +72,7 @@ SAMLOfflineSigninLimiterTest::SAMLOfflineSigninLimiterTest()
runner_handle_(runner_),
user_manager_(new MockUserManager),
user_manager_enabler_(user_manager_),
- limiter_(NULL) {
-}
+ limiter_(NULL) {}
SAMLOfflineSigninLimiterTest::~SAMLOfflineSigninLimiterTest() {
DestroyLimiter();
@@ -103,7 +105,7 @@ void SAMLOfflineSigninLimiterTest::SetUp() {
profile_.reset(new TestingProfile);
SAMLOfflineSigninLimiterFactory::SetClockForTesting(&clock_);
- user_manager_->AddUser(kTestUser);
+ user_manager_->AddUser(test_account_id_);
profile_->set_profile_name(kTestUser);
clock_.Advance(base::TimeDelta::FromHours(1));
@@ -129,8 +131,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLDefaultLimit) {
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -149,8 +153,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLDefaultLimit) {
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
pref = prefs->FindPreference(prefs::kSAMLLastGAIASignInTime);
@@ -174,8 +180,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLNoLimit) {
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -194,8 +202,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLNoLimit) {
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
pref = prefs->FindPreference(prefs::kSAMLLastGAIASignInTime);
@@ -219,8 +229,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLZeroLimit) {
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -239,8 +251,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLZeroLimit) {
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
pref = prefs->FindPreference(prefs::kSAMLLastGAIASignInTime);
@@ -264,8 +278,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLSetLimitWhileLoggedIn) {
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -293,8 +309,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLRemoveLimitWhileLoggedIn) {
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -325,8 +343,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, NoSAMLLogInWithExpiredLimit) {
// Authenticate against GAIA without SAML. Verify that the flag enforcing
// online login and the time of last login with SAML are cleared.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
const PrefService::Preference* pref =
@@ -344,8 +364,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLDefaultLimit) {
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is set.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -366,8 +388,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLDefaultLimit) {
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
last_gaia_signin_time = base::Time::FromInternalValue(
@@ -389,8 +413,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLDefaultLimit) {
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
last_gaia_signin_time = base::Time::FromInternalValue(
@@ -407,8 +433,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLDefaultLimit) {
// set.
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(1);
runner_->RunPendingTasks();
}
@@ -421,8 +449,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLNoLimit) {
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is set.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -443,8 +473,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLNoLimit) {
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
last_gaia_signin_time = base::Time::FromInternalValue(
@@ -466,8 +498,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLNoLimit) {
CreateLimiter();
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
last_gaia_signin_time = base::Time::FromInternalValue(
@@ -489,10 +523,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLZeroLimit) {
// last login with SAML is set.
CreateLimiter();
Sequence sequence;
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false))
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
.Times(1)
.InSequence(sequence);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true))
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
.Times(1)
.InSequence(sequence);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
@@ -511,8 +545,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLSetLimitWhileLoggedIn) {
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is set.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
const base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -525,8 +561,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLSetLimitWhileLoggedIn) {
// Set a zero time limit. Verify that the flag enforcing online login is set.
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(1);
prefs->SetInteger(prefs::kSAMLOfflineSigninTimeLimit, 0);
}
@@ -536,8 +574,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLRemoveLimit) {
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is set.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
const base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -554,8 +594,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLRemoveLimit) {
// changed.
Mock::VerifyAndClearExpectations(user_manager_);
SetUpUserManager();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
runner_->RunUntilIdle();
}
@@ -572,8 +614,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLLogInWithExpiredLimit) {
// Authenticate against GAIA with SAML. Verify that the flag enforcing online
// login is cleared and the time of last login with SAML is updated.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(1);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(0);
limiter_->SignedIn(UserContext::AUTH_FLOW_GAIA_WITH_SAML);
const base::Time last_gaia_signin_time = base::Time::FromInternalValue(
@@ -598,8 +642,10 @@ TEST_F(SAMLOfflineSigninLimiterTest, SAMLLogInOfflineWithExpiredLimit) {
// Authenticate offline. Verify that the flag enforcing online login is
// set and the time of last login with SAML is not changed.
CreateLimiter();
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, false)).Times(0);
- EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(kTestUser, true)).Times(1);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, false))
+ .Times(0);
+ EXPECT_CALL(*user_manager_, SaveForceOnlineSignin(test_account_id_, true))
+ .Times(1);
limiter_->SignedIn(UserContext::AUTH_FLOW_OFFLINE);
const base::Time last_gaia_signin_time = base::Time::FromInternalValue(
« ash/test/test_session_state_delegate.cc ('K') | « chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.cc ('k') | chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698