[hibernate-commits] Hibernate SVN: r17396 - in beanvalidation/trunk/validation-tck/src/main: resources/org/hibernate/jsr303/tck/tests/xmlconfiguration and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-08-21 09:40:38 -0400 (Fri, 21 Aug 2009)
New Revision: 17396

Modified:
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
   beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml
Log:
xml constraint declaration tests

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java	2009-08-21 13:17:05 UTC (rev 17395)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/ConsistentUserInformation.java	2009-08-21 13:40:38 UTC (rev 17396)
@@ -26,6 +26,7 @@
 import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.ConstraintPayload;
+import javax.validation.constraints.Max;
 import javax.validation.constraints.Pattern;
 
 
@@ -41,14 +42,18 @@
 
 	public abstract Class<?>[] groups() default { };
 
-	public abstract Class<? extends ConstraintPayload>[] payload() default {};
+	public abstract Class<? extends ConstraintPayload>[] payload() default { };
 
 	public abstract String stringParam() default "";
 
+	public abstract Class<?> classParam() default void.class;
+
 	public abstract String[] stringArrayParam() default { };
 
 	public abstract int intParam() default 0;
 
+	public abstract Max max() default @Max(value = 10);
+
 	public abstract Pattern[] patterns();
 
 	public abstract UserType userType() default UserType.BUYER;

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-08-21 13:17:05 UTC (rev 17395)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java	2009-08-21 13:40:38 UTC (rev 17396)
@@ -259,6 +259,36 @@
 		);
 	}
 
+	@Test
+	@SpecAssertions({
+			@SpecAssertion(section = "7.1.1.4", id = "c"),
+			@SpecAssertion(section = "7.1.1.4", id = "d"),
+			@SpecAssertion(section = "7.1.1.4", id = "e"),
+			@SpecAssertion(section = "7.1.1.4", id = "f"),
+			@SpecAssertion(section = "7.1.1.4", id = "g")
+	})
+	public void testElementConversionInXmlConfiguredConstraint() {
+		Validator validator = TestUtil.getValidatorUnderTest();
+		BeanDescriptor beanDescriptor = validator.getConstraintsForClass( User.class );
+		assertTrue( beanDescriptor.isBeanConstrained() );
+
+		Set<ConstraintDescriptor<?>> constraintDescriptors = beanDescriptor.getConstraintDescriptors();
+		assertTrue( constraintDescriptors.size() == 1 );
+
+		ConstraintDescriptor<?> descriptor = constraintDescriptors.iterator().next();
+		ConsistentUserInformation constraintAnnotation = ( ConsistentUserInformation ) descriptor.getAnnotation();
+
+		assertEquals( constraintAnnotation.stringParam(), "foobar", "Wrong parameter value" );
+		assertEquals( constraintAnnotation.classParam(), String.class, "Wrong parameter value" );
+		assertEquals( constraintAnnotation.userType(), UserType.SELLER, "Wrong parameter value" );
+
+		assertEquals( constraintAnnotation.stringArrayParam(), new String[] { "foo", "bar" }, "Wrong parameter value" );
+
+		assertEquals( constraintAnnotation.max().value(), 10, "Wrong parameter value. Default should be used" );
+		assertEquals( constraintAnnotation.patterns().length, 2, "Wrong array size" );
+	}
+
+
 	private InputStream getStream(String fileName) {
 		return this.getClass().getResourceAsStream( fileName );
 	}

Modified: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml	2009-08-21 13:17:05 UTC (rev 17395)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml	2009-08-21 13:40:38 UTC (rev 17396)
@@ -14,6 +14,7 @@
                     <value>javax.validation.groups.Default</value>
                 </groups>
                 <element name="stringParam">foobar</element>
+                <element name="classParam">java.lang.String</element>
                 <element name="stringArrayParam">
                     <value>foo</value>
                     <value>bar</value>