Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(441)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/autofill/content/browser/wallet/wallet_items_unittest.cc

Issue 151383003: Updates to wallet for i18n (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix blasted unit tests Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/autofill/content/browser/wallet/wallet_client_unittest.cc ('K') | « components/autofill/content/browser/wallet/wallet_client_unittest.cc ('k') | components/autofill/content/browser/wallet/wallet_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/content/browser/wallet/wallet_items_unittest.cc
diff --git a/components/autofill/content/browser/wallet/wallet_items_unittest.cc b/components/autofill/content/browser/wallet/wallet_items_unittest.cc
index 6cf23dc876c24a241099625366314c4edfbf50ca..46b056a742a98f003f156533a00671f1e5aa3eba 100644
--- a/components/autofill/content/browser/wallet/wallet_items_unittest.cc
+++ b/components/autofill/content/browser/wallet/wallet_items_unittest.cc
@@ -10,6 +10,7 @@
#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"
@@ -34,8 +35,10 @@ const char kMaskedInstrument[] =
" \"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 U
Evan Stade 2014/02/12 23:32:13 no, I made it burough for no particular reason; it
" \"state\":\"state\","
" \"postal_code\":\"postal_code\","
+ " \"sorting_code\":\"sorting_code\","
" \"phone_number\":\"phone_number\","
" \"country_code\":\"US\","
" \"type\":\"FULL\""
@@ -61,8 +64,10 @@ const char kMaskedInstrumentMissingStatus[] =
" \"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\""
" },"
@@ -86,8 +91,10 @@ const char kMaskedInstrumentMissingType[] =
" \"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\""
" },"
@@ -111,8 +118,10 @@ const char kMaskedInstrumentMissingLastFourDigits[] =
" \"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\""
" },"
@@ -151,6 +160,7 @@ const char kMaskedInstrumentMalformedAddress[] =
" \"address1\":\"address1\","
" \"address2\":\"address2\","
" \"city\":\"city\","
+ " \"dependent_locality_name\":\"burough\","
" \"state\":\"state\","
" \"phone_number\":\"phone_number\","
" \"country_code\":\"US\""
@@ -176,6 +186,7 @@ const char kMaskedInstrumentMissingObjectId[] =
" \"address1\":\"address1\","
" \"address2\":\"address2\","
" \"city\":\"city\","
+ " \"dependent_locality_name\":\"burough\","
" \"state\":\"state\","
" \"postal_code\":\"postal_code\","
" \"phone_number\":\"phone_number\","
@@ -313,8 +324,10 @@ const char kWalletItems[] =
" \"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\""
@@ -338,8 +351,10 @@ const char kWalletItems[] =
" \"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\""
" }"
" }"
@@ -441,15 +456,17 @@ TEST_F(WalletItemsTest, CreateMaskedInstrumentMissingObjectId) {
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(
@@ -568,15 +585,17 @@ TEST_F(WalletItemsTest, CreateWalletItems) {
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(
@@ -594,11 +613,12 @@ TEST_F(WalletItemsTest, CreateWalletItems) {
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());
« components/autofill/content/browser/wallet/wallet_client_unittest.cc ('K') | « components/autofill/content/browser/wallet/wallet_client_unittest.cc ('k') | components/autofill/content/browser/wallet/wallet_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698