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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/guid.h" | 6 #include "base/guid.h" |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/memory/scoped_vector.h" | 8 #include "base/memory/scoped_vector.h" |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 647 EXPECT_LT(0, b.Compare(a)); | 647 EXPECT_LT(0, b.Compare(a)); |
| 648 | 648 |
| 649 // Phone numbers are compared by the full number, including the area code. | 649 // Phone numbers are compared by the full number, including the area code. |
| 650 // This is a regression test for http://crbug.com/163024 | 650 // This is a regression test for http://crbug.com/163024 |
| 651 test::SetProfileInfo(&a, NULL, NULL, NULL, NULL, | 651 test::SetProfileInfo(&a, NULL, NULL, NULL, NULL, |
| 652 NULL, NULL, NULL, NULL, NULL, NULL, NULL, "650.555.4321"); | 652 NULL, NULL, NULL, NULL, NULL, NULL, NULL, "650.555.4321"); |
| 653 test::SetProfileInfo(&b, NULL, NULL, NULL, NULL, | 653 test::SetProfileInfo(&b, NULL, NULL, NULL, NULL, |
| 654 NULL, NULL, NULL, NULL, NULL, NULL, NULL, "408.555.4321"); | 654 NULL, NULL, NULL, NULL, NULL, NULL, NULL, "408.555.4321"); |
| 655 EXPECT_GT(0, a.Compare(b)); | 655 EXPECT_GT(0, a.Compare(b)); |
| 656 EXPECT_LT(0, b.Compare(a)); | 656 EXPECT_LT(0, b.Compare(a)); |
| 657 | |
| 658 // Addresses are compared in full. Regression test for http://crbug.com/375545 | |
| 659 test::SetProfileInfo(&a, "John", NULL, NULL, NULL, | |
| 660 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); | |
|
Dan Beam
2014/06/16 19:30:20
what kind of pointer do you want? we have NULL and
| |
| 661 a.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, | |
| 662 ASCIIToUTF16("line one\nline two")); | |
| 663 test::SetProfileInfo(&b, "John", NULL, NULL, NULL, | |
| 664 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); | |
| 665 b.SetRawInfo(ADDRESS_HOME_STREET_ADDRESS, | |
| 666 ASCIIToUTF16("line one\nline two\nline three")); | |
| 667 EXPECT_GT(0, a.Compare(b)); | |
|
Dan Beam
2014/06/16 19:30:20
nit: EXPECT_NE(0,
Evan Stade
2014/06/16 19:33:09
I kind of agree, but I'm matching the format of th
| |
| 668 EXPECT_LT(0, b.Compare(a)); | |
| 657 } | 669 } |
| 658 | 670 |
| 659 TEST(AutofillProfileTest, MultiValueNames) { | 671 TEST(AutofillProfileTest, MultiValueNames) { |
| 660 AutofillProfile p(base::GenerateGUID(), "https://www.example.com/"); | 672 AutofillProfile p(base::GenerateGUID(), "https://www.example.com/"); |
| 661 const base::string16 kJohnDoe(ASCIIToUTF16("John Doe")); | 673 const base::string16 kJohnDoe(ASCIIToUTF16("John Doe")); |
| 662 const base::string16 kJohnPDoe(ASCIIToUTF16("John P. Doe")); | 674 const base::string16 kJohnPDoe(ASCIIToUTF16("John P. Doe")); |
| 663 std::vector<base::string16> set_values; | 675 std::vector<base::string16> set_values; |
| 664 set_values.push_back(kJohnDoe); | 676 set_values.push_back(kJohnDoe); |
| 665 set_values.push_back(kJohnPDoe); | 677 set_values.push_back(kJohnPDoe); |
| 666 p.SetRawMultiInfo(NAME_FULL, set_values); | 678 p.SetRawMultiInfo(NAME_FULL, set_values); |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 892 ASCIIToUTF16("CA"), | 904 ASCIIToUTF16("CA"), |
| 893 "en-US"); | 905 "en-US"); |
| 894 EXPECT_FALSE(profile.GetInfo(full_address, "en-US").empty()); | 906 EXPECT_FALSE(profile.GetInfo(full_address, "en-US").empty()); |
| 895 profile.SetInfo(AutofillType(ADDRESS_HOME_COUNTRY), | 907 profile.SetInfo(AutofillType(ADDRESS_HOME_COUNTRY), |
| 896 base::string16(), | 908 base::string16(), |
| 897 "en-US"); | 909 "en-US"); |
| 898 EXPECT_TRUE(profile.GetInfo(full_address, "en-US").empty()); | 910 EXPECT_TRUE(profile.GetInfo(full_address, "en-US").empty()); |
| 899 } | 911 } |
| 900 | 912 |
| 901 } // namespace autofill | 913 } // namespace autofill |
| OLD | NEW |