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

Unified Diff: third_party/libaddressinput/chromium/cpp/test/address_data_test.cc

Issue 211443003: Revert of Determine language code and type of format for address. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: third_party/libaddressinput/chromium/cpp/test/address_data_test.cc
diff --git a/third_party/libaddressinput/chromium/cpp/test/address_data_test.cc b/third_party/libaddressinput/chromium/cpp/test/address_data_test.cc
index 26659fa3ad1f4939ae80c9c8a00c46ec03dfe8ee..a4d61c33afccbab30d865ef0839944f5faa2c97a 100644
--- a/third_party/libaddressinput/chromium/cpp/test/address_data_test.cc
+++ b/third_party/libaddressinput/chromium/cpp/test/address_data_test.cc
@@ -85,7 +85,6 @@
TEST(AddressDataTest, FormatForDisplayJp) {
AddressData address;
address.country_code = "JP";
- address.language_code = "ja";
address.administrative_area = "東京都";
address.locality = "渋谷区";
address.postal_code = "150-8512";
@@ -105,33 +104,6 @@
address.address_lines.end());
expected.push_back(address.organization);
expected.push_back(address.recipient);
-
- EXPECT_EQ(expected, actual);
-}
-
-TEST(AddressDataTest, FormatForDisplayJpLatn) {
- AddressData address;
- address.country_code = "JP";
- address.language_code = "ja-latn";
- address.administrative_area = "Tokyo";
- address.locality = "Shibuya-ku";
- address.postal_code = "150-8512";
- address.address_lines.push_back("26-1 Sakuragaoka-cho");
- address.address_lines.push_back("Cerulean Tower 6F");
- address.organization = "Google Japan Inc.";
- address.recipient = "Miki Murakami";
-
- std::vector<std::string> actual;
- address.FormatForDisplay(&actual);
-
- std::vector<std::string> expected;
- expected.push_back(address.recipient);
- expected.push_back(address.organization);
- expected.insert(expected.end(),
- address.address_lines.begin(),
- address.address_lines.end());
- expected.push_back(address.locality + ", "+ address.administrative_area);
- expected.push_back(address.postal_code);
EXPECT_EQ(expected, actual);
}

Powered by Google App Engine
This is Rietveld 408576698