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

Side by Side 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: Omit postal code examples and URL. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (C) 2013 Google Inc. 1 // Copyright (C) 2013 Google Inc.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 23 matching lines...) Expand all
34 using i18n::addressinput::NEWLINE; 34 using i18n::addressinput::NEWLINE;
35 using i18n::addressinput::ORGANIZATION; 35 using i18n::addressinput::ORGANIZATION;
36 using i18n::addressinput::POSTAL_CODE; 36 using i18n::addressinput::POSTAL_CODE;
37 using i18n::addressinput::RECIPIENT; 37 using i18n::addressinput::RECIPIENT;
38 using i18n::addressinput::RegionDataConstants; 38 using i18n::addressinput::RegionDataConstants;
39 using i18n::addressinput::Rule; 39 using i18n::addressinput::Rule;
40 using i18n::addressinput::STREET_ADDRESS; 40 using i18n::addressinput::STREET_ADDRESS;
41 41
42 TEST(RuleTest, CopyOverwritesRule) { 42 TEST(RuleTest, CopyOverwritesRule) {
43 Rule rule; 43 Rule rule;
44 ASSERT_TRUE(rule.ParseSerializedRule("{" 44 ASSERT_TRUE(rule.ParseSerializedRule(
45 "\"fmt\":\"%S%Z\"," 45 "{"
46 "\"state_name_type\":\"area\"," 46 "\"fmt\":\"%S%Z\","
47 "\"zip_name_type\":\"postal\"," 47 "\"require\":\"SZ\","
48 "\"sub_keys\":\"CA~NY~TX\"," 48 "\"state_name_type\":\"area\","
49 "\"lang\":\"en\"," 49 "\"zip_name_type\":\"postal\","
50 "\"languages\":\"en~fr\"" 50 "\"sub_keys\":\"CA~NY~TX\","
51 "}")); 51 "\"lang\":\"en\","
52 "\"languages\":\"en~fr\","
53 "\"zipex\":\"95014,22162-1010\","
54 "\"zip\":\"\\\\d{5}([ \\\\-]\\\\d{4})?\","
55 "\"posturl\":\"https://tools.usps.com/go/ZipLookupAction!input.action\""
56 "}"));
52 57
53 Rule copy; 58 Rule copy;
54 EXPECT_NE(rule.GetFormat(), copy.GetFormat()); 59 EXPECT_NE(rule.GetFormat(), copy.GetFormat());
60 EXPECT_NE(rule.GetRequired(), copy.GetRequired());
55 EXPECT_NE(rule.GetSubKeys(), copy.GetSubKeys()); 61 EXPECT_NE(rule.GetSubKeys(), copy.GetSubKeys());
56 EXPECT_NE(rule.GetLanguages(), copy.GetLanguages()); 62 EXPECT_NE(rule.GetLanguages(), copy.GetLanguages());
57 EXPECT_NE(rule.GetLanguage(), copy.GetLanguage()); 63 EXPECT_NE(rule.GetLanguage(), copy.GetLanguage());
64 EXPECT_NE(rule.GetPostalCodeFormat(), copy.GetPostalCodeFormat());
58 EXPECT_NE(rule.GetAdminAreaNameMessageId(), 65 EXPECT_NE(rule.GetAdminAreaNameMessageId(),
59 copy.GetAdminAreaNameMessageId()); 66 copy.GetAdminAreaNameMessageId());
60 EXPECT_NE(rule.GetPostalCodeNameMessageId(), 67 EXPECT_NE(rule.GetPostalCodeNameMessageId(),
61 copy.GetPostalCodeNameMessageId()); 68 copy.GetPostalCodeNameMessageId());
62 69
63 copy.CopyFrom(rule); 70 copy.CopyFrom(rule);
64 EXPECT_EQ(rule.GetFormat(), copy.GetFormat()); 71 EXPECT_EQ(rule.GetFormat(), copy.GetFormat());
72 EXPECT_EQ(rule.GetRequired(), copy.GetRequired());
65 EXPECT_EQ(rule.GetSubKeys(), copy.GetSubKeys()); 73 EXPECT_EQ(rule.GetSubKeys(), copy.GetSubKeys());
66 EXPECT_EQ(rule.GetLanguages(), copy.GetLanguages()); 74 EXPECT_EQ(rule.GetLanguages(), copy.GetLanguages());
67 EXPECT_EQ(rule.GetLanguage(), copy.GetLanguage()); 75 EXPECT_EQ(rule.GetLanguage(), copy.GetLanguage());
76 EXPECT_EQ(rule.GetPostalCodeFormat(), copy.GetPostalCodeFormat());
68 EXPECT_EQ(rule.GetAdminAreaNameMessageId(), 77 EXPECT_EQ(rule.GetAdminAreaNameMessageId(),
69 copy.GetAdminAreaNameMessageId()); 78 copy.GetAdminAreaNameMessageId());
70 EXPECT_EQ(rule.GetPostalCodeNameMessageId(), 79 EXPECT_EQ(rule.GetPostalCodeNameMessageId(),
71 copy.GetPostalCodeNameMessageId()); 80 copy.GetPostalCodeNameMessageId());
72 } 81 }
73 82
74 TEST(RuleTest, ParseOverwritesRule) { 83 TEST(RuleTest, ParseOverwritesRule) {
75 Rule rule; 84 Rule rule;
76 ASSERT_TRUE(rule.ParseSerializedRule("{" 85 ASSERT_TRUE(rule.ParseSerializedRule(
77 "\"fmt\":\"%S%Z\"," 86 "{"
78 "\"state_name_type\":\"area\"," 87 "\"fmt\":\"%S%Z\","
79 "\"zip_name_type\":\"postal\"," 88 "\"require\":\"SZ\","
80 "\"sub_keys\":\"CA~NY~TX\"," 89 "\"state_name_type\":\"area\","
81 "\"lang\":\"en\"," 90 "\"zip_name_type\":\"postal\","
82 "\"languages\":\"en~fr\"" 91 "\"sub_keys\":\"CA~NY~TX\","
83 "}")); 92 "\"lang\":\"en\","
93 "\"languages\":\"en~fr\","
94 "\"zipex\":\"95014,22162-1010\","
95 "\"zip\":\"\\\\d{5}([ \\\\-]\\\\d{4})?\","
96 "\"posturl\":\"https://tools.usps.com/go/ZipLookupAction!input.action\""
97 "}"));
84 EXPECT_FALSE(rule.GetFormat().empty()); 98 EXPECT_FALSE(rule.GetFormat().empty());
99 EXPECT_FALSE(rule.GetRequired().empty());
85 EXPECT_FALSE(rule.GetSubKeys().empty()); 100 EXPECT_FALSE(rule.GetSubKeys().empty());
86 EXPECT_FALSE(rule.GetLanguages().empty()); 101 EXPECT_FALSE(rule.GetLanguages().empty());
87 EXPECT_FALSE(rule.GetLanguage().empty()); 102 EXPECT_FALSE(rule.GetLanguage().empty());
103 EXPECT_FALSE(rule.GetPostalCodeFormat().empty());
88 EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_AREA, 104 EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_AREA,
89 rule.GetAdminAreaNameMessageId()); 105 rule.GetAdminAreaNameMessageId());
90 EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_POSTAL_CODE_LABEL, 106 EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_POSTAL_CODE_LABEL,
91 rule.GetPostalCodeNameMessageId()); 107 rule.GetPostalCodeNameMessageId());
92 108
93 ASSERT_TRUE(rule.ParseSerializedRule("{" 109 ASSERT_TRUE(rule.ParseSerializedRule(
94 "\"fmt\":\"\"," 110 "{"
95 "\"state_name_type\":\"do_si\"," 111 "\"fmt\":\"\","
96 "\"zip_name_type\":\"zip\"," 112 "\"require\":\"\","
97 "\"sub_keys\":\"\"," 113 "\"state_name_type\":\"do_si\","
98 "\"lang\":\"\"," 114 "\"zip_name_type\":\"zip\","
99 "\"languages\":\"\"" 115 "\"sub_keys\":\"\","
100 "}")); 116 "\"lang\":\"\","
117 "\"languages\":\"\","
118 "\"zipex\":\"\","
119 "\"zip\":\"\","
120 "\"posturl\":\"\""
121 "}"));
101 EXPECT_TRUE(rule.GetFormat().empty()); 122 EXPECT_TRUE(rule.GetFormat().empty());
123 EXPECT_TRUE(rule.GetRequired().empty());
102 EXPECT_TRUE(rule.GetSubKeys().empty()); 124 EXPECT_TRUE(rule.GetSubKeys().empty());
103 EXPECT_TRUE(rule.GetLanguages().empty()); 125 EXPECT_TRUE(rule.GetLanguages().empty());
104 EXPECT_TRUE(rule.GetLanguage().empty()); 126 EXPECT_TRUE(rule.GetLanguage().empty());
127 EXPECT_TRUE(rule.GetPostalCodeFormat().empty());
105 EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_DO_SI, 128 EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_DO_SI,
106 rule.GetAdminAreaNameMessageId()); 129 rule.GetAdminAreaNameMessageId());
107 EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_ZIP_CODE_LABEL, 130 EXPECT_EQ(IDS_LIBADDRESSINPUT_I18N_ZIP_CODE_LABEL,
108 rule.GetPostalCodeNameMessageId()); 131 rule.GetPostalCodeNameMessageId());
109 } 132 }
110 133
111 TEST(RuleTest, ParsesFormatCorrectly) { 134 TEST(RuleTest, ParsesFormatCorrectly) {
112 Rule rule; 135 Rule rule;
113 ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"%S\"}")); 136 ASSERT_TRUE(rule.ParseSerializedRule("{\"fmt\":\"%S\"}"));
114 ASSERT_EQ(1, rule.GetFormat().size()); 137 ASSERT_EQ(1, rule.GetFormat().size());
115 EXPECT_EQ(ADMIN_AREA, rule.GetFormat()[0]); 138 EXPECT_EQ(ADMIN_AREA, rule.GetFormat()[0]);
116 } 139 }
117 140
141 TEST(RuleTest, ParsesRequiredFieldsCorrectly) {
Evan Stade 2013/12/17 19:47:24 this doesn't seem like a very thorough test. Would
please use gerrit instead 2013/12/18 00:57:50 Added these tests.
142 Rule rule;
143 ASSERT_TRUE(rule.ParseSerializedRule("{\"require\":\"S\"}"));
144 ASSERT_EQ(1, rule.GetRequired().size());
145 EXPECT_EQ(ADMIN_AREA, rule.GetRequired()[0]);
146 }
147
118 TEST(RuleTest, ParsesSubKeysCorrectly) { 148 TEST(RuleTest, ParsesSubKeysCorrectly) {
119 Rule rule; 149 Rule rule;
120 ASSERT_TRUE(rule.ParseSerializedRule("{\"sub_keys\":\"CA~NY~TX\"}")); 150 ASSERT_TRUE(rule.ParseSerializedRule("{\"sub_keys\":\"CA~NY~TX\"}"));
121 std::vector<std::string> expected; 151 std::vector<std::string> expected;
122 expected.push_back("CA"); 152 expected.push_back("CA");
123 expected.push_back("NY"); 153 expected.push_back("NY");
124 expected.push_back("TX"); 154 expected.push_back("TX");
125 EXPECT_EQ(expected, rule.GetSubKeys()); 155 EXPECT_EQ(expected, rule.GetSubKeys());
126 } 156 }
127 157
128 TEST(RuleTest, ParsesLanguageCorrectly) { 158 TEST(RuleTest, ParsesLanguageCorrectly) {
129 Rule rule; 159 Rule rule;
130 ASSERT_TRUE(rule.ParseSerializedRule("{\"lang\":\"en\"}")); 160 ASSERT_TRUE(rule.ParseSerializedRule("{\"lang\":\"en\"}"));
131 EXPECT_EQ("en", rule.GetLanguage()); 161 EXPECT_EQ("en", rule.GetLanguage());
132 } 162 }
133 163
134 TEST(RuleTest, ParsesLanguagesCorrectly) { 164 TEST(RuleTest, ParsesLanguagesCorrectly) {
135 Rule rule; 165 Rule rule;
136 ASSERT_TRUE(rule.ParseSerializedRule("{\"languages\":\"de~fr~it\"}")); 166 ASSERT_TRUE(rule.ParseSerializedRule("{\"languages\":\"de~fr~it\"}"));
137 std::vector<std::string> expected; 167 std::vector<std::string> expected;
138 expected.push_back("de"); 168 expected.push_back("de");
139 expected.push_back("fr"); 169 expected.push_back("fr");
140 expected.push_back("it"); 170 expected.push_back("it");
141 EXPECT_EQ(expected, rule.GetLanguages()); 171 EXPECT_EQ(expected, rule.GetLanguages());
142 } 172 }
143 173
174 TEST(RuleTest, ParsesPostalCodeFormatCorrectly) {
175 Rule rule;
176 ASSERT_TRUE(rule.ParseSerializedRule(
177 "{"
178 "\"zip\":\"\\\\d{5}([ \\\\-]\\\\d{4})?\""
179 "}"));
180 EXPECT_EQ("\\d{5}([ \\-]\\d{4})?", rule.GetPostalCodeFormat());
181 }
182
144 TEST(RuleTest, EmptyStringIsNotValid) { 183 TEST(RuleTest, EmptyStringIsNotValid) {
145 Rule rule; 184 Rule rule;
146 EXPECT_FALSE(rule.ParseSerializedRule(std::string())); 185 EXPECT_FALSE(rule.ParseSerializedRule(std::string()));
147 } 186 }
148 187
149 TEST(RuleTest, EmptyDictionaryIsValid) { 188 TEST(RuleTest, EmptyDictionaryIsValid) {
150 Rule rule; 189 Rule rule;
151 EXPECT_TRUE(rule.ParseSerializedRule("{}")); 190 EXPECT_TRUE(rule.ParseSerializedRule("{}"));
152 } 191 }
153 192
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 EXPECT_TRUE(rule_.ParseSerializedRule( 263 EXPECT_TRUE(rule_.ParseSerializedRule(
225 RegionDataConstants::GetRegionData(GetParam()))); 264 RegionDataConstants::GetRegionData(GetParam())));
226 } 265 }
227 266
228 // Test parsing all region data. 267 // Test parsing all region data.
229 INSTANTIATE_TEST_CASE_P( 268 INSTANTIATE_TEST_CASE_P(
230 AllRulesTest, RuleParseTest, 269 AllRulesTest, RuleParseTest,
231 testing::ValuesIn(RegionDataConstants::GetRegionCodes())); 270 testing::ValuesIn(RegionDataConstants::GetRegionCodes()));
232 271
233 } // namespace 272 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698