[rAc] Persist selection of newly added cards and addresses.

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 442 matching lines @@
     DetailOutputMap cc_outputs;
     const DetailInputs& cc_inputs =
         controller()->RequestedFieldsForSection(SECTION_CC);
     for (size_t i = 0; i < cc_inputs.size(); ++i) {
       cc_outputs[&cc_inputs[i]] = cc_inputs[i].type == CREDIT_CARD_NUMBER ?
           ASCIIToUTF16(kTestCCNumberVisa) : ASCIIToUTF16("11");
     }
     controller()->GetView()->SetUserInput(SECTION_CC, cc_outputs);
   }
 
+  // Activates the 'Add new foo' option from the |section|'s suggestions
+  // dropdown and fills the |section|'s inputs with the data from the
+  // |data_model|.  If |section| is SECTION_CC, also fills in '123' for the CVC.
+  void FillInputs(DialogSection section, const AutofillDataModel& data_model) {
+    // Select the 'Add new foo' option.
+    ui::MenuModel* model = GetMenuModelForSection(section);
+    model->ActivatedAt(model->GetItemCount() - 2);
+
+    // Fill the inputs.
+    DetailOutputMap outputs;
+    const DetailInputs& inputs =
+        controller()->RequestedFieldsForSection(section);
+    for (size_t i = 0; i < inputs.size(); ++i) {
+      ServerFieldType type = inputs[i].type;
+      base::string16 output;
+      if (type == CREDIT_CARD_VERIFICATION_CODE)
+        output = ASCIIToUTF16("123");
+      else
+        output = data_model.GetInfo(AutofillType(type), "en-US");
+      outputs[&inputs[i]] = output;
+    }
+    controller()->GetView()->SetUserInput(section, outputs);
+  }
+
   std::vector<DialogNotification> NotificationsOfType(
       DialogNotification::Type type) {
     std::vector<DialogNotification> right_type;
     const std::vector<DialogNotification>& notifications =
         controller()->CurrentNotifications();
     for (size_t i = 0; i < notifications.size(); ++i) {
       if (notifications[i].type() == type)
         right_type.push_back(notifications[i]);
     }
     return right_type;
@@ skipping 58 matching lines @@
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(section);
     for (DetailInputs::const_iterator it = inputs.begin(); it != inputs.end();
          ++it) {
       if (it->type == type)
         return true;
     }
     return false;
   }
 
+  SuggestionsMenuModel* GetMenuModelForSection(DialogSection section) {
+    ui::MenuModel* model = controller()->MenuModelForSection(section);
+    return static_cast<SuggestionsMenuModel*>(model);
+  }
+
   TestAutofillDialogController* controller() { return controller_.get(); }
 
   const FormStructure* form_structure() { return form_structure_; }
 
   TestGeneratedCreditCardBubbleController* test_generated_bubble_controller() {
     return test_generated_bubble_controller_;
   }
 
   const MockNewCreditCardBubbleController* mock_new_card_bubble_controller() {
     return mock_new_card_bubble_controller_.get();
@@ skipping 348 matching lines @@
   verified_profile.SetRawInfo(ADDRESS_HOME_LINE2, string16());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
   shipping_model = controller()->MenuModelForSection(SECTION_SHIPPING);
   ASSERT_TRUE(shipping_model);
   EXPECT_EQ(4, shipping_model->GetItemCount());
 }
 
 // Makes sure that the choice of which Autofill profile to use for each section
 // is sticky.
 TEST_F(AutofillDialogControllerTest, AutofillProfileDefaults) {
-  AutofillProfile full_profile(test::GetFullProfile());
-  full_profile.set_origin(kSettingsOrigin);
-  controller()->GetTestingManager()->AddTestingProfile(&full_profile);
-  AutofillProfile full_profile2(test::GetFullProfile2());
-  full_profile2.set_origin(kSettingsOrigin);
-  controller()->GetTestingManager()->AddTestingProfile(&full_profile2);
+  AutofillProfile profile(test::GetVerifiedProfile());
+  AutofillProfile profile2(test::GetVerifiedProfile2());
+  controller()->GetTestingManager()->AddTestingProfile(&profile);
+  controller()->GetTestingManager()->AddTestingProfile(&profile2);
 
   // Until a selection has been made, the default shipping suggestion is the
   // first one (after "use billing").
-  SuggestionsMenuModel* shipping_model = static_cast<SuggestionsMenuModel*>(
-      controller()->MenuModelForSection(SECTION_SHIPPING));
+  SuggestionsMenuModel* shipping_model =
+      GetMenuModelForSection(SECTION_SHIPPING);
   EXPECT_EQ(1, shipping_model->checked_item());
 
   for (int i = 2; i >= 0; --i) {
-    shipping_model = static_cast<SuggestionsMenuModel*>(
-        controller()->MenuModelForSection(SECTION_SHIPPING));
+    shipping_model = GetMenuModelForSection(SECTION_SHIPPING);
     shipping_model->ExecuteCommand(i, 0);
     FillCreditCardInputs();
     controller()->OnAccept();
 
     Reset();
-    controller()->GetTestingManager()->AddTestingProfile(&full_profile);
-    controller()->GetTestingManager()->AddTestingProfile(&full_profile2);
-    shipping_model = static_cast<SuggestionsMenuModel*>(
-        controller()->MenuModelForSection(SECTION_SHIPPING));
+    controller()->GetTestingManager()->AddTestingProfile(&profile);
+    controller()->GetTestingManager()->AddTestingProfile(&profile2);
+    shipping_model = GetMenuModelForSection(SECTION_SHIPPING);
     EXPECT_EQ(i, shipping_model->checked_item());
   }
 
   // Try again, but don't add the default profile to the PDM. The dialog
   // should fall back to the first profile.
   shipping_model->ExecuteCommand(2, 0);
   FillCreditCardInputs();
   controller()->OnAccept();
   Reset();
-  controller()->GetTestingManager()->AddTestingProfile(&full_profile);
-  shipping_model = static_cast<SuggestionsMenuModel*>(
-      controller()->MenuModelForSection(SECTION_SHIPPING));
+  controller()->GetTestingManager()->AddTestingProfile(&profile);
+  shipping_model = GetMenuModelForSection(SECTION_SHIPPING);
   EXPECT_EQ(1, shipping_model->checked_item());
 }
 
+// Makes sure that a newly added Autofill profile becomes set as the default
+// choice for the next run.
+TEST_F(AutofillDialogControllerTest, NewAutofillProfileIsDefault) {
+  SwitchToAutofill();
+
+  AutofillProfile profile(test::GetVerifiedProfile());
+  CreditCard credit_card(test::GetVerifiedCreditCard());
+  controller()->GetTestingManager()->AddTestingProfile(&profile);
+  controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
+
+  // Until a selection has been made, the default suggestion is the first one.
+  // For the shipping section, this follows the "use billing" suggestion.
+  EXPECT_EQ(0, GetMenuModelForSection(SECTION_CC)->checked_item());
+  EXPECT_EQ(1, GetMenuModelForSection(SECTION_SHIPPING)->checked_item());
+
+  // Fill in the shipping and credit card sections with new data.
+  AutofillProfile new_profile(test::GetVerifiedProfile2());
+  CreditCard new_credit_card(test::GetVerifiedCreditCard2());
+  FillInputs(SECTION_SHIPPING, new_profile);
+  FillInputs(SECTION_CC, new_credit_card);
+  controller()->GetView()->CheckSaveDetailsLocallyCheckbox(true);
+  controller()->OnAccept();
+
+  // Update the |new_profile| and |new_credit_card|'s guids to the saved ones.
+  new_profile.set_guid(
+      controller()->GetTestingManager()->imported_profile().guid());
+  new_credit_card.set_guid(
+      controller()->GetTestingManager()->imported_credit_card().guid());
+
+  // Reload the dialog. The newly added address and credit card should now be
+  // set as the defaults.
+  Reset();
+  controller()->GetTestingManager()->AddTestingProfile(&profile);
+  controller()->GetTestingManager()->AddTestingProfile(&new_profile);
+  controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
+  controller()->GetTestingManager()->AddTestingCreditCard(&new_credit_card);
+
+  // Until a selection has been made, the default suggestion is the first one.
+  // For the shipping section, this follows the "use billing" suggestion.
+  EXPECT_EQ(1, GetMenuModelForSection(SECTION_CC)->checked_item());
+  EXPECT_EQ(2, GetMenuModelForSection(SECTION_SHIPPING)->checked_item());
+}
+
 TEST_F(AutofillDialogControllerTest, AutofillProfileVariants) {
   EXPECT_CALL(*controller()->GetView(), ModelChanged()).Times(1);
   ui::MenuModel* shipping_model =
       controller()->MenuModelForSection(SECTION_SHIPPING);
   ASSERT_TRUE(!!shipping_model);
   EXPECT_EQ(3, shipping_model->GetItemCount());
 
   // Set up some variant data.
   AutofillProfile full_profile(test::GetVerifiedProfile());
   std::vector<string16> names;
@@ skipping 459 matching lines @@
 
 // Checks that clicking the Manage menu item opens a new tab with a different
 // URL for Wallet and Autofill.
 TEST_F(AutofillDialogControllerTest, ManageItem) {
   AutofillProfile full_profile(test::GetVerifiedProfile());
   full_profile.set_origin(kSettingsOrigin);
   full_profile.SetRawInfo(ADDRESS_HOME_LINE2, string16());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   SwitchToAutofill();
 
-  SuggestionsMenuModel* shipping = static_cast<SuggestionsMenuModel*>(
-      controller()->MenuModelForSection(SECTION_SHIPPING));
+  SuggestionsMenuModel* shipping = GetMenuModelForSection(SECTION_SHIPPING);
   shipping->ExecuteCommand(shipping->GetItemCount() - 1, 0);
   GURL autofill_manage_url = controller()->open_tab_url();
   EXPECT_EQ("chrome", autofill_manage_url.scheme());
 
   SwitchToWallet();
   scoped_ptr<wallet::WalletItems> wallet_items = wallet::GetTestWalletItems();
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   controller()->SuggestionItemSelected(shipping, shipping->GetItemCount() - 1);
   GURL wallet_manage_addresses_url = controller()->open_tab_url();
   EXPECT_EQ("https", wallet_manage_addresses_url.scheme());
 
-  SuggestionsMenuModel* billing = static_cast<SuggestionsMenuModel*>(
-      controller()->MenuModelForSection(SECTION_CC_BILLING));
+  SuggestionsMenuModel* billing = GetMenuModelForSection(SECTION_CC_BILLING);
   controller()->SuggestionItemSelected(billing, billing->GetItemCount() - 1);
   GURL wallet_manage_instruments_url = controller()->open_tab_url();
   EXPECT_EQ("https", wallet_manage_instruments_url.scheme());
 
   EXPECT_NE(autofill_manage_url, wallet_manage_instruments_url);
   EXPECT_NE(wallet_manage_instruments_url, wallet_manage_addresses_url);
 }
 
 // Tests that adding an autofill profile and then submitting works.
 TEST_F(AutofillDialogControllerTest, AddAutofillProfile) {
@@ skipping 903 matching lines @@
   EXPECT_FALSE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
 
   // End the submit button delay.
   controller()->SimulateSubmitButtonDelayEnd();
 
   EXPECT_FALSE(controller()->ShouldShowSpinner());
   EXPECT_TRUE(controller()->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK));
 }
 
 }  // namespace autofill