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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libaddressinput/chromium/preload_address_validator_unittest.cc

Issue 298863012: Use upstream libaddressinput in Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Self review. Created 6 years, 6 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
« third_party/libaddressinput/chromium/localization.cc ('K') | « third_party/libaddressinput/chromium/preload_address_validator.cc ('k') | third_party/libaddressinput/chromium/storage_test_runner.h » ('j') | third_party/libaddressinput/chromium/suggestions.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libaddressinput/chromium/preload_address_validator_unittest.cc
diff --git a/third_party/libaddressinput/chromium/preload_address_validator_unittest.cc b/third_party/libaddressinput/chromium/preload_address_validator_unittest.cc
index 1cc7aafe7bff1277e7cd7173152205f9cf266595..4152cfaf13f95c33635f53c29c68dab11f291ccc 100644
--- a/third_party/libaddressinput/chromium/preload_address_validator_unittest.cc
+++ b/third_party/libaddressinput/chromium/preload_address_validator_unittest.cc
@@ -10,8 +10,6 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
-
-#define I18N_ADDRESSINPUT_UTIL_BASICTYPES_H_
#include "third_party/libaddressinput/chromium/preload_address_validator.h"
#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
@@ -107,6 +105,20 @@ TEST_F(PreloadAddressValidatorTest, EmptyAddressNoFatalFailure) {
validator_->Validate(address, NULL, &dummy));
}
+TEST_F(PreloadAddressValidatorTest, UsStateNamesAreValidEntries) {
+ AddressData address;
+ address.region_code = "US";
+ address.administrative_area = "California";
+
+ FieldProblemMap filter;
+ filter.insert(std::make_pair(ADMIN_AREA, UNKNOWN_VALUE));
+ FieldProblemMap problems;
+ EXPECT_EQ(
+ PreloadAddressValidator::SUCCESS,
+ validator_->Validate(address, &filter, &problems));
+ EXPECT_TRUE(problems.empty());
+}
+
TEST_F(PreloadAddressValidatorTest, USZipCode) {
AddressData address;
address.address_line.push_back("340 Main St.");
@@ -247,13 +259,6 @@ TEST_F(PreloadAddressValidatorTest, BasicValidationFailure) {
EXPECT_EQ(ADMIN_AREA, problems.begin()->first);
}
-TEST_F(PreloadAddressValidatorTest, NoNullSuggestionsCrash) {
- AddressData address;
- address.region_code = "US";
- EXPECT_EQ(PreloadAddressValidator::SUCCESS,
- validator_->GetSuggestions(address, COUNTRY, 1, NULL));
please use gerrit instead 2014/06/05 22:22:49 Add back this test! Handle NULL in PreloadAddressV
please use gerrit instead 2014/06/09 23:28:17 Done.
-}
-
TEST_F(PreloadAddressValidatorTest, SuggestAdminAreaForPostalCode) {
AddressData address;
address.region_code = "US";
@@ -273,6 +278,7 @@ TEST_F(PreloadAddressValidatorTest, SuggestLocalityForPostalCodeWithAdminArea) {
address.region_code = "TW";
address.postal_code = "515";
address.administrative_area = "Changhua";
+ address.language_code = "zh-Latn";
std::vector<AddressData> suggestions;
EXPECT_EQ(PreloadAddressValidator::SUCCESS,
@@ -289,6 +295,7 @@ TEST_F(PreloadAddressValidatorTest, SuggestAdminAreaForPostalCodeWithLocality) {
address.region_code = "TW";
address.postal_code = "515";
address.locality = "Dacun";
+ address.language_code = "zh-Latn";
std::vector<AddressData> suggestions;
EXPECT_EQ(PreloadAddressValidator::SUCCESS,
@@ -316,13 +323,14 @@ TEST_F(PreloadAddressValidatorTest, SuggestForLocality) {
AddressData address;
address.region_code = "CN";
address.locality = "Anqin";
+ address.language_code = "zh-Latn";
std::vector<AddressData> suggestions;
EXPECT_EQ(PreloadAddressValidator::SUCCESS,
validator_->GetSuggestions(address, LOCALITY, 10, &suggestions));
ASSERT_EQ(1U, suggestions.size());
EXPECT_EQ("Anqing Shi", suggestions[0].locality);
- EXPECT_EQ("ANHUI SHENG", suggestions[0].administrative_area);
+ EXPECT_EQ("Anhui Sheng", suggestions[0].administrative_area);
}
TEST_F(PreloadAddressValidatorTest, SuggestForLocalityAndAdminArea) {
@@ -331,6 +339,7 @@ TEST_F(PreloadAddressValidatorTest, SuggestForLocalityAndAdminArea) {
address.region_code = "CN";
address.locality = "Anqing";
address.administrative_area = "Anhui";
+ address.language_code = "zh-Latn";
std::vector<AddressData> suggestions;
EXPECT_EQ(PreloadAddressValidator::SUCCESS,
@@ -338,7 +347,7 @@ TEST_F(PreloadAddressValidatorTest, SuggestForLocalityAndAdminArea) {
ASSERT_EQ(1U, suggestions.size());
EXPECT_TRUE(suggestions[0].dependent_locality.empty());
EXPECT_EQ("Anqing Shi", suggestions[0].locality);
- EXPECT_EQ("ANHUI SHENG", suggestions[0].administrative_area);
+ EXPECT_EQ("Anhui Sheng", suggestions[0].administrative_area);
}
TEST_F(PreloadAddressValidatorTest, SuggestForAdminAreaAndLocality) {
@@ -347,6 +356,7 @@ TEST_F(PreloadAddressValidatorTest, SuggestForAdminAreaAndLocality) {
address.region_code = "CN";
address.locality = "Anqing";
address.administrative_area = "Anhui";
+ address.language_code = "zh-Latn";
std::vector<AddressData> suggestions;
EXPECT_EQ(PreloadAddressValidator::SUCCESS,
@@ -354,7 +364,7 @@ TEST_F(PreloadAddressValidatorTest, SuggestForAdminAreaAndLocality) {
ASSERT_EQ(1U, suggestions.size());
EXPECT_TRUE(suggestions[0].dependent_locality.empty());
EXPECT_TRUE(suggestions[0].locality.empty());
- EXPECT_EQ("ANHUI SHENG", suggestions[0].administrative_area);
+ EXPECT_EQ("Anhui Sheng", suggestions[0].administrative_area);
}
TEST_F(PreloadAddressValidatorTest, SuggestForDependentLocality) {
@@ -362,6 +372,7 @@ TEST_F(PreloadAddressValidatorTest, SuggestForDependentLocality) {
AddressData address;
address.region_code = "CN";
address.dependent_locality = "Zongyang";
+ address.language_code = "zh-Latn";
std::vector<AddressData> suggestions;
EXPECT_EQ(PreloadAddressValidator::SUCCESS,
@@ -370,7 +381,7 @@ TEST_F(PreloadAddressValidatorTest, SuggestForDependentLocality) {
ASSERT_EQ(1U, suggestions.size());
EXPECT_EQ("Zongyang Xian", suggestions[0].dependent_locality);
EXPECT_EQ("Anqing Shi", suggestions[0].locality);
- EXPECT_EQ("ANHUI SHENG", suggestions[0].administrative_area);
+ EXPECT_EQ("Anhui Sheng", suggestions[0].administrative_area);
}
TEST_F(PreloadAddressValidatorTest,
@@ -380,6 +391,7 @@ TEST_F(PreloadAddressValidatorTest,
address.region_code = "CN";
address.dependent_locality = "Zongyang";
address.administrative_area = "Sichuan Sheng";
+ address.language_code = "zh-Latn";
std::vector<AddressData> suggestions;
EXPECT_EQ(PreloadAddressValidator::SUCCESS,
@@ -492,7 +504,7 @@ TEST_F(PreloadAddressValidatorTest,
SuggestLatinNameWhenLanguageDiffersAndLatinNameAvailable) {
validator_->LoadRules("KR", *loaded_);
AddressData address;
- address.language_code = "en";
+ address.language_code = "ko-Latn";
address.region_code = "KR";
address.postal_code = "210-210";
@@ -504,23 +516,33 @@ TEST_F(PreloadAddressValidatorTest,
EXPECT_EQ("210-210", suggestions[0].postal_code);
}
-TEST_F(PreloadAddressValidatorTest, SuggestLatinNameWhenUserInputIsLatin) {
- validator_->LoadRules("KR", *loaded_);
+TEST_F(PreloadAddressValidatorTest, NoSuggestionsForEmptyAddress) {
AddressData address;
- address.language_code = "ko";
- address.region_code = "KR";
- address.administrative_area = "Gang";
+ address.region_code = "US";
+
+ std::vector<AddressData> suggestions;
+ EXPECT_EQ(
+ PreloadAddressValidator::SUCCESS,
+ validator_->GetSuggestions(address, POSTAL_CODE, 999, &suggestions));
+ EXPECT_TRUE(suggestions.empty());
+}
+
+TEST_F(PreloadAddressValidatorTest, SuggestionIncludesCountry) {
+ AddressData address;
+ address.region_code = "US";
+ address.postal_code = "90291";
std::vector<AddressData> suggestions;
EXPECT_EQ(PreloadAddressValidator::SUCCESS,
- validator_->GetSuggestions(address, ADMIN_AREA, 1, &suggestions));
+ validator_->GetSuggestions(address, POSTAL_CODE, 1, &suggestions));
ASSERT_EQ(1U, suggestions.size());
- EXPECT_EQ("Gangwon", suggestions[0].administrative_area);
+ EXPECT_EQ("US", suggestions[0].region_code);
}
-TEST_F(PreloadAddressValidatorTest, NoSuggestionsForEmptyAddress) {
+TEST_F(PreloadAddressValidatorTest, InvalidPostalCodeNoSuggestions) {
AddressData address;
address.region_code = "US";
+ address.postal_code = "0";
std::vector<AddressData> suggestions;
EXPECT_EQ(
@@ -529,16 +551,17 @@ TEST_F(PreloadAddressValidatorTest, NoSuggestionsForEmptyAddress) {
EXPECT_TRUE(suggestions.empty());
}
-TEST_F(PreloadAddressValidatorTest, SuggestionIncludesCountry) {
+TEST_F(PreloadAddressValidatorTest, MismatchedPostalCodeNoSuggestions) {
AddressData address;
address.region_code = "US";
+ address.administrative_area = "TX";
address.postal_code = "90291";
std::vector<AddressData> suggestions;
- EXPECT_EQ(PreloadAddressValidator::SUCCESS,
- validator_->GetSuggestions(address, POSTAL_CODE, 1, &suggestions));
- ASSERT_EQ(1U, suggestions.size());
- EXPECT_EQ("US", suggestions[0].region_code);
+ EXPECT_EQ(
+ PreloadAddressValidator::SUCCESS,
+ validator_->GetSuggestions(address, POSTAL_CODE, 999, &suggestions));
+ EXPECT_TRUE(suggestions.empty());
}
please use gerrit instead 2014/06/05 22:22:49 Add a test SuggestionsAreCleared!
please use gerrit instead 2014/06/09 23:28:17 Done.
TEST_F(PreloadAddressValidatorTest,
« third_party/libaddressinput/chromium/localization.cc ('K') | « third_party/libaddressinput/chromium/preload_address_validator.cc ('k') | third_party/libaddressinput/chromium/storage_test_runner.h » ('j') | third_party/libaddressinput/chromium/suggestions.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698