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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/passwords/manage_passwords_state_unittest.cc

Issue 1009953002: Integrate ManagePasswordsState into ManagePasswordsUIController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed the comments Created 5 years, 9 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/ui/passwords/manage_passwords_state.cc ('K') | « chrome/browser/ui/passwords/manage_passwords_state.cc ('k') | chrome/browser/ui/passwords/manage_passwords_test.cc » ('j') | chrome/browser/ui/passwords/manage_passwords_ui_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
diff --git a/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
index 90fbba691dabb4569363025a72b95884377dcb63..359c88c582296f8da73a41dbaa0f6efb2f7396d5 100644
--- a/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
@@ -36,6 +36,8 @@ class ManagePasswordsStateTest : public testing::Test {
test_federated_form_.origin = GURL("https://idp.com");
test_federated_form_.username_value = base::ASCIIToUTF16("username");
+
+ passwords_data_.set_client(&client_);
}
autofill::PasswordForm& test_local_form() { return test_local_form_; }
@@ -253,8 +255,7 @@ TEST_F(ManagePasswordsStateTest, OnRequestCredentials) {
EXPECT_TRUE(passwords_data().credentials_callback().is_null());
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(),
- ElementsAre(Pointee(test_federated_form())));
+ EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
TestAllUpdates();
@@ -354,16 +355,19 @@ TEST_F(ManagePasswordsStateTest, InactiveOnPSLMatched) {
}
TEST_F(ManagePasswordsStateTest, BlacklistBlockedAutofill) {
- test_local_form().blacklisted_by_user = true;
+ autofill::PasswordForm blacklisted;
+ blacklisted.blacklisted_by_user = true;
+ blacklisted.origin = GURL("http://example.com/bad");
autofill::PasswordFormMap password_form_map;
+ password_form_map[blacklisted.username_value] = &blacklisted;
password_form_map[test_local_form().username_value] = &test_local_form();
passwords_data().OnBlacklistBlockedAutofill(password_form_map);
EXPECT_THAT(passwords_data().GetCurrentForms(),
- ElementsAre(Pointee(test_local_form())));
+ ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
- EXPECT_EQ(test_local_form().origin, passwords_data().origin());
+ EXPECT_EQ(blacklisted.origin, passwords_data().origin());
// |passwords_data| should hold a separate copy of test_local_form().
EXPECT_THAT(passwords_data().GetCurrentForms(),
@@ -372,17 +376,20 @@ TEST_F(ManagePasswordsStateTest, BlacklistBlockedAutofill) {
}
TEST_F(ManagePasswordsStateTest, Unblacklist) {
+ autofill::PasswordForm blacklisted;
+ blacklisted.blacklisted_by_user = true;
+ blacklisted.origin = test_local_form().origin;
autofill::PasswordFormMap password_form_map;
- password_form_map[test_local_form().username_value] = &test_local_form();
+ password_form_map[blacklisted.username_value] = &blacklisted;
passwords_data().OnBlacklistBlockedAutofill(password_form_map);
EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
passwords_data().TransitionToState(password_manager::ui::MANAGE_STATE);
EXPECT_THAT(passwords_data().GetCurrentForms(),
- ElementsAre(Pointee(test_local_form())));
+ ElementsAre(Pointee(blacklisted)));
EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
- EXPECT_EQ(test_local_form().origin, passwords_data().origin());
+ EXPECT_EQ(blacklisted.origin, passwords_data().origin());
TestAllUpdates();
}
@@ -422,6 +429,8 @@ TEST_F(ManagePasswordsStateTest, PendingPasswordToBlacklisted) {
list.push_back(password_manager::PasswordStoreChange(
password_manager::PasswordStoreChange::ADD, blacklisted));
passwords_data().ProcessLoginsChanged(list);
+ EXPECT_THAT(passwords_data().GetCurrentForms(),
+ ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
@@ -464,6 +473,8 @@ TEST_F(ManagePasswordsStateTest, RequestCredentialsToBlacklisted) {
EXPECT_CALL(*this, OnChooseCredential(_))
.WillOnce(testing::SaveArg<0>(&credential_info));
passwords_data().ProcessLoginsChanged(list);
+ EXPECT_THAT(passwords_data().GetCurrentForms(),
+ ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY,
@@ -476,8 +487,7 @@ TEST_F(ManagePasswordsStateTest, RequestCredentialsToBlacklisted) {
passwords_data().ProcessLoginsChanged(list);
EXPECT_THAT(passwords_data().GetCurrentForms(),
ElementsAre(Pointee(test_local_form())));
- EXPECT_THAT(passwords_data().federated_credentials_forms(),
- ElementsAre(Pointee(test_federated_form())));
+ EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
EXPECT_EQ(origin, passwords_data().origin());
}
@@ -496,6 +506,8 @@ TEST_F(ManagePasswordsStateTest, AutoSigninToBlacklisted) {
password_manager::PasswordStoreChange::ADD, blacklisted);
password_manager::PasswordStoreChangeList list(1, change);
passwords_data().ProcessLoginsChanged(list);
+ EXPECT_THAT(passwords_data().GetCurrentForms(),
+ ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
@@ -527,6 +539,7 @@ TEST_F(ManagePasswordsStateTest, AutomaticPasswordSaveToBlacklisted) {
password_manager::PasswordStoreChange::ADD, blacklisted);
password_manager::PasswordStoreChangeList list(1, change);
passwords_data().ProcessLoginsChanged(list);
+ EXPECT_EQ(*passwords_data().GetCurrentForms()[0], blacklisted);
EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
@@ -557,8 +570,7 @@ TEST_F(ManagePasswordsStateTest, BackgroundAutofilledToBlacklisted) {
password_manager::PasswordStoreChangeList list(1, change);
passwords_data().ProcessLoginsChanged(list);
EXPECT_THAT(passwords_data().GetCurrentForms(),
- UnorderedElementsAre(Pointee(test_local_form()),
- Pointee(blacklisted)));
+ ElementsAre(Pointee(blacklisted), Pointee(test_local_form())));
EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
EXPECT_EQ(test_local_form().origin, passwords_data().origin());
@@ -577,14 +589,15 @@ TEST_F(ManagePasswordsStateTest, BackgroundAutofilledToBlacklisted) {
TEST_F(ManagePasswordsStateTest, BlacklistedToAutofilled) {
autofill::PasswordFormMap password_form_map;
password_form_map[test_local_form().username_value] = &test_local_form();
+ autofill::PasswordForm blacklisted;
+ blacklisted.blacklisted_by_user = true;
+ blacklisted.origin = GURL("http://example.com/bad");
+ password_form_map[blacklisted.username_value] = &blacklisted;
passwords_data().OnBlacklistBlockedAutofill(password_form_map);
EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, passwords_data().state());
- EXPECT_EQ(test_local_form().origin, passwords_data().origin());
+ EXPECT_EQ(blacklisted.origin, passwords_data().origin());
// Delete the blacklisted form.
- autofill::PasswordForm blacklisted = test_local_form();
- blacklisted.blacklisted_by_user = true;
- blacklisted.username_value = base::string16();
password_manager::PasswordStoreChangeList list;
list.push_back(password_manager::PasswordStoreChange(
password_manager::PasswordStoreChange::REMOVE, blacklisted));
@@ -593,7 +606,7 @@ TEST_F(ManagePasswordsStateTest, BlacklistedToAutofilled) {
ElementsAre(Pointee(test_local_form())));
EXPECT_THAT(passwords_data().federated_credentials_forms(), IsEmpty());
EXPECT_EQ(password_manager::ui::MANAGE_STATE, passwords_data().state());
- EXPECT_EQ(test_local_form().origin, passwords_data().origin());
+ EXPECT_EQ(blacklisted.origin, passwords_data().origin());
}
} // namespace
« chrome/browser/ui/passwords/manage_passwords_state.cc ('K') | « chrome/browser/ui/passwords/manage_passwords_state.cc ('k') | chrome/browser/ui/passwords/manage_passwords_test.cc » ('j') | chrome/browser/ui/passwords/manage_passwords_ui_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698