Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/guid.h" | 9 #include "base/guid.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 2251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2262 "John Dillinger", "423456789012" /* Visa */, | 2262 "John Dillinger", "423456789012" /* Visa */, |
| 2263 "01", "2010"); | 2263 "01", "2010"); |
| 2264 personal_data_->AddCreditCard(credit_card); | 2264 personal_data_->AddCreditCard(credit_card); |
| 2265 | 2265 |
| 2266 // Verify that the web database has been updated and the notification sent. | 2266 // Verify that the web database has been updated and the notification sent. |
| 2267 EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged()) | 2267 EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged()) |
| 2268 .WillOnce(QuitMainMessageLoop()); | 2268 .WillOnce(QuitMainMessageLoop()); |
| 2269 base::MessageLoop::current()->Run(); | 2269 base::MessageLoop::current()->Run(); |
| 2270 | 2270 |
| 2271 personal_data_->GetNonEmptyTypes(&non_empty_types); | 2271 personal_data_->GetNonEmptyTypes(&non_empty_types); |
| 2272 EXPECT_EQ(27U, non_empty_types.size()); | 2272 EXPECT_EQ(30U, non_empty_types.size()); |
| 2273 EXPECT_TRUE(non_empty_types.count(NAME_FIRST)); | 2273 EXPECT_TRUE(non_empty_types.count(NAME_FIRST)); |
| 2274 EXPECT_TRUE(non_empty_types.count(NAME_MIDDLE)); | 2274 EXPECT_TRUE(non_empty_types.count(NAME_MIDDLE)); |
| 2275 EXPECT_TRUE(non_empty_types.count(NAME_MIDDLE_INITIAL)); | 2275 EXPECT_TRUE(non_empty_types.count(NAME_MIDDLE_INITIAL)); |
| 2276 EXPECT_TRUE(non_empty_types.count(NAME_LAST)); | 2276 EXPECT_TRUE(non_empty_types.count(NAME_LAST)); |
| 2277 EXPECT_TRUE(non_empty_types.count(NAME_FULL)); | 2277 EXPECT_TRUE(non_empty_types.count(NAME_FULL)); |
| 2278 EXPECT_TRUE(non_empty_types.count(EMAIL_ADDRESS)); | 2278 EXPECT_TRUE(non_empty_types.count(EMAIL_ADDRESS)); |
| 2279 EXPECT_TRUE(non_empty_types.count(COMPANY_NAME)); | 2279 EXPECT_TRUE(non_empty_types.count(COMPANY_NAME)); |
| 2280 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_LINE1)); | 2280 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_LINE1)); |
| 2281 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_LINE2)); | 2281 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_LINE2)); |
| 2282 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_STREET_ADDRESS)); | 2282 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_STREET_ADDRESS)); |
| 2283 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_CITY)); | 2283 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_CITY)); |
| 2284 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_STATE)); | 2284 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_STATE)); |
| 2285 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_ZIP)); | 2285 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_ZIP)); |
| 2286 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_COUNTRY)); | 2286 EXPECT_TRUE(non_empty_types.count(ADDRESS_HOME_COUNTRY)); |
| 2287 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_NUMBER)); | 2287 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_NUMBER)); |
| 2288 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_CITY_CODE)); | 2288 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_CITY_CODE)); |
| 2289 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_COUNTRY_CODE)); | 2289 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_COUNTRY_CODE)); |
| 2290 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_CITY_AND_NUMBER)); | 2290 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_CITY_AND_NUMBER)); |
| 2291 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_WHOLE_NUMBER)); | 2291 EXPECT_TRUE(non_empty_types.count(PHONE_HOME_WHOLE_NUMBER)); |
| 2292 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_NAME)); | 2292 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_NAME)); |
| 2293 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_NUMBER)); | 2293 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_NUMBER)); |
| 2294 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_NUMBER_PART1)); | |
| 2295 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_NUMBER_PART2)); | |
| 2296 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_NUMBER_PART3)); | |
| 2297 EXPECT_FALSE(non_empty_types.count(CREDIT_CARD_NUMBER_PART4)); | |
|
Ilya Sherman
2014/07/25 03:37:49
Hrm. It might be better to update the card used i
Pritam Nikam
2014/07/26 11:29:51
Done.
| |
| 2294 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_TYPE)); | 2298 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_TYPE)); |
| 2295 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_MONTH)); | 2299 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_MONTH)); |
| 2296 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_2_DIGIT_YEAR)); | 2300 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_2_DIGIT_YEAR)); |
| 2297 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_4_DIGIT_YEAR)); | 2301 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_4_DIGIT_YEAR)); |
| 2298 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR)); | 2302 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_DATE_2_DIGIT_YEAR)); |
| 2299 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR)); | 2303 EXPECT_TRUE(non_empty_types.count(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR)); |
| 2300 } | 2304 } |
| 2301 | 2305 |
| 2302 TEST_F(PersonalDataManagerTest, CaseInsensitiveMultiValueAggregation) { | 2306 TEST_F(PersonalDataManagerTest, CaseInsensitiveMultiValueAggregation) { |
| 2303 FormData form1; | 2307 FormData form1; |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2609 &values, | 2613 &values, |
| 2610 &labels, | 2614 &labels, |
| 2611 &icons, | 2615 &icons, |
| 2612 &guid_pairs); | 2616 &guid_pairs); |
| 2613 ASSERT_FALSE(values.empty()); | 2617 ASSERT_FALSE(values.empty()); |
| 2614 EXPECT_EQ(values[0], | 2618 EXPECT_EQ(values[0], |
| 2615 base::UTF8ToUTF16("123 Zoo St., Second Line, Third line, unit 5")); | 2619 base::UTF8ToUTF16("123 Zoo St., Second Line, Third line, unit 5")); |
| 2616 } | 2620 } |
| 2617 | 2621 |
| 2618 } // namespace autofill | 2622 } // namespace autofill |
| OLD | NEW |