[hibernate-commits] Hibernate SVN: r17175 - in beanvalidation/trunk/validation-tck/src/main: java/org/hibernate/jsr303/tck/tests/constraints and 7 other directories.

Author: hardy.ferentschik Date: 2009-07-21 06:52:34 -0400 (Tue, 21 Jul 2009) New Revision: 17175 Added: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties Removed: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/customconstraint/ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/messageinterpolation/ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver/ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/validation/messageinterpolation/ Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Cloth.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Jacket.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/SnifferTraversableResolver.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Suit.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/TraversableResolverTest.java beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Trousers.java beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml Log: restructured package structure and added tests for TraversableResolver Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint (from rev 17143, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/customconstraint) Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation (from rev 17143, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/messageinterpolation) Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/messageinterpolation/MessageInterpolationTest.java 2009-07-17 21:41:19 UTC (rev 17143) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java 2009-07-21 10:52:34 UTC (rev 17175) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.messageinterpolation; +package org.hibernate.jsr303.tck.tests.messageinterpolation; import java.util.Locale; import javax.validation.MessageInterpolator; Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver (from rev 17143, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver) Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Cloth.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver/Cloth.java 2009-07-17 21:41:19 UTC (rev 17143) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Cloth.java 2009-07-21 10:52:34 UTC (rev 17175) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.traversableresolver; +package org.hibernate.jsr303.tck.tests.traversableresolver; /** * @author Emmanuel Bernard Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java (from rev 17143, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver/SnifferTraversableResolver.java) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/ExceptionThrowingTraversableResolver.java 2009-07-21 10:52:34 UTC (rev 17175) @@ -0,0 +1,36 @@ +// $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.traversableresolver; + +import java.lang.annotation.ElementType; +import javax.validation.Path; +import javax.validation.TraversableResolver; + +/** + * @author Emmanuel Bernard + */ +public class ExceptionThrowingTraversableResolver implements TraversableResolver { + + public boolean isReachable(Object o, Path.Node node, Class<?> aClass, Path path, ElementType elementType) { + throw new RuntimeException( "isReachable failed" ); + } + + public boolean isCascadable(Object o, Path.Node node, Class<?> aClass, Path path, ElementType elementType) { + throw new RuntimeException( "isCascadable failed" ); + } +} \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Jacket.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver/Jacket.java 2009-07-17 21:41:19 UTC (rev 17143) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Jacket.java 2009-07-21 10:52:34 UTC (rev 17175) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.traversableresolver; +package org.hibernate.jsr303.tck.tests.traversableresolver; import javax.validation.constraints.Max; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/SnifferTraversableResolver.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver/SnifferTraversableResolver.java 2009-07-17 21:41:19 UTC (rev 17143) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/SnifferTraversableResolver.java 2009-07-21 10:52:34 UTC (rev 17175) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.traversableresolver; +package org.hibernate.jsr303.tck.tests.traversableresolver; import java.lang.annotation.ElementType; import java.util.HashSet; @@ -89,6 +89,9 @@ ); } + /** + * Wrapper class for keeping track of the paramters for a single call to {@link SnifferTraversableResolver#isReachable} and {@link SnifferTraversableResolver#isCascadable}. + */ private static final class Call { private Object traversableObject; private String traversableProperty; @@ -105,7 +108,6 @@ } @Override - @SuppressWarnings("SimplifiableIfStatement") public boolean equals(Object o) { if ( this == o ) { return true; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Suit.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver/Suit.java 2009-07-17 21:41:19 UTC (rev 17143) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Suit.java 2009-07-21 10:52:34 UTC (rev 17175) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.traversableresolver; +package org.hibernate.jsr303.tck.tests.traversableresolver; import javax.validation.constraints.Max; import javax.validation.constraints.Min; Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/TraversableResolverTest.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver/TraversableResolverTest.java 2009-07-17 21:41:19 UTC (rev 17143) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/TraversableResolverTest.java 2009-07-21 10:52:34 UTC (rev 17175) @@ -15,18 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.traversableresolver; +package org.hibernate.jsr303.tck.tests.traversableresolver; import javax.validation.Configuration; import javax.validation.Validation; import javax.validation.Validator; import javax.validation.ValidatorFactory; +import javax.validation.ValidationException; import javax.validation.groups.Default; 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.test.audit.annotations.SpecAssertion; import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; @@ -34,9 +36,10 @@ /** * @author Emmanuel Bernard + * @author Hardy Ferentschik */ @Artifact(artifactType = ArtifactType.JSR303) -(a)Classes({TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class}) +@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class }) public class TraversableResolverTest extends AbstractTest { @Test public void testCorrectPathsAreRequested() { @@ -63,4 +66,18 @@ assertEquals( resolver.getReachPaths().size(), 5 ); assertEquals( resolver.getCascadePaths().size(), 2 ); } + + @Test(expectedExceptions = ValidationException.class) + @SpecAssertion(section = "3.5.2", id = "c") + public void testResolverExceptionsGetWrappedInValidationException() { + ExceptionThrowingTraversableResolver resolver = new ExceptionThrowingTraversableResolver(); + Configuration<?> config = ( Configuration<?> ) Validation.byDefaultProvider() + .configure() + .traversableResolver( resolver ); + + ValidatorFactory factory = config.buildValidatorFactory(); + Validator v = factory.getValidator(); + + v.validate( new Suit() ); + } } \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Trousers.java =================================================================== --- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/traversableresolver/Trousers.java 2009-07-17 21:41:19 UTC (rev 17143) +++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Trousers.java 2009-07-21 10:52:34 UTC (rev 17175) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hibernate.jsr303.tck.tests.validation.traversableresolver; +package org.hibernate.jsr303.tck.tests.traversableresolver; import javax.validation.constraints.Min; import javax.validation.constraints.Max; Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties (from rev 17143, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/validation/messageinterpolation/ValidationMessages.properties) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages.properties 2009-07-21 10:52:34 UTC (rev 17175) @@ -0,0 +1,4 @@ +javax.validation.constraints.NotNull.message=may not be null +foo=replacement worked +replace.in.user.bundle1={replace.in.user.bundle2} +replace.in.user.bundle2=recursion worked \ No newline at end of file Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties (from rev 17143, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/validation/messageinterpolation/ValidationMessages_de.properties) =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties (rev 0) +++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/messageinterpolation/ValidationMessages_de.properties 2009-07-21 10:52:34 UTC (rev 17175) @@ -0,0 +1 @@ +javax.validation.constraints.NotNull.message=kann nicht null sein \ No newline at end of file Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml =================================================================== --- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-07-21 09:46:56 UTC (rev 17174) +++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-07-21 10:52:34 UTC (rev 17175) @@ -466,15 +466,15 @@ wrapped into a ValidationException</text> </assertion> <assertion id="d"> - <text>if Java Persistence is available in the runtime environment, a property is + <text>If Java Persistence is available in the runtime environment, a property is considered reachable if Java Persistence considers the property as loaded</text> </assertion> <assertion id="d"> - <text>if Java Persistence is not available in the runtime environment, all properties + <text>If Java Persistence is not available in the runtime environment, all properties are considered reachable</text> </assertion> <assertion id="e"> - <text>all properties are considered cascadable</text> + <text>If Java Persistence is not available in the runtime environment, all properties are considered cascadable</text> </assertion> </section> <section id="3.5.3" title="ConstraintValidator resolution algorithm">