[rac] Parse postal code formats and required fields in libaddressinput.

third_party/libaddressinput/chromium/cpp/test/rule_test.cc

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..cf14715dc79734fa57f4157003b9802a89148998 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,8 +29,8 @@ 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;
 using i18n::addressinput::POSTAL_CODE;
 using i18n::addressinput::RECIPIENT;
@@ -41,20 +40,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 +66,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 +79,125 @@ 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<std::vector<AddressField> > expected_format;
+  expected_format.push_back(std::vector<AddressField>(1, ORGANIZATION));
+  expected_format.push_back(std::vector<AddressField>(1, RECIPIENT));
+  expected_format.push_back(std::vector<AddressField>(1, STREET_ADDRESS));
+  expected_format.push_back(std::vector<AddressField>(1, POSTAL_CODE));
+  expected_format.back().push_back(LOCALITY);
+  EXPECT_EQ(expected_format, rule.GetFormat());
+}
+
+TEST(RuleTest, DoubleTokenPrefixIsIgnoredInFormat) {
+  Rule rule;
+  ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"%%R\"}"));
+  ASSERT_FALSE(rule.GetFormat().empty());
+  ASSERT_FALSE(rule.GetFormat().front().empty());
+  EXPECT_EQ(COUNTRY, rule.GetFormat().front().front());
+}
+
+TEST(RuleTest, ParseDuplicateFormat) {
+  Rule rule;
+  ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"%R%R\"}"));
+  ASSERT_FALSE(rule.GetFormat().empty());
+  ASSERT_EQ(std::vector<AddressField>(2, COUNTRY), rule.GetFormat().front());
+}
+
+TEST(RuleTest, ParseInvalidFormatFields) {
+  Rule rule;
+  ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"%K%L\"}"));
+  EXPECT_TRUE(rule.GetFormat().empty());
+}
+
+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 +226,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()));