autocomplete: support address-line3, address-level{1,2,3}

components/autofill/core/browser/address_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 <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/address.h"
 #include "components/autofill/core/browser/autofill_type.h"
@@ skipping 141 matching lines @@
 }
 
 // Verifies that Address::GetInfo() correctly combines address lines.
 TEST(AddressTest, GetStreetAddress) {
   const AutofillType type = AutofillType(ADDRESS_HOME_STREET_ADDRESS);
 
   // Address has no address lines.
   Address address;
   EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE1).empty());
   EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE2).empty());
+  EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE3).empty());
   EXPECT_EQ(base::string16(), address.GetInfo(type, "en-US"));
 
   // Address has only line 1.
   address.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("123 Example Ave."));
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE1).empty());
   EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE2).empty());
+  EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE3).empty());
   EXPECT_EQ(ASCIIToUTF16("123 Example Ave."), address.GetInfo(type, "en-US"));
 
   // Address has only line 2.
   address.SetRawInfo(ADDRESS_HOME_LINE1, base::string16());
   address.SetRawInfo(ADDRESS_HOME_LINE2, ASCIIToUTF16("Apt 42."));
   EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE1).empty());
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE2).empty());
+  EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE3).empty());
   EXPECT_EQ(ASCIIToUTF16("\nApt 42."), address.GetInfo(type, "en-US"));
 
   // Address has lines 1 and 2.
   address.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("123 Example Ave."));
   address.SetRawInfo(ADDRESS_HOME_LINE2, ASCIIToUTF16("Apt. 42"));
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE1).empty());
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE2).empty());
+  EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE3).empty());
   EXPECT_EQ(ASCIIToUTF16("123 Example Ave.\n"
                          "Apt. 42"),
             address.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS));
   EXPECT_EQ(ASCIIToUTF16("123 Example Ave.\n"
                          "Apt. 42"),
             address.GetInfo(type, "en-US"));
+
+  // A wild third line appears.
+  address.SetRawInfo(ADDRESS_HOME_LINE3, ASCIIToUTF16("Living room couch"));
+  EXPECT_EQ(ASCIIToUTF16("Living room couch"),
+            address.GetRawInfo(ADDRESS_HOME_LINE3));
+  EXPECT_EQ(ASCIIToUTF16("123 Example Ave.\n"
+                         "Apt. 42\n"
+                         "Living room couch"),
+            address.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS));
+
+  // The second line vanishes.
+  address.SetRawInfo(ADDRESS_HOME_LINE2, base::string16());
+  EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE1).empty());
+  EXPECT_TRUE(address.GetRawInfo(ADDRESS_HOME_LINE2).empty());
+  EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE3).empty());
+  EXPECT_EQ(ASCIIToUTF16("123 Example Ave.\n"
+                         "\n"
+                         "Living room couch"),
+            address.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS));
+

[Ilya Sherman, 2014/06/12 22:37:54]

nit: Spurious newline.

[Evan Stade, 2014/06/13 01:49:43]

baleted

 }
 
 // Verifies that overwriting an address with N lines with one that has fewer
 // than N lines does not result in an address with blank lines at the end.
 TEST(AddressTest, GetStreetAddressAfterOverwritingLongAddressWithShorterOne) {
   // Start with an address that has two lines.
   Address address;
   address.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("123 Example Ave."));
   address.SetRawInfo(ADDRESS_HOME_LINE2, ASCIIToUTF16("Apt. 42"));
 
@@ skipping 43 matching lines @@
 // Verifies that Address::SetInfo() rejects setting data for
 // ADDRESS_HOME_STREET_ADDRESS without newlines, as there is no good general way
 // to parse that data into the consituent address lines. Addresses without
 // newlines should be set properly.
 TEST(AddressTest, SetStreetAddress) {
   const base::string16 empty_street_address;
   const base::string16 one_line_street_address =
       ASCIIToUTF16("456 New St., Apt. 17");
   const base::string16 multi_line_street_address =
       ASCIIToUTF16("789 Fancy Pkwy.\n"
-                   "Unit 3.14");
+                   "Unit 3.14\n"
+                   "Box 9");
   const AutofillType type = AutofillType(ADDRESS_HOME_STREET_ADDRESS);
 
   // Start with a non-empty address.
   Address address;
   address.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("123 Example Ave."));
   address.SetRawInfo(ADDRESS_HOME_LINE2, ASCIIToUTF16("Apt. 42"));
+  address.SetRawInfo(ADDRESS_HOME_LINE3, ASCIIToUTF16("and a half"));
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE1).empty());
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE2).empty());
+  EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE3).empty());
 
   // Attempting to set a one-line address should fail, as the single line might
   // actually represent multiple logical lines, combined into one due to the
   // user having to work around constraints imposed by the website.
   EXPECT_FALSE(address.SetInfo(type, one_line_street_address, "en-US"));
   EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_LINE1));
   EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_LINE2));
+  EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_LINE3));
 
   // Attempting to set a multi-line address should succeed.
   EXPECT_TRUE(address.SetInfo(type, multi_line_street_address, "en-US"));
   EXPECT_EQ(ASCIIToUTF16("789 Fancy Pkwy."),
             address.GetRawInfo(ADDRESS_HOME_LINE1));
   EXPECT_EQ(ASCIIToUTF16("Unit 3.14"), address.GetRawInfo(ADDRESS_HOME_LINE2));
+  EXPECT_EQ(ASCIIToUTF16("Box 9"), address.GetRawInfo(ADDRESS_HOME_LINE3));
 
   // Attempting to set an empty address should also succeed, and clear out the
   // previously stored data.
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE1).empty());
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE2).empty());
+  EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE3).empty());
   EXPECT_TRUE(address.SetInfo(type, empty_street_address, "en-US"));
   EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_LINE1));
   EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_LINE2));
+  EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_LINE3));
 }
 
 // Verifies that Address::SetInfio() rejects setting data for
 // ADDRESS_HOME_STREET_ADDRESS if the data has any interior blank lines.
 TEST(AddressTest, SetStreetAddressRejectsAddressesWithInteriorBlankLines) {
   // Start with a non-empty address.
   Address address;
   address.SetRawInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("123 Example Ave."));
   address.SetRawInfo(ADDRESS_HOME_LINE2, ASCIIToUTF16("Apt. 42"));
   EXPECT_FALSE(address.GetRawInfo(ADDRESS_HOME_LINE1).empty());
@@ skipping 52 matching lines @@
                                ASCIIToUTF16("Address line 1"
                                             "Address line 2"
                                             "\n"),
                                "en-US"));
   EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_LINE1));
   EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_LINE2));
   EXPECT_EQ(base::string16(), address.GetRawInfo(ADDRESS_HOME_STREET_ADDRESS));
 }
 
 }  // namespace autofill