Change DetailOutputMap to FieldValueMap

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 117 matching lines @@
       ServerFieldType type,
       const string16& value) OVERRIDE {
     if (!use_validation_)
       return string16();
     return AutofillDialogControllerImpl::InputValidityMessage(
         section, type, value);
   }
 
   virtual ValidityMessages InputsAreValid(
       DialogSection section,
-      const DetailOutputMap& inputs) OVERRIDE {
+      const FieldValueMap& inputs) OVERRIDE {
     if (!use_validation_)
       return ValidityMessages();
     return AutofillDialogControllerImpl::InputsAreValid(section, inputs);
   }
 
   // Saving to Chrome is tested in AutofillDialogControllerImpl unit tests.
   // TODO(estade): test that the view defaults to saving to Chrome.
   virtual bool ShouldOfferToSaveInChrome() const OVERRIDE {
     return false;
   }
@@ skipping 14 matching lines @@
 
   void set_notifications(const std::vector<DialogNotification>& notifications) {
     notifications_ = notifications;
   }
 
   TestPersonalDataManager* GetTestingManager() {
     return &test_manager_;
   }
 
   using AutofillDialogControllerImpl::IsEditingExistingData;
-  using AutofillDialogControllerImpl::IsManuallyEditingSection;
+  using AutofillDialogControllerImpl::IsPayingWithWallet;
   using AutofillDialogControllerImpl::IsSubmitPausedOn;
   using AutofillDialogControllerImpl::OnDidLoadRiskFingerprintData;
   using AutofillDialogControllerImpl::AccountChooserModelForTesting;
 
   void set_use_validation(bool use_validation) {
     use_validation_ = use_validation;
   }
 
   base::WeakPtr<TestAutofillDialogController> AsWeakPtr() {
     return weak_ptr_factory_.GetWeakPtr();
@@ skipping 705 matching lines @@
 
 // Flaky on Win7, WinXP, and Win Aura.  http://crbug.com/270314.
 #if defined(OS_WIN)
 #define MAYBE_PreservedSections DISABLED_PreservedSections
 #else
 #define MAYBE_PreservedSections PreservedSections
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, MAYBE_PreservedSections) {
   controller()->set_use_validation(true);
 
-  // Set up some Autofill state.
-  CreditCard credit_card(test::GetVerifiedCreditCard());
-  controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
+  TestableAutofillDialogView* view = controller()->GetTestableView();
 
-  AutofillProfile profile(test::GetVerifiedProfile());
-  controller()->GetTestingManager()->AddTestingProfile(&profile);
-
-  EXPECT_TRUE(controller()->SectionIsActive(SECTION_CC));
-  EXPECT_TRUE(controller()->SectionIsActive(SECTION_BILLING));
-  EXPECT_FALSE(controller()->SectionIsActive(SECTION_CC_BILLING));
-  EXPECT_TRUE(controller()->SectionIsActive(SECTION_SHIPPING));
-
-  EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_CC));
-  EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_BILLING));
-  EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
-
-  // Set up some Wallet state.
-  controller()->OnDidFetchWalletCookieValue(std::string());
-  controller()->OnDidGetWalletItems(
-      wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
-
-  ui::MenuModel* account_chooser = controller()->MenuModelForAccountChooser();
-  ASSERT_TRUE(account_chooser->IsItemCheckedAt(0));
-
-  // Check that the view's in the state we expect before starting to simulate
-  // user input.
-  EXPECT_FALSE(controller()->SectionIsActive(SECTION_CC));
-  EXPECT_FALSE(controller()->SectionIsActive(SECTION_BILLING));
-  EXPECT_TRUE(controller()->SectionIsActive(SECTION_CC_BILLING));
-  EXPECT_TRUE(controller()->SectionIsActive(SECTION_SHIPPING));
-
-  EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_CC_BILLING));
-
-  // Create some valid inputted billing data.
-  const DetailInput& cc_number =
-      controller()->RequestedFieldsForSection(SECTION_CC_BILLING)[0];
-  EXPECT_EQ(CREDIT_CARD_NUMBER, cc_number.type);
-  TestableAutofillDialogView* view = controller()->GetTestableView();
-  view->SetTextContentsOfInput(cc_number, ASCIIToUTF16("4111111111111111"));
-
-  // Select "Add new shipping info..." from suggestions menu.
-  ui::MenuModel* shipping_model =
-      controller()->MenuModelForSection(SECTION_SHIPPING);
-  shipping_model->ActivatedAt(shipping_model->GetItemCount() - 2);
-
-  EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
+  {
+    // Create some valid inputted billing data.
+    const DetailInput& cc_number =
+        controller()->RequestedFieldsForSection(SECTION_CC)[0];
+    DCHECK_EQ(cc_number.type, CREDIT_CARD_NUMBER);
+    view->SetTextContentsOfInput(cc_number, ASCIIToUTF16("4111111111111111"));
+  }
 
   // Create some invalid, manually inputted shipping data.
   const DetailInput& shipping_zip =
       controller()->RequestedFieldsForSection(SECTION_SHIPPING)[5];
   ASSERT_EQ(ADDRESS_HOME_ZIP, shipping_zip.type);
   view->SetTextContentsOfInput(shipping_zip, ASCIIToUTF16("shipping zip"));
 
-  // Switch to using Autofill.
+  // Switch to Wallet by simulating a successful server response.
+  controller()->OnDidFetchWalletCookieValue(std::string());
+  controller()->OnDidGetWalletItems(
+      wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
+  ASSERT_TRUE(controller()->IsPayingWithWallet());
+
+  {
+    // The valid data should be preserved.
+    const DetailInput& cc_number =
+        controller()->RequestedFieldsForSection(SECTION_CC_BILLING)[0];
+    EXPECT_EQ(cc_number.type, CREDIT_CARD_NUMBER);
+    EXPECT_EQ(ASCIIToUTF16("4111111111111111"),
+              view->GetTextContentsOfInput(cc_number));
+  }
+
+  // The invalid data should be dropped.
+  EXPECT_TRUE(view->GetTextContentsOfInput(shipping_zip).empty());
+
+  // Switch back to Autofill.
+  ui::MenuModel* account_chooser = controller()->MenuModelForAccountChooser();
   account_chooser->ActivatedAt(account_chooser->GetItemCount() - 1);
+  ASSERT_FALSE(controller()->IsPayingWithWallet());
 
-  // Check that appropriate sections are preserved and in manually editing mode
-  // (or disabled, in the case of the combined cc + billing section).
-  EXPECT_TRUE(controller()->SectionIsActive(SECTION_CC));
-  EXPECT_TRUE(controller()->SectionIsActive(SECTION_BILLING));
-  EXPECT_FALSE(controller()->SectionIsActive(SECTION_CC_BILLING));
-  EXPECT_TRUE(controller()->SectionIsActive(SECTION_SHIPPING));
-
-  EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_CC));
-  EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_BILLING));
-  EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
-
-  const DetailInput& new_cc_number =
-      controller()->RequestedFieldsForSection(SECTION_CC).front();
-  EXPECT_EQ(cc_number.type, new_cc_number.type);
-  EXPECT_EQ(ASCIIToUTF16("4111111111111111"),
-            view->GetTextContentsOfInput(new_cc_number));
-
-  EXPECT_NE(ASCIIToUTF16("shipping name"),
-            view->GetTextContentsOfInput(shipping_zip));
+  {
+    // The valid data should still be preserved when switched back.
+    const DetailInput& cc_number =
+        controller()->RequestedFieldsForSection(SECTION_CC)[0];
+    EXPECT_EQ(cc_number.type, CREDIT_CARD_NUMBER);
+    EXPECT_EQ(ASCIIToUTF16("4111111111111111"),
+              view->GetTextContentsOfInput(cc_number));
+  }
 }
 #endif  // defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        GeneratedCardLastFourAfterVerifyCvv) {
   controller()->OnDidFetchWalletCookieValue(std::string());
 
   scoped_ptr<wallet::WalletItems> wallet_items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   wallet_items->AddInstrument(wallet::GetTestMaskedInstrument());
@@ skipping 263 matching lines @@
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(2);
   // Tabs should now be: / rAc() \/ manage 2 \/ manage 1 \/ blank \.
   EXPECT_EQ(4, tab_strip->count());
   EXPECT_EQ(0, tab_strip->GetIndexOfWebContents(dialog_invoker));
   EXPECT_EQ(1, tab_strip->active_index());
   EXPECT_EQ(2, tab_strip->GetIndexOfWebContents(first_manage_tab));
   EXPECT_EQ(3, tab_strip->GetIndexOfWebContents(blank_tab));
 }
 
 }  // namespace autofill