Author: hardy.ferentschik Date: 2009-10-15 08:07:45 -0400 (Thu, 15 Oct 2009) New Revision: 17763 Modified: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java Log: BVTCK-1 Modified: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java =================================================================== --- beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java 2009-10-15 03:12:54 UTC (rev 17762) +++ beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidatePropertyTest.java 2009-10-15 12:07:45 UTC (rev 17763) @@ -21,7 +21,6 @@ import javax.validation.ConstraintViolation; import javax.validation.ValidationException; import javax.validation.Validator; -import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.jboss.test.audit.annotations.SpecAssertion; @@ -86,18 +85,7 @@ Validator validator = TestUtil.getValidatorUnderTest(); Customer customer = new Customer(); - Order order = new Order(); - customer.addOrder( order ); - try { - validator.validateProperty( customer, "orders[].orderNumber" ); - fail(); - } - catch ( IllegalArgumentException e ) { - // success - } - - try { validator.validateProperty( customer, "foobar" ); fail(); } @@ -105,13 +93,6 @@ // success } - try { - validator.validateProperty( customer, "orders[].foobar" ); - fail(); - } - catch ( IllegalArgumentException e ) { - // success - } // firstname exists, but the capitalisation is wrong try { @@ -129,10 +110,7 @@ Validator validator = TestUtil.getValidatorUnderTest(); Customer customer = new Customer(); - Order order = new Order(); - customer.addOrder( order ); - try { validator.validateProperty( customer, null ); fail(); @@ -190,38 +168,6 @@ } @Test - @SpecAssertions({ - @SpecAssertion(section = "4.1.1", id = "c"), - @SpecAssertion(section = "4.1.1", id = "d"), - @SpecAssertion(section = "4.1.1", id = "f") - }) - public void testValidatePropertyWithIndexedPath() { - Validator validator = TestUtil.getValidatorUnderTest(); - - ActorListBased clint = new ActorListBased( "Clint", "Eastwood" ); - ActorListBased morgan = new ActorListBased( "Morgan", null ); - ActorListBased charlie = new ActorListBased( "Charlie", "Sheen" ); - - clint.addPlayedWith( charlie ); - charlie.addPlayedWith( clint ); - charlie.addPlayedWith( morgan ); - morgan.addPlayedWith( charlie ); - morgan.addPlayedWith( clint ); - clint.addPlayedWith( morgan ); - - String property = "playedWith[0].playedWith[1].lastName"; - Set<ConstraintViolation<ActorListBased>> constraintViolations = validator.validateProperty( - clint, property - ); - assertCorrectNumberOfViolations( constraintViolations, 1 ); - assertCorrectConstraintTypes( constraintViolations, NotNull.class ); - - ConstraintViolation<ActorListBased> violation = constraintViolations.iterator().next(); - assertConstraintViolation( violation, ActorListBased.class, null, property ); - assertCorrectConstraintViolationMessages( constraintViolations, "Everyone has a last name." ); - } - - @Test @SpecAssertion(section = "4.1.1", id = "g") public void testValidIsNotHonoredValidateProperty() { Validator validator = TestUtil.getValidatorUnderTest(); Modified: beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java =================================================================== --- beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java 2009-10-15 03:12:54 UTC (rev 17762) +++ beanvalidation/tck/trunk/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java 2009-10-15 12:07:45 UTC (rev 17763) @@ -74,18 +74,18 @@ public void testValidateValue() { Validator validator = TestUtil.getValidatorUnderTest(); - Set<ConstraintViolation<Customer>> constraintViolations = validator.validateValue( - Customer.class, "orders[0].orderNumber", null + Set<ConstraintViolation<Order>> constraintViolations = validator.validateValue( + Order.class, "orderNumber", null ); assertCorrectNumberOfViolations( constraintViolations, 1 ); - assertCorrectPropertyPaths( constraintViolations, "orders[0].orderNumber" ); + assertCorrectPropertyPaths( constraintViolations, "orderNumber" ); assertCorrectConstraintViolationMessages( constraintViolations, "An order must have an order number." ); - ConstraintViolation constraintViolation = constraintViolations.iterator().next(); - assertConstraintViolation( constraintViolation, Customer.class, null, "orders[0].orderNumber" ); - assertEquals( constraintViolation.getRootBeanClass(), Customer.class, "Wrong root bean class" ); + ConstraintViolation<Order> constraintViolation = constraintViolations.iterator().next(); + assertConstraintViolation( constraintViolation, Order.class, null, "orderNumber" ); + assertEquals( constraintViolation.getRootBeanClass(), Order.class, "Wrong root bean class" ); - constraintViolations = validator.validateValue( Customer.class, "orders[0].orderNumber", 1234 ); + constraintViolations = validator.validateValue( Order.class, "orderNumber", 1234 ); assertCorrectNumberOfViolations( constraintViolations, 0 ); } @@ -102,14 +102,6 @@ // success } - try { - validator.validateValue( Customer.class, "orders[0].foobar", null ); - fail(); - } - catch ( IllegalArgumentException e ) { - // success - } - // firstname exists, but the capitalisation is wrong try { validator.validateValue( Customer.class, "FirstName", null );