Add preliminary Autofill support for 'autocompletetype' sections.

chrome/browser/autofill/form_structure_unittest.cc

 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 321 matching lines @@
   // Address.
   EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(5)->heuristic_type());
   // City.
   EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(6)->heuristic_type());
   // Zip.
   EXPECT_EQ(ADDRESS_HOME_ZIP, form_structure->field(7)->heuristic_type());
   // Submit.
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(8)->heuristic_type());
 }
 
-// Verify that we can correctly process the 'autocompletetype' attribute.
+// Verify that we can correctly process the |autocompletetype| attribute.
 TEST(FormStructureTest, HeuristicsAutocompletetype) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormField field;
   field.form_control_type = ASCIIToUTF16("text");
 
   field.label = string16();
   field.name = ASCIIToUTF16("field1");
@@ skipping 16 matching lines @@
 
   // Expect the correct number of fields.
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(EMAIL_ADDRESS, form_structure->field(2)->heuristic_type());
 }
 
-// If at least one field includes the 'autocompletetype' attribute, we should
+// If at least one field includes the |autocompletetype| attribute, we should
 // not try to apply any other heuristics.
 TEST(FormStructureTest, AutocompletetypeOverridesOtherHeuristics) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   // Start with a regular contact form.
   FormField field;
   field.form_control_type = ASCIIToUTF16("text");
 
@@ skipping 29 matching lines @@
   EXPECT_FALSE(form_structure->ShouldBeCrowdsourced());
 
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(0U, form_structure->autofill_count());
 
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(0)->heuristic_type());
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(1)->heuristic_type());
   EXPECT_EQ(UNKNOWN_TYPE, form_structure->field(2)->heuristic_type());
 }
 
+// Verify that we can correctly process sections listed in the |autocomplete|
+// attribute.
+TEST(FormStructureTest, HeuristicsAutocompletetypeWithSections) {
+  scoped_ptr<FormStructure> form_structure;
+  FormData form;
+  form.method = ASCIIToUTF16("post");
+
+  FormField field;
+  field.form_control_type = ASCIIToUTF16("text");
+
+  // We expect "shipping" and "billing" to be the most common sections.
+  field.label = string16();
+  field.name = ASCIIToUTF16("field1");
+  field.autocomplete_type =
+  ASCIIToUTF16("section-shipping given-name");

[dhollowa, 2011/08/11 14:52:14]

nit: indent (and below).

[Ilya Sherman, 2011/08/12 01:30:50]

Done.  Thanks for the catch =)

+  form.fields.push_back(field);
+
+  // Some field will have no section specified.  These fall into the default
+  // section, with an empty name.
+  field.label = string16();
+  field.name = ASCIIToUTF16("field2");
+  field.autocomplete_type =
+  ASCIIToUTF16("surname");
+  form.fields.push_back(field);
+
+  // We allow arbitrary section names.
+  field.label = string16();
+  field.name = ASCIIToUTF16("field3");
+  field.autocomplete_type = ASCIIToUTF16("section-foo address-line1");
+  form.fields.push_back(field);
+
+  // Specifying "section-" is equivalent to not specifying a section.
+  field.label = string16();
+  field.name = ASCIIToUTF16("field4");
+  field.autocomplete_type =
+  ASCIIToUTF16("section- address-line2");
+  form.fields.push_back(field);
+
+  // We don't do anything clever to try to coalesce sections; it's up to site
+  // authors to avoid typos.
+  field.label = string16();
+  field.name = ASCIIToUTF16("field5");
+  field.autocomplete_type =
+  ASCIIToUTF16("section--shipping locality");
+  form.fields.push_back(field);
+
+  // Credit card fields are implicitly in a separate section from other fields.
+  field.label = string16();
+  field.name = ASCIIToUTF16("field6");
+  field.autocomplete_type =
+  ASCIIToUTF16("section-shipping cc-number");
+  form.fields.push_back(field);
+
+  form_structure.reset(new FormStructure(form));
+  form_structure->DetermineHeuristicTypes();
+  EXPECT_TRUE(form_structure->IsAutofillable(true));
+
+  // Expect the correct number of fields.
+  ASSERT_EQ(6U, form_structure->field_count());
+  ASSERT_EQ(6U, form_structure->autofill_count());
+
+  EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("shipping-default"),
+            form_structure->field(0)->section());
+  EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("-default"), form_structure->field(1)->section());
+  EXPECT_EQ(ADDRESS_HOME_LINE1, form_structure->field(2)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("foo-default"), form_structure->field(2)->section());
+  EXPECT_EQ(ADDRESS_HOME_LINE2, form_structure->field(3)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("-default"), form_structure->field(3)->section());
+  EXPECT_EQ(ADDRESS_HOME_CITY, form_structure->field(4)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("-shipping-default"),
+            form_structure->field(4)->section());
+  EXPECT_EQ(CREDIT_CARD_NUMBER, form_structure->field(5)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("shipping-cc"), form_structure->field(5)->section());
+}
+
 // Verify that we can correctly process fallback types listed in the
-// 'autocompletetype' attribute.
+// |autocompletetype| attribute.
 TEST(FormStructureTest, HeuristicsAutocompletetypeWithFallbacks) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormField field;
   field.form_control_type = ASCIIToUTF16("text");
 
   // Skip over any sections and "x"-prefixed types.
   field.label = string16();
@@ skipping 17 matching lines @@
 
   form_structure.reset(new FormStructure(form));
   form_structure->DetermineHeuristicTypes();
   EXPECT_TRUE(form_structure->IsAutofillable(true));
 
   // Expect the correct number of fields.
   ASSERT_EQ(3U, form_structure->field_count());
   ASSERT_EQ(3U, form_structure->autofill_count());
 
   EXPECT_EQ(NAME_FIRST, form_structure->field(0)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("full-name-default"),
+            form_structure->field(0)->section());
   EXPECT_EQ(NAME_LAST, form_structure->field(1)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("full-name-default"),
+            form_structure->field(1)->section());
   EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
             form_structure->field(2)->heuristic_type());
+  EXPECT_EQ(ASCIIToUTF16("shipping-default"),
+            form_structure->field(2)->section());
 }
 
 TEST(FormStructureTest, HeuristicsSample8) {
   scoped_ptr<FormStructure> form_structure;
   FormData form;
   form.method = ASCIIToUTF16("post");
 
   FormField field;
   field.form_control_type = ASCIIToUTF16("text");
 
@@ skipping 1427 matching lines @@
       form_structure->FormSignature());
 
   form.name = ASCIIToUTF16("login_form");
   form_structure.reset(new FormStructure(form));
   EXPECT_EQ(FormStructureTest::Hash64Bit(
       std::string("https://login.facebook.com&login_form&email&first")),
       form_structure->FormSignature());
 }
 
 }  // namespace