Autofill: Set requirements for number of recognized fields in an autofillable form

components/autofill/core/browser/form_structure_unittest.cc

 // Copyright 2013 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 "components/autofill/core/browser/form_structure.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 93 matching lines @@
   field.form_control_type = "submit";
   form.fields.push_back(field);
 
   // Only text and select fields that are heuristically matched are counted.
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_EQ(1U, form_structure->autofill_count());
 
   // Add a field with should_autocomplete=false. This should not be considered a
   // fillable field.
-  field.label = ASCIIToUTF16("address1");
-  field.name = ASCIIToUTF16("address1");
+  field.label = ASCIIToUTF16("city");
+  field.name = ASCIIToUTF16("city");
   field.form_control_type = "text";
   field.should_autocomplete = false;
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_EQ(2U, form_structure->autofill_count());
 
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kRespectAutocompleteOffForAutofill);
@@ skipping 935 matching lines @@
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line3");
   field.name = ASCIIToUTF16("billing.address.addressLine3");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address Line4");
   field.name = ASCIIToUTF16("billing.address.addressLine4");
   form.fields.push_back(field);
 
+  field.label = ASCIIToUTF16("City");
+  field.name = ASCIIToUTF16("billing.address.city");
+  form.fields.push_back(field);
+
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
-  ASSERT_EQ(4U, form_structure->field_count());
-  ASSERT_EQ(3U, form_structure->autofill_count());
+  ASSERT_EQ(5U, form_structure->field_count());
+  EXPECT_EQ(4U, form_structure->autofill_count());
 
   // Address Line 1.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(0)->heuristic_type());
   // Address Line 2.
   EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(1)->heuristic_type());
   // Address Line 3.
   EXPECT_EQ(ADDRESS_HOME_LINE3, form_structure->field(2)->heuristic_type());
   // Address Line 4 (ignored).
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(3)->heuristic_type());
 }
@@ skipping 238 matching lines @@
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Address");
   field.name = ASCIIToUTF16("billing_address");
   form.fields.push_back(field);
 
+  field.label = ASCIIToUTF16("City");
+  field.name = ASCIIToUTF16("city");
+  form.fields.push_back(field);
+
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Expiration Date");
   field.name = ASCIIToUTF16("expiration_month");
   form.fields.push_back(field);
 
   field.label = ASCIIToUTF16("Expiration Year");
   field.name = ASCIIToUTF16("expiration_year");
   form.fields.push_back(field);
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable());
 
   // Expect the correct number of fields.
-  ASSERT_EQ(5U, form_structure->field_count());
-  EXPECT_EQ(5U, form_structure->autofill_count());
+  ASSERT_EQ(6U, form_structure->field_count());
+  EXPECT_EQ(6U, form_structure->autofill_count());
 
   // Name on Card.
   EXPECT_EQ(CREDIT_CARD_NAME, form_structure->field(0)->heuristic_type());
   // Address.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(1)->heuristic_type());
+  // City.
+  EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(2)->heuristic_type());
   // Card Number.
-  EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(2)->heuristic_type());
+  EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(3)->heuristic_type());
   // Expiration Date.
-  EXPECT_EQ(CREDIT_CARD_EXP_MONTH, form_structure->field(3)->heuristic_type());
+  EXPECT_EQ(CREDIT_CARD_EXP_MONTH, form_structure->field(4)->heuristic_type());
   // Expiration Year.
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
-            form_structure->field(4)->heuristic_type());
+            form_structure->field(5)->heuristic_type());
 }
 
 TEST(FormStructureTest, CVCCodeClash) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
 
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Card number");
@@ skipping 1039 matching lines @@
   std::string response =
       "<autofillqueryresponse>"
       "<field autofilltype=\"7\" />"
       "<field autofilltype=\"30\" />"
       "<field autofilltype=\"9\" />"
       "<field autofilltype=\"0\" />"
       "</autofillqueryresponse>";
 
   FormStructure::ParseQueryResponse(response, forms.get());
 
+  ASSERT_GE(forms[0]->field_count(), 2U);
+  ASSERT_GE(forms[1]->field_count(), 2U);
   EXPECT_EQ(7, forms[0]->field(0)->server_type());
   EXPECT_EQ(30, forms[0]->field(1)->server_type());
   EXPECT_EQ(9, forms[1]->field(0)->server_type());
   EXPECT_EQ(0, forms[1]->field(1)->server_type());
 }
 
 // If user defined types are present, only parse password fields.
 TEST(FormStructureTest, ParseQueryResponseAuthorDefinedTypes) {
   FormData form;
   FormFieldData field;
@@ skipping 15 matching lines @@
   forms.front()->DetermineHeuristicTypes();
 
   std::string response =
       "<autofillqueryresponse>"
       "<field autofilltype=\"9\" />"
       "<field autofilltype=\"76\" />"
       "</autofillqueryresponse>";
 
   FormStructure::ParseQueryResponse(response, forms.get());
 
+  ASSERT_GE(forms[0]->field_count(), 2U);
   EXPECT_EQ(NO_SERVER_DATA, forms[0]->field(0)->server_type());
   EXPECT_EQ(76, forms[0]->field(1)->server_type());
 }
 
 }  // namespace autofill