Author: hardy.ferentschik Date: 2009-08-24 10:18:16 -0400 (Mon, 24 Aug 2009) New Revision: 17403 Added: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/validation-DefaultSequenceDefinedInXmlTest.xml Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ClassLevelOverridingWithAnnotationTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Package.java beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ClassLevelOverridingWithAnnotationTest.xml Log: xml mapping tests Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ClassLevelOverridingWithAnnotationTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ClassLevelOverridingWithAnnotationTest.java 2009-08-24 12:42:58 UTC (rev 17402) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ClassLevelOverridingWithAnnotationTest.java 2009-08-24 14:18:16 UTC (rev 17403) @@ -20,6 +20,7 @@ import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validator; +import javax.validation.groups.Default; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java 2009-08-24 12:42:58 UTC (rev 17402) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java 2009-08-24 14:18:16 UTC (rev 17403) @@ -17,8 +17,11 @@ */ package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +import java.util.Set; import javax.validation.Configuration; +import javax.validation.ConstraintViolation; import javax.validation.Validator; +import javax.validation.groups.Default; import javax.validation.metadata.BeanDescriptor; import org.jboss.test.audit.annotations.SpecAssertion; @@ -34,6 +37,8 @@ import org.testng.annotations.Test; import org.hibernate.jsr303.tck.util.TestUtil; +import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; /** * @author Hardy Ferentschik @@ -54,7 +59,7 @@ public void testEntityConfiguredViaAnnotationsAndXml() { Validator validator = TestUtil.getValidatorUnderTest(); BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Package.class ); - assertTrue( beanDescriptor.isBeanConstrained(), "With xml configuration there should be two constraints." ); + assertTrue( beanDescriptor.isBeanConstrained(), "The bean should be constrained" ); assertEquals( beanDescriptor.getConstraintsForProperty( "maxWeight" ).getConstraintDescriptors().size(), @@ -78,4 +83,16 @@ "Without xml there should be only one constraint." ); } + + @Test + @SpecAssertion(section = "7.1.1.1", id = "e") + public void testDefaultGroupDefinitionDefinedInEntityApplies() { + Validator validator = TestUtil.getValidatorUnderTest(); + Package p = new Package(); + p.setMaxWeight(30); + Set<ConstraintViolation<Package>> violations = validator.validate( p, Default.class ); + + assertCorrectNumberOfViolations( violations, 1 ); + assertCorrectConstraintViolationMessages( violations, "ValidPackage defined as annotation" ); + } } \ No newline at end of file Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java (from rev 17390, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/ConfigurationViaXmlAndAnnotationsTest.java) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/DefaultSequenceDefinedInXmlTest.java 2009-08-24 14:18:16 UTC (rev 17403) @@ -0,0 +1,59 @@ +// $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.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; + +import java.util.Set; +import javax.validation.ConstraintViolation; +import javax.validation.Validator; +import javax.validation.groups.Default; + +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.testharness.AbstractTest; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ArtifactType; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.Resource; +import org.jboss.testharness.impl.packaging.jsr303.ValidationXml; +import org.testng.annotations.Test; + +import org.hibernate.jsr303.tck.util.TestUtil; +import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectConstraintViolationMessages; +import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations; + +/** + * @author Hardy Ferentschik + */ +@Artifact(artifactType = ArtifactType.JSR303) +@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class }) +@ValidationXml(value = "validation-DefaultSequenceDefinedInXmlTest.xml") +@Resource(source = "package-constraints-DefaultSequenceDefinedInXmlTest.xml", + destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml") +public class DefaultSequenceDefinedInXmlTest extends AbstractTest { + + @Test + @SpecAssertion(section = "7.1.1.1", id = "e") + public void testDefaultGroupDefinitionDefinedInEntityApplies() { + Validator validator = TestUtil.getValidatorUnderTest(); + Package p = new Package(); + p.setMaxWeight(30); + Set<ConstraintViolation<Package>> violations = validator.validate( p, Default.class ); + + assertCorrectNumberOfViolations( violations, 1 ); + assertCorrectConstraintViolationMessages( violations, "The package is too heavy" ); + } +} \ No newline at end of file Added: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Optional.java 2009-08-24 14:18:16 UTC (rev 17403) @@ -0,0 +1,24 @@ +// $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.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; + +/** + * @author Hardy Ferentschik + */ +public interface Optional { +} Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Package.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Package.java 2009-08-24 12:42:58 UTC (rev 17402) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/Package.java 2009-08-24 14:18:16 UTC (rev 17403) @@ -17,14 +17,16 @@ */ package org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; +import javax.validation.GroupSequence; import javax.validation.constraints.Max; /** * @author Hardy Ferentschik */ -@ValidPackage(message = "ValidPackage defined as annotation") +@GroupSequence(value = { Package.class, PrePosting.class }) +@ValidPackage(message = "ValidPackage defined as annotation", groups = PrePosting.class) public class Package { - @Max(20) + @Max(value = 20, groups = Optional.class, message = "The package is too heavy") private int maxWeight; public int getMaxWeight() { Added: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/PrePosting.java 2009-08-24 14:18:16 UTC (rev 17403) @@ -0,0 +1,24 @@ +// $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.jsr303.tck.tests.xmlconfiguration.constraintdeclaration; + +/** + * @author Hardy Ferentschik + */ +public interface PrePosting { +} Modified: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ClassLevelOverridingWithAnnotationTest.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ClassLevelOverridingWithAnnotationTest.xml 2009-08-24 12:42:58 UTC (rev 17402) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ClassLevelOverridingWithAnnotationTest.xml 2009-08-24 14:18:16 UTC (rev 17403) @@ -6,6 +6,10 @@ <class ignore-annotations="false"> <constraint annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.ValidPackage"> <message>ValidPackage defined in XML</message> + <groups> + <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.PrePosting + </value> + </groups> </constraint> </class> </bean> Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml (from rev 17390, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-ClassLevelOverridingTest.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml 2009-08-24 14:18:16 UTC (rev 17403) @@ -0,0 +1,13 @@ +<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd" + xmlns="http://jboss.org/xml/ns/javax/validation/mapping"> + <default-package>org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration</default-package> + <bean class="Package" ignore-annotations="false"> + <class ignore-annotations="false"> + <group-sequence> + <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.Package</value> + <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdeclaration.Optional</value> + </group-sequence> + </class> + </bean> +</constraint-mappings> \ No newline at end of file Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/validation-DefaultSequenceDefinedInXmlTest.xml (from rev 17390, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/validation-ClassLevelOverridingTest.xml) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/validation-DefaultSequenceDefinedInXmlTest.xml (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/validation-DefaultSequenceDefinedInXmlTest.xml 2009-08-24 14:18:16 UTC (rev 17403) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" + xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configu... validation-configuration-1.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <constraint-mapping>/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdeclaration/package-constraints-DefaultSequenceDefinedInXmlTest.xml</constraint-mapping> +</validation-config> \ No newline at end of file