AutoFill suggestions for billing and credit card fields should show derived labels.

chrome/browser/autofill/autofill_manager_unittest.cc

 // Copyright (c) 2010 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 <vector>
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/string16.h"
@@ skipping 74 matching lines @@
   void CreateTestCreditCards(ScopedVector<CreditCard>* credit_cards) {
     CreditCard* credit_card = new CreditCard;
     autofill_unittest::SetCreditCardInfo(credit_card, "First", "Elvis Presley",
                                          "Visa", "1234567890123456", "04",
                                          "2012", "Home");
     credit_card->set_unique_id(4);
     credit_cards->push_back(credit_card);
     credit_card = new CreditCard;
     autofill_unittest::SetCreditCardInfo(credit_card, "Second", "Buddy Holly",
                                          "Mastercard", "0987654321098765", "10",
-                                         "2014", "");
+                                         "2014", "Work");
     credit_card->set_unique_id(5);
     credit_cards->push_back(credit_card);
     credit_card = new CreditCard;
     autofill_unittest::SetCreditCardInfo(credit_card, "Empty", "", "", "", "",
                                          "", "");
     credit_card->set_unique_id(6);
     credit_cards->push_back(credit_card);
   }
 
   DISALLOW_COPY_AND_ASSIGN(TestPersonalDataManager);
@@ skipping 283 matching lines @@
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(6U, values.size());
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[1]);
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[2]);
   EXPECT_EQ(ASCIIToUTF16("************8765"), values[3]);
   EXPECT_EQ(ASCIIToUTF16("************8765"), values[4]);
   EXPECT_EQ(ASCIIToUTF16("************8765"), values[5]);
   ASSERT_EQ(6U, labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Home; *3456"), labels[0]);
-  EXPECT_EQ(ASCIIToUTF16("Work; *3456"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; *3456"), labels[2]);
-  EXPECT_EQ(ASCIIToUTF16("Home; *8765"), labels[3]);
-  EXPECT_EQ(ASCIIToUTF16("Work; *8765"), labels[4]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; *8765"), labels[5]);
+  EXPECT_EQ(ASCIIToUTF16("Elvis Aaron Presley; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Charles Hardin Holley; *3456"), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("*3456"), labels[2]);
+  EXPECT_EQ(ASCIIToUTF16("Elvis Aaron Presley; *8765"), labels[3]);
+  EXPECT_EQ(ASCIIToUTF16("Charles Hardin Holley; *8765"), labels[4]);
+  EXPECT_EQ(ASCIIToUTF16("*8765"), labels[5]);
 }
 
 TEST_F(AutoFillManagerTest,
        SKIP_BRANDED(GetCreditCardSuggestionsMatchCharacter)) {
   FormData form;
   CreateTestFormDataBilling(&form);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
@@ skipping 16 matching lines @@
   int page_id = 0;
   std::vector<string16> values;
   std::vector<string16> labels;
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(3U, values.size());
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[1]);
   EXPECT_EQ(ASCIIToUTF16("************3456"), values[2]);
   ASSERT_EQ(3U, labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Home; *3456"), labels[0]);
-  EXPECT_EQ(ASCIIToUTF16("Work; *3456"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; *3456"), labels[2]);
+  EXPECT_EQ(ASCIIToUTF16("Elvis Aaron Presley; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Charles Hardin Holley; *3456"), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("*3456"), labels[2]);
 }
 
 TEST_F(AutoFillManagerTest, SKIP_BRANDED(GetCreditCardSuggestionsNonCCNumber)) {
   FormData form;
   CreateTestFormDataBilling(&form);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
@@ skipping 18 matching lines @@
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(6U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[1]);
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[2]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[3]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[4]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[5]);
   ASSERT_EQ(6U, labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Home; *3456"), labels[0]);
-  EXPECT_EQ(ASCIIToUTF16("Work; *3456"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; *3456"), labels[2]);
-  EXPECT_EQ(ASCIIToUTF16("Home; *8765"), labels[3]);
-  EXPECT_EQ(ASCIIToUTF16("Work; *8765"), labels[4]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; *8765"), labels[5]);
+  EXPECT_EQ(ASCIIToUTF16("Elvis Aaron Presley; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Charles Hardin Holley; *3456"), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("*3456"), labels[2]);
+  EXPECT_EQ(ASCIIToUTF16("Elvis Aaron Presley; *8765"), labels[3]);
+  EXPECT_EQ(ASCIIToUTF16("Charles Hardin Holley; *8765"), labels[4]);
+  EXPECT_EQ(ASCIIToUTF16("*8765"), labels[5]);
 }
 
 TEST_F(AutoFillManagerTest, SKIP_BRANDED(GetCreditCardSuggestionsSemicolon)) {
   // |profile| will be owned by the mock PersonalDataManager.
   AutoFillProfile* profile = new AutoFillProfile;
   autofill_unittest::SetProfileInfo(profile, "Home; 8765", "Joe", "", "Ely",
                                     "flatlander@gmail.com", "MCA",
                                     "916 16th St.", "Apt. 6", "Lubbock",
                                     "Texas", "79401", "USA",
                                     "12345678901", "");
@@ skipping 29 matching lines @@
   ASSERT_EQ(8U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[1]);
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[2]);
   EXPECT_EQ(ASCIIToUTF16("Elvis Presley"), values[3]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[4]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[5]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[6]);
   EXPECT_EQ(ASCIIToUTF16("Buddy Holly"), values[7]);
   ASSERT_EQ(8U, labels.size());
-  EXPECT_EQ(ASCIIToUTF16("Home; *3456"), labels[0]);
-  EXPECT_EQ(ASCIIToUTF16("Work; *3456"), labels[1]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; *3456"), labels[2]);
-  EXPECT_EQ(ASCIIToUTF16("Home; 8765; *3456"), labels[3]);
-  EXPECT_EQ(ASCIIToUTF16("Home; *8765"), labels[4]);
-  EXPECT_EQ(ASCIIToUTF16("Work; *8765"), labels[5]);
-  EXPECT_EQ(ASCIIToUTF16("Empty; *8765"), labels[6]);
-  EXPECT_EQ(ASCIIToUTF16("Home; 8765; *8765"), labels[7]);
+  EXPECT_EQ(ASCIIToUTF16("Elvis Aaron Presley; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Charles Hardin Holley; *3456"), labels[1]);
+  EXPECT_EQ(ASCIIToUTF16("*3456"), labels[2]);
+  EXPECT_EQ(ASCIIToUTF16("Joe Ely; *3456"), labels[3]);
+  EXPECT_EQ(ASCIIToUTF16("Elvis Aaron Presley; *8765"), labels[4]);
+  EXPECT_EQ(ASCIIToUTF16("Charles Hardin Holley; *8765"), labels[5]);
+  EXPECT_EQ(ASCIIToUTF16("*8765"), labels[6]);
+  EXPECT_EQ(ASCIIToUTF16("Joe Ely; *8765"), labels[7]);
 }
 
 TEST_F(AutoFillManagerTest, SKIP_BRANDED(GetCreditCardSuggestionsNonHTTPS)) {
   FormData form;
   CreateTestFormDataBilling(&form);
   form.origin = GURL("http://myform.com/form.html");
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
@@ skipping 163 matching lines @@
   EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
   EXPECT_EQ(kPageID, page_id);
   ASSERT_EQ(2U, values.size());
   EXPECT_EQ(ASCIIToUTF16("Elvis"), values[0]);
   EXPECT_EQ(ASCIIToUTF16("Charles"), values[1]);
   ASSERT_EQ(2U, labels.size());
   EXPECT_EQ(string16(), labels[0]);
   EXPECT_EQ(string16(), labels[1]);
 }
 
+TEST_F(AutoFillManagerTest, GetBillingSuggestionsAddress1) {
+  FormData form;
+  CreateTestFormDataBilling(&form);
+
+  // Set up our FormStructures.
+  std::vector<FormData> forms;
+  forms.push_back(form);
+  autofill_manager_->FormsSeen(forms);
+
+  // The page ID sent to the AutoFillManager from the RenderView, used to send
+  // an IPC message back to the renderer.
+  const int kPageID = 1;
+
+  webkit_glue::FormField field;
+  autofill_unittest::CreateTestFormField(
+      "Address Line 1", "billingAddr1", "", "text", &field);
+  EXPECT_TRUE(autofill_manager_->GetAutoFillSuggestions(kPageID, false, field));
+
+  // No suggestions provided, so send an empty vector as the results.
+  // This triggers the combined message send.
+  rvh()->AutocompleteSuggestionsReturned(kPageID, std::vector<string16>());
+
+  // Test that we sent the right message to the renderer.
+  int page_id = 0;
+  std::vector<string16> values;
+  std::vector<string16> labels;
+  EXPECT_TRUE(GetAutoFillSuggestionsMessage(&page_id, &values, &labels));
+  EXPECT_EQ(kPageID, page_id);
+  ASSERT_EQ(2U, values.size());
+  EXPECT_EQ(ASCIIToUTF16("3734 Elvis Presley Blvd."), values[0]);
+  EXPECT_EQ(ASCIIToUTF16("123 Apple St."), values[1]);
+  ASSERT_EQ(2U, labels.size());
+  EXPECT_EQ(ASCIIToUTF16("Elvis Aaron Presley; *3456"), labels[0]);
+  EXPECT_EQ(ASCIIToUTF16("Charles Hardin Holley; *8765"), labels[1]);
+}
+
 TEST_F(AutoFillManagerTest, SKIP_BRANDED(FillCreditCardForm)) {
   FormData form;
   CreateTestFormDataBilling(&form);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
-  EXPECT_TRUE(
-      autofill_manager_->FillAutoFillFormData(kPageID,
-                                              form,
-                                              string16(),
-                                              ASCIIToUTF16("Home; *3456"),
-                                              AutoFillManager::PackIDs(4, 1)));
+  EXPECT_TRUE(autofill_manager_->FillAutoFillFormData(
+      kPageID, form, string16(), ASCIIToUTF16("Elvis Aaron Presley; *3456"),
+      AutoFillManager::PackIDs(4, 1)));
 
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("https://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("https://myform.com/submit.html"), results.action);
   ASSERT_EQ(15U, results.fields.size());
 
@@ skipping 61 matching lines @@
   CreateTestFormData(&form);
 
   // Set up our FormStructures.
   std::vector<FormData> forms;
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
-  EXPECT_TRUE(
-      autofill_manager_->FillAutoFillFormData(kPageID,
-                                              form,
-                                              string16(),
-                                              ASCIIToUTF16("Home; 8765"),
-                                              AutoFillManager::PackIDs(4, 7)));
+  EXPECT_TRUE(autofill_manager_->FillAutoFillFormData(
+      kPageID, form, string16(), ASCIIToUTF16("Elvis Aaron Presley; 8765"),
+      AutoFillManager::PackIDs(4, 7)));
 
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action);
   ASSERT_EQ(11U, results.fields.size());
 
@@ skipping 220 matching lines @@
   forms.push_back(form);
   autofill_manager_->FormsSeen(forms);
 
   // Now, after the call to |FormsSeen| we remove the phone number field before
   // filling.
   form.fields.erase(form.fields.begin() + 3);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
-  EXPECT_TRUE(autofill_manager_->FillAutoFillFormData(kPageID,
-                                                      form,
-                                                      ASCIIToUTF16("Elvis"),
-                                                      ASCIIToUTF16("Home"),
-                                                      1));
+  EXPECT_TRUE(autofill_manager_->FillAutoFillFormData(
+      kPageID, form, ASCIIToUTF16("Elvis"), ASCIIToUTF16("Elvis Aaron Presley"),
+      1));
 
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action);
   EXPECT_TRUE(results.user_submitted);
   ASSERT_EQ(4U, results.fields.size());
@@ skipping 42 matching lines @@
 
   // Now, after the call to |FormsSeen| we add the phone number field before
   // filling.
   autofill_unittest::CreateTestFormField(
       "Phone Number", "phonenumber", "", "text", &field);
   form.fields.insert(form.fields.begin() + 3, field);
 
   // The page ID sent to the AutoFillManager from the RenderView, used to send
   // an IPC message back to the renderer.
   const int kPageID = 1;
-  EXPECT_TRUE(autofill_manager_->FillAutoFillFormData(kPageID,
-                                                      form,
-                                                      ASCIIToUTF16("Elvis"),
-                                                      ASCIIToUTF16("Home"),
-                                                      1));
+  EXPECT_TRUE(autofill_manager_->FillAutoFillFormData(
+      kPageID, form, ASCIIToUTF16("Elvis"), ASCIIToUTF16("Elvis Aaron Presley"),
+      1));
 
   int page_id = 0;
   FormData results;
   EXPECT_TRUE(GetAutoFillFormDataFilledMessage(&page_id, &results));
   EXPECT_EQ(ASCIIToUTF16("MyForm"), results.name);
   EXPECT_EQ(ASCIIToUTF16("POST"), results.method);
   EXPECT_EQ(GURL("http://myform.com/form.html"), results.origin);
   EXPECT_EQ(GURL("http://myform.com/submit.html"), results.action);
   EXPECT_TRUE(results.user_submitted);
   ASSERT_EQ(5U, results.fields.size());
@@ skipping 62 matching lines @@
 #else
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
   profile()->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, true);
   profile()->GetPrefs()->ClearPref(prefs::kAutoFillAuxiliaryProfilesEnabled);
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 #endif
 }
+