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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 22040002: [Autofill] Add a separate enumeration for HTML field type hints. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add docs Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | chrome/browser/ui/autofill/data_model_wrapper.cc » ('j') | chrome/browser/ui/autofill/data_model_wrapper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 0088b4d82dc87ca896ccd43567b851f9ba890b8a..1c23ef4949ae397622e0cbeb9e67f426e521313f 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -933,22 +933,28 @@ TEST_F(AutofillDialogControllerTest, DontUseBillingAsShipping) {
controller()->OnAccept();
ASSERT_EQ(20U, form_structure()->field_count());
- EXPECT_EQ(ADDRESS_BILLING_STATE,
- form_structure()->field(9)->Type().native_type());
EXPECT_EQ(ADDRESS_HOME_STATE,
- form_structure()->field(16)->Type().native_type());
+ form_structure()->field(9)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(9)->Type().group());
+ EXPECT_EQ(ADDRESS_HOME_STATE,
+ form_structure()->field(16)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(ADDRESS_HOME, form_structure()->field(16)->Type().group());
string16 billing_state = form_structure()->field(9)->value;
string16 shipping_state = form_structure()->field(16)->value;
EXPECT_FALSE(billing_state.empty());
EXPECT_FALSE(shipping_state.empty());
EXPECT_NE(billing_state, shipping_state);
- EXPECT_EQ(CREDIT_CARD_NAME, form_structure()->field(1)->Type().native_type());
+ EXPECT_EQ(CREDIT_CARD_NAME,
+ form_structure()->field(1)->Type().GetEquivalentNativeType());
string16 cc_name = form_structure()->field(1)->value;
- EXPECT_EQ(NAME_BILLING_FULL,
- form_structure()->field(6)->Type().native_type());
+ EXPECT_EQ(NAME_FULL,
+ form_structure()->field(6)->Type().GetEquivalentNativeType());
+ 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().native_type());
+ EXPECT_EQ(NAME_FULL,
+ form_structure()->field(13)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());
string16 shipping_name = form_structure()->field(13)->value;
EXPECT_FALSE(cc_name.empty());
@@ -973,10 +979,12 @@ TEST_F(AutofillDialogControllerTest, UseBillingAsShipping) {
controller()->OnAccept();
ASSERT_EQ(20U, form_structure()->field_count());
- EXPECT_EQ(ADDRESS_BILLING_STATE,
- form_structure()->field(9)->Type().native_type());
EXPECT_EQ(ADDRESS_HOME_STATE,
- form_structure()->field(16)->Type().native_type());
+ form_structure()->field(9)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(9)->Type().group());
+ EXPECT_EQ(ADDRESS_HOME_STATE,
+ form_structure()->field(16)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(ADDRESS_HOME, form_structure()->field(16)->Type().group());
string16 billing_state = form_structure()->field(9)->value;
string16 shipping_state = form_structure()->field(16)->value;
EXPECT_FALSE(billing_state.empty());
@@ -984,12 +992,15 @@ TEST_F(AutofillDialogControllerTest, UseBillingAsShipping) {
EXPECT_EQ(billing_state, shipping_state);
EXPECT_EQ(CREDIT_CARD_NAME,
- form_structure()->field(1)->Type().native_type());
+ form_structure()->field(1)->Type().GetEquivalentNativeType());
string16 cc_name = form_structure()->field(1)->value;
- EXPECT_EQ(NAME_BILLING_FULL,
- form_structure()->field(6)->Type().native_type());
+ EXPECT_EQ(NAME_FULL,
+ form_structure()->field(6)->Type().GetEquivalentNativeType());
+ 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().native_type());
+ EXPECT_EQ(NAME_FULL,
+ form_structure()->field(13)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(NAME, form_structure()->field(13)->Type().group());
string16 shipping_name = form_structure()->field(13)->value;
EXPECT_FALSE(cc_name.empty());
@@ -1027,9 +1038,11 @@ TEST_F(AutofillDialogControllerTest, BillingVsShippingPhoneNumber) {
controller()->OnAccept();
ASSERT_EQ(2U, form_structure()->field_count());
EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
- form_structure()->field(0)->Type().native_type());
- EXPECT_EQ(PHONE_BILLING_WHOLE_NUMBER,
- form_structure()->field(1)->Type().native_type());
+ form_structure()->field(0)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(PHONE_HOME, form_structure()->field(0)->Type().group());
+ EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
+ form_structure()->field(1)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(PHONE_BILLING, form_structure()->field(1)->Type().group());
EXPECT_EQ(shipping_profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER),
form_structure()->field(0)->value);
EXPECT_EQ(billing_profile.GetRawInfo(PHONE_BILLING_WHOLE_NUMBER),
@@ -1963,7 +1976,8 @@ TEST_F(AutofillDialogControllerTest, HideWalletEmail) {
size_t i = 0;
for (; i < form_structure()->field_count(); ++i) {
- if (form_structure()->field(i)->Type().native_type() == EMAIL_ADDRESS) {
+ if (form_structure()->field(i)->Type().GetEquivalentNativeType() ==
+ EMAIL_ADDRESS) {
EXPECT_EQ(ASCIIToUTF16(kFakeEmail), form_structure()->field(i)->value);
break;
}
@@ -1978,13 +1992,16 @@ TEST_F(AutofillDialogControllerTest, AutofillTypes) {
controller()->OnAccept();
controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
ASSERT_EQ(20U, form_structure()->field_count());
- EXPECT_EQ(EMAIL_ADDRESS, form_structure()->field(0)->Type().native_type());
+ EXPECT_EQ(EMAIL_ADDRESS,
+ form_structure()->field(0)->Type().GetEquivalentNativeType());
EXPECT_EQ(CREDIT_CARD_NUMBER,
- form_structure()->field(2)->Type().native_type());
- EXPECT_EQ(ADDRESS_BILLING_STATE,
- form_structure()->field(9)->Type().native_type());
+ form_structure()->field(2)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(ADDRESS_HOME_STATE,
+ form_structure()->field(9)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(9)->Type().group());
EXPECT_EQ(ADDRESS_HOME_STATE,
- form_structure()->field(16)->Type().native_type());
+ form_structure()->field(16)->Type().GetEquivalentNativeType());
+ EXPECT_EQ(ADDRESS_HOME, form_structure()->field(16)->Type().group());
}
TEST_F(AutofillDialogControllerTest, SaveDetailsInChrome) {
« no previous file with comments | « chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc ('k') | chrome/browser/ui/autofill/data_model_wrapper.cc » ('j') | chrome/browser/ui/autofill/data_model_wrapper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698