Revision 986f6827
Added by Andreas Müller almost 6 years ago
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategyTest.java | ||
---|---|---|
58 | 58 |
public void setUp() throws Exception { |
59 | 59 |
person1 = Person.NewInstance(); |
60 | 60 |
|
61 |
person1.setFirstname("P1FN");
|
|
62 |
person1.setLastname("P1LN");
|
|
61 |
person1.setGivenName("P1FN");
|
|
62 |
person1.setFamilyName("P1LN");
|
|
63 | 63 |
person1.setPrefix("Dr1."); |
64 | 64 |
person1.setSuffix("Suff1"); |
65 | 65 |
|
66 | 66 |
person2 = Person.NewInstance(); |
67 | 67 |
person2.setNomenclaturalTitle("P2NomT"); |
68 |
person2.setLastname("P2LN");
|
|
69 |
person2.setFirstname("P2FN");
|
|
68 |
person2.setFamilyName("P2LN");
|
|
69 |
person2.setGivenName("P2FN");
|
|
70 | 70 |
person2.setSuffix("P2Suff"); |
71 | 71 |
|
72 | 72 |
person3 = Person.NewInstance(); //empty person |
... | ... | |
110 | 110 |
@Test |
111 | 111 |
public final void testGetTitleCacheAdaptedFromOldVersion(){ |
112 | 112 |
Assert.assertNotNull("person1 title cache must not to be null", person1.getTitleCache()); |
113 |
Assert.assertEquals("Person1 title cache should be created by lastname and computed initials", "P1LN, P.", person1.getTitleCache());
|
|
113 |
Assert.assertEquals("Person1 title cache should be created by familyname and computed initials", "P1LN, P.", person1.getTitleCache());
|
|
114 | 114 |
person1.setSuffix(null); |
115 | 115 |
Assert.assertEquals("Person1 title cache should be Dr1. P1FN P1LN", "P1LN, P.", person1.getTitleCache()); |
116 | 116 |
//peson2 |
... | ... | |
120 | 120 |
Assert.assertTrue("Person3 title cache must not be empty", StringUtils.isNotBlank(person3.getTitleCache())); |
121 | 121 |
//don't take to serious, may be also something different, but not empty |
122 | 122 |
Assert.assertEquals("Person3 title cache should start with Person#0", "Person#0", person3.getTitleCache().substring(0, 8)); |
123 |
person3.setFirstname("Klaus");
|
|
123 |
person3.setGivenName("Klaus");
|
|
124 | 124 |
Assert.assertEquals("Person3 title cache should be Klaus", "K.", person3.getTitleCache()); |
125 | 125 |
} |
126 | 126 |
|
127 | 127 |
@Test |
128 | 128 |
public final void testGetTitleCache(){ |
129 | 129 |
Person pers = Person.NewInstance(); |
130 |
pers.setLastname("Last");
|
|
130 |
pers.setFamilyName("Last");
|
|
131 | 131 |
pers.setInitials("E.M."); |
132 | 132 |
|
133 | 133 |
String expected = "Last, E.M."; |
134 | 134 |
Assert.assertNotNull("pers title cache must not to be null", pers.getTitleCache()); |
135 |
Assert.assertEquals("pers title cache should be created by lastname and initials",
|
|
135 |
Assert.assertEquals("pers title cache should be created by familyname and initials",
|
|
136 | 136 |
expected, pers.getTitleCache()); |
137 | 137 |
|
138 | 138 |
pers.setSuffix("xyz"); |
... | ... | |
142 | 142 |
Assert.assertEquals("Prefix should not influence title cache", |
143 | 143 |
expected, pers.getTitleCache()); |
144 | 144 |
|
145 |
pers.setFirstname("First");
|
|
146 |
Assert.assertEquals("Firstname should not influence title cache if initials are set",
|
|
145 |
pers.setGivenName("First");
|
|
146 |
Assert.assertEquals("Given name should not influence title cache if initials are set",
|
|
147 | 147 |
expected, pers.getTitleCache()); |
148 | 148 |
|
149 | 149 |
pers.setInitials(null); |
150 | 150 |
expected = "Last, F."; |
151 |
Assert.assertEquals("Initials should be computed from firstname if not set manually",
|
|
151 |
Assert.assertEquals("Initials should be computed from givenname if not set manually",
|
|
152 | 152 |
expected, pers.getTitleCache()); |
153 | 153 |
} |
154 | 154 |
|
... | ... | |
172 | 172 |
//don't take to serious, may be also something different, but not empty |
173 | 173 |
Assert.assertEquals("Person3 full title should start with Person#0", |
174 | 174 |
"Person#0", person3.getFullTitle().substring(0, 8)); |
175 |
person3.setFirstname("Klaus");
|
|
175 |
person3.setGivenName("Klaus");
|
|
176 | 176 |
Assert.assertEquals("Person3 full title should be Klaus", |
177 | 177 |
"Klaus", person3.getFullTitle()); |
178 | 178 |
} |
179 | 179 |
|
180 | 180 |
@Test |
181 |
public final void testInitialsFromFirstname(){
|
|
181 |
public final void testInitialsFromGivenName(){
|
|
182 | 182 |
PersonDefaultCacheStrategy formatter = PersonDefaultCacheStrategy.NewInstance(); |
183 | 183 |
boolean force = true; |
184 | 184 |
|
185 |
String firstname = null;
|
|
186 |
Assert.assertNull(formatter.getInitialsFromFirstname(firstname, force));
|
|
185 |
String givenname = null;
|
|
186 |
Assert.assertNull(formatter.getInitialsFromGivenName(givenname, force));
|
|
187 | 187 |
|
188 |
firstname = "";
|
|
189 |
Assert.assertEquals("", formatter.getInitialsFromFirstname(firstname, force));
|
|
188 |
givenname = "";
|
|
189 |
Assert.assertEquals("", formatter.getInitialsFromGivenName(givenname, force));
|
|
190 | 190 |
|
191 |
firstname = " ";
|
|
192 |
Assert.assertEquals("We expect blanks to be trimmed", "", formatter.getInitialsFromFirstname(firstname, force));
|
|
191 |
givenname = " ";
|
|
192 |
Assert.assertEquals("We expect blanks to be trimmed", "", formatter.getInitialsFromGivenName(givenname, force));
|
|
193 | 193 |
|
194 |
firstname = "John Michael ";
|
|
195 |
Assert.assertEquals("J.M.", formatter.getInitialsFromFirstname(firstname, force));
|
|
194 |
givenname = "John Michael ";
|
|
195 |
Assert.assertEquals("J.M.", formatter.getInitialsFromGivenName(givenname, force));
|
|
196 | 196 |
|
197 |
firstname = "Walter G.";
|
|
198 |
Assert.assertEquals("W.G.", formatter.getInitialsFromFirstname(firstname, force));
|
|
197 |
givenname = "Walter G.";
|
|
198 |
Assert.assertEquals("W.G.", formatter.getInitialsFromGivenName(givenname, force));
|
|
199 | 199 |
|
200 |
firstname = "A.L.";
|
|
201 |
Assert.assertEquals("A.L.", formatter.getInitialsFromFirstname(firstname, force));
|
|
200 |
givenname = "A.L.";
|
|
201 |
Assert.assertEquals("A.L.", formatter.getInitialsFromGivenName(givenname, force));
|
|
202 | 202 |
|
203 |
firstname = "A.Ludw. W.";
|
|
204 |
Assert.assertEquals("A.L.W.", formatter.getInitialsFromFirstname(firstname, force));
|
|
203 |
givenname = "A.Ludw. W.";
|
|
204 |
Assert.assertEquals("A.L.W.", formatter.getInitialsFromGivenName(givenname, force));
|
|
205 | 205 |
|
206 |
firstname = "A. Ludw. Norbert W.";
|
|
207 |
Assert.assertEquals("A.L.N.W.", formatter.getInitialsFromFirstname(firstname, force));
|
|
206 |
givenname = "A. Ludw. Norbert W.";
|
|
207 |
Assert.assertEquals("A.L.N.W.", formatter.getInitialsFromGivenName(givenname, force));
|
|
208 | 208 |
|
209 | 209 |
force = false; |
210 |
firstname = "A. Ludw. Norbert W.";
|
|
211 |
Assert.assertEquals("A.Ludw.N.W.", formatter.getInitialsFromFirstname(firstname, force));
|
|
210 |
givenname = "A. Ludw. Norbert W.";
|
|
211 |
Assert.assertEquals("A.Ludw.N.W.", formatter.getInitialsFromGivenName(givenname, force));
|
|
212 | 212 |
|
213 |
firstname = "W.-H.";
|
|
214 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
215 |
firstname = "W.-Henning";
|
|
216 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
217 |
firstname = "W.-Henn.";
|
|
218 |
Assert.assertEquals("W.-Henn.", formatter.getInitialsFromFirstname(firstname, force));
|
|
219 |
firstname = "Wolf-Henning";
|
|
220 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
221 |
firstname = "Wolf\u2013 Henning";
|
|
222 |
Assert.assertEquals("W.\u2013H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
213 |
givenname = "W.-H.";
|
|
214 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
215 |
givenname = "W.-Henning";
|
|
216 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
217 |
givenname = "W.-Henn.";
|
|
218 |
Assert.assertEquals("W.-Henn.", formatter.getInitialsFromGivenName(givenname, force));
|
|
219 |
givenname = "Wolf-Henning";
|
|
220 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
221 |
givenname = "Wolf\u2013 Henning";
|
|
222 |
Assert.assertEquals("W.\u2013H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
223 | 223 |
|
224 | 224 |
|
225 |
firstname = "W";
|
|
226 |
Assert.assertEquals("W.", formatter.getInitialsFromFirstname(firstname, force));
|
|
225 |
givenname = "W";
|
|
226 |
Assert.assertEquals("W.", formatter.getInitialsFromGivenName(givenname, force));
|
|
227 | 227 |
|
228 |
firstname = "W K";
|
|
229 |
Assert.assertEquals("W.K.", formatter.getInitialsFromFirstname(firstname, force));
|
|
228 |
givenname = "W K";
|
|
229 |
Assert.assertEquals("W.K.", formatter.getInitialsFromGivenName(givenname, force));
|
|
230 | 230 |
|
231 |
firstname = "WK";
|
|
232 |
Assert.assertEquals("W.K.", formatter.getInitialsFromFirstname(firstname, force));
|
|
231 |
givenname = "WK";
|
|
232 |
Assert.assertEquals("W.K.", formatter.getInitialsFromGivenName(givenname, force));
|
|
233 | 233 |
|
234 |
firstname = "WKH";
|
|
235 |
Assert.assertEquals("W.K.H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
234 |
givenname = "WKH";
|
|
235 |
Assert.assertEquals("W.K.H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
236 | 236 |
|
237 | 237 |
|
238 | 238 |
//force |
239 | 239 |
force = true; |
240 |
firstname = "W.-H.";
|
|
241 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
242 |
firstname = "W.-Henning";
|
|
243 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
244 |
firstname = "W.-Henn.";
|
|
245 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
246 |
firstname = "Wolf-Henning";
|
|
247 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
240 |
givenname = "W.-H.";
|
|
241 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
242 |
givenname = "W.-Henning";
|
|
243 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
244 |
givenname = "W.-Henn.";
|
|
245 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
246 |
givenname = "Wolf-Henning";
|
|
247 |
Assert.assertEquals("W.-H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
248 | 248 |
|
249 |
firstname = "W";
|
|
250 |
Assert.assertEquals("W.", formatter.getInitialsFromFirstname(firstname, force));
|
|
249 |
givenname = "W";
|
|
250 |
Assert.assertEquals("W.", formatter.getInitialsFromGivenName(givenname, force));
|
|
251 | 251 |
|
252 |
firstname = "W K";
|
|
253 |
Assert.assertEquals("W.K.", formatter.getInitialsFromFirstname(firstname, force));
|
|
252 |
givenname = "W K";
|
|
253 |
Assert.assertEquals("W.K.", formatter.getInitialsFromGivenName(givenname, force));
|
|
254 | 254 |
|
255 |
firstname = "WK";
|
|
256 |
Assert.assertEquals("W.K.", formatter.getInitialsFromFirstname(firstname, force));
|
|
255 |
givenname = "WK";
|
|
256 |
Assert.assertEquals("W.K.", formatter.getInitialsFromGivenName(givenname, force));
|
|
257 | 257 |
|
258 |
firstname = "WKH";
|
|
259 |
Assert.assertEquals("W.K.H.", formatter.getInitialsFromFirstname(firstname, force));
|
|
258 |
givenname = "WKH";
|
|
259 |
Assert.assertEquals("W.K.H.", formatter.getInitialsFromGivenName(givenname, force));
|
|
260 | 260 |
|
261 | 261 |
force = false; |
262 |
firstname = "Pe. Y.";
|
|
263 |
Assert.assertEquals("Pe.Y.", formatter.getInitialsFromFirstname(firstname, force));
|
|
262 |
givenname = "Pe. Y.";
|
|
263 |
Assert.assertEquals("Pe.Y.", formatter.getInitialsFromGivenName(givenname, force));
|
|
264 | 264 |
|
265 | 265 |
//brackets |
266 | 266 |
force = true; |
267 |
firstname = "Constantin (Konstantin) Georg Alexander";
|
|
268 |
Assert.assertEquals("C.G.A.", formatter.getInitialsFromFirstname(firstname, force));
|
|
269 |
firstname = "Franz (Joseph Andreas Nicolaus)";
|
|
270 |
Assert.assertEquals("F.", formatter.getInitialsFromFirstname(firstname, force));
|
|
271 |
firstname = "Viktor V. (W.W.)";
|
|
272 |
Assert.assertEquals("V.V.", formatter.getInitialsFromFirstname(firstname, force));
|
|
273 |
firstname = "(Georg Ferdinand) Otto";
|
|
274 |
Assert.assertEquals("O.", formatter.getInitialsFromFirstname(firstname, force));
|
|
275 |
firstname = "(Sébastien-) René";
|
|
276 |
Assert.assertEquals("R.", formatter.getInitialsFromFirstname(firstname, force));
|
|
277 |
firstname = "Joyce (M.) Chismore Lewin";
|
|
278 |
Assert.assertEquals("J.C.L.", formatter.getInitialsFromFirstname(firstname, force));
|
|
279 |
firstname = "Joyce (M.) Chismore Lewin";
|
|
280 |
Assert.assertEquals("J.C.L.", formatter.getInitialsFromFirstname(firstname, force));
|
|
267 |
givenname = "Constantin (Konstantin) Georg Alexander";
|
|
268 |
Assert.assertEquals("C.G.A.", formatter.getInitialsFromGivenName(givenname, force));
|
|
269 |
givenname = "Franz (Joseph Andreas Nicolaus)";
|
|
270 |
Assert.assertEquals("F.", formatter.getInitialsFromGivenName(givenname, force));
|
|
271 |
givenname = "Viktor V. (W.W.)";
|
|
272 |
Assert.assertEquals("V.V.", formatter.getInitialsFromGivenName(givenname, force));
|
|
273 |
givenname = "(Georg Ferdinand) Otto";
|
|
274 |
Assert.assertEquals("O.", formatter.getInitialsFromGivenName(givenname, force));
|
|
275 |
givenname = "(Sébastien-) René";
|
|
276 |
Assert.assertEquals("R.", formatter.getInitialsFromGivenName(givenname, force));
|
|
277 |
givenname = "Joyce (M.) Chismore Lewin";
|
|
278 |
Assert.assertEquals("J.C.L.", formatter.getInitialsFromGivenName(givenname, force));
|
|
279 |
givenname = "Joyce (M.) Chismore Lewin";
|
|
280 |
Assert.assertEquals("J.C.L.", formatter.getInitialsFromGivenName(givenname, force));
|
|
281 | 281 |
|
282 | 282 |
// "Robert. K." wurde auf "Robert. K." gemapped |
283 | 283 |
|
284 | 284 |
//must not throw exception (exact result may change in future) |
285 |
firstname = "W.-H.-";
|
|
286 |
Assert.assertEquals("W.-H.-", formatter.getInitialsFromFirstname(firstname, force));
|
|
287 |
firstname = "W.-Hennin-";
|
|
288 |
Assert.assertEquals("W.-H.-", formatter.getInitialsFromFirstname(firstname, force));
|
|
285 |
givenname = "W.-H.-";
|
|
286 |
Assert.assertEquals("W.-H.-", formatter.getInitialsFromGivenName(givenname, force));
|
|
287 |
givenname = "W.-Hennin-";
|
|
288 |
Assert.assertEquals("W.-H.-", formatter.getInitialsFromGivenName(givenname, force));
|
|
289 | 289 |
|
290 | 290 |
force = false; |
291 |
firstname = "W.-H.-";
|
|
292 |
Assert.assertEquals("W.-H.-", formatter.getInitialsFromFirstname(firstname, force));
|
|
293 |
firstname = "W.-Hennin-";
|
|
294 |
Assert.assertEquals("W.-H.-", formatter.getInitialsFromFirstname(firstname, force));
|
|
291 |
givenname = "W.-H.-";
|
|
292 |
Assert.assertEquals("W.-H.-", formatter.getInitialsFromGivenName(givenname, force));
|
|
293 |
givenname = "W.-Hennin-";
|
|
294 |
Assert.assertEquals("W.-H.-", formatter.getInitialsFromGivenName(givenname, force));
|
|
295 | 295 |
|
296 | 296 |
} |
297 | 297 |
|
Also available in: Unified diff
ref #7238 rename lastName and firstName