Project

General

Profile

« Previous | Next » 

Revision 62024

Capitalize letters after "-"

View differences:

modules/dnet-isti/trunk/src/main/java/eu/dnetlib/data/utils/XsltFunctions.java
65 65
	}
66 66

  
67 67
	public static String capitalize(final String s) {
68
		return Arrays.stream(s.split(" "))
69
				.map(String::toLowerCase)
68
		return Arrays.stream(fixApostrophes(s.toLowerCase()).split(" "))
69
				.map(p -> Arrays.stream(p.split("-"))
70
						.map(StringUtils::capitalize)
71
						.collect(Collectors.joining("-")))
70 72
				.map(StringUtils::capitalize)
71
				.map(XsltFunctions::fixApostrophes)
72 73
				.collect(Collectors.joining(" "));
73 74
	}
74 75

  
modules/dnet-isti/trunk/src/test/java/eu/dnetlib/data/utils/XsltFunctionsTest.java
21 21
		assertEquals("", XsltFunctions.cleanDoi(null));
22 22
	}
23 23

  
24
	@Test
25
	public void testCapitalizeName_1() {
26
		assertEquals("Michele Artini", XsltFunctions.capitalize("MICHELE ARTINI"));
27
	}
28

  
29
	@Test
30
	public void testCapitalizeName_2() {
31
		assertEquals("Michele Artini", XsltFunctions.capitalize("michele artini"));
32
	}
33

  
34
	@Test
35
	public void testCapitalizeName_3() {
36
		assertEquals("Michele-Francesco Artini", XsltFunctions.capitalize("MICHELE-FRANCESCO ARTINI"));
37
	}
38

  
39
	@Test
40
	public void testCapitalizeName_4() {
41
		assertEquals("Michele Artini-Smith", XsltFunctions.capitalize("MICHELE ARTINI-SMITH"));
42
	}
43

  
44
	@Test
45
	public void testCapitalizeName_5() {
46
		assertEquals("Michele Francesco Artini", XsltFunctions.capitalize("MICHELE FRANCESCO ARTINI"));
47
	}
48

  
49
	@Test
50
	public void testCapitalizeName_6() {
51
		assertEquals("Andrea Dell'Amico", XsltFunctions.capitalize("andrea dell'amico"));
52
	}
24 53
}

Also available in: Unified diff