HV-543 Fixing typo in French message bundle and updating tests

hibernate · Dec 16, 2011 · cddf9cb · cddf9cb
1 parent fd1646a
commit cddf9cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/...ate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties b/...ate-validator/src/main/resources/org/hibernate/validator/ValidationMessages_fr.properties
@@ -13,7 +13,7 @@ javax.validation.constraints.Pattern.message     = doit suivre "{regexp}"
 javax.validation.constraints.Size.message        = la taille doit \u00EAtre entre {min} et {max}
 
 org.hibernate.validator.constraints.CreditCardNumber.message = Num\u00E9ro de carte de cr\u00E9dit invalide
-org.hibernate.validator.constraints.Email.message            = Addresse email mal form\u00E9e
+org.hibernate.validator.constraints.Email.message            = Adresse email mal form\u00E9e
 org.hibernate.validator.constraints.Length.message           = la taille doit \u00EAtre entre {min} et {max}
 org.hibernate.validator.constraints.NotBlank.message         = ne peut pas \u00EAtre vide
 org.hibernate.validator.constraints.NotEmpty.message         = ne peut pas \u00EAtre vide

diff --git a/...validator/test/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java b/...validator/test/engine/messageinterpolation/MessageInterpolationWithDefaultBundleTest.java
@@ -27,6 +27,7 @@
 import org.testng.annotations.Test;
 
 import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
+import org.hibernate.validator.testutil.TestForIssue;
 import org.hibernate.validator.testutil.ValidatorUtil;
 
 import static org.hibernate.validator.testutil.ConstraintViolationAssert.assertCorrectConstraintViolationMessages;
@@ -51,10 +52,8 @@ public void restoreDefaultLocale() {
 		Locale.setDefault( defaultLocale );
 	}
 
-	/**
-	 * HV-268
-	 */
 	@Test
+	@TestForIssue(jiraKey = "HV-268")
 	public void testEmailAndRangeMessageEnglishLocale() {
 		Configuration<?> config = ValidatorUtil.getConfiguration( Locale.ENGLISH );
 		config.messageInterpolator( new ResourceBundleMessageInterpolator() );
@@ -69,10 +68,8 @@ public void testEmailAndRangeMessageEnglishLocale() {
 		);
 	}
 
-	/**
-	 * HV-268
-	 */
 	@Test
+	@TestForIssue(jiraKey = "HV-268")
 	public void testEmailAndRangeMessageGermanLocale() {
 		Configuration<?> config = ValidatorUtil.getConfiguration( Locale.GERMAN );
 		config.messageInterpolator( new ResourceBundleMessageInterpolator() );
@@ -87,10 +84,8 @@ public void testEmailAndRangeMessageGermanLocale() {
 		);
 	}
 
-	/**
-	 * HV-268
-	 */
 	@Test
+	@TestForIssue(jiraKey = "HV-268")
 	public void testEmailAndRangeMessageFrenchLocale() {
 		Configuration<?> config = ValidatorUtil.getConfiguration( Locale.FRENCH );
 		config.messageInterpolator( new ResourceBundleMessageInterpolator() );
@@ -101,7 +96,7 @@ public void testEmailAndRangeMessageFrenchLocale() {
 		Set<ConstraintViolation<User>> constraintViolations = validator.validate( user );
 		assertNumberOfViolations( constraintViolations, 2 );
 		assertCorrectConstraintViolationMessages(
-				constraintViolations, "Addresse email mal form\u00E9e", "doit \u00EAtre entre 18 et 21"
+				constraintViolations, "Adresse email mal form\u00E9e", "doit \u00EAtre entre 18 et 21"
 		);
 	}
 
@@ -110,6 +105,7 @@ public void testEmailAndRangeMessageFrenchLocale() {
 	 * must take precedence over the system's default locale.
 	 */
 	@Test
+	@TestForIssue(jiraKey = "HV-306")
 	public void testThatExplicitlySetEnglishLocaleHasPrecedenceOverDefaultLocale() {
 		Configuration<?> config = ValidatorUtil.getConfiguration( Locale.FRENCH );
 		config.messageInterpolator( new LocalizedMessageInterpolator( Locale.ENGLISH ) );