OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
6 #include "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
7 #include "base/string16.h" | 7 #include "base/string16.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/autofill/address_field.h" | 9 #include "chrome/browser/autofill/address_field.h" |
10 #include "chrome/browser/autofill/autofill_field.h" | 10 #include "chrome/browser/autofill/autofill_field.h" |
11 #include "chrome/browser/autofill/autofill_scanner.h" | 11 #include "chrome/browser/autofill/autofill_scanner.h" |
| 12 #include "chrome/common/form_field_data.h" |
12 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
13 #include "webkit/forms/form_field.h" | |
14 | 14 |
15 class AddressFieldTest : public testing::Test { | 15 class AddressFieldTest : public testing::Test { |
16 public: | 16 public: |
17 AddressFieldTest() {} | 17 AddressFieldTest() {} |
18 | 18 |
19 protected: | 19 protected: |
20 ScopedVector<const AutofillField> list_; | 20 ScopedVector<const AutofillField> list_; |
21 scoped_ptr<AddressField> field_; | 21 scoped_ptr<AddressField> field_; |
22 FieldTypeMap field_type_map_; | 22 FieldTypeMap field_type_map_; |
23 | 23 |
(...skipping 13 matching lines...) Expand all Loading... |
37 } | 37 } |
38 | 38 |
39 TEST_F(AddressFieldTest, NonParse) { | 39 TEST_F(AddressFieldTest, NonParse) { |
40 list_.push_back(new AutofillField); | 40 list_.push_back(new AutofillField); |
41 AutofillScanner scanner(list_.get()); | 41 AutofillScanner scanner(list_.get()); |
42 field_.reset(Parse(&scanner)); | 42 field_.reset(Parse(&scanner)); |
43 ASSERT_EQ(static_cast<AddressField*>(NULL), field_.get()); | 43 ASSERT_EQ(static_cast<AddressField*>(NULL), field_.get()); |
44 } | 44 } |
45 | 45 |
46 TEST_F(AddressFieldTest, ParseOneLineAddress) { | 46 TEST_F(AddressFieldTest, ParseOneLineAddress) { |
47 webkit::forms::FormField field; | 47 FormFieldData field; |
48 field.form_control_type = ASCIIToUTF16("text"); | 48 field.form_control_type = ASCIIToUTF16("text"); |
49 | 49 |
50 field.label = ASCIIToUTF16("Address"); | 50 field.label = ASCIIToUTF16("Address"); |
51 field.name = ASCIIToUTF16("address"); | 51 field.name = ASCIIToUTF16("address"); |
52 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); | 52 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); |
53 | 53 |
54 AutofillScanner scanner(list_.get()); | 54 AutofillScanner scanner(list_.get()); |
55 field_.reset(Parse(&scanner)); | 55 field_.reset(Parse(&scanner)); |
56 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 56 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
57 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 57 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
58 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 58 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
59 ASSERT_TRUE( | 59 ASSERT_TRUE( |
60 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); | 60 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); |
61 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); | 61 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); |
62 } | 62 } |
63 | 63 |
64 TEST_F(AddressFieldTest, ParseOneLineAddressBilling) { | 64 TEST_F(AddressFieldTest, ParseOneLineAddressBilling) { |
65 webkit::forms::FormField field; | 65 FormFieldData field; |
66 field.form_control_type = ASCIIToUTF16("text"); | 66 field.form_control_type = ASCIIToUTF16("text"); |
67 | 67 |
68 field.label = ASCIIToUTF16("Address"); | 68 field.label = ASCIIToUTF16("Address"); |
69 field.name = ASCIIToUTF16("billingAddress"); | 69 field.name = ASCIIToUTF16("billingAddress"); |
70 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); | 70 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); |
71 | 71 |
72 AutofillScanner scanner(list_.get()); | 72 AutofillScanner scanner(list_.get()); |
73 field_.reset(Parse(&scanner)); | 73 field_.reset(Parse(&scanner)); |
74 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 74 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
75 EXPECT_EQ(AddressField::kBillingAddress, field_->FindType()); | 75 EXPECT_EQ(AddressField::kBillingAddress, field_->FindType()); |
76 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 76 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
77 ASSERT_TRUE( | 77 ASSERT_TRUE( |
78 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); | 78 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); |
79 EXPECT_EQ(ADDRESS_BILLING_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); | 79 EXPECT_EQ(ADDRESS_BILLING_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); |
80 } | 80 } |
81 | 81 |
82 TEST_F(AddressFieldTest, ParseOneLineAddressShipping) { | 82 TEST_F(AddressFieldTest, ParseOneLineAddressShipping) { |
83 webkit::forms::FormField field; | 83 FormFieldData field; |
84 field.form_control_type = ASCIIToUTF16("text"); | 84 field.form_control_type = ASCIIToUTF16("text"); |
85 | 85 |
86 field.label = ASCIIToUTF16("Address"); | 86 field.label = ASCIIToUTF16("Address"); |
87 field.name = ASCIIToUTF16("shippingAddress"); | 87 field.name = ASCIIToUTF16("shippingAddress"); |
88 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); | 88 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); |
89 | 89 |
90 AutofillScanner scanner(list_.get()); | 90 AutofillScanner scanner(list_.get()); |
91 field_.reset(Parse(&scanner)); | 91 field_.reset(Parse(&scanner)); |
92 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 92 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
93 EXPECT_EQ(AddressField::kShippingAddress, field_->FindType()); | 93 EXPECT_EQ(AddressField::kShippingAddress, field_->FindType()); |
94 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 94 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
95 ASSERT_TRUE( | 95 ASSERT_TRUE( |
96 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); | 96 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); |
97 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); | 97 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); |
98 } | 98 } |
99 | 99 |
100 TEST_F(AddressFieldTest, ParseTwoLineAddress) { | 100 TEST_F(AddressFieldTest, ParseTwoLineAddress) { |
101 webkit::forms::FormField field; | 101 FormFieldData field; |
102 field.form_control_type = ASCIIToUTF16("text"); | 102 field.form_control_type = ASCIIToUTF16("text"); |
103 | 103 |
104 field.label = ASCIIToUTF16("Address"); | 104 field.label = ASCIIToUTF16("Address"); |
105 field.name = ASCIIToUTF16("address"); | 105 field.name = ASCIIToUTF16("address"); |
106 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); | 106 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); |
107 | 107 |
108 field.label = string16(); | 108 field.label = string16(); |
109 field.name = string16(); | 109 field.name = string16(); |
110 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr2"))); | 110 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr2"))); |
111 | 111 |
112 AutofillScanner scanner(list_.get()); | 112 AutofillScanner scanner(list_.get()); |
113 field_.reset(Parse(&scanner)); | 113 field_.reset(Parse(&scanner)); |
114 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 114 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
115 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 115 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
116 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 116 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
117 ASSERT_TRUE( | 117 ASSERT_TRUE( |
118 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); | 118 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); |
119 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); | 119 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); |
120 ASSERT_TRUE( | 120 ASSERT_TRUE( |
121 field_type_map_.find(ASCIIToUTF16("addr2")) != field_type_map_.end()); | 121 field_type_map_.find(ASCIIToUTF16("addr2")) != field_type_map_.end()); |
122 EXPECT_EQ(ADDRESS_HOME_LINE2, field_type_map_[ASCIIToUTF16("addr2")]); | 122 EXPECT_EQ(ADDRESS_HOME_LINE2, field_type_map_[ASCIIToUTF16("addr2")]); |
123 } | 123 } |
124 | 124 |
125 TEST_F(AddressFieldTest, ParseThreeLineAddress) { | 125 TEST_F(AddressFieldTest, ParseThreeLineAddress) { |
126 webkit::forms::FormField field; | 126 FormFieldData field; |
127 field.form_control_type = ASCIIToUTF16("text"); | 127 field.form_control_type = ASCIIToUTF16("text"); |
128 | 128 |
129 field.label = ASCIIToUTF16("Address Line1"); | 129 field.label = ASCIIToUTF16("Address Line1"); |
130 field.name = ASCIIToUTF16("Address1"); | 130 field.name = ASCIIToUTF16("Address1"); |
131 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); | 131 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); |
132 | 132 |
133 field.label = ASCIIToUTF16("Address Line2"); | 133 field.label = ASCIIToUTF16("Address Line2"); |
134 field.name = ASCIIToUTF16("Address2"); | 134 field.name = ASCIIToUTF16("Address2"); |
135 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr2"))); | 135 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr2"))); |
136 | 136 |
(...skipping 10 matching lines...) Expand all Loading... |
147 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); | 147 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); |
148 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); | 148 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); |
149 ASSERT_TRUE( | 149 ASSERT_TRUE( |
150 field_type_map_.find(ASCIIToUTF16("addr2")) != field_type_map_.end()); | 150 field_type_map_.find(ASCIIToUTF16("addr2")) != field_type_map_.end()); |
151 EXPECT_EQ(ADDRESS_HOME_LINE2, field_type_map_[ASCIIToUTF16("addr2")]); | 151 EXPECT_EQ(ADDRESS_HOME_LINE2, field_type_map_[ASCIIToUTF16("addr2")]); |
152 ASSERT_TRUE( | 152 ASSERT_TRUE( |
153 field_type_map_.find(ASCIIToUTF16("addr3")) == field_type_map_.end()); | 153 field_type_map_.find(ASCIIToUTF16("addr3")) == field_type_map_.end()); |
154 } | 154 } |
155 | 155 |
156 TEST_F(AddressFieldTest, ParseCity) { | 156 TEST_F(AddressFieldTest, ParseCity) { |
157 webkit::forms::FormField field; | 157 FormFieldData field; |
158 field.form_control_type = ASCIIToUTF16("text"); | 158 field.form_control_type = ASCIIToUTF16("text"); |
159 | 159 |
160 field.label = ASCIIToUTF16("City"); | 160 field.label = ASCIIToUTF16("City"); |
161 field.name = ASCIIToUTF16("city"); | 161 field.name = ASCIIToUTF16("city"); |
162 list_.push_back(new AutofillField(field, ASCIIToUTF16("city1"))); | 162 list_.push_back(new AutofillField(field, ASCIIToUTF16("city1"))); |
163 | 163 |
164 AutofillScanner scanner(list_.get()); | 164 AutofillScanner scanner(list_.get()); |
165 field_.reset(Parse(&scanner)); | 165 field_.reset(Parse(&scanner)); |
166 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 166 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
167 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 167 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
168 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 168 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
169 ASSERT_TRUE( | 169 ASSERT_TRUE( |
170 field_type_map_.find(ASCIIToUTF16("city1")) != field_type_map_.end()); | 170 field_type_map_.find(ASCIIToUTF16("city1")) != field_type_map_.end()); |
171 EXPECT_EQ(ADDRESS_HOME_CITY, field_type_map_[ASCIIToUTF16("city1")]); | 171 EXPECT_EQ(ADDRESS_HOME_CITY, field_type_map_[ASCIIToUTF16("city1")]); |
172 } | 172 } |
173 | 173 |
174 TEST_F(AddressFieldTest, ParseState) { | 174 TEST_F(AddressFieldTest, ParseState) { |
175 webkit::forms::FormField field; | 175 FormFieldData field; |
176 field.form_control_type = ASCIIToUTF16("text"); | 176 field.form_control_type = ASCIIToUTF16("text"); |
177 | 177 |
178 field.label = ASCIIToUTF16("State"); | 178 field.label = ASCIIToUTF16("State"); |
179 field.name = ASCIIToUTF16("state"); | 179 field.name = ASCIIToUTF16("state"); |
180 list_.push_back(new AutofillField(field, ASCIIToUTF16("state1"))); | 180 list_.push_back(new AutofillField(field, ASCIIToUTF16("state1"))); |
181 | 181 |
182 AutofillScanner scanner(list_.get()); | 182 AutofillScanner scanner(list_.get()); |
183 field_.reset(Parse(&scanner)); | 183 field_.reset(Parse(&scanner)); |
184 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 184 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
185 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 185 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
186 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 186 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
187 ASSERT_TRUE( | 187 ASSERT_TRUE( |
188 field_type_map_.find(ASCIIToUTF16("state1")) != field_type_map_.end()); | 188 field_type_map_.find(ASCIIToUTF16("state1")) != field_type_map_.end()); |
189 EXPECT_EQ(ADDRESS_HOME_STATE, field_type_map_[ASCIIToUTF16("state1")]); | 189 EXPECT_EQ(ADDRESS_HOME_STATE, field_type_map_[ASCIIToUTF16("state1")]); |
190 } | 190 } |
191 | 191 |
192 TEST_F(AddressFieldTest, ParseZip) { | 192 TEST_F(AddressFieldTest, ParseZip) { |
193 webkit::forms::FormField field; | 193 FormFieldData field; |
194 field.form_control_type = ASCIIToUTF16("text"); | 194 field.form_control_type = ASCIIToUTF16("text"); |
195 | 195 |
196 field.label = ASCIIToUTF16("Zip"); | 196 field.label = ASCIIToUTF16("Zip"); |
197 field.name = ASCIIToUTF16("zip"); | 197 field.name = ASCIIToUTF16("zip"); |
198 list_.push_back(new AutofillField(field, ASCIIToUTF16("zip1"))); | 198 list_.push_back(new AutofillField(field, ASCIIToUTF16("zip1"))); |
199 | 199 |
200 AutofillScanner scanner(list_.get()); | 200 AutofillScanner scanner(list_.get()); |
201 field_.reset(Parse(&scanner)); | 201 field_.reset(Parse(&scanner)); |
202 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 202 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
203 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 203 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
204 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 204 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
205 ASSERT_TRUE( | 205 ASSERT_TRUE( |
206 field_type_map_.find(ASCIIToUTF16("zip1")) != field_type_map_.end()); | 206 field_type_map_.find(ASCIIToUTF16("zip1")) != field_type_map_.end()); |
207 EXPECT_EQ(ADDRESS_HOME_ZIP, field_type_map_[ASCIIToUTF16("zip1")]); | 207 EXPECT_EQ(ADDRESS_HOME_ZIP, field_type_map_[ASCIIToUTF16("zip1")]); |
208 } | 208 } |
209 | 209 |
210 TEST_F(AddressFieldTest, ParseStateAndZipOneLabel) { | 210 TEST_F(AddressFieldTest, ParseStateAndZipOneLabel) { |
211 webkit::forms::FormField field; | 211 FormFieldData field; |
212 field.form_control_type = ASCIIToUTF16("text"); | 212 field.form_control_type = ASCIIToUTF16("text"); |
213 | 213 |
214 field.label = ASCIIToUTF16("State/Province, Zip/Postal Code"); | 214 field.label = ASCIIToUTF16("State/Province, Zip/Postal Code"); |
215 field.name = ASCIIToUTF16("state"); | 215 field.name = ASCIIToUTF16("state"); |
216 list_.push_back(new AutofillField(field, ASCIIToUTF16("state"))); | 216 list_.push_back(new AutofillField(field, ASCIIToUTF16("state"))); |
217 | 217 |
218 field.label = ASCIIToUTF16("State/Province, Zip/Postal Code"); | 218 field.label = ASCIIToUTF16("State/Province, Zip/Postal Code"); |
219 field.name = ASCIIToUTF16("zip"); | 219 field.name = ASCIIToUTF16("zip"); |
220 list_.push_back(new AutofillField(field, ASCIIToUTF16("zip"))); | 220 list_.push_back(new AutofillField(field, ASCIIToUTF16("zip"))); |
221 | 221 |
222 AutofillScanner scanner(list_.get()); | 222 AutofillScanner scanner(list_.get()); |
223 field_.reset(Parse(&scanner)); | 223 field_.reset(Parse(&scanner)); |
224 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 224 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
225 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 225 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
226 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 226 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
227 ASSERT_TRUE( | 227 ASSERT_TRUE( |
228 field_type_map_.find(ASCIIToUTF16("state")) != field_type_map_.end()); | 228 field_type_map_.find(ASCIIToUTF16("state")) != field_type_map_.end()); |
229 EXPECT_EQ(ADDRESS_HOME_STATE, field_type_map_[ASCIIToUTF16("state")]); | 229 EXPECT_EQ(ADDRESS_HOME_STATE, field_type_map_[ASCIIToUTF16("state")]); |
230 ASSERT_TRUE( | 230 ASSERT_TRUE( |
231 field_type_map_.find(ASCIIToUTF16("zip")) != field_type_map_.end()); | 231 field_type_map_.find(ASCIIToUTF16("zip")) != field_type_map_.end()); |
232 EXPECT_EQ(ADDRESS_HOME_ZIP, field_type_map_[ASCIIToUTF16("zip")]); | 232 EXPECT_EQ(ADDRESS_HOME_ZIP, field_type_map_[ASCIIToUTF16("zip")]); |
233 } | 233 } |
234 | 234 |
235 TEST_F(AddressFieldTest, ParseCountry) { | 235 TEST_F(AddressFieldTest, ParseCountry) { |
236 webkit::forms::FormField field; | 236 FormFieldData field; |
237 field.form_control_type = ASCIIToUTF16("text"); | 237 field.form_control_type = ASCIIToUTF16("text"); |
238 | 238 |
239 field.label = ASCIIToUTF16("Country"); | 239 field.label = ASCIIToUTF16("Country"); |
240 field.name = ASCIIToUTF16("country"); | 240 field.name = ASCIIToUTF16("country"); |
241 list_.push_back(new AutofillField(field, ASCIIToUTF16("country1"))); | 241 list_.push_back(new AutofillField(field, ASCIIToUTF16("country1"))); |
242 | 242 |
243 AutofillScanner scanner(list_.get()); | 243 AutofillScanner scanner(list_.get()); |
244 field_.reset(Parse(&scanner)); | 244 field_.reset(Parse(&scanner)); |
245 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 245 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
246 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 246 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
247 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 247 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
248 ASSERT_TRUE( | 248 ASSERT_TRUE( |
249 field_type_map_.find(ASCIIToUTF16("country1")) != field_type_map_.end()); | 249 field_type_map_.find(ASCIIToUTF16("country1")) != field_type_map_.end()); |
250 EXPECT_EQ(ADDRESS_HOME_COUNTRY, field_type_map_[ASCIIToUTF16("country1")]); | 250 EXPECT_EQ(ADDRESS_HOME_COUNTRY, field_type_map_[ASCIIToUTF16("country1")]); |
251 } | 251 } |
252 | 252 |
253 TEST_F(AddressFieldTest, ParseTwoLineAddressMissingLabel) { | 253 TEST_F(AddressFieldTest, ParseTwoLineAddressMissingLabel) { |
254 webkit::forms::FormField field; | 254 FormFieldData field; |
255 field.form_control_type = ASCIIToUTF16("text"); | 255 field.form_control_type = ASCIIToUTF16("text"); |
256 | 256 |
257 field.label = ASCIIToUTF16("Address"); | 257 field.label = ASCIIToUTF16("Address"); |
258 field.name = ASCIIToUTF16("address"); | 258 field.name = ASCIIToUTF16("address"); |
259 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); | 259 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr1"))); |
260 | 260 |
261 field.label = string16(); | 261 field.label = string16(); |
262 field.name = ASCIIToUTF16("bogus"); | 262 field.name = ASCIIToUTF16("bogus"); |
263 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr2"))); | 263 list_.push_back(new AutofillField(field, ASCIIToUTF16("addr2"))); |
264 | 264 |
265 AutofillScanner scanner(list_.get()); | 265 AutofillScanner scanner(list_.get()); |
266 field_.reset(Parse(&scanner)); | 266 field_.reset(Parse(&scanner)); |
267 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 267 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
268 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 268 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
269 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 269 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
270 ASSERT_TRUE( | 270 ASSERT_TRUE( |
271 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); | 271 field_type_map_.find(ASCIIToUTF16("addr1")) != field_type_map_.end()); |
272 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); | 272 EXPECT_EQ(ADDRESS_HOME_LINE1, field_type_map_[ASCIIToUTF16("addr1")]); |
273 ASSERT_TRUE( | 273 ASSERT_TRUE( |
274 field_type_map_.find(ASCIIToUTF16("addr2")) != field_type_map_.end()); | 274 field_type_map_.find(ASCIIToUTF16("addr2")) != field_type_map_.end()); |
275 EXPECT_EQ(ADDRESS_HOME_LINE2, field_type_map_[ASCIIToUTF16("addr2")]); | 275 EXPECT_EQ(ADDRESS_HOME_LINE2, field_type_map_[ASCIIToUTF16("addr2")]); |
276 } | 276 } |
277 | 277 |
278 TEST_F(AddressFieldTest, ParseCompany) { | 278 TEST_F(AddressFieldTest, ParseCompany) { |
279 webkit::forms::FormField field; | 279 FormFieldData field; |
280 field.form_control_type = ASCIIToUTF16("text"); | 280 field.form_control_type = ASCIIToUTF16("text"); |
281 | 281 |
282 field.label = ASCIIToUTF16("Company"); | 282 field.label = ASCIIToUTF16("Company"); |
283 field.name = ASCIIToUTF16("company"); | 283 field.name = ASCIIToUTF16("company"); |
284 list_.push_back(new AutofillField(field, ASCIIToUTF16("company1"))); | 284 list_.push_back(new AutofillField(field, ASCIIToUTF16("company1"))); |
285 | 285 |
286 AutofillScanner scanner(list_.get()); | 286 AutofillScanner scanner(list_.get()); |
287 field_.reset(Parse(&scanner)); | 287 field_.reset(Parse(&scanner)); |
288 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); | 288 ASSERT_NE(static_cast<AddressField*>(NULL), field_.get()); |
289 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); | 289 EXPECT_EQ(AddressField::kGenericAddress, field_->FindType()); |
290 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 290 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
291 ASSERT_TRUE( | 291 ASSERT_TRUE( |
292 field_type_map_.find(ASCIIToUTF16("company1")) != field_type_map_.end()); | 292 field_type_map_.find(ASCIIToUTF16("company1")) != field_type_map_.end()); |
293 EXPECT_EQ(COMPANY_NAME, field_type_map_[ASCIIToUTF16("company1")]); | 293 EXPECT_EQ(COMPANY_NAME, field_type_map_[ASCIIToUTF16("company1")]); |
294 } | 294 } |
OLD | NEW |