[hibernate-commits] Hibernate SVN: r20095 - in validator/trunk/hibernate-validator/src: test/java/org/hibernate/validator/test/cfg and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: gunnar.morling
Date: 2010-08-01 03:39:43 -0400 (Sun, 01 Aug 2010)
New Revision: 20095

Modified:
   validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/cfg/defs/RangeDef.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/Marathon.java
   validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/Runner.java
Log:
HV-355: Fixed wrong parameter names in RangeDef

Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/cfg/defs/RangeDef.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/cfg/defs/RangeDef.java	2010-07-30 21:29:10 UTC (rev 20094)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/cfg/defs/RangeDef.java	2010-08-01 07:39:43 UTC (rev 20095)
@@ -49,12 +49,12 @@
 	}
 
 	public RangeDef min(long min) {
-		addParameter( "value", min );
+		addParameter( "min", min );
 		return this;
 	}
 
 	public RangeDef max(long max) {
-		addParameter( "value", max );
+		addParameter( "max", max );
 		return this;
 	}
 }
\ No newline at end of file

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java	2010-07-30 21:29:10 UTC (rev 20094)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/ConstraintMappingTest.java	2010-08-01 07:39:43 UTC (rev 20095)
@@ -37,6 +37,7 @@
 import org.hibernate.validator.cfg.defs.MinDef;
 import org.hibernate.validator.cfg.defs.NotEmptyDef;
 import org.hibernate.validator.cfg.defs.NotNullDef;
+import org.hibernate.validator.cfg.defs.RangeDef;
 import org.hibernate.validator.cfg.defs.SizeDef;
 import org.hibernate.validator.test.util.TestUtil;
 import org.hibernate.validator.util.LoggerFactory;
@@ -295,6 +296,32 @@
 		config.buildValidatorFactory();
 	}
 
+	/**
+	 * HV-355 (parameter names of RangeDef wrong)
+	 */
+	@Test
+	public void testRangeDef() {
+
+		HibernateValidatorConfiguration config = TestUtil.getConfiguration( HibernateValidator.class );
+
+		ConstraintMapping mapping = new ConstraintMapping();
+		mapping.type( Runner.class )
+				.property( "age", METHOD )
+				.constraint( RangeDef.class )
+				.min( 12 )
+				.max( 99 );
+
+
+		config.addMapping( mapping );
+
+		ValidatorFactory factory = config.buildValidatorFactory();
+		Validator validator = factory.getValidator();
+
+		Set<ConstraintViolation<Runner>> violations = validator.validate( new Runner() );
+		assertNumberOfViolations( violations, 1 );
+		assertConstraintViolation( violations.iterator().next(), "must be between 12 and 99" );
+	}
+
 	public interface Foo {
 	}
 }

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/Marathon.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/Marathon.java	2010-07-30 21:29:10 UTC (rev 20094)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/Marathon.java	2010-08-01 07:39:43 UTC (rev 20095)
@@ -28,6 +28,10 @@
 
 	private String name;
 
+	/**
+	 * Intentionally without a getter/setter to test adding a constraint programmatically using field access type
+	 */
+	@SuppressWarnings("unused")
 	private long numberOfHelpers;
 
 	private Date tournamentDate;

Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/Runner.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/Runner.java	2010-07-30 21:29:10 UTC (rev 20094)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/test/cfg/Runner.java	2010-08-01 07:39:43 UTC (rev 20095)
@@ -21,10 +21,13 @@
  * @author Hardy Ferentschik
  */
 public class Runner {
+
 	private String name;
 
 	private boolean paidEntryFee;
 
+	private int age;
+
 	public boolean isPaidEntryFee() {
 		return paidEntryFee;
 	}
@@ -40,6 +43,13 @@
 	public void setName(String name) {
 		this.name = name;
 	}
-}
 
+	public int getAge() {
+		return age;
+	}
 
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+}