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/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/autofill/autofill_field.h" | 8 #include "chrome/browser/autofill/autofill_field.h" |
9 #include "chrome/browser/autofill/autofill_scanner.h" | 9 #include "chrome/browser/autofill/autofill_scanner.h" |
10 #include "chrome/browser/autofill/name_field.h" | 10 #include "chrome/browser/autofill/name_field.h" |
| 11 #include "chrome/common/form_field_data.h" |
11 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
12 #include "webkit/forms/form_field.h" | |
13 | 13 |
14 class NameFieldTest : public testing::Test { | 14 class NameFieldTest : public testing::Test { |
15 public: | 15 public: |
16 NameFieldTest() {} | 16 NameFieldTest() {} |
17 | 17 |
18 protected: | 18 protected: |
19 ScopedVector<const AutofillField> list_; | 19 ScopedVector<const AutofillField> list_; |
20 scoped_ptr<NameField> field_; | 20 scoped_ptr<NameField> field_; |
21 FieldTypeMap field_type_map_; | 21 FieldTypeMap field_type_map_; |
22 | 22 |
23 // Downcast for tests. | 23 // Downcast for tests. |
24 static NameField* Parse(AutofillScanner* scanner) { | 24 static NameField* Parse(AutofillScanner* scanner) { |
25 return static_cast<NameField*>(NameField::Parse(scanner)); | 25 return static_cast<NameField*>(NameField::Parse(scanner)); |
26 } | 26 } |
27 | 27 |
28 private: | 28 private: |
29 DISALLOW_COPY_AND_ASSIGN(NameFieldTest); | 29 DISALLOW_COPY_AND_ASSIGN(NameFieldTest); |
30 }; | 30 }; |
31 | 31 |
32 TEST_F(NameFieldTest, FirstMiddleLast) { | 32 TEST_F(NameFieldTest, FirstMiddleLast) { |
33 webkit::forms::FormField field; | 33 FormFieldData field; |
34 field.form_control_type = ASCIIToUTF16("text"); | 34 field.form_control_type = ASCIIToUTF16("text"); |
35 | 35 |
36 field.label = ASCIIToUTF16("First Name"); | 36 field.label = ASCIIToUTF16("First Name"); |
37 field.name = ASCIIToUTF16("First"); | 37 field.name = ASCIIToUTF16("First"); |
38 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 38 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
39 | 39 |
40 field.label = ASCIIToUTF16("Middle Name"); | 40 field.label = ASCIIToUTF16("Middle Name"); |
41 field.name = ASCIIToUTF16("Middle"); | 41 field.name = ASCIIToUTF16("Middle"); |
42 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 42 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
43 | 43 |
(...skipping 10 matching lines...) Expand all Loading... |
54 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 54 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
55 ASSERT_TRUE( | 55 ASSERT_TRUE( |
56 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 56 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
57 EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]); | 57 EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]); |
58 ASSERT_TRUE( | 58 ASSERT_TRUE( |
59 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); | 59 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); |
60 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); | 60 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); |
61 } | 61 } |
62 | 62 |
63 TEST_F(NameFieldTest, FirstMiddleLast2) { | 63 TEST_F(NameFieldTest, FirstMiddleLast2) { |
64 webkit::forms::FormField field; | 64 FormFieldData field; |
65 field.form_control_type = ASCIIToUTF16("text"); | 65 field.form_control_type = ASCIIToUTF16("text"); |
66 | 66 |
67 field.label = string16(); | 67 field.label = string16(); |
68 field.name = ASCIIToUTF16("firstName"); | 68 field.name = ASCIIToUTF16("firstName"); |
69 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 69 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
70 | 70 |
71 field.label = string16(); | 71 field.label = string16(); |
72 field.name = ASCIIToUTF16("middleName"); | 72 field.name = ASCIIToUTF16("middleName"); |
73 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 73 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
74 | 74 |
(...skipping 10 matching lines...) Expand all Loading... |
85 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 85 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
86 ASSERT_TRUE( | 86 ASSERT_TRUE( |
87 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 87 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
88 EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]); | 88 EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]); |
89 ASSERT_TRUE( | 89 ASSERT_TRUE( |
90 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); | 90 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); |
91 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); | 91 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); |
92 } | 92 } |
93 | 93 |
94 TEST_F(NameFieldTest, FirstLast) { | 94 TEST_F(NameFieldTest, FirstLast) { |
95 webkit::forms::FormField field; | 95 FormFieldData field; |
96 field.form_control_type = ASCIIToUTF16("text"); | 96 field.form_control_type = ASCIIToUTF16("text"); |
97 | 97 |
98 field.label = string16(); | 98 field.label = string16(); |
99 field.name = ASCIIToUTF16("first_name"); | 99 field.name = ASCIIToUTF16("first_name"); |
100 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 100 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
101 | 101 |
102 field.label = string16(); | 102 field.label = string16(); |
103 field.name = ASCIIToUTF16("last_name"); | 103 field.name = ASCIIToUTF16("last_name"); |
104 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 104 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
105 | 105 |
106 AutofillScanner scanner(list_.get()); | 106 AutofillScanner scanner(list_.get()); |
107 field_.reset(Parse(&scanner)); | 107 field_.reset(Parse(&scanner)); |
108 ASSERT_NE(static_cast<NameField*>(NULL), field_.get()); | 108 ASSERT_NE(static_cast<NameField*>(NULL), field_.get()); |
109 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 109 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
110 ASSERT_TRUE( | 110 ASSERT_TRUE( |
111 field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end()); | 111 field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end()); |
112 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 112 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
113 ASSERT_TRUE( | 113 ASSERT_TRUE( |
114 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 114 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
115 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]); | 115 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]); |
116 } | 116 } |
117 | 117 |
118 TEST_F(NameFieldTest, FirstLast2) { | 118 TEST_F(NameFieldTest, FirstLast2) { |
119 webkit::forms::FormField field; | 119 FormFieldData field; |
120 field.form_control_type = ASCIIToUTF16("text"); | 120 field.form_control_type = ASCIIToUTF16("text"); |
121 | 121 |
122 field.label = ASCIIToUTF16("Name"); | 122 field.label = ASCIIToUTF16("Name"); |
123 field.name = ASCIIToUTF16("first_name"); | 123 field.name = ASCIIToUTF16("first_name"); |
124 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 124 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
125 | 125 |
126 field.label = ASCIIToUTF16("Name"); | 126 field.label = ASCIIToUTF16("Name"); |
127 field.name = ASCIIToUTF16("last_name"); | 127 field.name = ASCIIToUTF16("last_name"); |
128 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 128 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
129 | 129 |
130 AutofillScanner scanner(list_.get()); | 130 AutofillScanner scanner(list_.get()); |
131 field_.reset(Parse(&scanner)); | 131 field_.reset(Parse(&scanner)); |
132 ASSERT_NE(static_cast<NameField*>(NULL), field_.get()); | 132 ASSERT_NE(static_cast<NameField*>(NULL), field_.get()); |
133 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 133 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
134 ASSERT_TRUE( | 134 ASSERT_TRUE( |
135 field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end()); | 135 field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end()); |
136 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 136 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
137 ASSERT_TRUE( | 137 ASSERT_TRUE( |
138 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 138 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
139 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]); | 139 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]); |
140 } | 140 } |
141 | 141 |
142 TEST_F(NameFieldTest, FirstLastMiddleWithSpaces) { | 142 TEST_F(NameFieldTest, FirstLastMiddleWithSpaces) { |
143 webkit::forms::FormField field; | 143 FormFieldData field; |
144 field.form_control_type = ASCIIToUTF16("text"); | 144 field.form_control_type = ASCIIToUTF16("text"); |
145 | 145 |
146 field.label = ASCIIToUTF16("First Name"); | 146 field.label = ASCIIToUTF16("First Name"); |
147 field.name = ASCIIToUTF16("first_name"); | 147 field.name = ASCIIToUTF16("first_name"); |
148 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 148 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
149 | 149 |
150 field.label = ASCIIToUTF16("Middle Name"); | 150 field.label = ASCIIToUTF16("Middle Name"); |
151 field.name = ASCIIToUTF16("middle_name"); | 151 field.name = ASCIIToUTF16("middle_name"); |
152 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 152 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
153 | 153 |
(...skipping 10 matching lines...) Expand all Loading... |
164 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 164 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
165 ASSERT_TRUE( | 165 ASSERT_TRUE( |
166 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 166 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
167 EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]); | 167 EXPECT_EQ(NAME_MIDDLE, field_type_map_[ASCIIToUTF16("name2")]); |
168 ASSERT_TRUE( | 168 ASSERT_TRUE( |
169 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); | 169 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); |
170 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); | 170 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); |
171 } | 171 } |
172 | 172 |
173 TEST_F(NameFieldTest, FirstLastEmpty) { | 173 TEST_F(NameFieldTest, FirstLastEmpty) { |
174 webkit::forms::FormField field; | 174 FormFieldData field; |
175 field.form_control_type = ASCIIToUTF16("text"); | 175 field.form_control_type = ASCIIToUTF16("text"); |
176 | 176 |
177 field.label = ASCIIToUTF16("Name"); | 177 field.label = ASCIIToUTF16("Name"); |
178 field.name = ASCIIToUTF16("first_name"); | 178 field.name = ASCIIToUTF16("first_name"); |
179 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 179 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
180 | 180 |
181 field.label = string16(); | 181 field.label = string16(); |
182 field.name = ASCIIToUTF16("last_name"); | 182 field.name = ASCIIToUTF16("last_name"); |
183 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 183 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
184 | 184 |
185 AutofillScanner scanner(list_.get()); | 185 AutofillScanner scanner(list_.get()); |
186 field_.reset(Parse(&scanner)); | 186 field_.reset(Parse(&scanner)); |
187 ASSERT_NE(static_cast<NameField*>(NULL), field_.get()); | 187 ASSERT_NE(static_cast<NameField*>(NULL), field_.get()); |
188 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 188 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
189 ASSERT_TRUE( | 189 ASSERT_TRUE( |
190 field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end()); | 190 field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end()); |
191 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 191 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
192 ASSERT_TRUE( | 192 ASSERT_TRUE( |
193 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 193 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
194 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]); | 194 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name2")]); |
195 } | 195 } |
196 | 196 |
197 TEST_F(NameFieldTest, FirstMiddleLastEmpty) { | 197 TEST_F(NameFieldTest, FirstMiddleLastEmpty) { |
198 webkit::forms::FormField field; | 198 FormFieldData field; |
199 field.form_control_type = ASCIIToUTF16("text"); | 199 field.form_control_type = ASCIIToUTF16("text"); |
200 | 200 |
201 field.label = ASCIIToUTF16("Name"); | 201 field.label = ASCIIToUTF16("Name"); |
202 field.name = ASCIIToUTF16("first_name"); | 202 field.name = ASCIIToUTF16("first_name"); |
203 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 203 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
204 | 204 |
205 field.label = string16(); | 205 field.label = string16(); |
206 field.name = ASCIIToUTF16("middle_name"); | 206 field.name = ASCIIToUTF16("middle_name"); |
207 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 207 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
208 | 208 |
(...skipping 10 matching lines...) Expand all Loading... |
219 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 219 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
220 ASSERT_TRUE( | 220 ASSERT_TRUE( |
221 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 221 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
222 EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]); | 222 EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]); |
223 ASSERT_TRUE( | 223 ASSERT_TRUE( |
224 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); | 224 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); |
225 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); | 225 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); |
226 } | 226 } |
227 | 227 |
228 TEST_F(NameFieldTest, MiddleInitial) { | 228 TEST_F(NameFieldTest, MiddleInitial) { |
229 webkit::forms::FormField field; | 229 FormFieldData field; |
230 field.form_control_type = ASCIIToUTF16("text"); | 230 field.form_control_type = ASCIIToUTF16("text"); |
231 | 231 |
232 field.label = ASCIIToUTF16("First Name"); | 232 field.label = ASCIIToUTF16("First Name"); |
233 field.name = ASCIIToUTF16("first_name"); | 233 field.name = ASCIIToUTF16("first_name"); |
234 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 234 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
235 | 235 |
236 field.label = ASCIIToUTF16("MI"); | 236 field.label = ASCIIToUTF16("MI"); |
237 field.name = ASCIIToUTF16("middle_name"); | 237 field.name = ASCIIToUTF16("middle_name"); |
238 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 238 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
239 | 239 |
(...skipping 10 matching lines...) Expand all Loading... |
250 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 250 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
251 ASSERT_TRUE( | 251 ASSERT_TRUE( |
252 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 252 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
253 EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]); | 253 EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]); |
254 ASSERT_TRUE( | 254 ASSERT_TRUE( |
255 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); | 255 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); |
256 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); | 256 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); |
257 } | 257 } |
258 | 258 |
259 TEST_F(NameFieldTest, MiddleInitialNoLastName) { | 259 TEST_F(NameFieldTest, MiddleInitialNoLastName) { |
260 webkit::forms::FormField field; | 260 FormFieldData field; |
261 field.form_control_type = ASCIIToUTF16("text"); | 261 field.form_control_type = ASCIIToUTF16("text"); |
262 | 262 |
263 field.label = ASCIIToUTF16("First Name"); | 263 field.label = ASCIIToUTF16("First Name"); |
264 field.name = ASCIIToUTF16("first_name"); | 264 field.name = ASCIIToUTF16("first_name"); |
265 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 265 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
266 | 266 |
267 field.label = ASCIIToUTF16("MI"); | 267 field.label = ASCIIToUTF16("MI"); |
268 field.name = ASCIIToUTF16("middle_name"); | 268 field.name = ASCIIToUTF16("middle_name"); |
269 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 269 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
270 | 270 |
271 AutofillScanner scanner(list_.get()); | 271 AutofillScanner scanner(list_.get()); |
272 field_.reset(Parse(&scanner)); | 272 field_.reset(Parse(&scanner)); |
273 ASSERT_EQ(static_cast<NameField*>(NULL), field_.get()); | 273 ASSERT_EQ(static_cast<NameField*>(NULL), field_.get()); |
274 } | 274 } |
275 | 275 |
276 // This case is from the dell.com checkout page. The middle initial "mi" string | 276 // This case is from the dell.com checkout page. The middle initial "mi" string |
277 // came at the end following other descriptive text. http://crbug.com/45123. | 277 // came at the end following other descriptive text. http://crbug.com/45123. |
278 TEST_F(NameFieldTest, MiddleInitialAtEnd) { | 278 TEST_F(NameFieldTest, MiddleInitialAtEnd) { |
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 = string16(); | 282 field.label = string16(); |
283 field.name = ASCIIToUTF16("XXXnameXXXfirst"); | 283 field.name = ASCIIToUTF16("XXXnameXXXfirst"); |
284 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); | 284 list_.push_back(new AutofillField(field, ASCIIToUTF16("name1"))); |
285 | 285 |
286 field.label = string16(); | 286 field.label = string16(); |
287 field.name = ASCIIToUTF16("XXXnameXXXmi"); | 287 field.name = ASCIIToUTF16("XXXnameXXXmi"); |
288 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); | 288 list_.push_back(new AutofillField(field, ASCIIToUTF16("name2"))); |
289 | 289 |
290 field.label = string16(); | 290 field.label = string16(); |
291 field.name = ASCIIToUTF16("XXXnameXXXlast"); | 291 field.name = ASCIIToUTF16("XXXnameXXXlast"); |
292 list_.push_back(new AutofillField(field, ASCIIToUTF16("name3"))); | 292 list_.push_back(new AutofillField(field, ASCIIToUTF16("name3"))); |
293 | 293 |
294 AutofillScanner scanner(list_.get()); | 294 AutofillScanner scanner(list_.get()); |
295 field_.reset(Parse(&scanner)); | 295 field_.reset(Parse(&scanner)); |
296 ASSERT_NE(static_cast<NameField*>(NULL), field_.get()); | 296 ASSERT_NE(static_cast<NameField*>(NULL), field_.get()); |
297 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); | 297 ASSERT_TRUE(field_->ClassifyField(&field_type_map_)); |
298 ASSERT_TRUE( | 298 ASSERT_TRUE( |
299 field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end()); | 299 field_type_map_.find(ASCIIToUTF16("name1")) != field_type_map_.end()); |
300 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); | 300 EXPECT_EQ(NAME_FIRST, field_type_map_[ASCIIToUTF16("name1")]); |
301 ASSERT_TRUE( | 301 ASSERT_TRUE( |
302 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); | 302 field_type_map_.find(ASCIIToUTF16("name2")) != field_type_map_.end()); |
303 EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]); | 303 EXPECT_EQ(NAME_MIDDLE_INITIAL, field_type_map_[ASCIIToUTF16("name2")]); |
304 ASSERT_TRUE( | 304 ASSERT_TRUE( |
305 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); | 305 field_type_map_.find(ASCIIToUTF16("name3")) != field_type_map_.end()); |
306 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); | 306 EXPECT_EQ(NAME_LAST, field_type_map_[ASCIIToUTF16("name3")]); |
307 } | 307 } |
OLD | NEW |