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

Side by Side Diff: chrome/browser/autofill/autofill_xml_parser_unittest.cc

Issue 11415221: Add support for autofilling radio buttons and checkboxes. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: addressed review comments Created 8 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
OLDNEW
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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/autofill/autofill_xml_parser.h" 9 #include "chrome/browser/autofill/autofill_xml_parser.h"
10 #include "chrome/browser/autofill/field_types.h" 10 #include "chrome/browser/autofill/field_types.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "third_party/libjingle/source/talk/xmllite/xmlparser.h" 12 #include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
13 13
14 namespace { 14 namespace {
15 15
16 TEST(AutofillQueryXmlParserTest, BasicQuery) { 16 TEST(AutofillQueryXmlParserTest, BasicQuery) {
17 // An XML string representing a basic query response. 17 // An XML string representing a basic query response.
18 std::string xml = "<autofillqueryresponse>" 18 std::string xml = "<autofillqueryresponse>"
19 "<field autofilltype=\"0\" />" 19 "<field autofilltype=\"0\" />"
20 "<field autofilltype=\"1\" />" 20 "<field autofilltype=\"1\" />"
21 "<field autofilltype=\"3\" />" 21 "<field autofilltype=\"3\" />"
22 "<field autofilltype=\"2\" />" 22 "<field autofilltype=\"2\" />"
23 "<field autofilltype=\"61\" defaultvalue=\"default\"/>"
23 "</autofillqueryresponse>"; 24 "</autofillqueryresponse>";
24 25
25 // Create a vector of AutofillFieldTypes, to assign the parsed field types to. 26 // Create a vector of AutofillFieldInfos, to assign the parsed field types to.
26 std::vector<AutofillFieldType> field_types; 27 std::vector<AutofillFieldInfo> field_infos;
27 UploadRequired upload_required = USE_UPLOAD_RATES; 28 UploadRequired upload_required = USE_UPLOAD_RATES;
28 std::string experiment_id; 29 std::string experiment_id;
29 30
30 // Create a parser. 31 // Create a parser.
31 AutofillQueryXmlParser parse_handler(&field_types, &upload_required, 32 AutofillQueryXmlParser parse_handler(&field_infos, &upload_required,
32 &experiment_id); 33 &experiment_id);
33 buzz::XmlParser parser(&parse_handler); 34 buzz::XmlParser parser(&parse_handler);
34 parser.Parse(xml.c_str(), xml.length(), true); 35 parser.Parse(xml.c_str(), xml.length(), true);
35 EXPECT_TRUE(parse_handler.succeeded()); 36 EXPECT_TRUE(parse_handler.succeeded());
36 EXPECT_EQ(USE_UPLOAD_RATES, upload_required); 37 EXPECT_EQ(USE_UPLOAD_RATES, upload_required);
37 ASSERT_EQ(4U, field_types.size()); 38 ASSERT_EQ(5U, field_infos.size());
38 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 39 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
39 EXPECT_EQ(UNKNOWN_TYPE, field_types[1]); 40 EXPECT_EQ(UNKNOWN_TYPE, field_infos[1].first);
40 EXPECT_EQ(NAME_FIRST, field_types[2]); 41 EXPECT_EQ(NAME_FIRST, field_infos[2].first);
41 EXPECT_EQ(EMPTY_TYPE, field_types[3]); 42 EXPECT_EQ(EMPTY_TYPE, field_infos[3].first);
43 EXPECT_EQ("", field_infos[3].second);
44 EXPECT_EQ(FIELD_WITH_DEFAULT_VALUE, field_infos[4].first);
45 EXPECT_EQ("default", field_infos[4].second);
42 EXPECT_EQ(std::string(), experiment_id); 46 EXPECT_EQ(std::string(), experiment_id);
43 } 47 }
44 48
45 // Test parsing the upload required attribute. 49 // Test parsing the upload required attribute.
46 TEST(AutofillQueryXmlParserTest, TestUploadRequired) { 50 TEST(AutofillQueryXmlParserTest, TestUploadRequired) {
47 std::vector<AutofillFieldType> field_types; 51 std::vector<AutofillFieldInfo> field_infos;
48 UploadRequired upload_required = USE_UPLOAD_RATES; 52 UploadRequired upload_required = USE_UPLOAD_RATES;
49 std::string experiment_id; 53 std::string experiment_id;
50 54
51 std::string xml = "<autofillqueryresponse uploadrequired=\"true\">" 55 std::string xml = "<autofillqueryresponse uploadrequired=\"true\">"
52 "<field autofilltype=\"0\" />" 56 "<field autofilltype=\"0\" />"
53 "</autofillqueryresponse>"; 57 "</autofillqueryresponse>";
54 58
55 scoped_ptr<AutofillQueryXmlParser> parse_handler( 59 scoped_ptr<AutofillQueryXmlParser> parse_handler(
56 new AutofillQueryXmlParser(&field_types, &upload_required, 60 new AutofillQueryXmlParser(&field_infos, &upload_required,
57 &experiment_id)); 61 &experiment_id));
58 scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get())); 62 scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get()));
59 parser->Parse(xml.c_str(), xml.length(), true); 63 parser->Parse(xml.c_str(), xml.length(), true);
60 EXPECT_TRUE(parse_handler->succeeded()); 64 EXPECT_TRUE(parse_handler->succeeded());
61 EXPECT_EQ(UPLOAD_REQUIRED, upload_required); 65 EXPECT_EQ(UPLOAD_REQUIRED, upload_required);
62 ASSERT_EQ(1U, field_types.size()); 66 ASSERT_EQ(1U, field_infos.size());
63 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 67 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
64 EXPECT_EQ(std::string(), experiment_id); 68 EXPECT_EQ(std::string(), experiment_id);
65 69
66 field_types.clear(); 70 field_infos.clear();
67 xml = "<autofillqueryresponse uploadrequired=\"false\">" 71 xml = "<autofillqueryresponse uploadrequired=\"false\">"
68 "<field autofilltype=\"0\" />" 72 "<field autofilltype=\"0\" />"
69 "</autofillqueryresponse>"; 73 "</autofillqueryresponse>";
70 74
71 parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required, 75 parse_handler.reset(new AutofillQueryXmlParser(&field_infos, &upload_required,
72 &experiment_id)); 76 &experiment_id));
73 parser.reset(new buzz::XmlParser(parse_handler.get())); 77 parser.reset(new buzz::XmlParser(parse_handler.get()));
74 parser->Parse(xml.c_str(), xml.length(), true); 78 parser->Parse(xml.c_str(), xml.length(), true);
75 EXPECT_TRUE(parse_handler->succeeded()); 79 EXPECT_TRUE(parse_handler->succeeded());
76 EXPECT_EQ(UPLOAD_NOT_REQUIRED, upload_required); 80 EXPECT_EQ(UPLOAD_NOT_REQUIRED, upload_required);
77 ASSERT_EQ(1U, field_types.size()); 81 ASSERT_EQ(1U, field_infos.size());
78 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 82 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
79 EXPECT_EQ(std::string(), experiment_id); 83 EXPECT_EQ(std::string(), experiment_id);
80 84
81 field_types.clear(); 85 field_infos.clear();
82 xml = "<autofillqueryresponse uploadrequired=\"bad_value\">" 86 xml = "<autofillqueryresponse uploadrequired=\"bad_value\">"
83 "<field autofilltype=\"0\" />" 87 "<field autofilltype=\"0\" />"
84 "</autofillqueryresponse>"; 88 "</autofillqueryresponse>";
85 89
86 parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required, 90 parse_handler.reset(new AutofillQueryXmlParser(&field_infos, &upload_required,
87 &experiment_id)); 91 &experiment_id));
88 parser.reset(new buzz::XmlParser(parse_handler.get())); 92 parser.reset(new buzz::XmlParser(parse_handler.get()));
89 parser->Parse(xml.c_str(), xml.length(), true); 93 parser->Parse(xml.c_str(), xml.length(), true);
90 EXPECT_TRUE(parse_handler->succeeded()); 94 EXPECT_TRUE(parse_handler->succeeded());
91 EXPECT_EQ(USE_UPLOAD_RATES, upload_required); 95 EXPECT_EQ(USE_UPLOAD_RATES, upload_required);
92 ASSERT_EQ(1U, field_types.size()); 96 ASSERT_EQ(1U, field_infos.size());
93 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 97 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
94 EXPECT_EQ(std::string(), experiment_id); 98 EXPECT_EQ(std::string(), experiment_id);
95 } 99 }
96 100
97 // Test parsing the experiment id attribute 101 // Test parsing the experiment id attribute
98 TEST(AutofillQueryXmlParserTest, ParseExperimentId) { 102 TEST(AutofillQueryXmlParserTest, ParseExperimentId) {
99 std::vector<AutofillFieldType> field_types; 103 std::vector<AutofillFieldInfo> field_infos;
100 UploadRequired upload_required = USE_UPLOAD_RATES; 104 UploadRequired upload_required = USE_UPLOAD_RATES;
101 std::string experiment_id; 105 std::string experiment_id;
102 106
103 // When the attribute is missing, we should get back the default value -- the 107 // When the attribute is missing, we should get back the default value -- the
104 // empty string. 108 // empty string.
105 std::string xml = "<autofillqueryresponse>" 109 std::string xml = "<autofillqueryresponse>"
106 "<field autofilltype=\"0\" />" 110 "<field autofilltype=\"0\" />"
107 "</autofillqueryresponse>"; 111 "</autofillqueryresponse>";
108 112
109 scoped_ptr<AutofillQueryXmlParser> parse_handler( 113 scoped_ptr<AutofillQueryXmlParser> parse_handler(
110 new AutofillQueryXmlParser(&field_types, &upload_required, 114 new AutofillQueryXmlParser(&field_infos, &upload_required,
111 &experiment_id)); 115 &experiment_id));
112 scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get())); 116 scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get()));
113 parser->Parse(xml.c_str(), xml.length(), true); 117 parser->Parse(xml.c_str(), xml.length(), true);
114 EXPECT_TRUE(parse_handler->succeeded()); 118 EXPECT_TRUE(parse_handler->succeeded());
115 EXPECT_EQ(USE_UPLOAD_RATES, upload_required); 119 EXPECT_EQ(USE_UPLOAD_RATES, upload_required);
116 ASSERT_EQ(1U, field_types.size()); 120 ASSERT_EQ(1U, field_infos.size());
117 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 121 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
118 EXPECT_EQ(std::string(), experiment_id); 122 EXPECT_EQ(std::string(), experiment_id);
119 123
120 field_types.clear(); 124 field_infos.clear();
121 125
122 // When the attribute is present, make sure we parse it. 126 // When the attribute is present, make sure we parse it.
123 xml = "<autofillqueryresponse experimentid=\"FancyNewAlgorithm\">" 127 xml = "<autofillqueryresponse experimentid=\"FancyNewAlgorithm\">"
124 "<field autofilltype=\"0\" />" 128 "<field autofilltype=\"0\" />"
125 "</autofillqueryresponse>"; 129 "</autofillqueryresponse>";
126 130
127 parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required, 131 parse_handler.reset(new AutofillQueryXmlParser(&field_infos, &upload_required,
128 &experiment_id)); 132 &experiment_id));
129 parser.reset(new buzz::XmlParser(parse_handler.get())); 133 parser.reset(new buzz::XmlParser(parse_handler.get()));
130 parser->Parse(xml.c_str(), xml.length(), true); 134 parser->Parse(xml.c_str(), xml.length(), true);
131 EXPECT_TRUE(parse_handler->succeeded()); 135 EXPECT_TRUE(parse_handler->succeeded());
132 EXPECT_EQ(USE_UPLOAD_RATES, upload_required); 136 EXPECT_EQ(USE_UPLOAD_RATES, upload_required);
133 ASSERT_EQ(1U, field_types.size()); 137 ASSERT_EQ(1U, field_infos.size());
134 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 138 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
135 EXPECT_EQ(std::string("FancyNewAlgorithm"), experiment_id); 139 EXPECT_EQ(std::string("FancyNewAlgorithm"), experiment_id);
136 140
137 field_types.clear(); 141 field_infos.clear();
138 142
139 // Make sure that we can handle parsing both the upload required and the 143 // Make sure that we can handle parsing both the upload required and the
140 // experiment id attribute together. 144 // experiment id attribute together.
141 xml = "<autofillqueryresponse uploadrequired=\"false\"" 145 xml = "<autofillqueryresponse uploadrequired=\"false\""
142 " experimentid=\"ServerSmartyPants\">" 146 " experimentid=\"ServerSmartyPants\">"
143 "<field autofilltype=\"0\" />" 147 "<field autofilltype=\"0\" />"
144 "</autofillqueryresponse>"; 148 "</autofillqueryresponse>";
145 149
146 parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required, 150 parse_handler.reset(new AutofillQueryXmlParser(&field_infos, &upload_required,
147 &experiment_id)); 151 &experiment_id));
148 parser.reset(new buzz::XmlParser(parse_handler.get())); 152 parser.reset(new buzz::XmlParser(parse_handler.get()));
149 parser->Parse(xml.c_str(), xml.length(), true); 153 parser->Parse(xml.c_str(), xml.length(), true);
150 EXPECT_TRUE(parse_handler->succeeded()); 154 EXPECT_TRUE(parse_handler->succeeded());
151 EXPECT_EQ(UPLOAD_NOT_REQUIRED, upload_required); 155 EXPECT_EQ(UPLOAD_NOT_REQUIRED, upload_required);
152 ASSERT_EQ(1U, field_types.size()); 156 ASSERT_EQ(1U, field_infos.size());
153 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 157 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
154 EXPECT_EQ(std::string("ServerSmartyPants"), experiment_id); 158 EXPECT_EQ(std::string("ServerSmartyPants"), experiment_id);
155 } 159 }
156 160
157 // Test badly formed XML queries. 161 // Test badly formed XML queries.
158 TEST(AutofillQueryXmlParserTest, ParseErrors) { 162 TEST(AutofillQueryXmlParserTest, ParseErrors) {
159 std::vector<AutofillFieldType> field_types; 163 std::vector<AutofillFieldInfo> field_infos;
160 UploadRequired upload_required = USE_UPLOAD_RATES; 164 UploadRequired upload_required = USE_UPLOAD_RATES;
161 std::string experiment_id; 165 std::string experiment_id;
162 166
163 // Test no Autofill type. 167 // Test no Autofill type.
164 std::string xml = "<autofillqueryresponse>" 168 std::string xml = "<autofillqueryresponse>"
165 "<field/>" 169 "<field/>"
166 "</autofillqueryresponse>"; 170 "</autofillqueryresponse>";
167 171
168 scoped_ptr<AutofillQueryXmlParser> parse_handler( 172 scoped_ptr<AutofillQueryXmlParser> parse_handler(
169 new AutofillQueryXmlParser(&field_types, &upload_required, 173 new AutofillQueryXmlParser(&field_infos, &upload_required,
170 &experiment_id)); 174 &experiment_id));
171 scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get())); 175 scoped_ptr<buzz::XmlParser> parser(new buzz::XmlParser(parse_handler.get()));
172 parser->Parse(xml.c_str(), xml.length(), true); 176 parser->Parse(xml.c_str(), xml.length(), true);
173 EXPECT_FALSE(parse_handler->succeeded()); 177 EXPECT_FALSE(parse_handler->succeeded());
174 EXPECT_EQ(USE_UPLOAD_RATES, upload_required); 178 EXPECT_EQ(USE_UPLOAD_RATES, upload_required);
175 EXPECT_EQ(0U, field_types.size()); 179 EXPECT_EQ(0U, field_infos.size());
176 EXPECT_EQ(std::string(), experiment_id); 180 EXPECT_EQ(std::string(), experiment_id);
177 181
178 // Test an incorrect Autofill type. 182 // Test an incorrect Autofill type.
179 xml = "<autofillqueryresponse>" 183 xml = "<autofillqueryresponse>"
180 "<field autofilltype=\"307\"/>" 184 "<field autofilltype=\"307\"/>"
181 "</autofillqueryresponse>"; 185 "</autofillqueryresponse>";
182 186
183 parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required, 187 parse_handler.reset(new AutofillQueryXmlParser(&field_infos, &upload_required,
184 &experiment_id)); 188 &experiment_id));
185 parser.reset(new buzz::XmlParser(parse_handler.get())); 189 parser.reset(new buzz::XmlParser(parse_handler.get()));
186 parser->Parse(xml.c_str(), xml.length(), true); 190 parser->Parse(xml.c_str(), xml.length(), true);
187 EXPECT_TRUE(parse_handler->succeeded()); 191 EXPECT_TRUE(parse_handler->succeeded());
188 EXPECT_EQ(USE_UPLOAD_RATES, upload_required); 192 EXPECT_EQ(USE_UPLOAD_RATES, upload_required);
189 ASSERT_EQ(1U, field_types.size()); 193 ASSERT_EQ(1U, field_infos.size());
190 // AutofillType was out of range and should be set to NO_SERVER_DATA. 194 // AutofillType was out of range and should be set to NO_SERVER_DATA.
191 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 195 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
192 EXPECT_EQ(std::string(), experiment_id); 196 EXPECT_EQ(std::string(), experiment_id);
193 197
194 // Test an incorrect Autofill type. 198 // Test an incorrect Autofill type.
195 field_types.clear(); 199 field_infos.clear();
196 xml = "<autofillqueryresponse>" 200 xml = "<autofillqueryresponse>"
197 "<field autofilltype=\"No Type\"/>" 201 "<field autofilltype=\"No Type\"/>"
198 "</autofillqueryresponse>"; 202 "</autofillqueryresponse>";
199 203
200 // Parse fails but an entry is still added to field_types. 204 // Parse fails but an entry is still added to field_infos.
201 parse_handler.reset(new AutofillQueryXmlParser(&field_types, &upload_required, 205 parse_handler.reset(new AutofillQueryXmlParser(&field_infos, &upload_required,
202 &experiment_id)); 206 &experiment_id));
203 parser.reset(new buzz::XmlParser(parse_handler.get())); 207 parser.reset(new buzz::XmlParser(parse_handler.get()));
204 parser->Parse(xml.c_str(), xml.length(), true); 208 parser->Parse(xml.c_str(), xml.length(), true);
205 EXPECT_FALSE(parse_handler->succeeded()); 209 EXPECT_FALSE(parse_handler->succeeded());
206 EXPECT_EQ(USE_UPLOAD_RATES, upload_required); 210 EXPECT_EQ(USE_UPLOAD_RATES, upload_required);
207 ASSERT_EQ(1U, field_types.size()); 211 ASSERT_EQ(1U, field_infos.size());
208 EXPECT_EQ(NO_SERVER_DATA, field_types[0]); 212 EXPECT_EQ(NO_SERVER_DATA, field_infos[0].first);
209 EXPECT_EQ(std::string(), experiment_id); 213 EXPECT_EQ(std::string(), experiment_id);
210 } 214 }
211 215
212 // Test successfull upload response. 216 // Test successfull upload response.
213 TEST(AutofillUploadXmlParser, TestSuccessfulResponse) { 217 TEST(AutofillUploadXmlParser, TestSuccessfulResponse) {
214 std::string xml = "<autofilluploadresponse positiveuploadrate=\"0.5\" " 218 std::string xml = "<autofilluploadresponse positiveuploadrate=\"0.5\" "
215 "negativeuploadrate=\"0.3\"/>"; 219 "negativeuploadrate=\"0.3\"/>";
216 double positive = 0; 220 double positive = 0;
217 double negative = 0; 221 double negative = 0;
218 AutofillUploadXmlParser parse_handler(&positive, &negative); 222 AutofillUploadXmlParser parse_handler(&positive, &negative);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 xml = ""; 262 xml = "";
259 parse_handler.reset(new AutofillUploadXmlParser(&positive, &negative)); 263 parse_handler.reset(new AutofillUploadXmlParser(&positive, &negative));
260 parser.reset(new buzz::XmlParser(parse_handler.get())); 264 parser.reset(new buzz::XmlParser(parse_handler.get()));
261 parser->Parse(xml.c_str(), xml.length(), true); 265 parser->Parse(xml.c_str(), xml.length(), true);
262 EXPECT_TRUE(!parse_handler->succeeded()); 266 EXPECT_TRUE(!parse_handler->succeeded());
263 EXPECT_DOUBLE_EQ(0, positive); 267 EXPECT_DOUBLE_EQ(0, positive);
264 EXPECT_DOUBLE_EQ(0, negative); 268 EXPECT_DOUBLE_EQ(0, negative);
265 } 269 }
266 270
267 } // namespace 271 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698