chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc - Issue 63053003: Ask libaddressinput for address components to use in requestAutocomplete().

Unified Diff: chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

Issue 63053003: Ask libaddressinput for address components to use in requestAutocomplete(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: let's try this again, android Created 7 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/autofill/autofill_dialog_common.cc ('K') | « chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | chrome/browser/ui/autofill/autofill_dialog_i18n_input.h » ('j') | chrome/browser/ui/autofill/autofill_dialog_i18n_input.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

index 98a6e04a68e40a9b364cc04836ff7e53b3231c48..5339a3f204f14099d9e02740b9797be9f785bfc2 100644

--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

@@ -20,6 +20,7 @@

#include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"

#include "chrome/browser/ui/autofill/mock_new_credit_card_bubble_controller.h"

#include "chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h"

+#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/render_messages.h"

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

@@ -90,17 +91,6 @@ 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,

- FieldValueMap* outputs) {

- for (size_t i = 0; i < inputs.size(); ++i) {

- if (inputs[i].type == type)

- (*outputs)[type] = value;

- }

// Copies the initial values from |inputs| into |outputs|.

void CopyInitialValues(const DetailInputs& inputs, FieldValueMap* outputs) {

for (size_t i = 0; i < inputs.size(); ++i) {

@@ -173,6 +163,7 @@ class TestAutofillDialogView : public AutofillDialogView {

}

virtual void UpdateSection(DialogSection section) OVERRIDE {

+ section_updates_[section]++;

EXPECT_GE(updates_started_, 1);

}

@@ -218,8 +209,17 @@ class TestAutofillDialogView : public AutofillDialogView {

save_details_locally_checked_ = checked;

}

+ void ClearSectionUpdates() {

+ section_updates_.clear();

+ }

+ std::map<DialogSection, size_t> section_updates() const {

+ return section_updates_;

+ }

private:

std::map<DialogSection, FieldValueMap> outputs_;

+ std::map<DialogSection, size_t> section_updates_;

int updates_started_;

bool save_details_locally_checked_;

@@ -304,6 +304,7 @@ class TestAutofillDialogController

MOCK_METHOD0(LoadRiskFingerprintData, void());

using AutofillDialogControllerImpl::OnDidLoadRiskFingerprintData;

using AutofillDialogControllerImpl::IsEditingExistingData;

+ using AutofillDialogControllerImpl::IsManuallyEditingSection;

using AutofillDialogControllerImpl::IsSubmitPausedOn;

using AutofillDialogControllerImpl::NOT_CHECKED;

using AutofillDialogControllerImpl::SignedInState;

@@ -525,11 +526,7 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {

const std::string& cc_number,

bool should_pass) {

FieldValueMap outputs;

- const DetailInputs& inputs =

- controller()->RequestedFieldsForSection(section);

- SetOutputValue(inputs, CREDIT_CARD_NUMBER,

- ASCIIToUTF16(cc_number), &outputs);

+ outputs[CREDIT_CARD_NUMBER] = UTF8ToUTF16(cc_number);

ValidityMessages messages =

controller()->InputsAreValid(section, outputs);

EXPECT_EQ(should_pass, !messages.HasSureError(CREDIT_CARD_NUMBER));

@@ -574,6 +571,44 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {

return static_cast<SuggestionsMenuModel*>(model);

}

+ void SubmitAndVerifyShippingAndBillingResults() {

+ // Test after setting use billing for shipping.

+ UseBillingForShipping();

+ controller()->OnAccept();

+ ASSERT_EQ(20U, form_structure()->field_count());

+ EXPECT_EQ(ADDRESS_HOME_COUNTRY,

+ form_structure()->field(11)->Type().GetStorableType());

+ EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(11)->Type().group());

+ EXPECT_EQ(ADDRESS_HOME_COUNTRY,

+ form_structure()->field(18)->Type().GetStorableType());

+ EXPECT_EQ(ADDRESS_HOME, form_structure()->field(18)->Type().group());

+ string16 billing_country = form_structure()->field(11)->value;

+ EXPECT_EQ(2U, billing_country.size());

+ string16 shipping_country = form_structure()->field(18)->value;

+ EXPECT_EQ(2U, shipping_country.size());

+ EXPECT_FALSE(billing_country.empty());

+ EXPECT_FALSE(shipping_country.empty());

+ EXPECT_EQ(billing_country, shipping_country);

+ EXPECT_EQ(CREDIT_CARD_NAME,

+ form_structure()->field(1)->Type().GetStorableType());

+ string16 cc_name = form_structure()->field(1)->value;

+ EXPECT_EQ(NAME_FULL, form_structure()->field(6)->Type().GetStorableType());

+ EXPECT_EQ(NAME_BILLING, form_structure()->field(6)->Type().group());

+ string16 billing_name = form_structure()->field(6)->value;

+ EXPECT_EQ(NAME_FULL, form_structure()->field(13)->Type().GetStorableType());

+ EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());

+ string16 shipping_name = form_structure()->field(13)->value;

+ EXPECT_FALSE(cc_name.empty());

+ EXPECT_FALSE(billing_name.empty());

+ EXPECT_FALSE(shipping_name.empty());

+ EXPECT_EQ(cc_name, billing_name);

+ EXPECT_EQ(cc_name, shipping_name);

+ }

TestAutofillDialogController* controller() { return controller_.get(); }

const FormStructure* form_structure() { return form_structure_; }

@@ -662,50 +697,45 @@ TEST_F(AutofillDialogControllerTest, PhoneNumberValidation) {

}

// Make sure country is United States.

- SetOutputValue(inputs, address, ASCIIToUTF16("United States"), &outputs);

+ outputs[address] = ASCIIToUTF16("United States");

// Existing data should have no errors.

ValidityMessages messages = controller()->InputsAreValid(section, outputs);

EXPECT_FALSE(HasAnyError(messages, phone));

// Input an empty phone number.

- SetOutputValue(inputs, phone, base::string16(), &outputs);

+ outputs[phone] = base::string16();