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

Side by Side Diff: components/autofill/core/browser/contact_info_unittest.cc

Issue 261993006: Modified to allow to preserve two-word string in first-name and last-name in autofill profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
OLDNEW
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 "components/autofill/core/browser/contact_info.h" 5 #include "components/autofill/core/browser/contact_info.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "components/autofill/core/browser/autofill_type.h" 10 #include "components/autofill/core/browser/autofill_type.h"
(...skipping 25 matching lines...) Expand all
36 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Saltykov-Shchedrin")); 36 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Saltykov-Shchedrin"));
37 EXPECT_EQ(name.GetRawInfo(NAME_FULL), 37 EXPECT_EQ(name.GetRawInfo(NAME_FULL),
38 ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin")); 38 ASCIIToUTF16("Mikhail Yevgrafovich Saltykov-Shchedrin"));
39 39
40 name.SetRawInfo(NAME_FULL, ASCIIToUTF16("Arthur Ignatius Conan Doyle")); 40 name.SetRawInfo(NAME_FULL, ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
41 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Arthur")); 41 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("Arthur"));
42 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Ignatius Conan")); 42 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Ignatius Conan"));
43 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Doyle")); 43 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Doyle"));
44 EXPECT_EQ(name.GetRawInfo(NAME_FULL), 44 EXPECT_EQ(name.GetRawInfo(NAME_FULL),
45 ASCIIToUTF16("Arthur Ignatius Conan Doyle")); 45 ASCIIToUTF16("Arthur Ignatius Conan Doyle"));
46
47 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
48 name.SetRawInfo(NAME_FIRST, base::string16());
49 name.SetRawInfo(NAME_FIRST, base::string16());
50 name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First"));
51 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
52 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
53 EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
54 EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First"));
55
56 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
57 name.SetRawInfo(NAME_FIRST, base::string16());
58 name.SetRawInfo(NAME_FIRST, base::string16());
59 name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First Last"));
60 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
61 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
62 EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16("Last"));
63 EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Last"));
64
65 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
66 name.SetRawInfo(NAME_FIRST, base::string16());
67 name.SetRawInfo(NAME_FIRST, base::string16());
68 name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First Middle Last"));
69 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
70 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
71 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
72 EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle Last"));
73
74 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
75 name.SetRawInfo(NAME_FIRST, base::string16());
76 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Last1 Last2"));
77 name.SetRawInfo(NAME_FULL, ASCIIToUTF16("First Last1 Last2"));
78 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
79 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
80 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last1 Last2"));
81 EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Last1 Last2"));
82
83 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First1 First2"));
84 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Middle1 Middle2"));
85 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("Last1 Last2"));
86 name.SetRawInfo(NAME_FULL,
87 ASCIIToUTF16("First1 First2 Middle1 Middle2 Last1 Last2"));
88 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First1 First2"));
89 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle1 Middle2"));
90 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Middle1 Middle2"));
91 EXPECT_EQ(name.GetRawInfo(NAME_FULL),
92 ASCIIToUTF16("First1 First2 Middle1 Middle2 Last1 Last2"));
93
94 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("first1 first2"));
95 name.SetRawInfo(NAME_FIRST, base::string16());
96 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("last1 last2"));
97 name.SetRawInfo(NAME_FULL, ASCIIToUTF16("middle1 middle2 last1 last2"));
98 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("first1 first2"));
99 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("middle1 middle2"));
100 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("last1 last2"));
101 EXPECT_EQ(name.GetRawInfo(NAME_FULL),
102 ASCIIToUTF16("first1 first2 middle1 middle2 last1 last2"));
103
104 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("first1 first2"));
105 name.SetRawInfo(NAME_FIRST, base::string16());
106 name.SetRawInfo(NAME_FIRST, base::string16());
107 name.SetRawInfo(NAME_FULL, ASCIIToUTF16("middle last"));
108 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("first1 first2"));
109 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("middle"));
110 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("last"));
111 EXPECT_EQ(name.GetRawInfo(NAME_FULL),
112 ASCIIToUTF16("first1 first2 middle last"));
46 } 113 }
47 114
48 TEST(NameInfoTest, GetFullName) { 115 TEST(NameInfoTest, GetFullName) {
49 NameInfo name; 116 NameInfo name;
50 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First")); 117 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
51 name.SetRawInfo(NAME_MIDDLE, base::string16()); 118 name.SetRawInfo(NAME_MIDDLE, base::string16());
52 name.SetRawInfo(NAME_LAST, base::string16()); 119 name.SetRawInfo(NAME_LAST, base::string16());
53 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First")); 120 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
54 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16()); 121 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), base::string16());
55 EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16()); 122 EXPECT_EQ(name.GetRawInfo(NAME_LAST), base::string16());
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First")); 165 name.SetRawInfo(NAME_FIRST, ASCIIToUTF16("First"));
99 name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle")); 166 name.SetRawInfo(NAME_MIDDLE, ASCIIToUTF16("Middle"));
100 name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last")); 167 name.SetRawInfo(NAME_LAST, ASCIIToUTF16("Last"));
101 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First")); 168 EXPECT_EQ(name.GetRawInfo(NAME_FIRST), ASCIIToUTF16("First"));
102 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle")); 169 EXPECT_EQ(name.GetRawInfo(NAME_MIDDLE), ASCIIToUTF16("Middle"));
103 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last")); 170 EXPECT_EQ(name.GetRawInfo(NAME_LAST), ASCIIToUTF16("Last"));
104 EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle Last")); 171 EXPECT_EQ(name.GetRawInfo(NAME_FULL), ASCIIToUTF16("First Middle Last"));
105 } 172 }
106 173
107 } // namespace autofill 174 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698