Change DetailOutputMap to FieldValueMap

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 76 matching lines @@
 const char kTestCCNumberMaster[] = "5555555555554444";
 const char kTestCCNumberDiscover[] = "6011111111111117";
 const char kTestCCNumberIncomplete[] = "4111111111";
 // Credit card number fails Luhn check.
 const char kTestCCNumberInvalid[] = "4111111111111112";
 
 // Sets the value of |type| in |outputs| to |value|.
 void SetOutputValue(const DetailInputs& inputs,
                     ServerFieldType type,
                     const base::string16& value,
-                    DetailOutputMap* outputs) {
+                    FieldValueMap* outputs) {
   for (size_t i = 0; i < inputs.size(); ++i) {
-    const DetailInput& input = inputs[i];
-    if (input.type == type)
-      (*outputs)[&input] = value;
+    if (inputs[i].type == type)
+      (*outputs)[type] = value;
   }
 }
 
 // Copies the initial values from |inputs| into |outputs|.
-void CopyInitialValues(const DetailInputs& inputs, DetailOutputMap* outputs) {
+void CopyInitialValues(const DetailInputs& inputs, FieldValueMap* outputs) {
   for (size_t i = 0; i < inputs.size(); ++i) {
     const DetailInput& input = inputs[i];
-    (*outputs)[&input] = input.initial_value;
+    (*outputs)[input.type] = input.initial_value;
   }
 }
 
 scoped_ptr<wallet::WalletItems> CompleteAndValidWalletItems() {
   scoped_ptr<wallet::WalletItems> items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   items->AddInstrument(wallet::GetTestMaskedInstrument());
   items->AddAddress(wallet::GetTestShippingAddress());
   return items.Pass();
 }
@@ skipping 56 matching lines @@
   virtual void UpdateSection(DialogSection section) OVERRIDE {
     EXPECT_GE(updates_started_, 1);
   }
 
   virtual void UpdateErrorBubble() OVERRIDE {
     EXPECT_GE(updates_started_, 1);
   }
 
   virtual void FillSection(DialogSection section,
                            const DetailInput& originating_input) OVERRIDE {};
-  virtual void GetUserInput(DialogSection section, DetailOutputMap* output)
+  virtual void GetUserInput(DialogSection section, FieldValueMap* output)
       OVERRIDE {
     *output = outputs_[section];
   }
   virtual TestableAutofillDialogView* GetTestableView() OVERRIDE {
     return NULL;
   }
 
   virtual string16 GetCvc() OVERRIDE { return string16(); }
   virtual bool HitTestInput(const DetailInput& input,
                             const gfx::Point& screen_point) OVERRIDE {
     return false;
   }
 
   virtual bool SaveDetailsLocally() OVERRIDE {
     return save_details_locally_checked_;
   }
 
   virtual const content::NavigationController* ShowSignIn() OVERRIDE {
     return NULL;
   }
   virtual void HideSignIn() OVERRIDE {}
 
   MOCK_METHOD0(ModelChanged, void());
   MOCK_METHOD0(UpdateForErrors, void());
 
   virtual void OnSignInResize(const gfx::Size& pref_size) OVERRIDE {}
 
-  void SetUserInput(DialogSection section, const DetailOutputMap& map) {
+  void SetUserInput(DialogSection section, const FieldValueMap& map) {
     outputs_[section] = map;
   }
 
   void CheckSaveDetailsLocallyCheckbox(bool checked) {
     save_details_locally_checked_ = checked;
   }
 
  private:
-  std::map<DialogSection, DetailOutputMap> outputs_;
+  std::map<DialogSection, FieldValueMap> outputs_;
 
   int updates_started_;
   bool save_details_locally_checked_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogView);
 };
 
 class TestAutofillDialogController
     : public AutofillDialogControllerImpl,
       public base::SupportsWeakPtr<TestAutofillDialogController> {
@@ skipping 200 matching lines @@
     if (!profile()->GetPrefs()->GetBoolean(
             ::prefs::kAutofillDialogPayWithoutWallet)) {
       EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems());
       controller_->OnDidFetchWalletCookieValue(std::string());
       controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
     }
   }
 
   // Fills the inputs in SECTION_CC with data.
   void FillCreditCardInputs() {
-    DetailOutputMap cc_outputs;
+    FieldValueMap 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 ?
+      cc_outputs[cc_inputs[i].type] = cc_inputs[i].type == CREDIT_CARD_NUMBER ?
           ASCIIToUTF16(kTestCCNumberVisa) : ASCIIToUTF16("11");
     }
     controller()->GetView()->SetUserInput(SECTION_CC, cc_outputs);
   }
 
   // Fills the inputs in SECTION_CC_BILLING with valid data.
   void FillCCBillingInputs() {
-    DetailOutputMap outputs;
+    FieldValueMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
     AutofillProfile full_profile(test::GetVerifiedProfile());
     CreditCard full_card(test::GetCreditCard());
     for (size_t i = 0; i < inputs.size(); ++i) {
-      const DetailInput& input = inputs[i];
-      outputs[&input] = full_profile.GetInfo(AutofillType(input.type),
-                                             "en-US");
+      const ServerFieldType type = inputs[i].type;
+      outputs[type] = full_profile.GetInfo(AutofillType(type), "en-US");
 
-      if (outputs[&input].empty())
-        outputs[&input] = full_card.GetInfo(AutofillType(input.type), "en-US");
+      if (outputs[type].empty())
+        outputs[type] = full_card.GetInfo(AutofillType(type), "en-US");
     }
     controller()->GetView()->SetUserInput(SECTION_CC_BILLING, 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);
     if (model)
       model->ActivatedAt(model->GetItemCount() - 2);
 
     // Fill the inputs.
-    DetailOutputMap outputs;
+    FieldValueMap 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;
+      outputs[inputs[i].type] = 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) {
@@ skipping 16 matching lines @@
     controller_->SimulateSigninError();
   }
 
   void UseBillingForShipping() {
     controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(0);
   }
 
   void ValidateCCNumber(DialogSection section,
                         const std::string& cc_number,
                         bool should_pass) {
-    DetailOutputMap outputs;
+    FieldValueMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(section);
 
     SetOutputValue(inputs, CREDIT_CARD_NUMBER,
                    ASCIIToUTF16(cc_number), &outputs);
     ValidityMessages messages =
         controller()->InputsAreValid(section, outputs);
     EXPECT_EQ(should_pass, !messages.HasSureError(CREDIT_CARD_NUMBER));
   }
 
@@ skipping 97 matching lines @@
         controller()->RequestedFieldsForSection(section);
     for (DetailInputs::const_iterator iter = shipping_inputs.begin();
          iter != shipping_inputs.end(); ++iter) {
       controller()->InputValidityMessage(section, iter->type, string16());
     }
   }
 }
 
 // Test for phone number validation.
 TEST_F(AutofillDialogControllerTest, PhoneNumberValidation) {
-  // Construct DetailOutputMap from existing data.
+  // Construct FieldValueMap from existing data.
   SwitchToAutofill();
 
   for (size_t i = 0; i < 2; ++i) {
     ServerFieldType phone = i == 0 ? PHONE_HOME_WHOLE_NUMBER :
                                      PHONE_BILLING_WHOLE_NUMBER;
     ServerFieldType address = i == 0 ? ADDRESS_HOME_COUNTRY :
                                        ADDRESS_BILLING_COUNTRY;
     DialogSection section = i == 0 ? SECTION_SHIPPING : SECTION_BILLING;
 
-    DetailOutputMap outputs;
+    FieldValueMap outputs;
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(section);
     AutofillProfile full_profile(test::GetVerifiedProfile());
     for (size_t i = 0; i < inputs.size(); ++i) {
-      const DetailInput& input = inputs[i];
-      outputs[&input] = full_profile.GetInfo(AutofillType(input.type),
-                                             "en-US");
+      const ServerFieldType type = inputs[i].type;
+      outputs[type] = full_profile.GetInfo(AutofillType(type), "en-US");
     }
 
     // Make sure country is United States.
     SetOutputValue(inputs, address, ASCIIToUTF16("United States"), &outputs);
 
     // Existing data should have no errors.
     ValidityMessages messages = controller()->InputsAreValid(section, outputs);
     EXPECT_FALSE(HasAnyError(messages, phone));
 
     // Input an empty phone number.
@@ skipping 23 matching lines @@
 
     // Input an invalid international phone number.
     SetOutputValue(inputs, phone,
                    ASCIIToUTF16("+112333 892 70 12 39"), &outputs);
     messages = controller()->InputsAreValid(section, outputs);
     EXPECT_TRUE(messages.HasSureError(phone));
   }
 }
 
 TEST_F(AutofillDialogControllerTest, ExpirationDateValidity) {
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
 
   ui::ComboboxModel* exp_year_model =
       controller()->ComboboxModelForAutofillType(CREDIT_CARD_EXP_4_DIGIT_YEAR);
   ui::ComboboxModel* exp_month_model =
       controller()->ComboboxModelForAutofillType(CREDIT_CARD_EXP_MONTH);
 
   base::string16 default_year_value =
       exp_year_model->GetItemAt(exp_year_model->GetDefaultIndex());
@@ skipping 27 matching lines @@
   // Expiration date with default year fails.
   SetOutputValue(inputs, CREDIT_CARD_EXP_MONTH, other_month_value, &outputs);
   SetOutputValue(inputs, CREDIT_CARD_EXP_4_DIGIT_YEAR,
                  default_year_value, &outputs);
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, outputs);
   EXPECT_TRUE(HasUnsureError(messages, CREDIT_CARD_EXP_4_DIGIT_YEAR));
   EXPECT_FALSE(HasUnsureError(messages, CREDIT_CARD_EXP_MONTH));
 }
 
 TEST_F(AutofillDialogControllerTest, BillingNameValidation) {
-  // Construct DetailOutputMap from AutofillProfile data.
+  // Construct FieldValueMap from AutofillProfile data.
   SwitchToAutofill();
 
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_BILLING);
 
   // Input an empty billing name.
   SetOutputValue(inputs, NAME_BILLING_FULL, base::string16(), &outputs);
   ValidityMessages messages = controller()->InputsAreValid(SECTION_BILLING,
                                                            outputs);
   EXPECT_TRUE(HasUnsureError(messages, NAME_BILLING_FULL));
 
   // Input a non-empty billing name.
   SetOutputValue(inputs, NAME_BILLING_FULL, ASCIIToUTF16("Bob"), &outputs);
   messages = controller()->InputsAreValid(SECTION_BILLING, outputs);
   EXPECT_FALSE(HasAnyError(messages, NAME_BILLING_FULL));
 
   // Switch to Wallet which only considers names with with at least two names to
   // be valid.
   SwitchToWallet();
 
   // Setup some wallet state.
   scoped_ptr<wallet::WalletItems> wallet_items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
-  DetailOutputMap wallet_outputs;
+  FieldValueMap wallet_outputs;
   const DetailInputs& wallet_inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
 
   // Input an empty billing name. Data source should not change this behavior.
   SetOutputValue(wallet_inputs, NAME_BILLING_FULL,
                  base::string16(), &wallet_outputs);
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, wallet_outputs);
   EXPECT_TRUE(HasUnsureError(messages, NAME_BILLING_FULL));
 
   // Input a one name billing name. Wallet does not currently support this.
@@ skipping 18 matching lines @@
   // Input a billing name with lots of crazy whitespace.
   SetOutputValue(
       wallet_inputs, NAME_BILLING_FULL,
       ASCIIToUTF16("     \\n\\r John \\n  Jacob Jingleheimer \\t Schmidt  "),
       &wallet_outputs);
   messages = controller()->InputsAreValid(SECTION_CC_BILLING, wallet_outputs);
   EXPECT_FALSE(HasAnyError(messages, NAME_BILLING_FULL));
 }
 
 TEST_F(AutofillDialogControllerTest, CreditCardNumberValidation) {
-  // Construct DetailOutputMap from AutofillProfile data.
+  // Construct FieldValueMap from AutofillProfile data.
   SwitchToAutofill();
 
   // Should accept AMEX, Visa, Master and Discover.
   ValidateCCNumber(SECTION_CC, kTestCCNumberVisa, true);
   ValidateCCNumber(SECTION_CC, kTestCCNumberMaster, true);
   ValidateCCNumber(SECTION_CC, kTestCCNumberDiscover, true);
   ValidateCCNumber(SECTION_CC, kTestCCNumberAmex, true);
   ValidateCCNumber(SECTION_CC, kTestCCNumberIncomplete, false);
   ValidateCCNumber(SECTION_CC, kTestCCNumberInvalid, false);
 
@@ skipping 745 matching lines @@
 // the user has selected "Same as billing".
 TEST_F(AutofillDialogControllerTest, SaveInstrumentSameAsBilling) {
   scoped_ptr<wallet::WalletItems> wallet_items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   ui::MenuModel* model = controller()->MenuModelForSection(SECTION_CC_BILLING);
   model->ActivatedAt(model->GetItemCount() - 2);
 
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
   AutofillProfile full_profile(test::GetVerifiedProfile());
   CreditCard full_card(test::GetCreditCard());
   for (size_t i = 0; i < inputs.size(); ++i) {
-    const DetailInput& input = inputs[i];
-    if (input.type == ADDRESS_BILLING_LINE1) {
-      outputs[&input] = ASCIIToUTF16(kEditedBillingAddress);
-    } else {
-      outputs[&input] = full_profile.GetInfo(AutofillType(input.type),
-                                             "en-US");
-    }
+    const ServerFieldType type = inputs[i].type;
+    if (type == ADDRESS_BILLING_LINE1)
+      outputs[type] = ASCIIToUTF16(kEditedBillingAddress);
+    else
+      outputs[type] = full_profile.GetInfo(AutofillType(type), "en-US");
 
-    if (outputs[&input].empty())
-      outputs[&input] = full_card.GetInfo(AutofillType(input.type), "en-US");
+    if (outputs[type].empty())
+      outputs[type] = full_card.GetInfo(AutofillType(type), "en-US");
   }
   controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);
 
   controller()->OnAccept();
 
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
               SaveToWalletMock(testing::NotNull(), UsesLocalBillingAddress()));
   AcceptAndLoadFakeFingerprint();
 }
 
@@ skipping 49 matching lines @@
   AutofillProfile full_profile(test::GetVerifiedProfile());
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&full_profile);
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
 
   ui::MenuModel* model = controller()->MenuModelForSection(SECTION_BILLING);
   // Activate the "Add billing address" menu item.
   model->ActivatedAt(model->GetItemCount() - 2);
 
   // Fill in the inputs from the profile.
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_BILLING);
   AutofillProfile full_profile2(test::GetVerifiedProfile2());
   for (size_t i = 0; i < inputs.size(); ++i) {
-    const DetailInput& input = inputs[i];
-    outputs[&input] = full_profile2.GetInfo(AutofillType(input.type), "en-US");
+    const ServerFieldType type = inputs[i].type;
+    outputs[type] = full_profile2.GetInfo(AutofillType(type), "en-US");
   }
   controller()->GetView()->SetUserInput(SECTION_BILLING, outputs);
 
   controller()->OnAccept();
   const AutofillProfile& added_profile =
       controller()->GetTestingManager()->imported_profile();
 
   const DetailInputs& shipping_inputs =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING);
   for (size_t i = 0; i < shipping_inputs.size(); ++i) {
-    const DetailInput& input = shipping_inputs[i];
-    EXPECT_EQ(full_profile2.GetInfo(AutofillType(input.type), "en-US"),
-              added_profile.GetInfo(AutofillType(input.type), "en-US"));
+    const ServerFieldType type = shipping_inputs[i].type;
+    EXPECT_EQ(full_profile2.GetInfo(AutofillType(type), "en-US"),
+              added_profile.GetInfo(AutofillType(type), "en-US"));
   }
 }
 
 TEST_F(AutofillDialogControllerTest, VerifyCvv) {
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetFullWallet(_));
   EXPECT_CALL(*controller()->GetTestingWalletClient(),
               AuthenticateInstrument(_, _));
 
   SubmitWithWalletItems(CompleteAndValidWalletItems());
 
@@ skipping 492 matching lines @@
   scoped_ptr<wallet::WalletItems> wallet_items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrumentExpired());
   controller()->OnDidGetWalletItems(wallet_items.Pass());
 
   EXPECT_TRUE(controller()->IsEditingExistingData(SECTION_CC_BILLING));
 
   // Use |SetOutputValue()| to put the right ServerFieldTypes into the map.
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   CopyInitialValues(inputs, &outputs);
   SetOutputValue(inputs, COMPANY_NAME, ASCIIToUTF16("Bluth Company"), &outputs);
 
   // The local inputs are invalid because the server said so. They'll
   // stay invalid until they differ from the remotely fetched model.
   ValidityMessages messages = controller()->InputsAreValid(SECTION_CC_BILLING,
                                                            outputs);
   EXPECT_TRUE(messages.HasSureError(CREDIT_CARD_EXP_MONTH));
   EXPECT_TRUE(messages.HasSureError(CREDIT_CARD_EXP_4_DIGIT_YEAR));
 
@@ skipping 386 matching lines @@
   // Expired instrument: CC number + CVV are not editable.
   items = wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   scoped_ptr<wallet::WalletItems::MaskedInstrument> expired_instrument =
       wallet::GetTestMaskedInstrumentExpired();
   items->AddInstrument(expired_instrument.Pass());
   controller()->OnDidGetWalletItems(items.Pass());
   EXPECT_TRUE(controller()->IsEditingExistingData(SECTION_CC_BILLING));
 
   const DetailInputs& inputs =
       controller()->RequestedFieldsForSection(SECTION_CC_BILLING);
-  DetailOutputMap outputs;
+  FieldValueMap outputs;
   CopyInitialValues(inputs, &outputs);
   controller()->GetView()->SetUserInput(SECTION_CC_BILLING, outputs);
 
   for (size_t i = 0; i < arraysize(sections); ++i) {
     const DetailInputs& inputs =
         controller()->RequestedFieldsForSection(sections[i]);
     for (size_t j = 0; j < inputs.size(); ++j) {
       if (inputs[j].type == CREDIT_CARD_NUMBER ||
           inputs[j].type == CREDIT_CARD_VERIFICATION_CODE) {
         EXPECT_FALSE(controller()->InputIsEditable(inputs[j], sections[i]));
@@ skipping 70 matching lines @@
   EXPECT_EQ(0U, controller()->GetTestingWalletClient()->user_index());
 
   // GetWalletItems should be called when the user switches accounts.
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems());
   controller()->MenuModelForAccountChooser()->ActivatedAt(1);
   // The wallet client should be updated to the new user index.
   EXPECT_EQ(1U, controller()->GetTestingWalletClient()->user_index());
 }
 
 }  // namespace autofill