Author: hardy.ferentschik Date: 2009-09-16 08:50:41 -0400 (Wed, 16 Sep 2009) New Revision: 17521 Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumber.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForString.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LengthValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PatternValidator.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArray.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfPrimitives.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForCollection.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForMap.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForString.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumberTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForStringTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/LengthValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumberTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForStringTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForNumberTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForStringTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PatternValidatorTest.java Log: HV-134 - Built-in constraint parameter validation now uses IllegalArguementException Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForNumber.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -19,7 +19,6 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import javax.validation.constraints.DecimalMax; @@ -39,7 +38,7 @@ this.maxValue = new BigDecimal( maxValue.value() ); } catch ( NumberFormatException nfe ) { - throw new ConstraintDeclarationException( maxValue.value() + " does not represent a valid BigDemcimal formt" ); + throw new IllegalArgumentException( maxValue.value() + " does not represent a valid BigDecimal format" ); } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMaxValidatorForString.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -18,7 +18,6 @@ package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import javax.validation.constraints.DecimalMax; @@ -38,7 +37,7 @@ this.maxValue = new BigDecimal( maxValue.value() ); } catch ( NumberFormatException nfe ) { - throw new ConstraintDeclarationException( maxValue.value() + " does not represent a valid BigDemcimal formt" ); + throw new IllegalArgumentException( maxValue.value() + " does not represent a valid BigDecimal format" ); } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForNumber.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -19,7 +19,6 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import javax.validation.constraints.DecimalMin; @@ -39,7 +38,7 @@ this.minValue = new BigDecimal( minValue.value() ); } catch ( NumberFormatException nfe ) { - throw new ConstraintDeclarationException( minValue.value() + " does not represent a valid BigDemcimal formt" ); + throw new IllegalArgumentException( minValue.value() + " does not represent a valid BigDecimal format" ); } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DecimalMinValidatorForString.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -18,7 +18,6 @@ package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import javax.validation.constraints.DecimalMin; @@ -35,7 +34,7 @@ this.minValue = new BigDecimal( minValue.value() ); } catch ( NumberFormatException nfe ) { - throw new ConstraintDeclarationException( minValue.value() + " does not represent a valid BigDemcimal formt" ); + throw new IllegalArgumentException( minValue.value() + " does not represent a valid BigDecimal format" ); } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumber.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumber.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumber.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -20,7 +20,6 @@ import java.math.BigDecimal; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ValidationException; import javax.validation.constraints.Digits; /** @@ -63,10 +62,10 @@ private void validateParameters() { if ( maxIntegerLength < 0 ) { - throw new ValidationException( "The length of the interger part cannot be negative." ); + throw new IllegalArgumentException( "The length of the integer part cannot be negative." ); } if ( maxFractionLength < 0 ) { - throw new ValidationException( "The length of the fraction part cannot be negative." ); + throw new IllegalArgumentException( "The length of the fraction part cannot be negative." ); } } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForString.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/DigitsValidatorForString.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -71,10 +71,10 @@ private void validateParameters() { if ( maxIntegerLength < 0 ) { - throw new ValidationException( "The length of the interger part cannot be negative." ); + throw new IllegalArgumentException( "The length of the integer part cannot be negative." ); } if ( maxFractionLength < 0 ) { - throw new ValidationException( "The length of the fraction part cannot be negative." ); + throw new IllegalArgumentException( "The length of the fraction part cannot be negative." ); } } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LengthValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LengthValidator.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/LengthValidator.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -19,7 +19,6 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ValidationException; import org.hibernate.validator.constraints.Length; @@ -49,13 +48,13 @@ private void validateParameters() { if ( min < 0 ) { - throw new ValidationException( "The min parameter cannot be negative." ); + throw new IllegalArgumentException( "The min parameter cannot be negative." ); } if ( max < 0 ) { - throw new ValidationException( "The max paramter cannot be negative." ); + throw new IllegalArgumentException( "The max parameter cannot be negative." ); } if ( max < min ) { - throw new ValidationException( "The length cannot be negative." ); + throw new IllegalArgumentException( "The length cannot be negative." ); } } } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PatternValidator.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PatternValidator.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/PatternValidator.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -19,7 +19,6 @@ import java.util.regex.Matcher; import java.util.regex.PatternSyntaxException; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import javax.validation.constraints.Pattern; @@ -42,7 +41,7 @@ pattern = java.util.regex.Pattern.compile( parameters.regexp(), intFlag ); } catch ( PatternSyntaxException e ) { - throw new ConstraintDeclarationException( "Invalid regular expression.", e ); + throw new IllegalArgumentException( "Invalid regular expression.", e ); } } Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArray.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArray.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArray.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -20,11 +20,10 @@ import java.lang.reflect.Array; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ValidationException; import javax.validation.constraints.Size; /** - * Check that the length of an array is betweeb <i>min</i> and <i>max</i> + * Check that the length of an array is between <i>min</i> and <i>max</i> * * @author Hardy Ferentschik */ @@ -58,13 +57,13 @@ private void validateParameters() { if ( min < 0 ) { - throw new ValidationException( "The min parameter cannot be negative." ); + throw new IllegalArgumentException( "The min parameter cannot be negative." ); } if ( max < 0 ) { - throw new ValidationException( "The max paramter cannot be negative." ); + throw new IllegalArgumentException( "The max parameter cannot be negative." ); } if ( max < min ) { - throw new ValidationException( "The length cannot be negative." ); + throw new IllegalArgumentException( "The length cannot be negative." ); } } } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfPrimitives.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfPrimitives.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForArraysOfPrimitives.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -17,11 +17,10 @@ */ package org.hibernate.validator.constraints.impl; -import javax.validation.ValidationException; import javax.validation.constraints.Size; /** - * Check that the length of an array is betweeb <i>min</i> and <i>max</i> + * Check that the length of an array is between <i>min</i> and <i>max</i> * * @author Hardy Ferentschik */ @@ -37,13 +36,13 @@ private void validateParameters() { if ( min < 0 ) { - throw new ValidationException( "The min parameter cannot be negative." ); + throw new IllegalArgumentException( "The min parameter cannot be negative." ); } if ( max < 0 ) { - throw new ValidationException( "The max paramter cannot be negative." ); + throw new IllegalArgumentException( "The max parameter cannot be negative." ); } if ( max < min ) { - throw new ValidationException( "The length cannot be negative." ); + throw new IllegalArgumentException( "The length cannot be negative." ); } } } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForCollection.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForCollection.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForCollection.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -20,7 +20,6 @@ import java.util.Collection; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ValidationException; import javax.validation.constraints.Size; /** @@ -56,15 +55,15 @@ return length >= min && length <= max; } - private void validateParameters() { + private void validateParameters() { if ( min < 0 ) { - throw new ValidationException( "The min parameter cannot be negative." ); + throw new IllegalArgumentException( "The min parameter cannot be negative." ); } if ( max < 0 ) { - throw new ValidationException( "The max paramter cannot be negative." ); + throw new IllegalArgumentException( "The max parameter cannot be negative." ); } if ( max < min ) { - throw new ValidationException( "The length cannot be negative." ); + throw new IllegalArgumentException( "The length cannot be negative." ); } } } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForMap.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForMap.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForMap.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -20,7 +20,6 @@ import java.util.Map; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ValidationException; import javax.validation.constraints.Size; /** @@ -58,13 +57,13 @@ private void validateParameters() { if ( min < 0 ) { - throw new ValidationException( "The min parameter cannot be negative." ); + throw new IllegalArgumentException( "The min parameter cannot be negative." ); } if ( max < 0 ) { - throw new ValidationException( "The max paramter cannot be negative." ); + throw new IllegalArgumentException( "The max parameter cannot be negative." ); } if ( max < min ) { - throw new ValidationException( "The length cannot be negative." ); + throw new IllegalArgumentException( "The length cannot be negative." ); } } } \ No newline at end of file Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForString.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForString.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/constraints/impl/SizeValidatorForString.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -19,7 +19,6 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.ValidationException; import javax.validation.constraints.Size; /** @@ -58,13 +57,13 @@ private void validateParameters() { if ( min < 0 ) { - throw new ValidationException( "The min parameter cannot be negative." ); + throw new IllegalArgumentException( "The min parameter cannot be negative." ); } if ( max < 0 ) { - throw new ValidationException( "The max paramter cannot be negative." ); + throw new IllegalArgumentException( "The max parameter cannot be negative." ); } if ( max < min ) { - throw new ValidationException( "The length cannot be negative." ); + throw new IllegalArgumentException( "The length cannot be negative." ); } } } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumberTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumberTest.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForNumberTest.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -18,7 +18,6 @@ package org.hibernate.validator.constraints.impl; import java.math.BigDecimal; -import javax.validation.ValidationException; import javax.validation.constraints.Digits; import static org.testng.Assert.assertFalse; @@ -80,7 +79,7 @@ assertFalse( constraint.isValid( Double.valueOf( "500.2" ), null ) ); } - @Test(expectedExceptions = ValidationException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testNegativeIntegerLength() { AnnotationDescriptor<Digits> descriptor = new AnnotationDescriptor<Digits>( Digits.class ); @@ -93,7 +92,7 @@ constraint.initialize( p ); } - @Test(expectedExceptions = ValidationException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testNegativeFractionLength() { AnnotationDescriptor<Digits> descriptor = new AnnotationDescriptor<Digits>( Digits.class ); Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForStringTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForStringTest.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/DigitsValidatorForStringTest.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -17,7 +17,6 @@ */ package org.hibernate.validator.constraints.impl; -import javax.validation.ValidationException; import javax.validation.constraints.Digits; import static org.testng.Assert.assertFalse; @@ -62,7 +61,7 @@ assertFalse( constraint.isValid( "12.0001", null ) ); } - @Test(expectedExceptions = ValidationException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testNegativeIntegerLength() { AnnotationDescriptor<Digits> descriptor = new AnnotationDescriptor<Digits>( Digits.class ); @@ -75,7 +74,7 @@ constraint.initialize( p ); } - @Test(expectedExceptions = ValidationException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testNegativeFractionLength() { AnnotationDescriptor<Digits> descriptor = new AnnotationDescriptor<Digits>( Digits.class ); Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/LengthValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/LengthValidatorTest.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/LengthValidatorTest.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -17,8 +17,6 @@ */ package org.hibernate.validator.constraints.impl; -import javax.validation.ValidationException; - import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import org.testng.annotations.Test; @@ -51,7 +49,7 @@ assertFalse( constraint.isValid( "foobar", null ) ); } - @Test(expectedExceptions = ValidationException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testNegativeMinValue() { AnnotationDescriptor<Length> descriptor = new AnnotationDescriptor<Length>( Length.class ); descriptor.setValue( "min", -1 ); @@ -63,7 +61,7 @@ constraint.initialize( p ); } - @Test(expectedExceptions = ValidationException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testNegativeMaxValue() { AnnotationDescriptor<Length> descriptor = new AnnotationDescriptor<Length>( Length.class ); descriptor.setValue( "min", 1 ); @@ -75,7 +73,7 @@ constraint.initialize( p ); } - @Test(expectedExceptions = ValidationException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testNegativeLength() { AnnotationDescriptor<Length> descriptor = new AnnotationDescriptor<Length>( Length.class ); descriptor.setValue( "min", 5 ); Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumberTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumberTest.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForNumberTest.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -19,7 +19,6 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.Max; @@ -77,7 +76,7 @@ constraint.initialize( m ); fail(); } - catch ( ConstraintDeclarationException e ) { + catch ( IllegalArgumentException e ) { // success } } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForStringTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForStringTest.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MaxValidatorForStringTest.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -17,7 +17,6 @@ */ package org.hibernate.validator.constraints.impl; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.Max; @@ -74,7 +73,7 @@ constraint.initialize( m ); fail(); } - catch ( ConstraintDeclarationException e ) { + catch ( IllegalArgumentException e ) { // success } } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForNumberTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForNumberTest.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForNumberTest.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -19,7 +19,6 @@ import java.math.BigDecimal; import java.math.BigInteger; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Min; @@ -75,7 +74,7 @@ constraint.initialize( m ); fail(); } - catch ( ConstraintDeclarationException e ) { + catch ( IllegalArgumentException e ) { // success } } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForStringTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForStringTest.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/MinValidatorForStringTest.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -17,7 +17,6 @@ */ package org.hibernate.validator.constraints.impl; -import javax.validation.ConstraintDeclarationException; import javax.validation.ConstraintValidator; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.Min; @@ -73,7 +72,7 @@ constraint.initialize( m ); fail(); } - catch ( ConstraintDeclarationException e ) { + catch ( IllegalArgumentException e ) { // success } } Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PatternValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PatternValidatorTest.java 2009-09-16 09:00:15 UTC (rev 17520) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/PatternValidatorTest.java 2009-09-16 12:50:41 UTC (rev 17521) @@ -17,7 +17,6 @@ */ package org.hibernate.validator.constraints.impl; -import javax.validation.ValidationException; import javax.validation.constraints.Pattern; import static org.testng.Assert.assertFalse; @@ -65,7 +64,7 @@ assertTrue( constraint.isValid( "a b c foo", null ) ); } - @Test(expectedExceptions = ValidationException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testInvalidRegularExpression() { AnnotationDescriptor<Pattern> descriptor = new AnnotationDescriptor<Pattern>( Pattern.class ); descriptor.setValue( "regexp", "(unbalanced parentheses" );