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

Side by Side Diff: chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc

Issue 1162583003: Credential Management: Rename 'LocalCredential' to 'PasswordCredential' (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@drop
Patch Set: Fix. 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 unified diff | Download patch
OLDNEW
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/bind.h" 5 #include "base/bind.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/time/time.h" 8 #include "base/time/time.h"
9 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h" 9 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h"
10 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" 10 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 EXPECT_EQ(origin, controller()->origin()); 395 EXPECT_EQ(origin, controller()->origin());
396 EXPECT_THAT(controller()->GetCurrentForms(), 396 EXPECT_THAT(controller()->GetCurrentForms(),
397 ElementsAre(Pointee(test_local_form()))); 397 ElementsAre(Pointee(test_local_form())));
398 398
399 ManagePasswordsIconMock mock; 399 ManagePasswordsIconMock mock;
400 controller()->UpdateIconAndBubbleState(&mock); 400 controller()->UpdateIconAndBubbleState(&mock);
401 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, mock.state()); 401 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, mock.state());
402 402
403 controller()->ManagePasswordsUIController::ChooseCredential( 403 controller()->ManagePasswordsUIController::ChooseCredential(
404 test_local_form(), 404 test_local_form(),
405 password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL); 405 password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
406 controller()->OnBubbleHidden(); 406 controller()->OnBubbleHidden();
407 EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state()); 407 EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
408 ASSERT_TRUE(credential_info()); 408 ASSERT_TRUE(credential_info());
409 EXPECT_EQ(test_local_form().username_value, credential_info()->id); 409 EXPECT_EQ(test_local_form().username_value, credential_info()->id);
410 EXPECT_EQ(test_local_form().password_value, credential_info()->password); 410 EXPECT_EQ(test_local_form().password_value, credential_info()->password);
411 EXPECT_TRUE(credential_info()->federation.is_empty()); 411 EXPECT_TRUE(credential_info()->federation.is_empty());
412 EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL, 412 EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD,
413 credential_info()->type); 413 credential_info()->type);
414 } 414 }
415 415
416 TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocalButFederated) { 416 TEST_F(ManagePasswordsUIControllerTest, ChooseCredentialLocalButFederated) {
417 ScopedVector<autofill::PasswordForm> local_credentials; 417 ScopedVector<autofill::PasswordForm> local_credentials;
418 local_credentials.push_back( 418 local_credentials.push_back(
419 new autofill::PasswordForm(test_federated_form())); 419 new autofill::PasswordForm(test_federated_form()));
420 ScopedVector<autofill::PasswordForm> federated_credentials; 420 ScopedVector<autofill::PasswordForm> federated_credentials;
421 GURL origin("http://example.com"); 421 GURL origin("http://example.com");
422 EXPECT_TRUE(controller()->OnChooseCredentials( 422 EXPECT_TRUE(controller()->OnChooseCredentials(
423 local_credentials.Pass(), federated_credentials.Pass(), origin, 423 local_credentials.Pass(), federated_credentials.Pass(), origin,
424 base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback, 424 base::Bind(&ManagePasswordsUIControllerTest::CredentialCallback,
425 base::Unretained(this)))); 425 base::Unretained(this))));
426 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, 426 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE,
427 controller()->state()); 427 controller()->state());
428 EXPECT_FALSE(controller()->PasswordPendingUserDecision()); 428 EXPECT_FALSE(controller()->PasswordPendingUserDecision());
429 EXPECT_EQ(origin, controller()->origin()); 429 EXPECT_EQ(origin, controller()->origin());
430 EXPECT_THAT(controller()->GetCurrentForms(), 430 EXPECT_THAT(controller()->GetCurrentForms(),
431 ElementsAre(Pointee(test_federated_form()))); 431 ElementsAre(Pointee(test_federated_form())));
432 432
433 ManagePasswordsIconMock mock; 433 ManagePasswordsIconMock mock;
434 controller()->UpdateIconAndBubbleState(&mock); 434 controller()->UpdateIconAndBubbleState(&mock);
435 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, mock.state()); 435 EXPECT_EQ(password_manager::ui::CREDENTIAL_REQUEST_STATE, mock.state());
436 436
437 controller()->ManagePasswordsUIController::ChooseCredential( 437 controller()->ManagePasswordsUIController::ChooseCredential(
438 test_federated_form(), 438 test_federated_form(),
439 password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL); 439 password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD);
440 controller()->OnBubbleHidden(); 440 controller()->OnBubbleHidden();
441 EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state()); 441 EXPECT_EQ(password_manager::ui::MANAGE_STATE, controller()->state());
442 ASSERT_TRUE(credential_info()); 442 ASSERT_TRUE(credential_info());
443 EXPECT_EQ(test_federated_form().username_value, credential_info()->id); 443 EXPECT_EQ(test_federated_form().username_value, credential_info()->id);
444 EXPECT_EQ(test_federated_form().federation_url, 444 EXPECT_EQ(test_federated_form().federation_url,
445 credential_info()->federation); 445 credential_info()->federation);
446 EXPECT_TRUE(credential_info()->password.empty()); 446 EXPECT_TRUE(credential_info()->password.empty());
447 EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED, 447 EXPECT_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED,
448 credential_info()->type); 448 credential_info()->type);
449 } 449 }
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) { 543 TEST_F(ManagePasswordsUIControllerTest, InactiveOnPSLMatched) {
544 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); 544 base::string16 kTestUsername = base::ASCIIToUTF16("test_username");
545 autofill::PasswordFormMap map; 545 autofill::PasswordFormMap map;
546 autofill::PasswordForm psl_matched_test_form = test_local_form(); 546 autofill::PasswordForm psl_matched_test_form = test_local_form();
547 psl_matched_test_form.original_signon_realm = "http://pslmatched.example.com"; 547 psl_matched_test_form.original_signon_realm = "http://pslmatched.example.com";
548 map[kTestUsername] = &psl_matched_test_form; 548 map[kTestUsername] = &psl_matched_test_form;
549 controller()->OnPasswordAutofilled(map); 549 controller()->OnPasswordAutofilled(map);
550 550
551 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state()); 551 EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->state());
552 } 552 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698