Author: hardy.ferentschik
Date: 2009-09-10 11:45:31 -0400 (Thu, 10 Sep 2009)
New Revision: 17505
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java
Log:
HV-222 - MessageInterpolationTest#testFallbackToDefaultLocale
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java
===================================================================
---
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java 2009-09-10
14:16:48 UTC (rev 17504)
+++
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java 2009-09-10
15:45:31 UTC (rev 17505)
@@ -75,7 +75,7 @@
@SpecAssertion(section = "4.3.1", id = "e"),
@SpecAssertion(section = "4.3.1.1", id = "a")
})
- public void testSuccessfullInterpolationOfValidationMessagesValue() {
+ public void testSuccessfulInterpolationOfValidationMessagesValue() {
MessageInterpolator interpolator = getDefaultMessageInterpolator();
ConstraintDescriptor<?> descriptor = getDescriptorFor( DummyEntity.class,
"foo" );
@@ -93,14 +93,14 @@
actual = interpolator.interpolate( "This {foo} just fine", context );
assertEquals( actual, expected, "Wrong substitution" );
- expected = "{} replacement worked {unkown}";
- actual = interpolator.interpolate( "{} {foo} {unkown}", context );
+ expected = "{} replacement worked {unknown}";
+ actual = interpolator.interpolate( "{} {foo} {unknown}", context );
assertEquals( actual, expected, "Wrong substitution" );
}
@Test
@SpecAssertion(section = "4.3.1.1", id = "b")
- public void testRecursiveMessageInterpoliation() {
+ public void testRecursiveMessageInterpolation() {
MessageInterpolator interpolator = getDefaultMessageInterpolator();
ConstraintDescriptor<?> descriptor = getDescriptorFor( DummyEntity.class,
"fubar" );
MessageInterpolator.Context context = new TestContext( descriptor );
@@ -114,7 +114,7 @@
@Test
@SpecAssertion(section = "4.3.1", id = "d")
- public void testMessagesCanBeOverrridenAtConstraintLevel() {
+ public void testMessagesCanBeOverriddenAtConstraintLevel() {
Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<DummyEntity>> constraintViolations =
validator.validateProperty(
new DummyEntity(), "snafu"
@@ -169,12 +169,12 @@
@Test
@SpecAssertion(section = "4.3.1.1", id = "a")
- public void testUnkownTokenInterpolation() {
+ public void testUnknownTokenInterpolation() {
MessageInterpolator interpolator = getDefaultMessageInterpolator();
ConstraintDescriptor<?> descriptor = getDescriptorFor( DummyEntity.class,
"foo" );
MessageInterpolator.Context context = new TestContext( descriptor );
- String expected = "{bar}"; // unkown token {}
+ String expected = "{bar}"; // unknown token {}
String actual = interpolator.interpolate( "{bar}", context );
assertEquals( actual, expected, "Wrong substitution" );
}
@@ -186,7 +186,7 @@
ConstraintDescriptor<?> descriptor = getDescriptorFor( Person.class,
"birthday" );
MessageInterpolator.Context context = new TestContext( descriptor );
- String key = "{javax.validation.constraints.Past.message}"; // Past is a
builtin constraint so the provider must provide a default message
+ String key = "{javax.validation.constraints.Past.message}"; // Past is a
built-in constraint so the provider must provide a default message
String actual = interpolator.interpolate( key, context );
assertFalse(
key.equals( actual ),
@@ -222,20 +222,18 @@
@Test
@SpecAssertion(section = "4.3.1.1", id = "i")
- public void testFallbackToDefaultLocale() {
+ public void testIfNoLocaleIsSpecifiedTheDefaultLocaleIsAssumed() {
MessageInterpolator interpolator = getDefaultMessageInterpolator();
ConstraintDescriptor<?> descriptor = getDescriptorFor( DummyEntity.class,
"foo" );
+ String messageTemplate = ( String ) descriptor.getAttributes().get( "message"
);
MessageInterpolator.Context context = new TestContext( descriptor );
- String expected = "may not be null";
- String actual = interpolator.interpolate( ( String ) descriptor.getAttributes().get(
"message" ), context );
- assertEquals( actual, expected, "Wrong substitution" );
-
- expected = "may not be null";
- actual = interpolator.interpolate(
- ( String ) descriptor.getAttributes().get( "message" ), context,
Locale.JAPAN
+ String messageInterpolatedWithNoLocale = interpolator.interpolate( messageTemplate,
context );
+ String messageInterpolatedWithDefaultLocale = interpolator.interpolate(
+ messageTemplate, context, Locale.getDefault()
);
- assertEquals( actual, expected, "Wrong substitution" );
+
+ assertEquals( messageInterpolatedWithNoLocale, messageInterpolatedWithDefaultLocale,
"Wrong substitution" );
}
private ConstraintDescriptor<?> getDescriptorFor(Class<?> clazz, String
propertyName) {