Chromium Code Reviews| Index: chrome/renderer/form_manager_browsertest.cc |
| diff --git a/chrome/renderer/form_manager_browsertest.cc b/chrome/renderer/form_manager_browsertest.cc |
| index 7a948d8119cd2b129602b5ebd7a3dcef73d4410f..76b5c87df88339a5947f3b257550ccbfeb28e26d 100644 |
| --- a/chrome/renderer/form_manager_browsertest.cc |
| +++ b/chrome/renderer/form_manager_browsertest.cc |
| @@ -37,6 +37,9 @@ namespace { |
| typedef RenderViewTest FormManagerTest; |
| +// TODO(isherman): Pull this as a named constant from WebKit |
| +const int defaultMaxLength = 524288; |
|
dhollowa
2010/11/19 03:00:29
nit: kDefaultMaxLength. Also, 524288 == 0x80000 i
|
| + |
| TEST_F(FormManagerTest, WebFormElementToFormData) { |
| LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">" |
| " <INPUT type=\"text\" id=\"firstname\" value=\"John\"/>" |
| @@ -68,13 +71,13 @@ TEST_F(FormManagerTest, WebFormElementToFormData) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("notvisible"), |
| @@ -117,13 +120,13 @@ TEST_F(FormManagerTest, ExtractForms) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -167,13 +170,13 @@ TEST_F(FormManagerTest, ExtractMultipleForms) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -194,13 +197,13 @@ TEST_F(FormManagerTest, ExtractMultipleForms) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields2[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields2[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -267,13 +270,13 @@ TEST_F(FormManagerTest, GetFormsAutocomplete) { |
| ASCIIToUTF16("middlename"), |
| ASCIIToUTF16("Jack"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply"), |
| @@ -313,13 +316,13 @@ TEST_F(FormManagerTest, GetFormsElementsEnabled) { |
| ASCIIToUTF16("middlename"), |
| ASCIIToUTF16("Jack"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("submit"), |
| @@ -365,13 +368,13 @@ TEST_F(FormManagerTest, FindForm) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -421,13 +424,13 @@ TEST_F(FormManagerTest, FillForm) { |
| ASCIIToUTF16("firstname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("imhidden"), |
| @@ -439,19 +442,19 @@ TEST_F(FormManagerTest, FillForm) { |
| ASCIIToUTF16("notempty"), |
| ASCIIToUTF16("Hi"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[3]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("noautocomplete"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[4]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("notenabled"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[5]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -548,13 +551,13 @@ TEST_F(FormManagerTest, PreviewForm) { |
| ASCIIToUTF16("firstname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("imhidden"), |
| @@ -566,19 +569,19 @@ TEST_F(FormManagerTest, PreviewForm) { |
| ASCIIToUTF16("notempty"), |
| ASCIIToUTF16("Hi"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[3]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("noautocomplete"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[4]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("notenabled"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[5]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -691,13 +694,13 @@ TEST_F(FormManagerTest, Labels) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack( |
| FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -737,13 +740,13 @@ TEST_F(FormManagerTest, LabelsWithSpans) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack( |
| FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -789,13 +792,13 @@ TEST_F(FormManagerTest, InvalidLabels) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack( |
| FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -840,13 +843,13 @@ TEST_F(FormManagerTest, OneLabelElementFirstControlElementDisabled) { |
| ASCIIToUTF16("middlename"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -886,13 +889,13 @@ TEST_F(FormManagerTest, LabelsInferredFromText) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -975,13 +978,13 @@ TEST_F(FormManagerTest, LabelsInferredFromParagraph) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1032,13 +1035,13 @@ TEST_F(FormManagerTest, LabelsInferredFromTableCell) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1108,13 +1111,13 @@ TEST_F(FormManagerTest, LabelsInferredFromTableCellNested) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1177,13 +1180,13 @@ TEST_F(FormManagerTest, LabelsInferredFromTableEmptyTDs) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("*Last Name"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Milton"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1233,13 +1236,13 @@ TEST_F(FormManagerTest, LabelsInferredFromTableLabels) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last Name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1291,13 +1294,13 @@ TEST_F(FormManagerTest, LabelsInferredFromTableTDInterveningElements) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last Name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1364,13 +1367,13 @@ TEST_F(FormManagerTest, LabelsInferredFromDefinitionList) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1410,13 +1413,13 @@ TEST_F(FormManagerTest, LabelsInferredWithSameName) { |
| ASCIIToUTF16("Address"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Address Line 2:"), |
| ASCIIToUTF16("Address"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1466,31 +1469,31 @@ TEST_F(FormManagerTest, LabelsInferredWithImageTags) { |
| ASCIIToUTF16("dayphone1"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("-"), |
| ASCIIToUTF16("dayphone2"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("-"), |
| ASCIIToUTF16("dayphone3"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[2]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("ext.:"), |
| ASCIIToUTF16("dayphone4"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[3]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("dummy"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[4]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1536,13 +1539,13 @@ TEST_F(FormManagerTest, LabelsInferredFromDivTable) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("Last Name:"), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1588,13 +1591,13 @@ TEST_F(FormManagerTest, FillFormMaxLength) { |
| ASCIIToUTF16("firstname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + 5), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + 5), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1622,13 +1625,13 @@ TEST_F(FormManagerTest, FillFormMaxLength) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("Broth"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + 5))); |
| EXPECT_TRUE(fields2[1].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Jonat"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + 5))); |
| EXPECT_TRUE(fields2[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1676,13 +1679,13 @@ TEST_F(FormManagerTest, FillFormNegativeMaxLength) { |
| ASCIIToUTF16("firstname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1711,13 +1714,13 @@ TEST_F(FormManagerTest, FillFormNegativeMaxLength) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("Brother"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields2[1].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Jonathan"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields2[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -1762,28 +1765,28 @@ TEST_F(FormManagerTest, FillFormMoreFormDataFields) { |
| ASCIIToUTF16("prefix"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20); |
| + defaultMaxLength); |
| form->fields.insert(form->fields.begin(), field1); |
| FormField field2(string16(), |
| ASCIIToUTF16("hidden"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20); |
| + defaultMaxLength); |
| form->fields.insert(form->fields.begin() + 2, field2); |
| FormField field3(string16(), |
| ASCIIToUTF16("second"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20); |
| + defaultMaxLength); |
| form->fields.insert(form->fields.begin() + 4, field3); |
| FormField field4(string16(), |
| ASCIIToUTF16("postfix"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20); |
| + defaultMaxLength); |
| form->fields.insert(form->fields.begin() + 6, field4); |
| // Fill the form. |
| @@ -1814,17 +1817,17 @@ TEST_F(FormManagerTest, FillFormMoreFormDataFields) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("Brother"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("middlename"), |
| ASCIIToUTF16("Joseph"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Jonathan"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| string16(), |
| @@ -1892,37 +1895,37 @@ TEST_F(FormManagerTest, FillFormFewerFormDataFields) { |
| ASCIIToUTF16("prefix"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("Brother"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("hidden"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("middlename"), |
| ASCIIToUTF16("Joseph"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[4].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("second"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[5].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Jonathan"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[6].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("postfix"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[7].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| string16(), |
| @@ -1987,17 +1990,17 @@ TEST_F(FormManagerTest, FillFormChangedFormDataFields) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("Brother"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("middlename"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Jonathan"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| string16(), |
| @@ -2059,22 +2062,22 @@ TEST_F(FormManagerTest, FillFormExtraFieldInCache) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("Brother"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("middlename"), |
| ASCIIToUTF16("Joseph"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Jonathan"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("postfix"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[4].StrictlyEqualsHack(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| string16(), |
| @@ -2118,13 +2121,13 @@ TEST_F(FormManagerTest, FillFormEmptyName) { |
| ASCIIToUTF16("firstname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| string16(), |
| @@ -2152,13 +2155,13 @@ TEST_F(FormManagerTest, FillFormEmptyName) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("Wyatt"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields2[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Earp"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields2[1]); |
| EXPECT_EQ(FormField(string16(), |
| string16(), |
| @@ -2210,13 +2213,13 @@ TEST_F(FormManagerTest, FillFormEmptyFormNames) { |
| ASCIIToUTF16("apple"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("banana"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| string16(), |
| @@ -2244,13 +2247,13 @@ TEST_F(FormManagerTest, FillFormEmptyFormNames) { |
| ASCIIToUTF16("apple"), |
| ASCIIToUTF16("Red"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields2[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("banana"), |
| ASCIIToUTF16("Yellow"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields2[1]); |
| EXPECT_EQ(FormField(string16(), |
| string16(), |
| @@ -2296,25 +2299,25 @@ TEST_F(FormManagerTest, ThreePartPhone) { |
| ASCIIToUTF16("dayphone1"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("-"), |
| ASCIIToUTF16("dayphone2"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("-"), |
| ASCIIToUTF16("dayphone3"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[2]); |
| EXPECT_EQ(FormField(ASCIIToUTF16("ext.:"), |
| ASCIIToUTF16("dayphone4"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[3]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -2325,22 +2328,22 @@ TEST_F(FormManagerTest, ThreePartPhone) { |
| } |
| -TEST_F(FormManagerTest, SizeFields) { |
| +TEST_F(FormManagerTest, MaxLengthFields) { |
| LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">" |
| " Phone:" |
| - " <input type=\"text\" size=\"3\" name=\"dayphone1\">" |
| + " <input type=\"text\" maxlength=\"3\" name=\"dayphone1\">" |
| " -" |
| - " <input type=\"text\" size=\"3\" name=\"dayphone2\">" |
| + " <input type=\"text\" maxlength=\"3\" name=\"dayphone2\">" |
| " -" |
| - " <input type=\"text\" size=\"4\" name=\"dayphone3\">" |
| + " <input type=\"text\" maxlength=\"4\" size=\"5\"" |
| + " name=\"dayphone3\">" |
| " ext.:" |
| - " <input type=\"text\" size=\"5\" name=\"dayphone4\">" |
| + " <input type=\"text\" maxlength=\"5\" name=\"dayphone4\">" |
| " <input type=\"text\" name=\"default1\">" |
| - " <input type=\"text\" size=\"-1\" name=\"invalid1\">" |
| + " <input type=\"text\" maxlength=\"-1\" name=\"invalid1\">" |
| " <input type=\"submit\" name=\"reply-send\" value=\"Send\">" |
| "</FORM>"); |
| - |
| WebFrame* frame = GetMainFrame(); |
| ASSERT_NE(static_cast<WebFrame*>(NULL), frame); |
| @@ -2383,19 +2386,19 @@ TEST_F(FormManagerTest, SizeFields) { |
| ASCIIToUTF16("text"), |
| 5), |
| fields[3]); |
| - // When unspecified |size|, default is 20. |
| + // When unspecified |size|, default is returned. |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("default1"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[4]); |
| - // When invalid |size| same value is returned. |
| + // When invalid |size|, default is returned. |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("invalid1"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - -1), |
| + defaultMaxLength), |
| fields[5]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("reply-send"), |
| @@ -2447,13 +2450,13 @@ TEST_F(FormManagerTest, FillFormNonEmptyField) { |
| ASCIIToUTF16("firstname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields[1]); |
| EXPECT_EQ(FormField(string16(), |
| string16(), |
| @@ -2481,13 +2484,13 @@ TEST_F(FormManagerTest, FillFormNonEmptyField) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("Wyatt"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields2[0]); |
| EXPECT_EQ(FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Earp"), |
| ASCIIToUTF16("text"), |
| - 20), |
| + defaultMaxLength), |
| fields2[1]); |
| EXPECT_EQ(FormField(string16(), |
| string16(), |
| @@ -2554,25 +2557,25 @@ TEST_F(FormManagerTest, ClearFormWithNode) { |
| ASCIIToUTF16("firstname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields2[1].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields2[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("noAC"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields2[3].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("notenabled"), |
| ASCIIToUTF16("no clear"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields2[4].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("notvisible"), |
| @@ -2647,13 +2650,13 @@ TEST_F(FormManagerTest, ClearFormWithNodeContainingSelectOne) { |
| ASCIIToUTF16("firstname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields2[1].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| string16(), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields2[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("state"), |
| @@ -2921,13 +2924,13 @@ TEST_F(FormManagerTest, SelectOneAsText) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("country"), |
| @@ -2957,13 +2960,13 @@ TEST_F(FormManagerTest, SelectOneAsText) { |
| ASCIIToUTF16("firstname"), |
| ASCIIToUTF16("John"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[1].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("lastname"), |
| ASCIIToUTF16("Smith"), |
| ASCIIToUTF16("text"), |
| - 20))); |
| + defaultMaxLength))); |
| EXPECT_TRUE(fields[2].StrictlyEqualsHack( |
| FormField(string16(), |
| ASCIIToUTF16("country"), |