[hibernate-commits] Hibernate SVN: r17205 - in beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck: tests/constraints/builtinconstraints and 20 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Mon Jul 27 11:09:53 EDT 2009
Author: hardy.ferentschik
Date: 2009-07-27 11:09:52 -0400 (Mon, 27 Jul 2009)
New Revision: 17205
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java
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/groups/DefaultGroupRedefinitionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java
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/metadata/BeanDescriptorTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateWithGroupsTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/EmptyXmlConfigurationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/GroupIsNotAllowedAsElementNameTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MessageIsNotAllowedAsElementNameTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java
Log:
added TestUtil.getValidatorUnderTest - now one has to specifiy the property validation.provider as property to run the TCK
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -56,7 +56,7 @@
sarah.setLastName( "Jones" );
sarah.setPersonalNumber( "000000-0000" );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Woman>> violations = validator.validate( sarah );
assertCorrectNumberOfViolations(
@@ -91,7 +91,7 @@
public void testFieldAccess() {
SuperWoman superwoman = new SuperWoman();
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<SuperWoman>> violations = validator.validateProperty( superwoman, "firstName" );
assertCorrectNumberOfViolations( violations, 0 );
}
@@ -105,7 +105,7 @@
public void testPropertyAccess() {
SuperWoman superwoman = new SuperWoman();
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<SuperWoman>> violations = validator.validateProperty( superwoman, "firstName" );
assertCorrectNumberOfViolations( violations, 0 );
}
@@ -118,19 +118,19 @@
public void testConstraintAppliedOnFieldAndProperty() {
Building building = new Building( 10000000 );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Building>> violations = validator.validate( building );
assertCorrectNumberOfViolations( violations, 2 );
String expectedMessage = "Building costs are max {max} dollars.";
assertCorrectConstraintViolationMessages( violations, expectedMessage, expectedMessage );
}
- @Test(enabled = false)
+ @Test
@SpecAssertion(section = "3.1", id = "b")
public void testIgnoreStaticFieldsAndProperties() {
StaticFieldsAndProperties entity = new StaticFieldsAndProperties();
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<StaticFieldsAndProperties>> violations = validator.validate( entity );
assertCorrectNumberOfViolations( violations, 0 );
}
@@ -140,7 +140,7 @@
public void testFieldAndPropertyVisiblityIsNotConstrainted() {
Visibility entity = new Visibility();
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Visibility>> violations = validator.validate( entity );
assertCorrectNumberOfViolations( violations, 6 );
assertCorrectConstraintTypes(
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/builtinconstraints/BuiltinConstraintsTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -71,7 +71,7 @@
@SpecAssertion(section = "6", id = "c")
})
public void testNullConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
NullDummyEntity dummy = new NullDummyEntity();
Object foo = new Object();
dummy.setProperty( foo );
@@ -93,7 +93,7 @@
@SpecAssertion(section = "6", id = "d")
})
public void testNotNullConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
NotNullDummyEntity dummy = new NotNullDummyEntity();
Set<ConstraintViolation<NotNullDummyEntity>> constraintViolations = validator.validate( dummy );
assertCorrectNumberOfViolations( constraintViolations, 1 );
@@ -112,7 +112,7 @@
@SpecAssertion(section = "6", id = "e")
})
public void testAssertTrueConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
AssertTrueDummyEntity dummy = new AssertTrueDummyEntity();
Set<ConstraintViolation<AssertTrueDummyEntity>> constraintViolations = validator.validate( dummy );
@@ -141,7 +141,7 @@
@SpecAssertion(section = "6", id = "f")
})
public void testAssertFalseConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
AssertFalseDummyEntity dummy = new AssertFalseDummyEntity();
dummy.setPrimitiveBoolean( true );
@@ -171,7 +171,7 @@
@SpecAssertion(section = "6", id = "g")
})
public void testMinConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
MinDummyEntity dummy = new MinDummyEntity();
Set<ConstraintViolation<MinDummyEntity>> constraintViolations = validator.validate( dummy );
@@ -217,7 +217,7 @@
@SpecAssertion(section = "6", id = "h")
})
public void testMaxConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
MaxDummyEntity dummy = new MaxDummyEntity();
dummy.intPrimitive = 102;
@@ -268,7 +268,7 @@
@SpecAssertion(section = "6", id = "i")
})
public void testDecimalMinConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DecimalMinDummyEntity dummy = new DecimalMinDummyEntity();
Set<ConstraintViolation<DecimalMinDummyEntity>> constraintViolations = validator.validate( dummy );
@@ -314,7 +314,7 @@
@SpecAssertion(section = "6", id = "j")
})
public void testDecimalMaxConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DecimalMaxDummyEntity dummy = new DecimalMaxDummyEntity();
dummy.intPrimitive = 102;
@@ -365,7 +365,7 @@
@SpecAssertion(section = "6", id = "k")
})
public void testSizeConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
SizeDummyEntity dummy = new SizeDummyEntity();
Set<ConstraintViolation<SizeDummyEntity>> constraintViolations = validator.validate( dummy );
@@ -406,7 +406,7 @@
@SpecAssertion(section = "6", id = "l")
})
public void testDigitsConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DigitsDummyEntity dummy = new DigitsDummyEntity();
dummy.intPrimitive = 42;
@@ -457,7 +457,7 @@
@SpecAssertion(section = "6", id = "m")
})
public void testPastConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
PastDummyEntity dummy = new PastDummyEntity();
Set<ConstraintViolation<PastDummyEntity>> constraintViolations = validator.validate( dummy );
@@ -488,7 +488,7 @@
@SpecAssertion(section = "6", id = "n")
})
public void testFutureConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
FutureDummyEntity dummy = new FutureDummyEntity();
Set<ConstraintViolation<FutureDummyEntity>> constraintViolations = validator.validate( dummy );
@@ -519,7 +519,7 @@
@SpecAssertion(section = "6", id = "o")
})
public void testPatternConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
PatternDummyEntity dummy = new PatternDummyEntity();
Set<ConstraintViolation<PatternDummyEntity>> constraintViolations = validator.validate( dummy );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -64,7 +64,7 @@
})
public void testComposedConstraints() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
FrenchAddress address = getFrenchAddressWithoutZipCode();
Set<ConstraintViolation<FrenchAddress>> constraintViolations = validator.validate( address );
assertCorrectNumberOfViolations( constraintViolations, 1 );
@@ -85,7 +85,7 @@
@SpecAssertion(section = "2.3", id = "k")
})
public void testComposedConstraintsAreRecursive() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
GermanAddress address = new GermanAddress();
address.setAddressline1( "Rathausstrasse 5" );
@@ -108,7 +108,7 @@
})
public void testValidationOfMainAnnotationIsAlsoApplied() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
FrenchAddress address = getFrenchAddressWithoutZipCode();
address.setZipCode( "00000" );
Set<ConstraintViolation<FrenchAddress>> constraintViolations = validator.validate( address );
@@ -127,7 +127,7 @@
})
public void testEachFailingConstraintCreatesConstraintViolation() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
FrenchAddress address = getFrenchAddressWithoutZipCode();
address.setZipCode( "abc" );
Set<ConstraintViolation<FrenchAddress>> constraintViolations = validator.validate( address );
@@ -167,7 +167,7 @@
@SpecAssertion(section = "2.3", id = "e")
})
public void testGroupsDefinedOnMainAnnotationAreInherited() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
FrenchAddress address = getFrenchAddressWithoutZipCode();
Set<ConstraintViolation<FrenchAddress>> constraintViolations = validator.validate( address );
@@ -187,7 +187,7 @@
@Test
@SpecAssertion(section = "2.3", id = "g")
public void testOnlySingleConstraintViolation() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
GermanAddress address = new GermanAddress();
address.setAddressline1( "Rathausstrasse 5" );
@@ -209,7 +209,7 @@
@SpecAssertion(section = "2.3", id = "h")
public void testAttributesDefinedOnComposingConstraints() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor descriptor = validator.getConstraintsForClass( FrenchAddress.class );
Set<ConstraintDescriptor<?>> constraintDescriptors = descriptor.getConstraintsForProperty( "zipCode" )
.getConstraintDescriptors();
@@ -230,7 +230,7 @@
@SpecAssertion(section = "2.3", id = "o")
})
public void testOverridenAttributesMustMatchInType() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validate( new DummyEntityWithZipCode( "foobar" ) );
fail( "Wrong atttibute override in composite constraint. An Exception should have been thrown." );
@@ -243,7 +243,7 @@
@Test
@SpecAssertion(section = "2.3", id = "f")
public void testAllComposingConstraintsMustBeApplicableToAnnotatedType() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validate( new Shoe( 41 ) );
fail( "Shoe defines @NotEmpty on an int. Validation should have failed." );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -45,7 +45,7 @@
@Test
public void testFirstConstraintAllViolationsSecondConstraintSingleViolation() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity1 dummy = new DummyEntity1( "" );
Set<ConstraintViolation<DummyEntity1>> constraintViolations = validator.validate( dummy );
assertCorrectNumberOfViolations( constraintViolations, 2 );
@@ -59,7 +59,7 @@
@Test
public void testFirstConstraintSingleViolationSecondConstraintSingleViolation() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity2 dummy = new DummyEntity2( "" );
Set<ConstraintViolation<DummyEntity2>> constraintViolations = validator.validate( dummy );
assertCorrectNumberOfViolations( constraintViolations, 1 );
@@ -69,7 +69,7 @@
@Test
public void testFirstConstraintAllViolationSecondConstraintAllViolations() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity3 dummy = new DummyEntity3( "" );
Set<ConstraintViolation<DummyEntity3>> constraintViolations = validator.validate( dummy );
assertCorrectNumberOfViolations( constraintViolations, 3 );
@@ -81,7 +81,7 @@
@Test
public void testFirstConstraintSingleViolationSecondConstraintAllViolations() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity4 dummy = new DummyEntity4( "" );
Set<ConstraintViolation<DummyEntity4>> constraintViolations = validator.validate( dummy );
assertCorrectNumberOfViolations( constraintViolations, 1 );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintdefinition/ConstraintDefinitionsTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -49,7 +49,7 @@
})
public void testConstraintWithCustomAttributes() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintDescriptor<?>> descriptors = validator.getConstraintsForClass( Person.class )
.getConstraintsForProperty( "lastName" )
.getConstraintDescriptors();
@@ -71,7 +71,7 @@
@SpecAssertion(section = "2.1.1", id = "f")
public void testDefaultGroupAssumedWhenNoGroupsSpecified() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
ConstraintDescriptor<?> descriptor = validator.getConstraintsForClass( Person.class )
.getConstraintsForProperty( "firstName" )
.getConstraintDescriptors()
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-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -54,7 +54,7 @@
@SpecAssertion(section = "2.4", id = "e")
})
public void testRightValidatorIsSlectedAndInializedCalled() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Shoe shoe = new Shoe();
shoe.size = -2;
final PropertyDescriptor propertyDescriptor = validator.getConstraintsForClass( Shoe.class )
@@ -81,7 +81,7 @@
@SpecAssertion(section = "2.4", id = "f")
})
public void testIsValidIsCalledForEachValidation() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Shoe shoe = new Shoe();
shoe.size = -2;
@@ -115,14 +115,14 @@
@SpecAssertion(section = "2.4", id = "i")
@Test(expectedExceptions = UnexpectedTypeException.class)
public void testUnexpectedTypeExceptionIsRaisedForInvalidType() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new OddShoe() );
}
@SpecAssertion(section = "2.4", id = "j")
@Test(expectedExceptions = ValidationException.class)
public void testRuntimeExceptionFromIsValidIsWrapped() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Shoe shoe = new Shoe();
shoe.size = -2;
BoundariesConstraintValidator.throwRuntimeExceptionFromIsValid = true;
@@ -132,14 +132,14 @@
@SpecAssertion(section = "2.4", id = "j")
@Test(expectedExceptions = ValidationException.class)
public void testRuntimeExceptionFromInitializeIsWrapped() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new Freezer() );
}
@Test
@SpecAssertion(section = "2.4", id = "l")
public void testOneConstraintViolationPerFailingConstraint() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Author author = new Author();
author.setLastName( "" );
@@ -166,7 +166,7 @@
@Test
@SpecAssertion(section = "2.4", id = "n")
public void testNonInterpolatedMessageParamterIsUsed() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Author author = new Author();
author.setLastName( "John" );
@@ -184,7 +184,7 @@
@Test
@SpecAssertion(section = "2.4", id = "o")
public void testDefaultPropertyPath() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Author author = new Author();
author.setLastName( "John" );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -59,7 +59,7 @@
address.setStreet( "Guldmyntgatan" );
address.setCity( "Gothenborg" );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Address>> constraintViolations = validator.validate( address );
assertCorrectNumberOfViolations( constraintViolations, 1 );
@@ -82,7 +82,7 @@
@Test(enabled = false)
@SpecAssertion(section = "3.4.3", id = "b")
public void testConstraintsHostedOnEntityZBelongToGroupZ() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Address.class );
assertTrue( beanDescriptor.isBeanConstrained() );
@@ -106,7 +106,7 @@
Car car = new Car();
car.setType( "A" );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
// if the group sequence would not be properly redefined there would be no error when validating default.
@@ -136,7 +136,7 @@
})
public void testGroupSequenceContainingDefault() {
Address address = new AddressWithDefaultInGroupSequence();
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validate( address );
fail( "It shoud not be allowed to have Default.class in the group sequence of a class." );
@@ -153,7 +153,7 @@
})
public void testGroupSequenceWithNoImplicitDefaultGroup() {
Address address = new AddressWithNoImplicitDefaultGroupSequence();
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validate( address );
fail( "A valid group sequence definiton must contain the class itself as implicit default group." );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -55,7 +55,7 @@
@Test
@SpecAssertion(section = "3.4", id = "a")
public void testConstraintWithNoExplicitlySpecifiedGroupBelongsToDefault() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( User.class );
assertTrue( beanDescriptor.isBeanConstrained() );
@@ -81,7 +81,7 @@
// all fields per default null. Depending on the validation groups there should be a different amount
// of constraint failures.
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<User>> constraintViolations = validator.validate( user );
assertEquals(
@@ -150,7 +150,7 @@
@Test
@SpecAssertion(section = "3.4", id = "c")
public void testConstraintCanBelongToMoreThanOneGroup() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( User.class );
assertTrue( beanDescriptor.isBeanConstrained() );
@@ -163,7 +163,7 @@
@Test
public void testGroups() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Author author = new Author();
author.setLastName( "" );
@@ -217,7 +217,7 @@
@Test
public void testGroupSequence() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Author author = new Author();
author.setLastName( "" );
@@ -259,7 +259,7 @@
@Test
public void testGroupSequences() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Dictonary dictonary = new Dictonary();
dictonary.setTitle( "English - German" );
@@ -275,7 +275,7 @@
@Test
public void testValidationFailureInMultipleGroups() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Animal elepfant = new Animal();
elepfant.setName( "" );
elepfant.setDomain( Animal.Domain.EUKARYOTA );
@@ -297,7 +297,7 @@
user.setLastname( "Bar" );
user.setPhoneNumber( "+46 123-456" );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<User>> constraintViolations = validator.validate(
user, User.BuyInOneClick.class, User.Optional.class
@@ -338,7 +338,7 @@
@Test
@SpecAssertion(section = "3.4.4", id = "a")
public void testImplicitGrouping() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
assertTrue( beanDescriptor.isBeanConstrained() );
@@ -360,7 +360,7 @@
@SpecAssertion(section = "8.4", id = "a")
})
public void testCyclicGroupSequence() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new Order(), CyclicGroupSequence.class );
}
}
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -50,7 +50,7 @@
@SpecAssertion(section = "8.4", id = "a")
})
public void testInvalidDefinitionOfDefaultSequenceInEntity() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
TestEntity entity = new TestEntity();
validator.validate( entity, Complete.class );
}
@@ -58,7 +58,7 @@
@Test(enabled = false)
// @SpecAssertion(section = "3.4.2", id = "j")
public void testOnlyFirstGroupInSequenceGetEvaluated() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Car car = new Car( "USd-298" );
Set<ConstraintViolation<Car>> violations = validator.validateProperty(
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -43,7 +43,7 @@
@Test
public void testCorrectDefaultSequenceInheritance() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
B1 b = new B1();
b.name = "this name is too long";
b.nickname = "and this nickname as well";
@@ -75,7 +75,7 @@
@Test
public void testCorrectDefaultSequenceInheritance2() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
B2 b = new B2();
b.name = "this name is too long";
b.nickname = "and this nickname as well";
@@ -112,7 +112,7 @@
@Test
public void testCorrectDefaultSequenceInheritance3() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
B3 b = new B3();
b.name = "this name is too long";
b.nickname = "and this nickname as well";
@@ -127,7 +127,7 @@
@Test
public void testCorrectDefaultSequenceContainedCaseWithoutGroupRedefinitionOnContainedEntity() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
C c = new C();
c.name = "this name is too long";
c.d.nickname = "and this nickname as well";
@@ -158,7 +158,7 @@
@Test
public void testCorrectDefaultSequenceContainedCaseWithGroupRedefinitionOnContainedEntity() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
E e = new E();
e.name = "this name is too long";
e.f.nickname = "and this nickname as well";
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/inheritance/GroupInheritanceTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -49,7 +49,7 @@
@Test
@SpecAssertion(section = "3.4.1", id = "a")
public void testGroupCanInheritGroupsViaInterfaceInheritance() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Part part = new Part();
part.setPartNumber( 123456 );
@@ -66,7 +66,7 @@
@Test
@SpecAssertion(section = "3.4.1", id = "b")
public void testGroupMembership() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor descriptor = validator.getConstraintsForClass( MiniaturePart.class );
// PreManufacturing belongs implicitly to All
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/inheritance/ConstraintInheritanceTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -44,7 +44,7 @@
@Test
@SpecAssertion(section = "3.3", id = "b")
public void testConstraintsOnSuperClassAreInherited() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Bar.class );
String propertyName = "foo";
@@ -64,7 +64,7 @@
@SpecAssertion(section = "3.3", id = "b")
})
public void testConstraintsOnInterfaceAreInherited() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Bar.class );
String propertyName = "fubar";
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -46,7 +46,7 @@
})
public void testConstraintDefinitionWithParamterStartingWithValid() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityValidProperty() );
fail( "The used constraint does use an invalid property name. The validation should have failed." );
}
@@ -65,7 +65,7 @@
})
public void testConstraintDefinitionWithoutMessageParameter() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityNoMessage() );
fail( "The used constraint does not define a message parameter. The validation should have failed." );
}
@@ -82,7 +82,7 @@
})
public void testConstraintDefinitionWithoutGroupParameter() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityNoGroups() );
fail( "The used constraint does not define a groups parameter. The validation should have failed." );
}
@@ -99,7 +99,7 @@
})
public void testConstraintDefinitionWithoutPayloadParameter() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityNoGroups() );
fail( "The used constraint does not define a payload parameter. The validation should have failed." );
}
@@ -116,7 +116,7 @@
})
public void testConstraintDefinitionWithWrongDefaultGroupValue() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityInvalidDefaultGroup() );
fail( "The default groups parameter is not the empty array. The validation should have failed." );
}
@@ -133,7 +133,7 @@
})
public void testConstraintDefinitionWithWrongDefaultPayloadValue() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityInvalidDefaultPayload() );
fail( "The default payload parameter is not the empty array. The validation should have failed." );
}
@@ -150,7 +150,7 @@
})
public void testConstraintDefinitionWithWrongPayloadClass() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityInvalidPayloadClass() );
fail( "The default payload parameter has to be of type Class<? extends ConstraintPayload>[]. The validation should have failed." );
}
@@ -167,7 +167,7 @@
})
public void testConstraintDefinitionWithWrongMessageType() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityInvalidMessageType() );
fail( "The message parameter has to be of type String. The validation should have failed." );
}
@@ -184,7 +184,7 @@
})
public void testConstraintDefinitionWithWrongGroupType() {
try {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityInvalidGroupsType() );
fail( "The groups parameter has to be of type Class<?>[]. The validation should have failed." );
}
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/ValidatorResolutionTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -50,7 +50,7 @@
@Test
@SpecAssertion(section = "3.5.3", id = "a")
public void testTargetTypeIsInterface() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
assertEquals(
@@ -70,8 +70,8 @@
@Test
@SpecAssertion(section = "3.5.3", id = "a")
- public void testTargetTypeIsCLass() {
- Validator validator = TestUtil.getDefaultValidator();
+ public void testTargetTypeIsClass() {
+ Validator validator = TestUtil.getValidatorUnderTest();
assertEquals(
@@ -93,7 +93,7 @@
@Test
@SpecAssertion(section = "3.5.3", id = "b")
public void testTargetedTypeIsField() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
assertEquals(
CustomConstraint.ValidatorForSubClassA.callCounter,
@@ -113,7 +113,7 @@
@Test
@SpecAssertion(section = "3.5.3", id = "c")
public void testTargetedTypeIsGetter() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
assertEquals(
CustomConstraint.ValidatorForSubClassB.callCounter,
@@ -136,7 +136,7 @@
@SpecAssertion(section = "3.5.3", id = "d")
})
public void testResolutionOfMultipleSizeValidators() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Suburb suburb = new Suburb();
@@ -216,7 +216,7 @@
@SpecAssertion(section = "3.5.3", id = "d")
})
public void testResolutionOfMinMaxForDifferentTypes() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
MinMax minMax = new MinMax( "5", 5 );
Set<ConstraintViolation<MinMax>> constraintViolations = validator.validate( minMax );
assertCorrectNumberOfViolations( constraintViolations, 2 );
@@ -230,7 +230,7 @@
@SpecAssertion(section = "2.4", id = "i")
})
public void testUnexpectedTypeInValidatorResolution() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Bar bar = new Bar();
try {
@@ -248,7 +248,7 @@
@SpecAssertion(section = "8.3", id = "b")
})
public void testAmbigiousValidatorResolution() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Foo foo = new Foo( new SerializableBarSubclass() );
try {
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-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -44,7 +44,7 @@
import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages;
import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations;
import static org.hibernate.jsr303.tck.util.TestUtil.getDefaultMessageInterpolator;
-import static org.hibernate.jsr303.tck.util.TestUtil.getDefaultValidator;
+import static org.hibernate.jsr303.tck.util.TestUtil.getValidatorUnderTest;
/**
* @author Hardy Ferentschik
@@ -98,7 +98,7 @@
@Test
@SpecAssertion(section = "4.3.1", id = "d")
public void testMessagesCanBeOverrridenAtConstraintLevel() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<DummyEntity>> constraintViolations = validator.validateProperty(
new DummyEntity(), "snafu"
);
@@ -107,7 +107,7 @@
}
- @Test(enabled = false)
+ @Test
@SpecAssertions({
@SpecAssertion(section = "4.3.1", id = "f"),
@SpecAssertion(section = "4.3.1", id = "g"),
@@ -219,7 +219,7 @@
}
private ConstraintDescriptor<?> getDescriptorFor(String propertyName) {
- Validator validator = getDefaultValidator();
+ Validator validator = getValidatorUnderTest();
return validator.getConstraintsForClass( DummyEntity.class )
.getConstraintsForProperty( propertyName )
.getConstraintDescriptors()
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -51,7 +51,7 @@
@SpecAssertion(section = "5.3", id = "a")
})
public void testIsBeanConstrainedDueToValidAnnotation() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Customer.class );
// constraint via @Valid
@@ -65,7 +65,7 @@
@SpecAssertion(section = "5.3", id = "a")
})
public void testIsBeanConstrainedDueToConstraintOnEntity() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
// constraint hosted on bean itself
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Account.class );
@@ -79,7 +79,7 @@
@SpecAssertion(section = "5.3", id = "a")
})
public void testIsBeanConstrainedDueToConstraintProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
// constraint on bean property
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
@@ -93,7 +93,7 @@
@SpecAssertion(section = "5.3", id = "a")
})
public void testIsBeanConstrainedDueToConstraintOnInterface() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
// constraint on implemented interface
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Man.class );
@@ -107,7 +107,7 @@
@SpecAssertion(section = "5.3", id = "a")
})
public void testUnconstraintClass() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( UnconstraintEntity.class );
assertFalse( beanDescriptor.hasConstraints(), "There should be no direct constraints on the specified bean." );
assertFalse( beanDescriptor.isBeanConstrained(), "Bean should be unconstrainted." );
@@ -119,7 +119,7 @@
@SpecAssertion(section = "5.3", id = "b")
})
public void testGetConstraintForConstrainedProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
PropertyDescriptor propertyDescriptor = beanDescriptor.getConstraintsForProperty( "orderNumber" );
assertEquals(
@@ -134,7 +134,7 @@
@SpecAssertion(section = "5.4", id = "a")
})
public void testGetConstraintForUnConstrainedProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Customer.class );
PropertyDescriptor propertyDescriptor = beanDescriptor.getConstraintsForProperty( "orderList" );
assertEquals(
@@ -149,7 +149,7 @@
@SpecAssertion(section = "5.3", id = "b")
})
public void testGetConstraintsForNonExistingProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
assertNull( beanDescriptor.getConstraintsForProperty( "foobar" ), "There should be no descriptor" );
}
@@ -160,7 +160,7 @@
@SpecAssertion(section = "5.3", id = "b")
})
public void testGetConstrainedProperties() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
Set<PropertyDescriptor> constraintProperties = beanDescriptor.getConstrainedProperties();
assertEquals( constraintProperties.size(), 1, "There should be only one property" );
@@ -177,7 +177,7 @@
@SpecAssertion(section = "5.3", id = "b")
})
public void testGetConstrainedPropertiesForUnconstraintEntity() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( UnconstraintEntity.class );
Set<PropertyDescriptor> constraintProperties = beanDescriptor.getConstrainedProperties();
assertEquals( constraintProperties.size(), 0, "We should get the empty set." );
@@ -186,7 +186,7 @@
// TODO - enable or remove
@Test(enabled = false)
public void testGetConstrainedPropertiesImmutable() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
Set<PropertyDescriptor> constraintProperties = beanDescriptor.getConstrainedProperties();
try {
@@ -209,7 +209,7 @@
// TODO - map or remove
@Test(expectedExceptions = IllegalArgumentException.class)
public void testGetConstraintsForNullProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
beanDescriptor.getConstraintsForProperty( null );
}
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/PropertyPathTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -64,7 +64,7 @@
@SpecAssertion(section = "4.2", id = "m")
})
public void testPropertyPathWithConstraintViolationForRootObject() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<VerySpecialClass>> constraintViolations = validator.validate( new VerySpecialClass() );
assertCorrectNumberOfViolations( constraintViolations, 1 );
ConstraintViolation<VerySpecialClass> constraintViolation = constraintViolations.iterator().next();
@@ -84,7 +84,7 @@
@SpecAssertion(section = "4.2", id = "l")
})
public void testPropertyPathTraversedObject() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Engine engine = new Engine();
engine.setSerialNumber( "ABCDEFGH1234" );
@@ -108,7 +108,7 @@
@SpecAssertion(section = "4.2", id = "k")
})
public void testPropertyPathWithList() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Actor clint = new ActorListBased( "Clint", "Eastwood" );
Actor morgan = new ActorListBased( "Morgan", null );
@@ -130,7 +130,7 @@
@SpecAssertion(section = "4.2", id = "k")
})
public void testPropertyPathWithArray() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Actor clint = new ActorArrayBased( "Clint", "Eastwood" );
Actor morgan = new ActorArrayBased( "Morgan", null );
@@ -152,7 +152,7 @@
@SpecAssertion(section = "4.2", id = "k")
})
public void testPropertyPathWithMap() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
ActorDB db = new ActorDB();
Actor morgan = new ActorArrayBased( "Morgan", null );
@@ -182,7 +182,7 @@
@SpecAssertion(section = "4.2", id = "k")
})
public void testPropertyPathSet() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
customer.setFirstName( "John" );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -52,7 +52,7 @@
@SpecAssertion(section = "4.1.1", id = "e")
@SuppressWarnings("NullArgumentToVariableArgMethod")
public void testPassingNullAsGroup() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
try {
@@ -67,7 +67,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "e")
public void testIllegalArgumentExceptionIsThrownForNullValue() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validateProperty( null, "firstName" );
fail();
@@ -83,7 +83,7 @@
@SpecAssertion(section = "4.1.1", id = "f")
})
public void testValidatePropertyWithInvalidPropertyPath() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
Order order = new Order();
@@ -126,7 +126,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "e")
public void testValidatePropertyWithNullProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
Order order = new Order();
@@ -145,7 +145,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "e")
public void testValidatePropertyWithEmptyProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
Order order = new Order();
@@ -167,7 +167,7 @@
@SpecAssertion(section = "4.1.1", id = "f")
})
public void testValidateProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Address address = new Address();
address.setStreet( null );
@@ -196,7 +196,7 @@
@SpecAssertion(section = "4.1.1", id = "f")
})
public void testValidatePropertyWithIndexedPath() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
ActorListBased clint = new ActorListBased( "Clint", "Eastwood" );
ActorListBased morgan = new ActorListBased( "Morgan", null );
@@ -224,7 +224,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "g")
public void testValidIsNotHonoredValidateProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
Order order = new Order();
@@ -237,7 +237,7 @@
@Test(expectedExceptions = ValidationException.class)
@SpecAssertion(section = "4.1.1", id = "k")
public void testUnexpectedExceptionsInValidatePropertyGetWrappedInValidationExceptions() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validateProperty( new BadlyBehavedEntity(), "value" );
}
}
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -65,7 +65,7 @@
public void testValidatedPropertyDoesNotFollowJavaBeansConvention() {
try {
Boy boy = new Boy();
- TestUtil.getDefaultValidator().validate( boy );
+ TestUtil.getValidatorUnderTest().validate( boy );
fail();
}
catch ( ValidationException e ) {
@@ -76,7 +76,7 @@
@Test
@SpecAssertion(section = "5.1", id = "b")
public void testConstraintDescriptorWithoutExplicitGroup() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
PropertyDescriptor propertyDescriptor = beanDescriptor.getConstraintsForProperty( "orderNumber" );
@@ -96,13 +96,13 @@
@Test(expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "5.1", id = "c")
public void testNullParamterToGetConstraintsForClass() {
- TestUtil.getDefaultValidator().getConstraintsForClass( null );
+ TestUtil.getValidatorUnderTest().getConstraintsForClass( null );
}
@Test(expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "4.1.1", id = "b")
public void testValidateWithNullValue() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( null );
}
@@ -110,7 +110,7 @@
@SpecAssertion(section = "4.1.1", id = "b")
@SuppressWarnings("NullArgumentToVariableArgMethod")
public void testValidateWithNullGroup() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new Boy(), null );
}
@@ -121,7 +121,7 @@
})
public void testMultipleViolationOfTheSameType() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Engine engine = new Engine();
engine.setSerialNumber( "mail at foobar.com" );
@@ -140,7 +140,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "c")
public void testMultipleConstraintViolationOfDifferentTypes() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Address address = new Address();
address.setStreet( null );
@@ -162,7 +162,7 @@
@SpecAssertion(section = "4.2", id = "e")
})
public void testConstraintViolation() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Engine engine = new Engine();
engine.setSerialNumber( "ABCDEFGH1234" );
@@ -191,7 +191,7 @@
@SpecAssertion(section = "2.4", id = "o")
})
public void testGraphValidationWithList() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Actor clint = new ActorListBased( "Clint", "Eastwood" );
Actor morgan = new ActorListBased( "Morgan", null );
@@ -225,7 +225,7 @@
@SpecAssertion(section = "3.1.3", id = "c")
})
public void testGraphValidationWithArray() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Actor clint = new ActorArrayBased( "Clint", "Eastwood" );
Actor morgan = new ActorArrayBased( "Morgan", null );
@@ -255,7 +255,7 @@
@SpecAssertion(section = "4.1.1", id = "b")
@SuppressWarnings("NullArgumentToVariableArgMethod")
public void testPassingNullAsGroup() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
try {
validator.validate( customer, null );
@@ -268,7 +268,7 @@
@Test
@SpecAssertion(section = "3.5", id = "b")
public void testOnlyFirstGroupInSequenceGetEvaluated() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Car car = new Car( "USd-298" );
Set<ConstraintViolation<Car>> violations = validator.validateProperty(
@@ -286,14 +286,14 @@
@Test(expectedExceptions = ValidationException.class)
@SpecAssertion(section = "4.1.1", id = "k")
public void testUnexpectedExceptionsInValidateGetWrappedInValidationExceptions() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new BadlyBehavedEntity() );
}
// TODO - map or remove
@Test
public void testValidationIsPolymorphic() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
customer.setFirstName( "Foo" );
@@ -321,7 +321,7 @@
// TODO - map or remove
@Test
public void testObjectTraversion() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
customer.setFirstName( "John" );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -48,7 +48,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "h")
public void testValidateValueSuccess() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Address>> constraintViolations = validator.validateValue(
Address.class, "city", "Paris"
@@ -59,7 +59,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "h")
public void testValidateValueFailure() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Address>> constraintViolations = validator.validateValue(
Address.class, "city", null
@@ -71,7 +71,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "h")
public void testValidateValue() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Customer>> constraintViolations = validator.validateValue(
Customer.class, "orders[0].orderNumber", null
@@ -91,7 +91,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "i")
public void testValidateValueWithInvalidPropertyPath() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validateValue( Customer.class, "foobar", null );
@@ -123,7 +123,7 @@
@SuppressWarnings("NullArgumentToVariableArgMethod")
@SpecAssertion(section = "4.1.1", id = "i")
public void testValidateValuePassingNullAsGroup() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validateValue( Customer.class, "firstName", "foobar", null );
@@ -137,7 +137,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "i")
public void testValidateValueWithEmptyPropertyPath() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validateValue( Customer.class, "", null );
@@ -151,7 +151,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "i")
public void testValidateValueWithNullObject() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validateValue( null, "firstName", "foobar" );
fail();
@@ -164,7 +164,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "i")
public void testValidateValueWithNullPropertyName() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validateValue( Customer.class, null, "foobar" );
fail();
@@ -177,7 +177,7 @@
@Test
@SpecAssertion(section = "4.1.1", id = "j")
public void testValidIsNotHonoredValidateValue() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Customer customer = new Customer();
Order order = new Order();
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateWithGroupsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateWithGroupsTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateWithGroupsTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -51,7 +51,7 @@
@SpecAssertion(section = "4.1.2", id = "b")
})
public void testCorrectGroupsAreAppliedForValidate() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Address>> constraintViolations = validator.validate( new Address() );
assertCorrectNumberOfViolations( constraintViolations, 2 );
@@ -80,7 +80,7 @@
@SpecAssertion(section = "4.1.2", id = "b")
})
public void testCorrectGroupsAreAppliedForValidateProperty() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Address>> constraintViolations = validator.validateProperty( new Address(), "city" );
assertCorrectNumberOfViolations( constraintViolations, 1 );
@@ -107,7 +107,7 @@
@SpecAssertion(section = "4.1.2", id = "b")
})
public void testCorrectGroupsAreAppliedForValidateValue() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Address>> constraintViolations = validator.validateValue( Address.class, "city", null );
assertCorrectNumberOfViolations( constraintViolations, 1 );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -73,7 +73,7 @@
order.addOrderLine( line1 );
order.addOrderLine( line2 );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Order>> constraintViolations = validator.validate( order );
assertCorrectNumberOfViolations( constraintViolations, 3 );
@@ -94,7 +94,7 @@
User john = new User( "John", null );
john.knows( john );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<User>> constraintViolations = validator.validate( john );
assertEquals( constraintViolations.size(), 1, "Wrong number of constraints" );
@@ -132,7 +132,7 @@
elephant.setWeight( 500 );
cage.setContainAnimal( elephant );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<SingleCage>> constraintViolations = validator.validate( cage );
assertCorrectNumberOfViolations( constraintViolations, 1 );
assertCorrectConstraintViolationMessages( constraintViolations, "An elephant weighs at least 1000 kg" );
@@ -145,7 +145,7 @@
cage.addAnimal( new Zebra( null ) );
cage.addAnimal( new Zebra( null ) );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<MultiCage>> constraintViolations = validator.validate( cage );
assertCorrectNumberOfViolations( constraintViolations, 2 );
assertCorrectConstraintViolationMessages( constraintViolations, "may not be null", "may not be null" );
@@ -160,7 +160,7 @@
zebraHerd.addAnimal( new Zebra( null ) );
reserve.setHerd( zebraHerd );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<GameReserve<Zebra>>> constraintViolations = validator.validate( reserve );
assertCorrectNumberOfViolations( constraintViolations, 2 );
assertCorrectConstraintViolationMessages( constraintViolations, "may not be null", "may not be null" );
@@ -181,7 +181,7 @@
condor.setWingspan( 200 );
zoo.addAnimal( condor );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Zoo>> constraintViolations = validator.validate( zoo );
assertCorrectNumberOfViolations( constraintViolations, 2 );
assertCorrectConstraintViolationMessages(
@@ -207,7 +207,7 @@
condor.setWingspan( 200 );
caretaker.addAnimal( "Andes", condor );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<AnimalCaretaker>> constraintViolations = validator.validate( caretaker );
assertCorrectNumberOfViolations( constraintViolations, 2 );
assertCorrectPropertyPaths(
@@ -225,7 +225,7 @@
public void testFullGraphValidationBeforeNextGroupInSequence() {
Parent p = new Parent();
p.setChild( new Child() );
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Parent>> errors = validator.validate( p, Parent.ProperOrder.class );
assertCorrectNumberOfViolations( errors, 1 );
assertCorrectPropertyPaths( errors, "child.name" );
@@ -235,7 +235,7 @@
@SpecAssertion(section = "3.5.1", id = "c")
public void testNullReferencesGetIgnored() {
Parent p = new Parent();
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<Parent>> errors = validator.validateProperty( p, "child" );
assertCorrectNumberOfViolations( errors, 0 );
}
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -47,7 +47,7 @@
@Test
public void testNoCustomization() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DummyValidator.disableDefaultError( false );
DummyValidator.setErrorMessages( null );
@@ -64,7 +64,7 @@
*/
@Test
public void testDisableDefaultErrorWithoutCustomError() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DummyValidator.disableDefaultError( true );
Map<String, String> errors = new HashMap<String, String>();
@@ -78,7 +78,7 @@
@Test
public void testDisableDefaultErrorWithCustomErrors() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DummyValidator.disableDefaultError( true );
Map<String, String> errors = new HashMap<String, String>();
@@ -95,7 +95,7 @@
@Test
public void testNestedValidation() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
DummyValidator.disableDefaultError( false );
DummyValidator.setErrorMessages( null );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -44,7 +44,7 @@
@SpecAssertion(section = "2.5", id = "a")
@Test
public void testDefaultConstructorInValidatorCalled() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new Dummy() );
assertTrue(
MyConstraintValidator.defaultConstructorCalled,
@@ -55,7 +55,7 @@
@SpecAssertion(section = "2.5", id = "b")
@Test(expectedExceptions = ValidationException.class)
public void testRuntimeExceptionInValidatorCreationIsWrapped() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new SecondDummy() );
}
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/EmptyXmlConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/EmptyXmlConfigurationTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/EmptyXmlConfigurationTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -43,7 +43,7 @@
@Test
public void testNoDefinedConstraints() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
assertFalse(
validator.getConstraintsForClass( Order.class ).isBeanConstrained(), "Bean should be unsonstrained"
);
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/InvalidXmlConfigurationTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -43,7 +43,7 @@
@SpecAssertion(section = "7", id = "a")
public void testInvalidValidationXml() {
try {
- TestUtil.getDefaultValidator();
+ TestUtil.getValidatorUnderTest();
fail();
}
catch ( ValidationException e ) {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -57,7 +57,7 @@
})
public void testBeanCannotBeDescribedMoreThanOnce() {
try {
- TestUtil.getDefaultValidator();
+ TestUtil.getValidatorUnderTest();
fail();
}
catch ( ValidationException e ) {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -51,7 +51,7 @@
})
public void testFieldMappingCanotOccurMoreThanOnce() {
try {
- TestUtil.getDefaultValidator();
+ TestUtil.getValidatorUnderTest();
fail();
}
catch ( ValidationException e ) {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -51,7 +51,7 @@
})
public void testGetterMappingCanotOccurMoreThanOnce() {
try {
- TestUtil.getDefaultValidator();
+ TestUtil.getValidatorUnderTest();
fail();
}
catch ( ValidationException e ) {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -52,7 +52,7 @@
@Test
public void testClassConstraintDefinedInXml() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
User user = new User();
Set<ConstraintViolation<User>> constraintViolations = validator.validate( user );
@@ -68,7 +68,7 @@
@Test
public void testPropertyConstraintDefinedInXml() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
User user = new User();
user.setConsistent( true );
@@ -85,7 +85,7 @@
@Test
public void testFieldConstraintDefinedInXml() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
User user = new User();
user.setConsistent( true );
@@ -105,7 +105,7 @@
@Test
public void testAnnotationDefinedConstraintApplies() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
User user = new User();
user.setConsistent( true );
@@ -124,7 +124,7 @@
@Test
public void testCascadingConfiguredInXml() {
- Validator validator = TestUtil.getDefaultValidator();
+ Validator validator = TestUtil.getValidatorUnderTest();
User user = new User();
user.setConsistent( true );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/GroupIsNotAllowedAsElementNameTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/GroupIsNotAllowedAsElementNameTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/GroupIsNotAllowedAsElementNameTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -46,7 +46,7 @@
@SpecAssertion(section = "7.1.1.4", id = "b")
public void testGroupIsNotAllowedAsElementName() {
try {
- TestUtil.getDefaultValidator();
+ TestUtil.getValidatorUnderTest();
fail();
}
catch ( ValidationException e ) {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MandatoryNameAttributeTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -46,7 +46,7 @@
@SpecAssertion(section = "7.1.1.4", id = "a")
public void testNameAttributeIsMandatory() {
try {
- TestUtil.getDefaultValidator();
+ TestUtil.getValidatorUnderTest();
fail();
}
catch ( ValidationException e ) {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MessageIsNotAllowedAsElementNameTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MessageIsNotAllowedAsElementNameTest.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/MessageIsNotAllowedAsElementNameTest.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -46,7 +46,7 @@
@SpecAssertion(section = "7.1.1.4", id = "b")
public void testMessageIsNotAllowedAsElementName() {
try {
- TestUtil.getDefaultValidator();
+ TestUtil.getValidatorUnderTest();
fail();
}
catch ( ValidationException e ) {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java 2009-07-27 10:23:54 UTC (rev 17204)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/util/TestUtil.java 2009-07-27 15:09:52 UTC (rev 17205)
@@ -31,9 +31,11 @@
import javax.validation.Path;
import javax.validation.Validation;
import javax.validation.Validator;
+import javax.validation.bootstrap.ProviderSpecificBootstrap;
import javax.validation.metadata.ConstraintDescriptor;
import javax.validation.metadata.ElementDescriptor;
import javax.validation.metadata.PropertyDescriptor;
+import javax.validation.spi.ValidationProvider;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -44,9 +46,23 @@
*/
public final class TestUtil {
+ private static String VALIDIDATION_PROVIDER_TEST_CLASS = "validation.provider";
+
+ private static ValidationProvider<?> validationProviderUnderTest;
+
private TestUtil() {
}
+ public static Validator getValidatorUnderTest() {
+ if(validationProviderUnderTest == null) {
+ instantiateValidationProviderUnderTest();
+ }
+
+ ProviderSpecificBootstrap<?> bootstrap = Validation.byProvider( validationProviderUnderTest.getClass() );
+ Configuration<?> config = bootstrap.configure();
+ return config.buildValidatorFactory().getValidator();
+ }
+
public static Validator getDefaultValidator() {
return Validation.buildDefaultValidatorFactory().getValidator();
}
@@ -116,7 +132,8 @@
assertEquals(
propertyPaths.length,
propertyPathsOfViolations.size(),
- "Wrong number of property paths. Expected: " + propertyPaths.length + " Actual: " + propertyPathsOfViolations.size()
+ "Wrong number of property paths. Expected: " + propertyPaths.length + " Actual: " + propertyPathsOfViolations
+ .size()
);
for ( String propertyPath : propertyPaths ) {
@@ -200,7 +217,7 @@
}
public static PropertyDescriptor getPropertyDescriptor(Class<?> clazz, String property) {
- Validator validator = getDefaultValidator();
+ Validator validator = getValidatorUnderTest();
return validator.getConstraintsForClass( clazz ).getConstraintsForProperty( property );
}
@@ -220,6 +237,33 @@
return inputStream;
}
+
+ private static <U extends ValidationProvider<?>> void instantiateValidationProviderUnderTest() {
+ String validatorproviderClassName = System.getProperty( VALIDIDATION_PROVIDER_TEST_CLASS );
+ if ( validatorproviderClassName == null ) {
+ throw new RuntimeException(
+ "The test harness must specify the class name of the validation provider under test. Set system property '" + VALIDIDATION_PROVIDER_TEST_CLASS + "'"
+ );
+ }
+
+ Class<U> providerClass;
+ try {
+ @SuppressWarnings("unchecked")
+ Class<U> tmpClazz = ( Class<U> ) TestUtil.class.getClassLoader().loadClass( validatorproviderClassName );
+ providerClass = tmpClazz;
+ }
+ catch ( ClassNotFoundException e ) {
+ throw new RuntimeException( "Unable to load " + validatorproviderClassName );
+ }
+
+ try {
+ validationProviderUnderTest = providerClass.newInstance();
+ }
+ catch ( Exception e ) {
+ throw new RuntimeException( "Unable to instantiate " + validatorproviderClassName );
+ }
+ }
+
public static class PathImpl implements Path {
/**
More information about the hibernate-commits
mailing list