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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 106763007: [rac] Parse postal code formats and required fields in libaddressinput. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move AddressField parsing into Rule. Add more tests for parsing AddressFields. Created 7 years 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/cpp/src/rule.h ('K') | « third_party/libaddressinput/chromium/cpp/test/address_field_util_test.cc ('k') | third_party/libaddressinput/libaddressinput.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libaddressinput/chromium/cpp/test/rule_test.cc
diff --git a/third_party/libaddressinput/chromium/cpp/test/rule_test.cc b/third_party/libaddressinput/chromium/cpp/test/rule_test.cc
index 7f7609f11b20f27baccc201b337345f5953d3659..024db72f98554ce0a553f814981ff7c5c3bb31f0 100644
--- a/third_party/libaddressinput/chromium/cpp/test/rule_test.cc
+++ b/third_party/libaddressinput/chromium/cpp/test/rule_test.cc
@@ -22,7 +22,6 @@
#include <gtest/gtest.h>
-#include "address_field_util.h"
#include "messages.h"
#include "region_data_constants.h"
@@ -30,6 +29,7 @@ namespace {
using i18n::addressinput::AddressField;
using i18n::addressinput::ADMIN_AREA;
+using i18n::addressinput::COUNTRY;
using i18n::addressinput::LOCALITY;
using i18n::addressinput::NEWLINE;
using i18n::addressinput::ORGANIZATION;
@@ -41,20 +41,25 @@ using i18n::addressinput::STREET_ADDRESS;
TEST(RuleTest, CopyOverwritesRule) {
Rule rule;
- ASSERT_TRUE(rule.ParseSerializedRule("{"
- "\"fmt\":\"%S%Z\","
- "\"state_name_type\":\"area\","
- "\"zip_name_type\":\"postal\","
- "\"sub_keys\":\"CA~NY~TX\","
- "\"lang\":\"en\","
- "\"languages\":\"en~fr\""
- "}"));
+ ASSERT_TRUE(rule.ParseSerializedRule(
+ "{"
+ "\"fmt\":\"%S%Z\","
+ "\"require\":\"SZ\","
+ "\"state_name_type\":\"area\","
+ "\"zip_name_type\":\"postal\","
+ "\"sub_keys\":\"CA~NY~TX\","
+ "\"lang\":\"en\","
+ "\"languages\":\"en~fr\","
+ "\"zip\":\"\\\\d{5}([ \\\\-]\\\\d{4})?\""
+ "}"));
Rule copy;
EXPECT_NE(rule.GetFormat(), copy.GetFormat());
+ EXPECT_NE(rule.GetRequired(), copy.GetRequired());
EXPECT_NE(rule.GetSubKeys(), copy.GetSubKeys());
EXPECT_NE(rule.GetLanguages(), copy.GetLanguages());
EXPECT_NE(rule.GetLanguage(), copy.GetLanguage());
+ EXPECT_NE(rule.GetPostalCodeFormat(), copy.GetPostalCodeFormat());
EXPECT_NE(rule.GetAdminAreaNameMessageId(),
copy.GetAdminAreaNameMessageId());
EXPECT_NE(rule.GetPostalCodeNameMessageId(),
@@ -62,9 +67,11 @@ TEST(RuleTest, CopyOverwritesRule) {
copy.CopyFrom(rule);
EXPECT_EQ(rule.GetFormat(), copy.GetFormat());
+ EXPECT_EQ(rule.GetRequired(), copy.GetRequired());
EXPECT_EQ(rule.GetSubKeys(), copy.GetSubKeys());
EXPECT_EQ(rule.GetLanguages(), copy.GetLanguages());
EXPECT_EQ(rule.GetLanguage(), copy.GetLanguage());
+ EXPECT_EQ(rule.GetPostalCodeFormat(), copy.GetPostalCodeFormat());
EXPECT_EQ(rule.GetAdminAreaNameMessageId(),
copy.GetAdminAreaNameMessageId());
EXPECT_EQ(rule.GetPostalCodeNameMessageId(),
@@ -73,46 +80,114 @@ TEST(RuleTest, CopyOverwritesRule) {
TEST(RuleTest, ParseOverwritesRule) {
Rule rule;
- ASSERT_TRUE(rule.ParseSerializedRule("{"
- "\"fmt\":\"%S%Z\","
- "\"state_name_type\":\"area\","
- "\"zip_name_type\":\"postal\","
- "\"sub_keys\":\"CA~NY~TX\","
- "\"lang\":\"en\","
- "\"languages\":\"en~fr\""
- "}"));
+ ASSERT_TRUE(rule.ParseSerializedRule(
+ "{"
+ "\"fmt\":\"%S%Z\","
+ "\"require\":\"SZ\","
+ "\"state_name_type\":\"area\","
+ "\"zip_name_type\":\"postal\","
+ "\"sub_keys\":\"CA~NY~TX\","
+ "\"lang\":\"en\","
+ "\"languages\":\"en~fr\","
+ "\"zip\":\"\\\\d{5}([ \\\\-]\\\\d{4})?\""
+ "}"));
EXPECT_FALSE(rule.GetFormat().empty());
+ EXPECT_FALSE(rule.GetRequired().empty());
EXPECT_FALSE(rule.GetSubKeys().empty());
EXPECT_FALSE(rule.GetLanguages().empty());
EXPECT_FALSE(rule.GetLanguage().empty());
+ EXPECT_FALSE(rule.GetPostalCodeFormat().empty());
EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_AREA,
rule.GetAdminAreaNameMessageId());
EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_POSTAL_CODE_LABEL,
rule.GetPostalCodeNameMessageId());
- ASSERT_TRUE(rule.ParseSerializedRule("{"
- "\"fmt\":\"\","
- "\"state_name_type\":\"do_si\","
- "\"zip_name_type\":\"zip\","
- "\"sub_keys\":\"\","
- "\"lang\":\"\","
- "\"languages\":\"\""
- "}"));
+ ASSERT_TRUE(rule.ParseSerializedRule(
+ "{"
+ "\"fmt\":\"\","
+ "\"require\":\"\","
+ "\"state_name_type\":\"do_si\","
+ "\"zip_name_type\":\"zip\","
+ "\"sub_keys\":\"\","
+ "\"lang\":\"\","
+ "\"languages\":\"\","
+ "\"zip\":\"\""
+ "}"));
EXPECT_TRUE(rule.GetFormat().empty());
+ EXPECT_TRUE(rule.GetRequired().empty());
EXPECT_TRUE(rule.GetSubKeys().empty());
EXPECT_TRUE(rule.GetLanguages().empty());
EXPECT_TRUE(rule.GetLanguage().empty());
+ EXPECT_TRUE(rule.GetPostalCodeFormat().empty());
EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_DO_SI,
rule.GetAdminAreaNameMessageId());
EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_ZIP_CODE_LABEL,
rule.GetPostalCodeNameMessageId());
}
-TEST(RuleTest, ParsesFormatCorrectly) {
+TEST(RuleTest, ParseFormatWithNewLines) {
Rule rule;
- ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"%S\"}"));
- ASSERT_EQ(1, rule.GetFormat().size());
- EXPECT_EQ(ADMIN_AREA, rule.GetFormat()[0]);
+ ASSERT_TRUE(
+ rule.ParseSerializedRule("{\"fmt\":\"%O%n%N%n%A%nAX-%Z %C%nÅLAND\"}"));
+ std::vector<AddressField> expected;
+ expected.push_back(ORGANIZATION);
+ expected.push_back(static_cast<AddressField>(NEWLINE));
+ expected.push_back(RECIPIENT);
+ expected.push_back(static_cast<AddressField>(NEWLINE));
+ expected.push_back(STREET_ADDRESS);
+ expected.push_back(static_cast<AddressField>(NEWLINE));
+ expected.push_back(POSTAL_CODE);
+ expected.push_back(LOCALITY);
+ expected.push_back(static_cast<AddressField>(NEWLINE));
+ EXPECT_EQ(expected, rule.GetFormat());
+}
+
+TEST(RuleTest, DoubleTokenPrefixIsIgnoredInFormat) {
+ Rule rule;
+ ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"%%R\"}"));
+ EXPECT_EQ(std::vector<AddressField>(1, COUNTRY), rule.GetFormat());
+}
+
+TEST(RuleTest, PrefixWithoutTokenIsIgnoredInFormat) {
+ Rule rule;
+ ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"%\"}"));
+ EXPECT_TRUE(rule.GetFormat().empty());
+}
+
+TEST(RuleTest, EmptyStringFormat) {
+ Rule rule;
+ ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"\"}"));
+ EXPECT_TRUE(rule.GetFormat().empty());
+}
+
+TEST(RuleTest, ParseRequiredFields) {
+ Rule rule;
+ ASSERT_TRUE(rule.ParseSerializedRule("{\"require\":\"ONAZC\"}"));
+ std::vector<AddressField> expected;
+ expected.push_back(ORGANIZATION);
+ expected.push_back(RECIPIENT);
+ expected.push_back(STREET_ADDRESS);
+ expected.push_back(POSTAL_CODE);
+ expected.push_back(LOCALITY);
+ EXPECT_EQ(expected, rule.GetRequired());
+}
+
+TEST(RuleTest, ParseEmptyStringRequiredFields) {
+ Rule rule;
+ ASSERT_TRUE(rule.ParseSerializedRule("{\"require\":\"\"}"));
+ EXPECT_TRUE(rule.GetRequired().empty());
+}
+
+TEST(RuleTest, ParseInvalidRequiredFields) {
+ Rule rule;
+ ASSERT_TRUE(rule.ParseSerializedRule("{\"require\":\"garbage\"}"));
+ EXPECT_TRUE(rule.GetRequired().empty());
+}
+
+TEST(RuleTest, ParseDuplicateRequiredFields) {
+ Rule rule;
+ ASSERT_TRUE(rule.ParseSerializedRule("{\"require\":\"SSS\"}"));
+ EXPECT_EQ(std::vector<AddressField>(3, ADMIN_AREA), rule.GetRequired());
}
TEST(RuleTest, ParsesSubKeysCorrectly) {
@@ -141,6 +216,15 @@ TEST(RuleTest, ParsesLanguagesCorrectly) {
EXPECT_EQ(expected, rule.GetLanguages());
}
+TEST(RuleTest, ParsesPostalCodeFormatCorrectly) {
+ Rule rule;
+ ASSERT_TRUE(rule.ParseSerializedRule(
+ "{"
+ "\"zip\":\"\\\\d{5}([ \\\\-]\\\\d{4})?\""
+ "}"));
+ EXPECT_EQ("\\d{5}([ \\-]\\d{4})?", rule.GetPostalCodeFormat());
+}
+
TEST(RuleTest, EmptyStringIsNotValid) {
Rule rule;
EXPECT_FALSE(rule.ParseSerializedRule(std::string()));
« third_party/libaddressinput/chromium/cpp/src/rule.h ('K') | « third_party/libaddressinput/chromium/cpp/test/address_field_util_test.cc ('k') | third_party/libaddressinput/libaddressinput.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698