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

Side by Side Diff: chrome/browser/password_manager/password_store_mac_unittest.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "testing/gmock/include/gmock/gmock.h" 5 #include "testing/gmock/include/gmock/gmock.h"
6 #include "testing/gtest/include/gtest/gtest.h" 6 #include "testing/gtest/include/gtest/gtest.h"
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 form->preferred = form_data.preferred; 152 form->preferred = form_data.preferred;
153 form->ssl_valid = form_data.ssl_valid; 153 form->ssl_valid = form_data.ssl_valid;
154 form->date_created = base::Time::FromDoubleT(form_data.creation_time); 154 form->date_created = base::Time::FromDoubleT(form_data.creation_time);
155 if (form_data.signon_realm) 155 if (form_data.signon_realm)
156 form->signon_realm = std::string(form_data.signon_realm); 156 form->signon_realm = std::string(form_data.signon_realm);
157 if (form_data.origin) 157 if (form_data.origin)
158 form->origin = GURL(form_data.origin); 158 form->origin = GURL(form_data.origin);
159 if (form_data.action) 159 if (form_data.action)
160 form->action = GURL(form_data.action); 160 form->action = GURL(form_data.action);
161 if (form_data.submit_element) 161 if (form_data.submit_element)
162 form->submit_element = WideToUTF16(form_data.submit_element); 162 form->submit_element = base::WideToUTF16(form_data.submit_element);
163 if (form_data.username_element) 163 if (form_data.username_element)
164 form->username_element = WideToUTF16(form_data.username_element); 164 form->username_element = base::WideToUTF16(form_data.username_element);
165 if (form_data.password_element) 165 if (form_data.password_element)
166 form->password_element = WideToUTF16(form_data.password_element); 166 form->password_element = base::WideToUTF16(form_data.password_element);
167 if (form_data.username_value) { 167 if (form_data.username_value) {
168 form->username_value = WideToUTF16(form_data.username_value); 168 form->username_value = base::WideToUTF16(form_data.username_value);
169 if (form_data.password_value) 169 if (form_data.password_value)
170 form->password_value = WideToUTF16(form_data.password_value); 170 form->password_value = base::WideToUTF16(form_data.password_value);
171 } else { 171 } else {
172 form->blacklisted_by_user = true; 172 form->blacklisted_by_user = true;
173 } 173 }
174 return form; 174 return form;
175 } 175 }
176 176
177 // Macro to simplify calling CheckFormsAgainstExpectations with a useful label. 177 // Macro to simplify calling CheckFormsAgainstExpectations with a useful label.
178 #define CHECK_FORMS(forms, expectations, i) \ 178 #define CHECK_FORMS(forms, expectations, i) \
179 CheckFormsAgainstExpectations(forms, expectations, #forms, i) 179 CheckFormsAgainstExpectations(forms, expectations, #forms, i)
180 180
(...skipping 16 matching lines...) Expand all
197 for (unsigned int i = 0; i < expectations.size(); ++i) { 197 for (unsigned int i = 0; i < expectations.size(); ++i) {
198 snprintf(test_label, kBufferSize, "%s in test %u, item %u", 198 snprintf(test_label, kBufferSize, "%s in test %u, item %u",
199 forms_label, test_number, i); 199 forms_label, test_number, i);
200 PasswordForm* form = forms[i]; 200 PasswordForm* form = forms[i];
201 PasswordFormData* expectation = expectations[i]; 201 PasswordFormData* expectation = expectations[i];
202 EXPECT_EQ(expectation->scheme, form->scheme) << test_label; 202 EXPECT_EQ(expectation->scheme, form->scheme) << test_label;
203 EXPECT_EQ(std::string(expectation->signon_realm), form->signon_realm) 203 EXPECT_EQ(std::string(expectation->signon_realm), form->signon_realm)
204 << test_label; 204 << test_label;
205 EXPECT_EQ(GURL(expectation->origin), form->origin) << test_label; 205 EXPECT_EQ(GURL(expectation->origin), form->origin) << test_label;
206 EXPECT_EQ(GURL(expectation->action), form->action) << test_label; 206 EXPECT_EQ(GURL(expectation->action), form->action) << test_label;
207 EXPECT_EQ(WideToUTF16(expectation->submit_element), form->submit_element) 207 EXPECT_EQ(base::WideToUTF16(expectation->submit_element),
208 << test_label; 208 form->submit_element) << test_label;
209 EXPECT_EQ(WideToUTF16(expectation->username_element), 209 EXPECT_EQ(base::WideToUTF16(expectation->username_element),
210 form->username_element) << test_label; 210 form->username_element) << test_label;
211 EXPECT_EQ(WideToUTF16(expectation->password_element), 211 EXPECT_EQ(base::WideToUTF16(expectation->password_element),
212 form->password_element) << test_label; 212 form->password_element) << test_label;
213 if (expectation->username_value) { 213 if (expectation->username_value) {
214 EXPECT_EQ(WideToUTF16(expectation->username_value), 214 EXPECT_EQ(base::WideToUTF16(expectation->username_value),
215 form->username_value) << test_label; 215 form->username_value) << test_label;
216 EXPECT_EQ(WideToUTF16(expectation->password_value), 216 EXPECT_EQ(base::WideToUTF16(expectation->password_value),
217 form->password_value) << test_label; 217 form->password_value) << test_label;
218 } else { 218 } else {
219 EXPECT_TRUE(form->blacklisted_by_user) << test_label; 219 EXPECT_TRUE(form->blacklisted_by_user) << test_label;
220 } 220 }
221 EXPECT_EQ(expectation->preferred, form->preferred) << test_label; 221 EXPECT_EQ(expectation->preferred, form->preferred) << test_label;
222 EXPECT_EQ(expectation->ssl_valid, form->ssl_valid) << test_label; 222 EXPECT_EQ(expectation->ssl_valid, form->ssl_valid) << test_label;
223 EXPECT_DOUBLE_EQ(expectation->creation_time, 223 EXPECT_DOUBLE_EQ(expectation->creation_time,
224 form->date_created.ToDoubleT()) << test_label; 224 form->date_created.ToDoubleT()) << test_label;
225 } 225 }
226 } 226 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 *keychain_, keychain_item, &form); 284 *keychain_, keychain_item, &form);
285 285
286 EXPECT_TRUE(parsed) << "In iteration " << i; 286 EXPECT_TRUE(parsed) << "In iteration " << i;
287 287
288 EXPECT_EQ(expected[i].scheme, form.scheme) << "In iteration " << i; 288 EXPECT_EQ(expected[i].scheme, form.scheme) << "In iteration " << i;
289 EXPECT_EQ(GURL(expected[i].origin), form.origin) << "In iteration " << i; 289 EXPECT_EQ(GURL(expected[i].origin), form.origin) << "In iteration " << i;
290 EXPECT_EQ(expected[i].ssl_valid, form.ssl_valid) << "In iteration " << i; 290 EXPECT_EQ(expected[i].ssl_valid, form.ssl_valid) << "In iteration " << i;
291 EXPECT_EQ(std::string(expected[i].signon_realm), form.signon_realm) 291 EXPECT_EQ(std::string(expected[i].signon_realm), form.signon_realm)
292 << "In iteration " << i; 292 << "In iteration " << i;
293 if (expected[i].username) { 293 if (expected[i].username) {
294 EXPECT_EQ(WideToUTF16(expected[i].username), form.username_value) 294 EXPECT_EQ(base::WideToUTF16(expected[i].username), form.username_value)
295 << "In iteration " << i; 295 << "In iteration " << i;
296 EXPECT_EQ(WideToUTF16(expected[i].password), form.password_value) 296 EXPECT_EQ(base::WideToUTF16(expected[i].password), form.password_value)
297 << "In iteration " << i; 297 << "In iteration " << i;
298 EXPECT_FALSE(form.blacklisted_by_user) << "In iteration " << i; 298 EXPECT_FALSE(form.blacklisted_by_user) << "In iteration " << i;
299 } else { 299 } else {
300 EXPECT_TRUE(form.blacklisted_by_user) << "In iteration " << i; 300 EXPECT_TRUE(form.blacklisted_by_user) << "In iteration " << i;
301 } 301 }
302 base::Time::Exploded exploded_time; 302 base::Time::Exploded exploded_time;
303 form.date_created.UTCExplode(&exploded_time); 303 form.date_created.UTCExplode(&exploded_time);
304 EXPECT_EQ(expected[i].creation_year, exploded_time.year) 304 EXPECT_EQ(expected[i].creation_year, exploded_time.year)
305 << "In iteration " << i; 305 << "In iteration " << i;
306 EXPECT_EQ(expected[i].creation_month, exploded_time.month) 306 EXPECT_EQ(expected[i].creation_month, exploded_time.month)
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 EXPECT_EQ(0U, matching_items.size()) << "iteration " << i; 1021 EXPECT_EQ(0U, matching_items.size()) << "iteration " << i;
1022 } 1022 }
1023 STLDeleteElements(&matching_items); 1023 STLDeleteElements(&matching_items);
1024 1024
1025 login_db_->GetLogins(*query_form, &matching_items); 1025 login_db_->GetLogins(*query_form, &matching_items);
1026 EXPECT_EQ(updates[i].password ? 1U : 0U, matching_items.size()) 1026 EXPECT_EQ(updates[i].password ? 1U : 0U, matching_items.size())
1027 << "iteration " << i; 1027 << "iteration " << i;
1028 STLDeleteElements(&matching_items); 1028 STLDeleteElements(&matching_items);
1029 } 1029 }
1030 } 1030 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698