Author: hardy.ferentschik Date: 2009-06-16 16:12:49 -0400 (Tue, 16 Jun 2009) New Revision: 16812 Added: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/DateHolder.java Removed: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/DateHolder.java Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/FutureValidatorTest.java validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml Log: some cleanup Deleted: 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 2009-06-16 20:07:56 UTC (rev 16811) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/DateHolder.java 2009-06-16 20:12:49 UTC (rev 16812) @@ -1,67 +0,0 @@ -// $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; - } -} Copied: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/DateHolder.java (from rev 16790, validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/DateHolder.java) =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/DateHolder.java (rev 0) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/DateHolder.java 2009-06-16 20:12:49 UTC (rev 16812) @@ -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.impl; + +import java.util.Calendar; +import java.util.Date; +import javax.validation.constraints.Future; +import javax.validation.constraints.Past; + +/** + * @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; + } +} Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/FutureValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/FutureValidatorTest.java 2009-06-16 20:07:56 UTC (rev 16811) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/impl/FutureValidatorTest.java 2009-06-16 20:12:49 UTC (rev 16812) @@ -24,7 +24,6 @@ import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; -import org.hibernate.validation.constraints.DateHolder; import org.hibernate.validation.util.TestUtil; /** Modified: validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml =================================================================== --- validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml 2009-06-16 20:07:56 UTC (rev 16811) +++ validator/trunk/hibernate-validator/src/test/suite/unit-tests.xml 2009-06-16 20:12:49 UTC (rev 16812) @@ -5,15 +5,9 @@ <packages> <package name="org.hibernate.validation.bootstrap"/> <package name="org.hibernate.validation.constraints.impl"/> - <package name="org.hibernate.validation.constraints.custom"/> <package name="org.hibernate.validation.engine"/> - <package name="org.hibernate.validation.engine.constraintcomposition"/> - <package name="org.hibernate.validation.engine.graphnavigation"/> <package name="org.hibernate.validation.engine.groups"/> - <package name="org.hibernate.validation.metadata"/> - <package name="org.hibernate.validation.engine.inheritance"/> - <package name="org.hibernate.validation.engine.resolver"/> - <package name="org.hibernate.validation.xml"/> + <package name="org.hibernate.validation.engine.traversableresolver"/> <package name="org.hibernate.validation.util"/> <package name="org.hibernate.validation.util.annotationfactory"/> </packages>