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,6 +99,6 @@ public class ConfigurationPrefixTest {
99	String expected = "prefix ending with dot";	99	String expected = "prefix ending with dot";
100		100
101	assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());	101	assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());
102	- assertEquals(expected, propertyEndingWithDotPrefix.getPrefixedAttribute());	102	+ assertEquals(expected, xmlEndingWithDotPrefix.getPrefixedAttribute());
103	}	103	}
104	}	104	}