[hibernate-commits] Hibernate SVN: r17230 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint.
Author: epbernard
Date: 2009-08-04 18:04:27 -0400 (Tue, 04 Aug 2009)
New Revision: 17230
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java
Log:
fix various incorrent assumptions on the implementation detail
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java
===================================================================
---
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java 2009-08-04
20:59:22 UTC (rev 17229)
+++
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java 2009-08-04
22:04:27 UTC (rev 17230)
@@ -65,7 +65,7 @@
final Set<ConstraintViolation<Shoe>> constraintViolations =
validator.validate( shoe );
assertEquals( 1, constraintViolations.size() );
assertTrue(
- BoundariesConstraintValidator.isValidCalls == 1,
+ BoundariesConstraintValidator.isValidCalls >= 1,
"Ensure the right validator implementation class was picked."
);
assertTrue(
@@ -84,29 +84,32 @@
Validator validator = TestUtil.getValidatorUnderTest();
Shoe shoe = new Shoe();
shoe.size = -2;
-
+ int nbrOfValidCalls = 0;
BoundariesConstraintValidator.isValidCalls = 0;
validator.validate( shoe );
assertTrue(
- BoundariesConstraintValidator.isValidCalls == 1,
+ BoundariesConstraintValidator.isValidCalls > nbrOfValidCalls,
"Ensure is valid hasbeen called."
);
+ nbrOfValidCalls = BoundariesConstraintValidator.isValidCalls;
validator.validate( shoe );
assertTrue(
- BoundariesConstraintValidator.isValidCalls == 2,
+ BoundariesConstraintValidator.isValidCalls > nbrOfValidCalls,
"Ensure is valid hasbeen called."
);
+ nbrOfValidCalls = BoundariesConstraintValidator.isValidCalls;
validator.validateProperty( shoe, "size" );
assertTrue(
- BoundariesConstraintValidator.isValidCalls == 3,
+ BoundariesConstraintValidator.isValidCalls > nbrOfValidCalls,
"Ensure is valid hasbeen called."
);
+ nbrOfValidCalls = BoundariesConstraintValidator.isValidCalls;
validator.validateValue( Shoe.class, "size", 41 );
assertTrue(
- BoundariesConstraintValidator.isValidCalls == 4,
+ BoundariesConstraintValidator.isValidCalls > nbrOfValidCalls,
"Ensure is valid hasbeen called."
);
}
@@ -165,7 +168,7 @@
@Test
@SpecAssertion(section = "2.4", id = "n")
- public void testNonInterpolatedMessageParamterIsUsed() {
+ public void testNonInterpolatedMessageParameterIsUsed() {
Validator validator = TestUtil.getValidatorUnderTest();
Author author = new Author();
@@ -177,8 +180,10 @@
assertCorrectNumberOfViolations( constraintViolations, 1 );
ConstraintViolation<Author> constraintViolation =
constraintViolations.iterator().next();
- assertEquals( constraintViolation.getMessage(), "The company name must be a
minimum 3 characters" );
+ //commented we cannot make assumptions on the default locale.
+ //assertEquals( constraintViolation.getMessage(), "The company name must be a
minimum 3 characters" );
assertEquals( constraintViolation.getMessageTemplate(), "The company name must be
a minimum {min} characters" );
+ assertTrue( !constraintViolation.getMessageTemplate().equals(
constraintViolation.getMessage() ) );
}
@Test