Updates to wallet for i18n

components/autofill/content/browser/wallet/wallet_items_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 "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/content/browser/wallet/gaia_account.h"
 #include "components/autofill/content/browser/wallet/required_action.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
+#include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using base::ASCIIToUTF16;
 
 namespace {
 
 const char kMaskedInstrument[] =
     "{"
     "  \"descriptive_name\":\"descriptive_name\","
     "  \"type\":\"VISA\","
     "  \"supported_currency\":"
     "  ["
     "    \"currency\""
     "  ],"
     "  \"last_four_digits\":\"last_four_digits\","
     "  \"expiration_month\":12,"
     "  \"expiration_year\":2012,"
     "  \"billing_address\":"
     "  {"
     "    \"name\":\"name\","
     "    \"address1\":\"address1\","
     "    \"address2\":\"address2\","
     "    \"city\":\"city\","
+    "    \"dependent_locality_name\":\"burough\","

[Dan Beam, 2014/02/12 21:34:33]

this is burough because billing addresses can be US-only?

[Evan Stade, 2014/02/12 23:32:13]

no, I made it burough for no particular reason; it can be anything really.
burough follows the city/state/etc. naming convention which is why I did it here
but not elsewhere.

     "    \"state\":\"state\","
     "    \"postal_code\":\"postal_code\","
+    "    \"sorting_code\":\"sorting_code\","
     "    \"phone_number\":\"phone_number\","
     "    \"country_code\":\"US\","
     "    \"type\":\"FULL\""
     "  },"
     "  \"status\":\"VALID\","
     "  \"object_id\":\"object_id\""
     "}";
 
 const char kMaskedInstrumentMissingStatus[] =
     "{"
     "  \"descriptive_name\":\"descriptive_name\","
     "  \"type\":\"VISA\","
     "  \"supported_currency\":"
     "  ["
     "    \"currency\""
     "  ],"
     "  \"last_four_digits\":\"last_four_digits\","
     "  \"expiration_month\":12,"
     "  \"expiration_year\":2012,"
     "  \"billing_address\":"
     "  {"
     "    \"name\":\"name\","
     "    \"address1\":\"address1\","
     "    \"address2\":\"address2\","
     "    \"city\":\"city\","
+    "    \"dependent_locality_name\":\"burough\","
     "    \"state\":\"state\","
     "    \"postal_code\":\"postal_code\","
+    "    \"sorting_code\":\"sorting_code\","
     "    \"phone_number\":\"phone_number\","
     "    \"country_code\":\"US\""
     "  },"
     "  \"object_id\":\"object_id\","
     "  \"amex_disallowed\":true"
     "}";
 
 const char kMaskedInstrumentMissingType[] =
     "{"
     "  \"descriptive_name\":\"descriptive_name\","
     "  \"supported_currency\":"
     "  ["
     "    \"currency\""
     "  ],"
     "  \"last_four_digits\":\"last_four_digits\","
     "  \"expiration_month\":12,"
     "  \"expiration_year\":2012,"
     "  \"billing_address\":"
     "  {"
     "    \"name\":\"name\","
     "    \"address1\":\"address1\","
     "    \"address2\":\"address2\","
     "    \"city\":\"city\","
+    "    \"dependent_locality_name\":\"burough\","
     "    \"state\":\"state\","
     "    \"postal_code\":\"postal_code\","
+    "    \"sorting_code\":\"sorting_code\","
     "    \"phone_number\":\"phone_number\","
     "    \"country_code\":\"US\""
     "  },"
     "  \"status\":\"VALID\","
     "  \"object_id\":\"object_id\""
     "}";
 
 const char kMaskedInstrumentMissingLastFourDigits[] =
     "{"
     "  \"descriptive_name\":\"descriptive_name\","
     "  \"type\":\"VISA\","
     "  \"supported_currency\":"
     "  ["
     "    \"currency\""
     "  ],"
     "  \"expiration_month\":12,"
     "  \"expiration_year\":2012,"
     "  \"billing_address\":"
     "  {"
     "    \"name\":\"name\","
     "    \"address1\":\"address1\","
     "    \"address2\":\"address2\","
     "    \"city\":\"city\","
+    "    \"dependent_locality_name\":\"burough\","
     "    \"state\":\"state\","
     "    \"postal_code\":\"postal_code\","
+    "    \"sorting_code\":\"sorting_code\","
     "    \"phone_number\":\"phone_number\","
     "    \"country_code\":\"US\""
     "  },"
     "  \"status\":\"VALID\","
     "  \"object_id\":\"object_id\""
     "}";
 
 const char kMaskedInstrumentMissingAddress[] =
     "{"
     "  \"descriptive_name\":\"descriptive_name\","
@@ skipping 18 matching lines @@
     "    \"currency\""
     "  ],"
     "  \"last_four_digits\":\"last_four_digits\","
     "  \"expiration_month\":12,"
     "  \"expiration_year\":2012,"
     "  \"billing_address\":"
     "  {"
     "    \"address1\":\"address1\","
     "    \"address2\":\"address2\","
     "    \"city\":\"city\","
+    "    \"dependent_locality_name\":\"burough\","
     "    \"state\":\"state\","
     "    \"phone_number\":\"phone_number\","
     "    \"country_code\":\"US\""
     "  },"
     "  \"status\":\"VALID\","
     "  \"object_id\":\"object_id\""
     "}";
 
 const char kMaskedInstrumentMissingObjectId[] =
     "{"
     "  \"descriptive_name\":\"descriptive_name\","
     "  \"type\":\"VISA\","
     "  \"supported_currency\":"
     "  ["
     "    \"currency\""
     "  ],"
     "  \"last_four_digits\":\"last_four_digits\","
     "  \"expiration_month\":12,"
     "  \"expiration_year\":2012,"
     "  \"billing_address\":"
     "  {"
     "    \"name\":\"name\","
     "    \"address1\":\"address1\","
     "    \"address2\":\"address2\","
     "    \"city\":\"city\","
+    "    \"dependent_locality_name\":\"burough\","
     "    \"state\":\"state\","
     "    \"postal_code\":\"postal_code\","
     "    \"phone_number\":\"phone_number\","
     "    \"country_code\":\"US\""
     "  },"
     "  \"status\":\"VALID\""
     "}";
 
 const char kLegalDocument[] =
     "{"
@@ skipping 117 matching lines @@
     "      ],"
     "      \"last_four_digits\":\"last_four_digits\","
     "      \"expiration_month\":12,"
     "      \"expiration_year\":2012,"
     "      \"billing_address\":"
     "      {"
     "        \"name\":\"name\","
     "        \"address1\":\"address1\","
     "        \"address2\":\"address2\","
     "        \"city\":\"city\","
+    "        \"dependent_locality_name\":\"burough\","
     "        \"state\":\"state\","
     "        \"postal_code\":\"postal_code\","
+    "        \"sorting_code\":\"sorting_code\","
     "        \"phone_number\":\"phone_number\","
     "        \"country_code\":\"US\","
     "        \"type\":\"FULL\""
     "      },"
     "      \"status\":\"VALID\","
     "      \"object_id\":\"object_id\""
     "    }"
     "  ],"
     "  \"default_instrument_id\":\"default_instrument_id\","
     "  \"address\":"
     "  ["
     "    {"
     "      \"id\":\"id\","
     "      \"phone_number\":\"phone_number\","
     "      \"postal_address\":"
     "      {"
     "        \"recipient_name\":\"recipient_name\","
     "        \"address_line\":"
     "        ["
     "          \"address_line_1\","
     "          \"address_line_2\""
     "        ],"
     "        \"locality_name\":\"locality_name\","
+    "        \"dependent_locality_name\":\"dependent_locality_name\","
     "        \"administrative_area_name\":\"administrative_area_name\","
     "        \"postal_code_number\":\"postal_code_number\","
+    "        \"sorting_code\":\"sorting_code\","
     "        \"country_name_code\":\"US\""
     "      }"
     "    }"
     "  ],"
     "  \"default_address_id\":\"default_address_id\","
     "  \"obfuscated_gaia_id\":\"ignore_this_value\","
     "  \"amex_disallowed\":true,"
     "  \"gaia_profile\":"
     "  ["
     "    {"
@@ skipping 81 matching lines @@
 }
 
 TEST_F(WalletItemsTest, CreateMaskedInstrumentMissingObjectId) {
   SetUpDictionary(kMaskedInstrumentMissingObjectId);
   EXPECT_EQ(NULL,
             WalletItems::MaskedInstrument::CreateMaskedInstrument(*dict).get());
 }
 
 TEST_F(WalletItemsTest, CreateMaskedInstrument) {
   SetUpDictionary(kMaskedInstrument);
-  scoped_ptr<Address> address(new Address("US",
-                                          ASCIIToUTF16("name"),
-                                          ASCIIToUTF16("address1"),
-                                          ASCIIToUTF16("address2"),
-                                          ASCIIToUTF16("city"),
-                                          ASCIIToUTF16("state"),
-                                          ASCIIToUTF16("postal_code"),
-                                          ASCIIToUTF16("phone_number"),
-                                          std::string()));
+  scoped_ptr<Address> address(
+      new Address("US",
+                  ASCIIToUTF16("name"),
+                  StreetAddress("address1", "address2"),
+                  ASCIIToUTF16("city"),
+                  ASCIIToUTF16("burough"),
+                  ASCIIToUTF16("state"),
+                  ASCIIToUTF16("postal_code"),
+                  ASCIIToUTF16("sorting_code"),
+                  ASCIIToUTF16("phone_number"),
+                  std::string()));
   std::vector<base::string16> supported_currencies;
   supported_currencies.push_back(ASCIIToUTF16("currency"));
   WalletItems::MaskedInstrument masked_instrument(
       ASCIIToUTF16("descriptive_name"),
       WalletItems::MaskedInstrument::VISA,
       supported_currencies,
       ASCIIToUTF16("last_four_digits"),
       12,
       2012,
       address.Pass(),
@@ skipping 98 matching lines @@
       true));
   expected.AddAccount(user1.Pass());
   scoped_ptr<GaiaAccount> user2(GaiaAccount::CreateForTesting(
       "user2@chromium.org",
       "obfuscated_gaia_id",
       1,
       false));
   expected.AddAccount(user2.Pass());
   EXPECT_EQ("123456789", expected.ObfuscatedGaiaId());
 
-  scoped_ptr<Address> billing_address(new Address("US",
-                                                  ASCIIToUTF16("name"),
-                                                  ASCIIToUTF16("address1"),
-                                                  ASCIIToUTF16("address2"),
-                                                  ASCIIToUTF16("city"),
-                                                  ASCIIToUTF16("state"),
-                                                  ASCIIToUTF16("postal_code"),
-                                                  ASCIIToUTF16("phone_number"),
-                                                  std::string()));
+  scoped_ptr<Address> billing_address(
+      new Address("US",
+                  ASCIIToUTF16("name"),
+                  StreetAddress("address1", "address2"),
+                  ASCIIToUTF16("city"),
+                  ASCIIToUTF16("burough"),
+                  ASCIIToUTF16("state"),
+                  ASCIIToUTF16("postal_code"),
+                  ASCIIToUTF16("sorting_code"),
+                  ASCIIToUTF16("phone_number"),
+                  std::string()));
   std::vector<base::string16> supported_currencies;
   supported_currencies.push_back(ASCIIToUTF16("currency"));
   scoped_ptr<WalletItems::MaskedInstrument> masked_instrument(
       new WalletItems::MaskedInstrument(ASCIIToUTF16("descriptive_name"),
                                         WalletItems::MaskedInstrument::VISA,
                                         supported_currencies,
                                         ASCIIToUTF16("last_four_digits"),
                                         12,
                                         2012,
                                         billing_address.Pass(),
                                         WalletItems::MaskedInstrument::VALID,
                                         "object_id"));
   expected.AddInstrument(masked_instrument.Pass());
 
   scoped_ptr<Address> shipping_address(
       new Address("US",
                   ASCIIToUTF16("recipient_name"),
-                  ASCIIToUTF16("address_line_1"),
-                  ASCIIToUTF16("address_line_2"),
+                  StreetAddress("address_line_1", "address_line_2"),
                   ASCIIToUTF16("locality_name"),
+                  ASCIIToUTF16("dependent_locality_name"),
                   ASCIIToUTF16("administrative_area_name"),
                   ASCIIToUTF16("postal_code_number"),
+                  ASCIIToUTF16("sorting_code"),
                   ASCIIToUTF16("phone_number"),
                   "id"));
   expected.AddAddress(shipping_address.Pass());
   EXPECT_EQ(expected, *WalletItems::CreateWalletItems(*dict));
 
   // Now try with a legal document as well.
   SetUpDictionary(std::string(kWalletItems) +
                   std::string(kRequiredLegalDocument) +
                   std::string(kCloseJson));
   scoped_ptr<WalletItems::LegalDocument> legal_document(
       new WalletItems::LegalDocument("doc_id",
                                      ASCIIToUTF16("display_name")));
   expected.AddLegalDocument(legal_document.Pass());
   expected.AddLegalDocument(
       WalletItems::LegalDocument::CreatePrivacyPolicyDocument());
 
   EXPECT_EQ(expected, *WalletItems::CreateWalletItems(*dict));
 }
 
 }  // namespace wallet
 }  // namespace autofill