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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autofill/autofill_manager_unittest.cc

Issue 6033010: Support autocompletion for HTMl5 tags:"email", "month" and "tel". (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix format errors and change to use toWebInputElement(). Created 9 years, 11 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/autofill/autofill_manager.cc ('k') | chrome/browser/autofill/credit_card.h » ('j') | chrome/renderer/form_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autofill/autofill_manager_unittest.cc
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index 9a3aa8f5df4425b19bf7cc823a4a9a55d9e3abf7..5de37f7816f7b5e7c38e08621d657a60696578b4 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -90,6 +90,17 @@ class TestPersonalDataManager : public PersonalDataManager {
credit_cards_.reset();
}
+ void CreateTestCreditCardsYearMonth(const char* year, const char* month) {
Ilya Sherman 2011/01/25 06:21:30 nit: This only creates a single credit card, so pe
honten.org 2011/01/25 06:38:28 Done.
+ ClearCreditCards();
+ // Create four credit cards with year month combination as following,
Ilya Sherman 2011/01/25 06:21:30 nit: Now only creates one credit card.
honten.org 2011/01/25 06:38:28 Done.
+ CreditCard* credit_card = new CreditCard;
+ autofill_test::SetCreditCardInfo(credit_card, "Miku", "Miku Hatsune",
+ "4234567890654321", // Visa
+ month, year);
+ credit_card->set_guid("00000000-0000-0000-0000-000000000007");
+ credit_cards_->push_back(credit_card);
+ }
+
private:
void CreateTestAutoFillProfiles(ScopedVector<AutoFillProfile>* profiles) {
AutoFillProfile* profile = new AutoFillProfile;
@@ -184,12 +195,20 @@ void CreateTestAddressFormData(FormData* form) {
autofill_test::CreateTestFormField(
"Email", "email", "", "text", &field);
form->fields.push_back(field);
+ autofill_test::CreateTestFormField(
+ "Email", "email2", "", "email", &field);
+ form->fields.push_back(field);
+ autofill_test::CreateTestFormField(
+ "Phone Number", "phonenumber2", "", "tel", &field);
+ form->fields.push_back(field);
}
// Populates |form| with data corresponding to a simple credit card form.
// Note that this actually appends fields to the form data, which can be useful
// for building up more complex test forms.
-void CreateTestCreditCardFormData(FormData* form, bool is_https) {
+void CreateTestCreditCardFormData(FormData* form,
+ bool is_https,
+ bool use_month_type) {
form->name = ASCIIToUTF16("MyForm");
form->method = ASCIIToUTF16("POST");
if (is_https) {
@@ -208,12 +227,18 @@ void CreateTestCreditCardFormData(FormData* form, bool is_https) {
autofill_test::CreateTestFormField(
"Card Number", "cardnumber", "", "text", &field);
form->fields.push_back(field);
- autofill_test::CreateTestFormField(
- "Expiration Date", "ccmonth", "", "text", &field);
- form->fields.push_back(field);
- autofill_test::CreateTestFormField(
- "", "ccyear", "", "text", &field);
- form->fields.push_back(field);
+ if (use_month_type) {
+ autofill_test::CreateTestFormField(
+ "Expiration Date", "ccmonth", "", "month", &field);
+ form->fields.push_back(field);
+ } else {
+ autofill_test::CreateTestFormField(
+ "Expiration Date", "ccmonth", "", "text", &field);
+ form->fields.push_back(field);
+ autofill_test::CreateTestFormField(
+ "", "ccyear", "", "text", &field);
+ form->fields.push_back(field);
+ }
}
void ExpectSuggestions(int page_id,
@@ -244,7 +269,7 @@ void ExpectSuggestions(int page_id,
// Verifies that the |filled_form| has been filled with the given data.
// Verifies address fields if |has_address_fields| is true, and verifies
// credit card fields if |has_credit_card_fields| is true. Verifies both if both
-// are true.
+// are true. |use_month_type| is used for credit card input month type.
void ExpectFilledForm(int page_id,
const FormData& filled_form,
int expected_page_id,
@@ -265,10 +290,11 @@ void ExpectFilledForm(int page_id,
const char* expiration_month,
const char* expiration_year,
bool has_address_fields,
- bool has_credit_card_fields) {
+ bool has_credit_card_fields,
+ bool use_month_type) {
// The number of fields in the address and credit card forms created above.
- const size_t kAddressFormSize = 12;
- const size_t kCreditCardFormSize = 4;
+ const size_t kAddressFormSize = 14;
+ const size_t kCreditCardFormSize = use_month_type ? 3 : 4;
EXPECT_EQ(expected_page_id, page_id);
EXPECT_EQ(ASCIIToUTF16("MyForm"), filled_form.name);
@@ -327,6 +353,12 @@ void ExpectFilledForm(int page_id,
autofill_test::CreateTestFormField(
"Email", "email", email, "text", &field);
EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[11]));
+ autofill_test::CreateTestFormField(
+ "Email", "email2", email, "email", &field);
+ EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[12]));
+ autofill_test::CreateTestFormField(
+ "Phone Number", "phonenumber2", phone, "tel", &field);
+ EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[13]));
}
if (has_credit_card_fields) {
@@ -337,12 +369,23 @@ void ExpectFilledForm(int page_id,
autofill_test::CreateTestFormField(
"Card Number", "cardnumber", card_number, "text", &field);
EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[offset + 1]));
- autofill_test::CreateTestFormField(
- "Expiration Date", "ccmonth", expiration_month, "text", &field);
- EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[offset + 2]));
- autofill_test::CreateTestFormField(
- "", "ccyear", expiration_year, "text", &field);
- EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[offset + 3]));
+ if (use_month_type) {
+ std::string exp_year = expiration_year;
+ std::string exp_month = expiration_month;
+ std::string date;
+ if (!exp_year.empty() && !exp_month.empty())
+ date = exp_year + "-" + exp_month;
+ autofill_test::CreateTestFormField(
+ "Expiration Date", "ccmonth", date.c_str(), "month", &field);
+ EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[offset + 2]));
+ } else {
+ autofill_test::CreateTestFormField(
+ "Expiration Date", "ccmonth", expiration_month, "text", &field);
+ EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[offset + 2]));
+ autofill_test::CreateTestFormField(
+ "", "ccyear", expiration_year, "text", &field);
+ EXPECT_TRUE(field.StrictlyEqualsHack(filled_form.fields[offset + 3]));
+ }
}
}
@@ -354,7 +397,7 @@ void ExpectFilledAddressFormElvis(int page_id,
"Presley", "3734 Elvis Presley Blvd.", "Apt. 10", "Memphis",
"Tennessee", "38116", "USA", "12345678901", "",
"theking@gmail.com", "", "", "", "", true,
- has_credit_card_fields);
+ has_credit_card_fields, false);
}
void ExpectFilledCreditCardFormElvis(int page_id,
@@ -364,7 +407,19 @@ void ExpectFilledCreditCardFormElvis(int page_id,
ExpectFilledForm(page_id, filled_form, expected_page_id,
"", "", "", "", "", "", "", "", "", "", "", "",
"Elvis Presley", "4234567890123456", "04", "2012",
- has_address_fields, true);
+ has_address_fields, true, false);
+}
+
+void ExpectFilledCreditCardYearMonthWithYearMonth(int page_id,
+ const FormData& filled_form,
+ int expected_page_id,
+ bool has_address_fields,
+ const char* year,
+ const char* month) {
+ ExpectFilledForm(page_id, filled_form, expected_page_id,
+ "", "", "", "", "", "", "", "", "", "", "", "",
+ "Miku Hatsune", "4234567890654321", month, year,
+ has_address_fields, true, true);
}
class TestAutoFillManager : public AutoFillManager {
@@ -768,7 +823,7 @@ TEST_F(AutoFillManagerTest, GetProfileSuggestionsMethodGet) {
TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsEmptyValue) {
// Set up our form data.
FormData form;
- CreateTestCreditCardFormData(&form, true);
+ CreateTestCreditCardFormData(&form, true, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -811,7 +866,7 @@ TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsEmptyValue) {
TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsMatchCharacter) {
// Set up our form data.
FormData form;
- CreateTestCreditCardFormData(&form, true);
+ CreateTestCreditCardFormData(&form, true, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -847,7 +902,7 @@ TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsMatchCharacter) {
TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsNonCCNumber) {
// Set up our form data.
FormData form;
- CreateTestCreditCardFormData(&form, true);
+ CreateTestCreditCardFormData(&form, true, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -890,7 +945,7 @@ TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsNonCCNumber) {
TEST_F(AutoFillManagerTest, GetCreditCardSuggestionsNonHTTPS) {
// Set up our form data.
FormData form;
- CreateTestCreditCardFormData(&form, false);
+ CreateTestCreditCardFormData(&form, false, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -955,7 +1010,7 @@ TEST_F(AutoFillManagerTest, GetAddressAndCreditCardSuggestions) {
// Set up our form data.
FormData form;
CreateTestAddressFormData(&form);
- CreateTestCreditCardFormData(&form, true);
+ CreateTestCreditCardFormData(&form, true, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -1029,7 +1084,7 @@ TEST_F(AutoFillManagerTest, GetAddressAndCreditCardSuggestionsNonHttps) {
// Set up our form data.
FormData form;
CreateTestAddressFormData(&form);
- CreateTestCreditCardFormData(&form, false);
+ CreateTestCreditCardFormData(&form, false, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -1289,7 +1344,7 @@ TEST_F(AutoFillManagerTest, FillAddressForm) {
TEST_F(AutoFillManagerTest, FillCreditCardForm) {
// Set up our form data.
FormData form;
- CreateTestCreditCardFormData(&form, true);
+ CreateTestCreditCardFormData(&form, true, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -1304,12 +1359,110 @@ TEST_F(AutoFillManagerTest, FillCreditCardForm) {
ExpectFilledCreditCardFormElvis(page_id, results, kDefaultPageID, false);
}
+// Test that we correctly fill a credit card form with month input type.
+// 1. year empty, month empty
+TEST_F(AutoFillManagerTest, FillCreditCardFormNoYearNoMonth) {
+ // Same as the SetUp(), but generate 4 credit cards with year month
+ // combination.
+ test_personal_data_->CreateTestCreditCardsYearMonth("", "");
+ // Set up our form data.
+ FormData form;
+ CreateTestCreditCardFormData(&form, true, true);
+ std::vector<FormData> forms(1, form);
+ FormsSeen(forms);
+
+ std::string guid = autofill_manager_->GetLabeledCreditCard("Miku")->guid();
+ FillAutoFillFormData(
+ kDefaultPageID, form, *form.fields.begin(),
+ autofill_manager_->PackGUIDs(guid, std::string()));
+
+ int page_id = 0;
+ FormData results;
+ EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+ ExpectFilledCreditCardYearMonthWithYearMonth(page_id, results,
+ kDefaultPageID, false, "", "");
+}
+
+
+// Test that we correctly fill a credit card form with month input type.
+// 2. year empty, month non-empty
+TEST_F(AutoFillManagerTest, FillCreditCardFormNoYearMonth) {
+ // Same as the SetUp(), but generate 4 credit cards with year month
+ // combination.
+ test_personal_data_->CreateTestCreditCardsYearMonth("", "04");
+ // Set up our form data.
+ FormData form;
+ CreateTestCreditCardFormData(&form, true, true);
+ std::vector<FormData> forms(1, form);
+ FormsSeen(forms);
+
+ std::string guid = autofill_manager_->GetLabeledCreditCard("Miku")->guid();
+ FillAutoFillFormData(
+ kDefaultPageID, form, *form.fields.begin(),
+ autofill_manager_->PackGUIDs(guid, std::string()));
+
+ int page_id = 0;
+ FormData results;
+ EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+ ExpectFilledCreditCardYearMonthWithYearMonth(page_id, results,
+ kDefaultPageID, false, "", "04");
+}
+
+// Test that we correctly fill a credit card form with month input type.
+// 3. year non-empty, month empty
+TEST_F(AutoFillManagerTest, FillCreditCardFormYearNoMonth) {
+ // Same as the SetUp(), but generate 4 credit cards with year month
+ // combination.
+ test_personal_data_->CreateTestCreditCardsYearMonth("2012", "");
+ // Set up our form data.
+ FormData form;
+ CreateTestCreditCardFormData(&form, true, true);
+ std::vector<FormData> forms(1, form);
+ FormsSeen(forms);
+
+ std::string guid = autofill_manager_->GetLabeledCreditCard("Miku")->guid();
+ FillAutoFillFormData(
+ kDefaultPageID, form, *form.fields.begin(),
+ autofill_manager_->PackGUIDs(guid, std::string()));
+
+ int page_id = 0;
+ FormData results;
+ EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+ ExpectFilledCreditCardYearMonthWithYearMonth(page_id, results,
+ kDefaultPageID, false, "2012", "");
+}
+
+// Test that we correctly fill a credit card form with month input type.
+// 4. year non-empty, month empty
+TEST_F(AutoFillManagerTest, FillCreditCardFormYearMonth) {
+ // Same as the SetUp(), but generate 4 credit cards with year month
+ // combination.
+ test_personal_data_->ClearCreditCards();
+ test_personal_data_->CreateTestCreditCardsYearMonth("2012", "04");
+ // Set up our form data.
+ FormData form;
+ CreateTestCreditCardFormData(&form, true, true);
+ std::vector<FormData> forms(1, form);
+ FormsSeen(forms);
+
+ std::string guid = autofill_manager_->GetLabeledCreditCard("Miku")->guid();
+ FillAutoFillFormData(
+ kDefaultPageID, form, *form.fields.begin(),
+ autofill_manager_->PackGUIDs(guid, std::string()));
+
+ int page_id = 0;
+ FormData results;
+ EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
+ ExpectFilledCreditCardYearMonthWithYearMonth(page_id, results,
+ kDefaultPageID, false, "2012", "04");
+}
+
// Test that we correctly fill a combined address and credit card form.
TEST_F(AutoFillManagerTest, FillAddressAndCreditCardForm) {
// Set up our form data.
FormData form;
CreateTestAddressFormData(&form);
- CreateTestCreditCardFormData(&form, true);
+ CreateTestCreditCardFormData(&form, true, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -1349,7 +1502,7 @@ TEST_F(AutoFillManagerTest, FillAutoFilledForm) {
CreateTestAddressFormData(&form);
// Mark one of the address fields as autofilled.
form.fields[4].set_autofilled(true);
- CreateTestCreditCardFormData(&form, true);
+ CreateTestCreditCardFormData(&form, true, false);
std::vector<FormData> forms(1, form);
FormsSeen(forms);
@@ -1366,7 +1519,7 @@ TEST_F(AutoFillManagerTest, FillAutoFilledForm) {
SCOPED_TRACE("Address");
ExpectFilledForm(page_id, results, kDefaultPageID,
"Elvis", "", "", "", "", "", "", "", "", "", "", "",
- "", "", "", "", true, true);
+ "", "", "", "", true, true, false);
}
// Now fill the credit card data.
@@ -1402,7 +1555,7 @@ TEST_F(AutoFillManagerTest, FillAutoFilledForm) {
SCOPED_TRACE("Credit card 2");
ExpectFilledForm(page_id, results, kPageID3,
"", "", "", "", "", "", "", "", "", "", "", "",
- "", "", "", "2012", true, true);
+ "", "", "", "2012", true, true, false);
}
}
« no previous file with comments | « chrome/browser/autofill/autofill_manager.cc ('k') | chrome/browser/autofill/credit_card.h » ('j') | chrome/renderer/form_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698