Author: hardy.ferentschik Date: 2009-05-11 08:18:22 -0400 (Mon, 11 May 2009) New Revision: 16528 Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/DateHolder.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/validatorcontext/FutureValidatorTest.java Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/FutureValidatorForCalendar.java validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/FutureValidatorForDate.java Log: HV-158 Fixed the validators and added a test Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/FutureValidatorForCalendar.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/FutureValidatorForCalendar.java 2009-05-11 10:54:59 UTC (rev 16527) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/FutureValidatorForCalendar.java 2009-05-11 12:18:22 UTC (rev 16528) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -20,7 +20,7 @@ import java.util.Calendar; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.constraints.Past; +import javax.validation.constraints.Future; /** * Check that the <code>java.util.Calendar</code> passed to be validated is in @@ -28,9 +28,9 @@ * * @author Alaa Nassef */ -public class FutureValidatorForCalendar implements ConstraintValidator<Past, Calendar> { +public class FutureValidatorForCalendar implements ConstraintValidator<Future, Calendar> { - public void initialize(Past constraintAnnotation) { + public void initialize(Future constraintAnnotation) { } public boolean isValid(Calendar cal, ConstraintValidatorContext constraintValidatorContext) { Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/FutureValidatorForDate.java =================================================================== --- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/FutureValidatorForDate.java 2009-05-11 10:54:59 UTC (rev 16527) +++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/FutureValidatorForDate.java 2009-05-11 12:18:22 UTC (rev 16528) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2008, Red Hat Middleware LLC, and individual contributors @@ -20,7 +20,7 @@ import java.util.Date; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import javax.validation.constraints.Past; +import javax.validation.constraints.Future; /** * Check that the <code>java.util.Date</code> passed to be validated is in the @@ -28,9 +28,9 @@ * * @author Alaa Nassef */ -public class FutureValidatorForDate implements ConstraintValidator<Past, Date> { +public class FutureValidatorForDate implements ConstraintValidator<Future, Date> { - public void initialize(Past constraintAnnotation) { + public void initialize(Future constraintAnnotation) { } public boolean isValid(Date date, ConstraintValidatorContext constraintValidatorContext) { Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/DateHolder.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/DateHolder.java (rev 0) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/DateHolder.java 2009-05-11 12:18:22 UTC (rev 16528) @@ -0,0 +1,67 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.validation.constraints; + +import java.util.Calendar; +import java.util.Date; +import javax.validation.constraints.Past; +import javax.validation.constraints.Future; + +/** + * @author Hardy Ferentschik + */ +public class DateHolder { + + @Past + private Calendar calendarWithPastDate; + + @Future + private Calendar calendarWithFutureDate; + + @Past + private Date past; + + @Past + private Date future; + + public DateHolder() { + calendarWithPastDate = Calendar.getInstance(); + calendarWithPastDate.add( Calendar.YEAR, -1 ); + past = calendarWithPastDate.getTime(); + + calendarWithFutureDate = Calendar.getInstance(); + calendarWithFutureDate.add( Calendar.YEAR, 1 ); + future = calendarWithFutureDate.getTime(); + } + + public Calendar getCalendarWithPastDate() { + return calendarWithPastDate; + } + + public Calendar getCalendarWithFutureDate() { + return calendarWithFutureDate; + } + + public Date getPast() { + return past; + } + + public Date getFuture() { + return future; + } +} Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/DateHolder.java ___________________________________________________________________ Name: svn:keywords + Id Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/validatorcontext/FutureValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/validatorcontext/FutureValidatorTest.java (rev 0) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/validatorcontext/FutureValidatorTest.java 2009-05-11 12:18:22 UTC (rev 16528) @@ -0,0 +1,45 @@ +// $Id:$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2008, Red Hat Middleware LLC, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.validation.constraints.validatorcontext; + +import java.util.Set; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; + +import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import org.hibernate.validation.constraints.DateHolder; +import org.hibernate.validation.util.TestUtil; + +/** + * @author Hardy Ferentschik + */ +public class FutureValidatorTest { + + /** + * HV-158 + */ + @Test + public void testFutureAndPast() { + Validator validator = TestUtil.getValidator(); + DateHolder dateHolder = new DateHolder(); + Set<ConstraintViolation<DateHolder>> constraintViolations = validator.validate( dateHolder ); + assertEquals( constraintViolations.size(), 1, "Wrong number of constraints" ); + } +} Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/validatorcontext/FutureValidatorTest.java ___________________________________________________________________ Name: svn:keywords + Id