Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/metrics/histogram_samples.h" | 5 #include "base/metrics/histogram_samples.h" |
| 6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "base/test/statistics_delta_reader.h" | 8 #include "base/test/statistics_delta_reader.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" | 10 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 86 | 86 |
| 87 TEST_F(ManagePasswordsUIControllerTest, PasswordAutofilled) { | 87 TEST_F(ManagePasswordsUIControllerTest, PasswordAutofilled) { |
| 88 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); | 88 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); |
| 89 autofill::PasswordFormMap map; | 89 autofill::PasswordFormMap map; |
| 90 map[kTestUsername] = &test_form(); | 90 map[kTestUsername] = &test_form(); |
| 91 controller()->OnPasswordAutofilled(map); | 91 controller()->OnPasswordAutofilled(map); |
| 92 | 92 |
| 93 EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state()); | 93 EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state()); |
| 94 EXPECT_FALSE(controller()->PasswordPendingUserDecision()); | 94 EXPECT_FALSE(controller()->PasswordPendingUserDecision()); |
| 95 EXPECT_EQ(test_form().origin, controller()->origin()); | 95 EXPECT_EQ(test_form().origin, controller()->origin()); |
| 96 EXPECT_EQ(1, controller()->best_matches().size()); | |
| 97 ASSERT_EQ(1, controller()->best_matches().count(kTestUsername)); | |
| 98 EXPECT_NE(&test_form(), | |
|
vabr (Chromium)
2014/08/04 15:36:56
Please say in a comment, that you check the pointe
vasilii
2014/08/04 16:20:59
Done.
| |
| 99 controller()->best_matches().find(kTestUsername)->second); | |
| 96 | 100 |
| 97 ManagePasswordsIconMock mock; | 101 ManagePasswordsIconMock mock; |
| 98 controller()->UpdateIconAndBubbleState(&mock); | 102 controller()->UpdateIconAndBubbleState(&mock); |
| 99 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); | 103 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); |
| 100 } | 104 } |
| 101 | 105 |
| 102 TEST_F(ManagePasswordsUIControllerTest, PasswordSubmitted) { | 106 TEST_F(ManagePasswordsUIControllerTest, PasswordSubmitted) { |
| 103 password_manager::StubPasswordManagerClient client; | 107 password_manager::StubPasswordManagerClient client; |
| 104 password_manager::StubPasswordManagerDriver driver; | 108 password_manager::StubPasswordManagerDriver driver; |
| 105 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( | 109 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 229 TEST_F(ManagePasswordsUIControllerTest, BlacklistBlockedAutofill) { | 233 TEST_F(ManagePasswordsUIControllerTest, BlacklistBlockedAutofill) { |
| 230 test_form().blacklisted_by_user = true; | 234 test_form().blacklisted_by_user = true; |
| 231 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); | 235 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); |
| 232 autofill::PasswordFormMap map; | 236 autofill::PasswordFormMap map; |
| 233 map[kTestUsername] = &test_form(); | 237 map[kTestUsername] = &test_form(); |
| 234 controller()->OnBlacklistBlockedAutofill(map); | 238 controller()->OnBlacklistBlockedAutofill(map); |
| 235 | 239 |
| 236 EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, controller()->state()); | 240 EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, controller()->state()); |
| 237 EXPECT_FALSE(controller()->PasswordPendingUserDecision()); | 241 EXPECT_FALSE(controller()->PasswordPendingUserDecision()); |
| 238 EXPECT_EQ(test_form().origin, controller()->origin()); | 242 EXPECT_EQ(test_form().origin, controller()->origin()); |
| 243 EXPECT_EQ(1, controller()->best_matches().size()); | |
| 244 ASSERT_EQ(1, controller()->best_matches().count(kTestUsername)); | |
| 245 EXPECT_NE(&test_form(), | |
| 246 controller()->best_matches().find(kTestUsername)->second); | |
| 239 | 247 |
| 240 ManagePasswordsIconMock mock; | 248 ManagePasswordsIconMock mock; |
| 241 controller()->UpdateIconAndBubbleState(&mock); | 249 controller()->UpdateIconAndBubbleState(&mock); |
| 242 EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, mock.state()); | 250 EXPECT_EQ(password_manager::ui::BLACKLIST_STATE, mock.state()); |
| 243 } | 251 } |
| 244 | 252 |
| 245 TEST_F(ManagePasswordsUIControllerTest, ClickedUnblacklist) { | 253 TEST_F(ManagePasswordsUIControllerTest, ClickedUnblacklist) { |
| 246 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); | 254 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); |
| 247 autofill::PasswordFormMap map; | 255 autofill::PasswordFormMap map; |
| 248 map[kTestUsername] = &test_form(); | 256 map[kTestUsername] = &test_form(); |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 307 new password_manager::PasswordFormManager( | 315 new password_manager::PasswordFormManager( |
| 308 NULL, &client, &driver, test_form(), false)); | 316 NULL, &client, &driver, test_form(), false)); |
| 309 | 317 |
| 310 controller()->OnAutomaticPasswordSave(test_form_manager.Pass()); | 318 controller()->OnAutomaticPasswordSave(test_form_manager.Pass()); |
| 311 EXPECT_EQ(password_manager::ui::CONFIRMATION_STATE, controller()->state()); | 319 EXPECT_EQ(password_manager::ui::CONFIRMATION_STATE, controller()->state()); |
| 312 | 320 |
| 313 ManagePasswordsIconMock mock; | 321 ManagePasswordsIconMock mock; |
| 314 controller()->UpdateIconAndBubbleState(&mock); | 322 controller()->UpdateIconAndBubbleState(&mock); |
| 315 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); | 323 EXPECT_EQ(password_manager::ui::MANAGE_STATE, mock.state()); |
| 316 } | 324 } |
| OLD | NEW |