[hibernate-commits] Hibernate SVN: r17405 - in beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests: metadata and 1 other directory.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Aug 25 06:22:21 EDT 2009
Author: hardy.ferentschik
Date: 2009-08-25 06:22:20 -0400 (Tue, 25 Aug 2009)
New Revision: 17405
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java
Log:
enabled commented out group sequence test, cleanup
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java 2009-08-25 09:50:17 UTC (rev 17404)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java 2009-08-25 10:22:20 UTC (rev 17405)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -22,6 +22,7 @@
import javax.validation.GroupDefinitionException;
import javax.validation.GroupSequence;
import javax.validation.Validator;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -55,23 +56,35 @@
validator.validate( entity, Complete.class );
}
- @Test(enabled = false)
-// @SpecAssertion(section = "3.4.2", id = "j")
+ @Test
+ @SpecAssertion(section = "3.4.2", id = "j")
public void testOnlyFirstGroupInSequenceGetEvaluated() {
Validator validator = TestUtil.getValidatorUnderTest();
Car car = new Car( "USd-298" );
-
- Set<ConstraintViolation<Car>> violations = validator.validateProperty(
- car, "licensePlateNumber", All.class
- );
+
+ // the constraint fails for each group
+ Set<ConstraintViolation<Car>> violations = validator.validate( car, First.class );
assertCorrectNumberOfViolations( violations, 1 );
- ConstraintViolation<Car> violation = violations.iterator().next();
+
+ violations = validator.validate( car, Second.class );
+ assertCorrectNumberOfViolations( violations, 2 );
+
+ // if we validate against the sequence All we only get one violation since group Second won't be executed
+ violations = validator.validate( car, All.class );
+ assertCorrectNumberOfViolations( violations, 1 );
+
+ // if we validate against the sequence AllReverese we only get two violations since group First won't be executed
+ violations = validator.validate( car, AllReverse.class );
+ assertCorrectNumberOfViolations( violations, 2 );
}
class Car {
@Pattern(regexp = "[A-Z][A-Z][A-Z]-[0-9][0-9][0-9]", groups = { First.class, Second.class })
private String licensePlateNumber;
+ @NotNull(groups = Second.class)
+ private String make;
+
Car(String licensePlateNumber) {
this.licensePlateNumber = licensePlateNumber;
}
@@ -90,4 +103,8 @@
@GroupSequence({ First.class, Second.class })
interface All {
}
+
+ @GroupSequence({ Second.class, First.class })
+ interface AllReverse {
+ }
}
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java 2009-08-25 09:50:17 UTC (rev 17404)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java 2009-08-25 10:22:20 UTC (rev 17405)
@@ -32,7 +32,6 @@
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
import org.testng.annotations.Test;
import org.hibernate.jsr303.tck.util.TestUtil;
@@ -183,29 +182,6 @@
assertEquals( constraintProperties.size(), 0, "We should get the empty set." );
}
- // TODO - enable or remove
- @Test(enabled = false)
- public void testGetConstrainedPropertiesImmutable() {
- Validator validator = TestUtil.getValidatorUnderTest();
- BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Order.class );
- Set<PropertyDescriptor> constraintProperties = beanDescriptor.getConstrainedProperties();
- try {
- constraintProperties.add( null );
- fail( "Set should be immutable" );
- }
- catch ( UnsupportedOperationException e ) {
- // success
- }
-
- try {
- constraintProperties.remove( constraintProperties.iterator().next() );
- fail( "Set should be immutable" );
- }
- catch ( UnsupportedOperationException e ) {
- // success
- }
- }
-
// TODO - map or remove
@Test(expectedExceptions = IllegalArgumentException.class)
public void testGetConstraintsForNullProperty() {
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java 2009-08-25 09:50:17 UTC (rev 17404)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/ConstraintDescriptorTest.java 2009-08-25 10:22:20 UTC (rev 17405)
@@ -19,11 +19,11 @@
import java.util.Map;
import java.util.Set;
+import javax.validation.ConstraintPayload;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import javax.validation.groups.Default;
import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.ConstraintPayload;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -45,7 +45,7 @@
* @author Hardy Ferentschik
*/
@Artifact(artifactType = ArtifactType.JSR303)
- at Classes({TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class})
+ at Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
public class ConstraintDescriptorTest extends AbstractTest {
@Test
@@ -163,43 +163,6 @@
assertTrue( payload.size() == 0 );
}
- @Test(enabled = false)
- public void testConstraintDescriptorImmutable() {
- ConstraintDescriptor<?> descriptor = getConstraintDescriptor( Order.class, "orderNumber" );
-
- try {
- descriptor.getGroups().add( Default.class );
- fail( "Should be immutable" );
- }
- catch ( UnsupportedOperationException e ) {
- // success
- }
-
- try {
- descriptor.getAttributes().put( "foo", "bar" );
- fail( "Should be immutable" );
- }
- catch ( UnsupportedOperationException e ) {
- // success
- }
-
- try {
- descriptor.getConstraintValidatorClasses().add( null );
- fail( "Should be immutable" );
- }
- catch ( UnsupportedOperationException e ) {
- // success
- }
-
- try {
- descriptor.getComposingConstraints().add( null );
- fail( "Should be immutable" );
- }
- catch ( UnsupportedOperationException e ) {
- // success
- }
- }
-
private ConstraintDescriptor<?> getConstraintDescriptor(Class<?> clazz, String property) {
Set<ConstraintDescriptor<?>> descriptors = getConstraintDescriptorsFor( clazz, property );
assertTrue( descriptors.size() == 1, "There should only by one descriptor." );
More information about the hibernate-commits
mailing list