Merge remote-tracking branch 'origin/2.4.0' into 2.4.0

Dancovich
2 parents d8ddaaca 996145d0
Showing 2 changed files with 3 additions and 5 deletions Show diff stats
impl/core/src/test/java/configuration/prefix/ConfigurationPrefixTest.java
impl/core/src/test/resources/configuration/field/map/demoiselle.xml
@@ -99,6 +99,6 @@ public class ConfigurationPrefixTest {
 		String expected = "prefix ending with dot";
  
 		assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
-		assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
+		assertEquals(expected, xmlEndingWithDotPrefix.getPrefixedAttribute());
 	}
 }
@@ -42,13 +42,11 @@
 	<item2>
 		<stringWithDefinedKeyMap>framework</stringWithDefinedKeyMap>
 	</item2>
-	<stringWithUndefinedKeyMap>undefined</stringWithUndefinedKeyMap>
+		<stringWithUndefinedKeyMap>undefined</stringWithUndefinedKeyMap>
 	<item1>
 		<emptyValueMap></emptyValueMap>
 	</item1>
 	<item2>
 		<emptyValueMap></emptyValueMap>
-	</item2>
-	
-	
+	</item2>	
 </configuration>
...	...	@@ -99,6 +99,6 @@ public class ConfigurationPrefixTest {
99	99	String expected = "prefix ending with dot";
100	100
101	101	assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
102		- assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
	102	+ assertEquals(expected, xmlEndingWithDotPrefix.getPrefixedAttribute());
103	103	}
104	104	}
...	...
...	...	@@ -42,13 +42,11 @@
42	42	<item2>
43	43	<stringWithDefinedKeyMap>framework</stringWithDefinedKeyMap>
44	44	</item2>
45		- <stringWithUndefinedKeyMap>undefined</stringWithUndefinedKeyMap>
	45	+ <stringWithUndefinedKeyMap>undefined</stringWithUndefinedKeyMap>
46	46	<item1>
47	47	<emptyValueMap></emptyValueMap>
48	48	</item1>
49	49	<item2>
50	50	<emptyValueMap></emptyValueMap>
51		- </item2>
52		-
53		-
	51	+ </item2>
54	52	</configuration>
...	...