Hibernate SVN: r17511 - validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-14 03:34:28 -0400 (Mon, 14 Sep 2009)
New Revision: 17511
Modified:
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java
Log:
Fixed typos
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java 2009-09-11 17:05:54 UTC (rev 17510)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java 2009-09-14 07:34:28 UTC (rev 17511)
@@ -73,15 +73,15 @@
public void testSuccessfulInterpolation() {
interpolator = new ResourceBundleMessageInterpolator( new TestResourceBundle() );
MessageInterpolator.Context context = new MessageInterpolatorContext( notNullDescriptor, null );
- String expected = "message interpolation successfull";
+ String expected = "message interpolation successful";
String actual = interpolator.interpolate( "{simple.key}", context );
assertEquals( actual, expected, "Wrong substitution" );
- expected = "message interpolation successfull message interpolation successfull";
+ expected = "message interpolation successful message interpolation successful";
actual = interpolator.interpolate( "{simple.key} {simple.key}", context );
assertEquals( actual, expected, "Wrong substitution" );
- expected = "The message interpolation successfull completed";
+ expected = "The message interpolation successful completed";
actual = interpolator.interpolate( "The {simple.key} completed", context );
assertEquals( actual, expected, "Wrong substitution" );
@@ -124,11 +124,11 @@
}
@Test
- public void testUnkownTokenInterpolation() {
+ public void testUnknownTokenInterpolation() {
interpolator = new ResourceBundleMessageInterpolator( new TestResourceBundle() );
MessageInterpolator.Context context = new MessageInterpolatorContext( notNullDescriptor, null );
- String expected = "{bar}"; // unkown token {}
+ String expected = "{bar}"; // unknown token {}
String actual = interpolator.interpolate( "{bar}", context );
assertEquals( actual, expected, "Wrong substitution" );
}
@@ -138,7 +138,7 @@
interpolator = new ResourceBundleMessageInterpolator( new TestResourceBundle() );
MessageInterpolator.Context context = new MessageInterpolatorContext( notNullDescriptor, null );
- String expected = "message interpolation successfull"; // unkown token {}
+ String expected = "message interpolation successful"; // unknown token {}
String actual = interpolator.interpolate( "{key-with-dashes}", context );
assertEquals( actual, expected, "Wrong substitution" );
}
@@ -148,7 +148,7 @@
interpolator = new ResourceBundleMessageInterpolator( new TestResourceBundle() );
MessageInterpolator.Context context = new MessageInterpolatorContext( notNullDescriptor, null );
- String expected = "message interpolation successfull"; // unkown token {}
+ String expected = "message interpolation successful"; // unknown token {}
String actual = interpolator.interpolate( "{key with spaces}", context );
assertEquals( actual, expected, "Wrong substitution" );
}
@@ -162,7 +162,7 @@
String actual = interpolator.interpolate( notNull.message(), context );
assertEquals( actual, expected, "Wrong substitution" );
- expected = "size must be between 0 and 2147483647"; // unkown token {}
+ expected = "size must be between 0 and 2147483647"; // unknown token {}
context = new MessageInterpolatorContext( sizeDescriptor, null );
actual = interpolator.interpolate( size.message(), context );
assertEquals( actual, expected, "Wrong substitution" );
@@ -202,7 +202,7 @@
* HV-102
*/
@Test
- public void testRecursiveMessageInterpoliation() {
+ public void testRecursiveMessageInterpolation() {
AnnotationDescriptor<Max> descriptor = new AnnotationDescriptor<Max>( Max.class );
descriptor.setValue( "message", "{replace.in.user.bundle1}" );
descriptor.setValue( "value", 10l );
@@ -219,7 +219,7 @@
String expected = "{replace.in.default.bundle2}";
String actual = interpolator.interpolate( max.message(), context );
assertEquals(
- actual, expected, "Within default bundle replacement parameter evauation should not be recursive!"
+ actual, expected, "Within default bundle replacement parameter evaluation should not be recursive!"
);
}
@@ -229,7 +229,7 @@
@Test
public void testCorrectMessageInterpolationIfParameterCannotBeReplaced() {
AnnotationDescriptor<Max> descriptor = new AnnotationDescriptor<Max>( Max.class );
- String message = "Message should stay unchanged since {fubar} is not replacable";
+ String message = "Message should stay unchanged since {fubar} is not replaceable";
descriptor.setValue( "message", message );
descriptor.setValue( "value", 10l );
Max max = AnnotationFactory.create( descriptor );
@@ -259,9 +259,9 @@
public TestResourceBundle() {
testResources = new HashMap<String, String>();
// add some test messages
- testResources.put( "simple.key", "message interpolation successfull" );
- testResources.put( "key-with-dashes", "message interpolation successfull" );
- testResources.put( "key with spaces", "message interpolation successfull" );
+ testResources.put( "simple.key", "message interpolation successful" );
+ testResources.put( "key-with-dashes", "message interpolation successful" );
+ testResources.put( "key with spaces", "message interpolation successful" );
testResources.put( "replace.in.user.bundle1", "{replace.in.user.bundle2}" );
testResources.put( "replace.in.user.bundle2", "{replace.in.default.bundle1}" );
14 years, 7 months
- 1
- 0
Hibernate SVN: r17510 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-11 13:05:54 -0400 (Fri, 11 Sep 2009)
New Revision: 17510
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java
Removed:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java
Log:
HV-225 mapped the tests for NestedConstraintCompositionTest
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -0,0 +1,43 @@
+// $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.constraints.constraintcomposition.nestedconstraintcomposition;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Target({ METHOD, FIELD })
+@Retention(RUNTIME)
+@Constraint(validatedBy = { })
+@Pattern(regexp = "abc", message = "Pattern must match {regexp}")
+@NestedConstraintSingleViolation
+public @interface CompositeConstraint1 {
+ public abstract String message() default "CompositeConstraint1 failed.";
+
+ public abstract Class<?>[] groups() default { };
+
+ public abstract Class<? extends Payload>[] payload() default { };
+}
Property changes on: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint1.java
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -0,0 +1,45 @@
+// $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.constraints.constraintcomposition.nestedconstraintcomposition;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import javax.validation.constraints.Pattern;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.ReportAsSingleViolation;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Pattern(regexp = "abc")
+@Target({ METHOD, FIELD })
+@Retention(RUNTIME)
+@Constraint(validatedBy = { })
+@NestedConstraintSingleViolation
+@ReportAsSingleViolation
+public @interface CompositeConstraint2 {
+ public abstract String message() default "CompositeConstraint2 failed.";
+
+ public abstract Class<?>[] groups() default { };
+
+ public abstract Class<? extends Payload>[] payload() default { };
+}
\ No newline at end of file
Property changes on: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint2.java
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -0,0 +1,43 @@
+// $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.constraints.constraintcomposition.nestedconstraintcomposition;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import javax.validation.constraints.Pattern;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Pattern(regexp = "abc", message = "Pattern must match {regexp}")
+@Target({ METHOD, FIELD })
+@Retention(RUNTIME)
+@Constraint(validatedBy = { })
+@NestedCompositeConstraint
+public @interface CompositeConstraint3 {
+ public abstract String message() default "CompositeConstraint3 failed.";
+
+ public abstract Class<?>[] groups() default { };
+
+ public abstract Class<? extends Payload>[] payload() default { };
+}
\ No newline at end of file
Property changes on: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint3.java
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -0,0 +1,45 @@
+// $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.constraints.constraintcomposition.nestedconstraintcomposition;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import javax.validation.constraints.Pattern;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.ReportAsSingleViolation;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Pattern(regexp = "abc")
+@Target({ METHOD, FIELD })
+@Retention(RUNTIME)
+@Constraint(validatedBy = { })
+@NestedCompositeConstraint
+@ReportAsSingleViolation
+public @interface CompositeConstraint4 {
+ public abstract String message() default "CompositeConstraint4 failed.";
+
+ public abstract Class<?>[] groups() default { };
+
+ public abstract Class<? extends Payload>[] payload() default { };
+}
\ No newline at end of file
Property changes on: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/CompositeConstraint4.java
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java 2009-09-11 16:21:07 UTC (rev 17509)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint1.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -1,43 +0,0 @@
-// $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.constraints.constraintcomposition.nestedconstraintcomposition;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
-
-/**
- * @author Hardy Ferentschik
- */
-@Target({ METHOD, FIELD })
-@Retention(RUNTIME)
-@Constraint(validatedBy = { })
-@Pattern(regexp = "abc", message = "Pattern must match {regexp}")
-@SecondCompositeConstraintSingleViolation
-public @interface FirstCompositeConstraint1 {
- public abstract String message() default "FirstCompositeConstraint1 failed.";
-
- public abstract Class<?>[] groups() default { };
-
- public abstract Class<? extends Payload>[] payload() default { };
-}
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java 2009-09-11 16:21:07 UTC (rev 17509)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint2.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -1,45 +0,0 @@
-// $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.constraints.constraintcomposition.nestedconstraintcomposition;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import javax.validation.constraints.Pattern;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.ReportAsSingleViolation;
-
-/**
- * @author Hardy Ferentschik
- */
-@Pattern(regexp = "abc")
-@Target({ METHOD, FIELD })
-@Retention(RUNTIME)
-@Constraint(validatedBy = { })
-@SecondCompositeConstraintSingleViolation
-@ReportAsSingleViolation
-public @interface FirstCompositeConstraint2 {
- public abstract String message() default "FirstCompositeConstraint2 failed.";
-
- public abstract Class<?>[] groups() default { };
-
- public abstract Class<? extends Payload>[] payload() default { };
-}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java 2009-09-11 16:21:07 UTC (rev 17509)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint3.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -1,43 +0,0 @@
-// $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.constraints.constraintcomposition.nestedconstraintcomposition;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import javax.validation.constraints.Pattern;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-/**
- * @author Hardy Ferentschik
- */
-@Pattern(regexp = "abc", message = "Pattern must match {regexp}")
-@Target({ METHOD, FIELD })
-@Retention(RUNTIME)
-@Constraint(validatedBy = { })
-@SecondCompositeConstraint
-public @interface FirstCompositeConstraint3 {
- public abstract String message() default "FirstCompositeConstraint3 failed.";
-
- public abstract Class<?>[] groups() default { };
-
- public abstract Class<? extends Payload>[] payload() default { };
-}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java 2009-09-11 16:21:07 UTC (rev 17509)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/FirstCompositeConstraint4.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -1,45 +0,0 @@
-// $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.constraints.constraintcomposition.nestedconstraintcomposition;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import javax.validation.constraints.Pattern;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.ReportAsSingleViolation;
-
-/**
- * @author Hardy Ferentschik
- */
-@Pattern(regexp = "abc")
-@Target({ METHOD, FIELD })
-@Retention(RUNTIME)
-@Constraint(validatedBy = { })
-@SecondCompositeConstraint
-@ReportAsSingleViolation
-public @interface FirstCompositeConstraint4 {
- public abstract String message() default "FirstCompositeConstraint4 failed.";
-
- public abstract Class<?>[] groups() default { };
-
- public abstract Class<? extends Payload>[] payload() default { };
-}
\ No newline at end of file
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -0,0 +1,45 @@
+// $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.constraints.constraintcomposition.nestedconstraintcomposition;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Pattern(regexp = "...", message = "Pattern must match {regexp}")
+@Size(min = 3, max = 3, message = "Size must be {min}")
+@Target({ METHOD, FIELD, TYPE })
+@Retention(RUNTIME)
+@Constraint(validatedBy = { })
+public @interface NestedCompositeConstraint {
+ public abstract String message() default "NestedCompositeConstraint failed.";
+
+ public abstract Class<?>[] groups() default { };
+
+ public abstract Class<? extends Payload>[] payload() default { };
+}
\ No newline at end of file
Property changes on: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedCompositeConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java 2009-09-11 16:21:07 UTC (rev 17509)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintCompositionTest.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -23,6 +23,7 @@
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
+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;
@@ -35,7 +36,7 @@
import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations;
/**
- * Tests for composing constraints.
+ * Tests for error creation for nested composed constraints with different variations of @REeportAsSingleViolation.
*
* @author Hardy Ferentschik
*/
@@ -44,31 +45,34 @@
public class NestedConstraintCompositionTest extends AbstractTest {
@Test
- public void testFirstConstraintAllViolationsSecondConstraintSingleViolation() {
+ @SpecAssertion(section = "2.3", id = "g")
+ public void testCompositeConstraint1WithNestedConstraintSingleViolation() {
Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity1 dummy = new DummyEntity1( "" );
Set<ConstraintViolation<DummyEntity1>> constraintViolations = validator.validate( dummy );
assertCorrectNumberOfViolations( constraintViolations, 2 );
assertCorrectConstraintTypes(
- constraintViolations, Pattern.class, SecondCompositeConstraintSingleViolation.class
+ constraintViolations, Pattern.class, NestedConstraintSingleViolation.class
);
assertCorrectConstraintViolationMessages(
- constraintViolations, "Pattern must match abc", "SecondCompositeConstraintSingleViolation failed."
+ constraintViolations, "Pattern must match abc", "NestedConstraintSingleViolation failed."
);
}
@Test
- public void testFirstConstraintSingleViolationSecondConstraintSingleViolation() {
+ @SpecAssertion(section = "2.3", id = "g")
+ public void testCompositeConstraint2WithNestedConstraintSingleViolation() {
Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity2 dummy = new DummyEntity2( "" );
Set<ConstraintViolation<DummyEntity2>> constraintViolations = validator.validate( dummy );
assertCorrectNumberOfViolations( constraintViolations, 1 );
- assertCorrectConstraintTypes( constraintViolations, FirstCompositeConstraint2.class );
- assertCorrectConstraintViolationMessages( constraintViolations, "FirstCompositeConstraint2 failed." );
+ assertCorrectConstraintTypes( constraintViolations, CompositeConstraint2.class );
+ assertCorrectConstraintViolationMessages( constraintViolations, "CompositeConstraint2 failed." );
}
@Test
- public void testFirstConstraintAllViolationSecondConstraintAllViolations() {
+ @SpecAssertion(section = "2.3", id = "g")
+ public void testCompositeConstraint3WithNestedConstraint() {
Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity3 dummy = new DummyEntity3( "" );
Set<ConstraintViolation<DummyEntity3>> constraintViolations = validator.validate( dummy );
@@ -80,18 +84,18 @@
}
@Test
- public void testFirstConstraintSingleViolationSecondConstraintAllViolations() {
+ @SpecAssertion(section = "2.3", id = "g")
+ public void testCompositeConstraint4WithNestedConstraintSingleViolation() {
Validator validator = TestUtil.getValidatorUnderTest();
DummyEntity4 dummy = new DummyEntity4( "" );
Set<ConstraintViolation<DummyEntity4>> constraintViolations = validator.validate( dummy );
assertCorrectNumberOfViolations( constraintViolations, 1 );
- assertCorrectConstraintTypes( constraintViolations, FirstCompositeConstraint4.class );
- assertCorrectConstraintViolationMessages( constraintViolations, "FirstCompositeConstraint4 failed." );
+ assertCorrectConstraintTypes( constraintViolations, CompositeConstraint4.class );
+ assertCorrectConstraintViolationMessages( constraintViolations, "CompositeConstraint4 failed." );
}
-
class DummyEntity1 {
- @FirstCompositeConstraint1
+ @CompositeConstraint1
String string;
DummyEntity1(String s) {
@@ -100,7 +104,7 @@
}
class DummyEntity2 {
- @FirstCompositeConstraint2
+ @CompositeConstraint2
String string;
DummyEntity2(String s) {
@@ -109,7 +113,7 @@
}
class DummyEntity3 {
- @FirstCompositeConstraint3
+ @CompositeConstraint3
String string;
DummyEntity3(String s) {
@@ -118,7 +122,7 @@
}
class DummyEntity4 {
- @FirstCompositeConstraint4
+ @CompositeConstraint4
String string;
DummyEntity4(String s) {
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -0,0 +1,47 @@
+// $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.constraints.constraintcomposition.nestedconstraintcomposition;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.ReportAsSingleViolation;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Pattern(regexp = "...", message = "Pattern must match {regexp}")
+@Size(min = 3, max = 3, message = "Size must be {min}")
+@Target({ METHOD, FIELD, TYPE })
+@Retention(RUNTIME)
+@Constraint(validatedBy = { })
+@ReportAsSingleViolation
+public @interface NestedConstraintSingleViolation {
+ public abstract String message() default "NestedConstraintSingleViolation failed.";
+
+ public abstract Class<?>[] groups() default { };
+
+ public abstract Class<? extends Payload>[] payload() default { };
+}
\ No newline at end of file
Property changes on: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/NestedConstraintSingleViolation.java
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java 2009-09-11 16:21:07 UTC (rev 17509)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraint.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -1,45 +0,0 @@
-// $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.constraints.constraintcomposition.nestedconstraintcomposition;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-/**
- * @author Hardy Ferentschik
- */
-@Pattern(regexp = "...", message = "Pattern must match {regexp}")
-@Size(min = 3, max = 3, message = "Size must be {min}")
-@Target({ METHOD, FIELD, TYPE })
-@Retention(RUNTIME)
-@Constraint(validatedBy = { })
-public @interface SecondCompositeConstraint {
- public abstract String message() default "SecondCompositeConstraintSingleViolation failed.";
-
- public abstract Class<?>[] groups() default { };
-
- public abstract Class<? extends Payload>[] payload() default { };
-}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java 2009-09-11 16:21:07 UTC (rev 17509)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/constraintcomposition/nestedconstraintcomposition/SecondCompositeConstraintSingleViolation.java 2009-09-11 17:05:54 UTC (rev 17510)
@@ -1,47 +0,0 @@
-// $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.constraints.constraintcomposition.nestedconstraintcomposition;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.ReportAsSingleViolation;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-/**
- * @author Hardy Ferentschik
- */
-@Pattern(regexp = "...", message = "Pattern must match {regexp}")
-@Size(min = 3, max = 3, message = "Size must be {min}")
-@Target({ METHOD, FIELD, TYPE })
-@Retention(RUNTIME)
-@Constraint(validatedBy = { })
-@ReportAsSingleViolation
-public @interface SecondCompositeConstraintSingleViolation {
- public abstract String message() default "SecondCompositeConstraintSingleViolation failed.";
-
- public abstract Class<?>[] groups() default { };
-
- public abstract Class<? extends Payload>[] payload() default { };
-}
\ No newline at end of file
14 years, 7 months
- 1
- 0
Hibernate SVN: r17509 - in beanvalidation/trunk/validation-tck/src/main: resources and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-11 12:21:07 -0400 (Fri, 11 Sep 2009)
New Revision: 17509
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java
beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
added @SpecAssertion mapping for testPropertyName
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java 2009-09-11 16:15:06 UTC (rev 17508)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/PropertyDescriptorTest.java 2009-09-11 16:21:07 UTC (rev 17509)
@@ -54,6 +54,7 @@
}
@Test
+ @SpecAssertion(section = "5.4", id = "b")
public void testPropertyName() {
String propertyName = "orderList";
PropertyDescriptor descriptor = getPropertyDescriptor( Customer.class, propertyName );
Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-09-11 16:15:06 UTC (rev 17508)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-09-11 16:21:07 UTC (rev 17509)
@@ -949,6 +949,9 @@
<assertion id="a">
<text>The isCascaded method returns true if the property is marked with @Valid</text>
</assertion>
+ <assertion id="b">
+ <text>getPropertyName returns the property name</text>
+ </assertion>
</section>
<section id="5.5" title="ConstraintDescriptor">
<assertion id="a">
14 years, 7 months
- 1
- 0
Hibernate SVN: r17508 - in beanvalidation/trunk/validation-tck/src/main: java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-11 12:15:06 -0400 (Fri, 11 Sep 2009)
New Revision: 17508
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml
Removed:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/IncludeExisistingValidatorsTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-ExludeExisistingValidatorsTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-IncludeExisistingValidatorsTest.xml
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java
Log:
combined several test classes to consolidate test
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -18,8 +18,13 @@
package org.hibernate.jsr303.tck.tests.xmlconfiguration;
+import java.util.Set;
import javax.validation.Configuration;
import javax.validation.ValidationException;
+import javax.validation.Validator;
+import javax.validation.constraints.Pattern;
+import javax.validation.metadata.BeanDescriptor;
+import javax.validation.metadata.ConstraintDescriptor;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -29,6 +34,8 @@
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import org.testng.annotations.Test;
@@ -59,7 +66,32 @@
public final static String mappingFile3 = "user-constraints-MultipleFieldDefinitionTest.xml";
public final static String mappingFile4 = "user-constraints-MultipleGetterDefinitionTest.xml";
+
@Test
+ @SpecAssertion(section = "7.1", id = "a")
+ public void testXmlConfiguredConstraintExposesCorrespondingAnnotationViaMetadata() {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile1 ) );
+ Validator validator = config.buildValidatorFactory().getValidator();
+
+
+ BeanDescriptor beanDescriptor = validator.getConstraintsForClass( User.class );
+ Set<ConstraintDescriptor<?>> constraintDescriptors = beanDescriptor.getConstraintDescriptors();
+ assertEquals( constraintDescriptors.size(), 1, "There should be one class level constraint defined in xml" );
+
+ ConstraintDescriptor<?> descriptor = constraintDescriptors.iterator().next();
+ assertTrue( descriptor.getAnnotation() instanceof ConsistentUserInformation );
+
+
+ constraintDescriptors = beanDescriptor.getConstraintsForProperty( "lastname" )
+ .getConstraintDescriptors();
+ assertEquals( constraintDescriptors.size(), 1, "There should be one constraint defined in xml for 'lastname'" );
+ descriptor = constraintDescriptors.iterator().next();
+ assertTrue( descriptor.getAnnotation() instanceof Pattern );
+ }
+
+
+ @Test
@SpecAssertions({
@SpecAssertion(section = "7.1", id = "b"),
@SpecAssertion(section = "7.1", id = "e")
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-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/XmlConfigurationTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -218,28 +218,6 @@
}
@Test
- @SpecAssertion(section = "7.1", id = "a")
- public void testXmlConfiguredConstraintExposesCorrespondingAnnotationViaMetadata() {
- Validator validator = TestUtil.getValidatorUnderTest();
-
-
- BeanDescriptor beanDescriptor = validator.getConstraintsForClass( User.class );
- Set<ConstraintDescriptor<?>> constraintDescriptors = beanDescriptor.getConstraintDescriptors();
- assertEquals( constraintDescriptors.size(), 1, "There should be one class level constraint defined in xml" );
-
- ConstraintDescriptor<?> descriptor = constraintDescriptors.iterator().next();
- assertTrue( descriptor.getAnnotation() instanceof ConsistentUserInformation );
-
-
- constraintDescriptors = beanDescriptor.getConstraintsForProperty( "lastname" )
- .getConstraintDescriptors();
- assertEquals( constraintDescriptors.size(), 1, "There should be one constraint defined in xml for 'lastname'" );
- descriptor = constraintDescriptors.iterator().next();
- assertTrue( descriptor.getAnnotation() instanceof Pattern );
- }
-
-
- @Test
@SpecAssertion(section = "4.4.6", id = "m")
public void testMappingFilesAddedViaConfigurationGetAddedToXmlConfiguredMappings() {
Validator validator = TestUtil.getValidatorUnderTest();
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,73 +0,0 @@
-// $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.constraintdefinition;
-
-import java.lang.annotation.Annotation;
-import java.util.List;
-import java.util.Set;
-import javax.validation.ConstraintValidator;
-import javax.validation.Validator;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
-
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-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 static org.testng.Assert.assertEquals;
-import org.testng.annotations.Test;
-
-import org.hibernate.jsr303.tck.util.TestUtil;
-
-/**
- * @author Hardy Ferentschik
- */
-@Artifact(artifactType = ArtifactType.JSR303)
-@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
-@ValidationXml(value = "validation-ExludeExisistingValidatorsTest.xml")
-@Resource(source = "constraint-definition-ExludeExisistingValidatorsTest.xml",
- destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml")
-public class ExludeExisistingValidatorsTest extends AbstractTest {
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "7.1.2", id = "b"),
- @SpecAssertion(section = "7.1.2", id = "e")
- })
- public <T extends Annotation> void testExcludeExistingValidators() {
- Validator validator = TestUtil.getValidatorUnderTest();
- PropertyDescriptor propDescriptor = validator.getConstraintsForClass( Name.class )
- .getConstraintsForProperty( "name" );
-
- Set<ConstraintDescriptor<?>> descriptors = propDescriptor.getConstraintDescriptors();
- assertEquals( descriptors.size(), 1, "There should only be one constraint." );
-
- ConstraintDescriptor<T> descriptor = ( ConstraintDescriptor<T> ) descriptors.iterator().next();
- List<Class<? extends ConstraintValidator<T, ?>>> validators = descriptor.getConstraintValidatorClasses();
-
- assertEquals(
- validators.size(),
- 0,
- "No xml defined validator and annotations are ignored -> no validator"
- );
- }
-}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/IncludeExisistingValidatorsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/IncludeExisistingValidatorsTest.java 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/IncludeExisistingValidatorsTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,78 +0,0 @@
-// $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.constraintdefinition;
-
-import java.util.List;
-import java.util.Set;
-import java.lang.annotation.Annotation;
-import javax.validation.ConstraintValidator;
-import javax.validation.Validator;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
-
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-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 static org.testng.Assert.assertEquals;
-import org.testng.annotations.Test;
-
-import org.hibernate.jsr303.tck.util.TestUtil;
-
-/**
- * @author Hardy Ferentschik
- */
-@Artifact(artifactType = ArtifactType.JSR303)
-@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
-@ValidationXml(value = "validation-IncludeExisistingValidatorsTest.xml")
-@Resource(source = "constraint-definition-IncludeExisistingValidatorsTest.xml",
- destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml")
-public class IncludeExisistingValidatorsTest extends AbstractTest {
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "7.1.2", id = "c"),
- @SpecAssertion(section = "7.1.2", id = "d"),
- @SpecAssertion(section = "7.1.2", id = "e")
- })
- public <T extends Annotation> void testIncludeExistingValidators() {
- Validator validator = TestUtil.getValidatorUnderTest();
- PropertyDescriptor propDescriptor = validator.getConstraintsForClass( Name.class )
- .getConstraintsForProperty( "name" );
-
-
- Set<ConstraintDescriptor<?>> descriptors = propDescriptor.getConstraintDescriptors();
- assertEquals( descriptors.size(), 1, "There should only be one constraint." );
-
- @SuppressWarnings( "unchecked")
- ConstraintDescriptor<T> descriptor = ( ConstraintDescriptor<T> ) descriptors.iterator().next();
- List<Class<? extends ConstraintValidator<T, ?>>> validators = descriptor.getConstraintValidatorClasses();
-
-
- assertEquals(
- validators.size(),
- 2,
- "One validator should be defined in annotation and one in xml"
- );
-
- }
-}
\ No newline at end of file
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/ExludeExisistingValidatorsTest.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/XmlConfiguredConstraintValidatorTest.java 2009-09-11 16:15:06 UTC (rev 17508)
@@ -0,0 +1,115 @@
+// $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.constraintdefinition;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+import javax.validation.Configuration;
+import javax.validation.ConstraintValidator;
+import javax.validation.Validator;
+import javax.validation.metadata.ConstraintDescriptor;
+import javax.validation.metadata.PropertyDescriptor;
+
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+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.Resources;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+
+import org.hibernate.jsr303.tck.util.TestUtil;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Artifact(artifactType = ArtifactType.JSR303)
+@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
+@Resources({
+ @Resource(source = XmlConfiguredConstraintValidatorTest.mappingFile1,
+ destination = "WEB-INF/classes" + XmlConfiguredConstraintValidatorTest.packageName + XmlConfiguredConstraintValidatorTest.mappingFile1),
+ @Resource(source = XmlConfiguredConstraintValidatorTest.mappingFile2,
+ destination = "WEB-INF/classes" + XmlConfiguredConstraintValidatorTest.packageName + XmlConfiguredConstraintValidatorTest.mappingFile2)
+})
+public class XmlConfiguredConstraintValidatorTest extends AbstractTest {
+
+ public final static String packageName = "/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/";
+ public final static String mappingFile1 = "constraint-definition-ExludeExistingValidatorsTest.xml";
+ public final static String mappingFile2 = "constraint-definition-IncludeExistingValidatorsTest.xml";
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "7.1.2", id = "b"),
+ @SpecAssertion(section = "7.1.2", id = "e")
+ })
+ public <T extends Annotation> void testExcludeExistingValidators() {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile1 ) );
+ Validator validator = config.buildValidatorFactory().getValidator();
+
+ PropertyDescriptor propDescriptor = validator.getConstraintsForClass( Name.class )
+ .getConstraintsForProperty( "name" );
+
+ Set<ConstraintDescriptor<?>> descriptors = propDescriptor.getConstraintDescriptors();
+ assertEquals( descriptors.size(), 1, "There should only be one constraint." );
+
+ @SuppressWarnings("unchecked")
+ ConstraintDescriptor<T> descriptor = ( ConstraintDescriptor<T> ) descriptors.iterator().next();
+ List<Class<? extends ConstraintValidator<T, ?>>> validators = descriptor.getConstraintValidatorClasses();
+
+ assertEquals(
+ validators.size(),
+ 0,
+ "No xml defined validator and annotations are ignored -> no validator"
+ );
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "7.1.2", id = "c"),
+ @SpecAssertion(section = "7.1.2", id = "d"),
+ @SpecAssertion(section = "7.1.2", id = "e")
+ })
+ public <T extends Annotation> void testIncludeExistingValidators() {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile2 ) );
+ Validator validator = config.buildValidatorFactory().getValidator();
+
+ PropertyDescriptor propDescriptor = validator.getConstraintsForClass( Name.class )
+ .getConstraintsForProperty( "name" );
+
+
+ Set<ConstraintDescriptor<?>> descriptors = propDescriptor.getConstraintDescriptors();
+ assertEquals( descriptors.size(), 1, "There should only be one constraint." );
+
+ @SuppressWarnings("unchecked")
+ ConstraintDescriptor<T> descriptor = ( ConstraintDescriptor<T> ) descriptors.iterator().next();
+ List<Class<? extends ConstraintValidator<T, ?>>> validators = descriptor.getConstraintValidatorClasses();
+
+
+ assertEquals(
+ validators.size(),
+ 2,
+ "One validator should be defined in annotation and one in xml"
+ );
+ }
+}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,7 +0,0 @@
-<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">
- <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.Length">
- <validated-by include-existing-validators="false"/>
- </constraint-definition>
-</constraint-mappings>
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml (from rev 17502, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -0,0 +1,7 @@
+<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">
+ <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.Length">
+ <validated-by include-existing-validators="false"/>
+ </constraint-definition>
+</constraint-mappings>
Property changes on: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExistingValidatorsTest.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,9 +0,0 @@
-<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">
- <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.Length">
- <validated-by include-existing-validators="true">
- <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.DummyLengthValidator</value>
- </validated-by>
- </constraint-definition>
-</constraint-mappings>
Copied: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml (from rev 17502, beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -0,0 +1,9 @@
+<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">
+ <constraint-definition annotation="org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.Length">
+ <validated-by include-existing-validators="true">
+ <value>org.hibernate.jsr303.tck.tests.xmlconfiguration.constraintdefinition.DummyLengthValidator</value>
+ </validated-by>
+ </constraint-definition>
+</constraint-mappings>
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-ExludeExisistingValidatorsTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-ExludeExisistingValidatorsTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-ExludeExisistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,8 +0,0 @@
-<?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/configuration validation-configuration-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <constraint-mapping>
- org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-ExludeExisistingValidatorsTest.xml
- </constraint-mapping>
-</validation-config>
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-IncludeExisistingValidatorsTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-IncludeExisistingValidatorsTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/validation-IncludeExisistingValidatorsTest.xml 2009-09-11 16:15:06 UTC (rev 17508)
@@ -1,8 +0,0 @@
-<?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/configuration validation-configuration-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <constraint-mapping>
- org/hibernate/jsr303/tck/tests/xmlconfiguration/constraintdefinition/constraint-definition-IncludeExisistingValidatorsTest.xml
- </constraint-mapping>
-</validation-config>
\ No newline at end of file
14 years, 7 months
- 1
- 0
Hibernate SVN: r17507 - in beanvalidation/trunk/validation-tck/src/main: resources/org/hibernate/jsr303/tck/tests/xmlconfiguration and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-11 11:49:40 -0400 (Fri, 11 Sep 2009)
New Revision: 17507
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java
Removed:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleFieldDefinitionTest.xml
beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleGetterDefinitionTest.xml
Log:
combined several test classes into one
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/DuplicateConfigurationTest.java 2009-09-11 15:49:40 UTC (rev 17507)
@@ -0,0 +1,113 @@
+// $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;
+
+
+import javax.validation.Configuration;
+import javax.validation.ValidationException;
+
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+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.Resources;
+import static org.testng.Assert.fail;
+import org.testng.annotations.Test;
+
+import org.hibernate.jsr303.tck.util.TestUtil;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Artifact(artifactType = ArtifactType.JSR303)
+@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
+@Resources(
+ {
+ @Resource(source = DuplicateConfigurationTest.mappingFile1,
+ destination = "WEB-INF/classes" + DuplicateConfigurationTest.packageName + DuplicateConfigurationTest.mappingFile1),
+ @Resource(source = DuplicateConfigurationTest.mappingFile2,
+ destination = "WEB-INF/classes" + DuplicateConfigurationTest.packageName + DuplicateConfigurationTest.mappingFile2),
+ @Resource(source = DuplicateConfigurationTest.mappingFile3,
+ destination = "WEB-INF/classes" + DuplicateConfigurationTest.packageName + DuplicateConfigurationTest.mappingFile3),
+ @Resource(source = DuplicateConfigurationTest.mappingFile4,
+ destination = "WEB-INF/classes" + DuplicateConfigurationTest.packageName + DuplicateConfigurationTest.mappingFile4)
+ }
+)
+public class DuplicateConfigurationTest extends AbstractTest {
+
+ public final static String packageName = "/org/hibernate/jsr303/tck/tests/xmlconfiguration/";
+ public final static String mappingFile1 = "user-constraints.xml";
+ public final static String mappingFile2 = "user-constraints-MultipleBeanDefinitionTest.xml";
+ public final static String mappingFile3 = "user-constraints-MultipleFieldDefinitionTest.xml";
+ public final static String mappingFile4 = "user-constraints-MultipleGetterDefinitionTest.xml";
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "7.1", id = "b"),
+ @SpecAssertion(section = "7.1", id = "e")
+ })
+ public void testBeanCannotBeDescribedMoreThanOnce() {
+ try {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile1 ) );
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile2 ) );
+ config.buildValidatorFactory().getValidator();
+ fail( "You should not be able to define the same bean multiple times." );
+ }
+ catch ( ValidationException e ) {
+ // success
+ }
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "7.1", id = "c"),
+ @SpecAssertion(section = "7.1", id = "e")
+ })
+ public void testFieldMappingCannotOccurMoreThanOnce() {
+ try {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile3 ) );
+ config.buildValidatorFactory().getValidator();
+ fail( "You should not be able to define multiple field mappings per entity" );
+ }
+ catch ( ValidationException e ) {
+ // success
+ }
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "7.1", id = "d"),
+ @SpecAssertion(section = "7.1", id = "e")
+ })
+ public void testGetterMappingCannotOccurMoreThanOnce() {
+ try {
+ Configuration<?> config = TestUtil.getConfigurationUnderTest();
+ config.addMapping( TestUtil.getInputStreamForPath( packageName + mappingFile4 ) );
+ config.buildValidatorFactory().getValidator();
+ fail( "You should not be able to define multiple getter mappings per entity" );
+ }
+ catch ( ValidationException e ) {
+ // success
+ }
+ }
+}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java 2009-09-11 11:15:49 UTC (rev 17506)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleBeanDefinitionTest.java 2009-09-11 15:49:40 UTC (rev 17507)
@@ -1,67 +0,0 @@
-// $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;
-
-
-import javax.validation.ValidationException;
-
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-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.Resources;
-import org.jboss.testharness.impl.packaging.jsr303.ValidationXml;
-import static org.testng.Assert.fail;
-import org.testng.annotations.Test;
-
-import org.hibernate.jsr303.tck.util.TestUtil;
-
-/**
- * @author Hardy Ferentschik
- */
-@Artifact(artifactType = ArtifactType.JSR303)
-@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
-@ValidationXml(value = "validation-MultipleBeanDefinitionTest.xml")
-@Resources(
- {
- @Resource(source = "user-constraints.xml",
- destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml"),
- @Resource(source = "user-constraints-MultipleBeanDefinitionTest.xml",
- destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleBeanDefinitionTest.xml")
- }
-)
-public class MultipleBeanDefinitionTest extends AbstractTest {
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "7.1", id = "b"),
- @SpecAssertion(section = "7.1", id = "e")
- })
- public void testBeanCannotBeDescribedMoreThanOnce() {
- try {
- TestUtil.getValidatorUnderTest();
- fail( "You should not be able to define the same bean multiple times." );
- }
- catch ( ValidationException e ) {
- // success
- }
- }
-}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java 2009-09-11 11:15:49 UTC (rev 17506)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleFieldDefinitionTest.java 2009-09-11 15:49:40 UTC (rev 17507)
@@ -1,60 +0,0 @@
-// $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;
-
-
-import javax.validation.ValidationException;
-
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-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 static org.testng.Assert.fail;
-import org.testng.annotations.Test;
-
-import org.hibernate.jsr303.tck.util.TestUtil;
-
-/**
- * @author Hardy Ferentschik
- */
-@Artifact(artifactType = ArtifactType.JSR303)
-@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
-@ValidationXml(value = "validation-MultipleFieldDefinitionTest.xml")
-@Resource(source = "user-constraints-MultipleFieldDefinitionTest.xml",
- destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml")
-public class MultipleFieldDefinitionTest extends AbstractTest {
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "7.1", id = "c"),
- @SpecAssertion(section = "7.1", id = "e")
- })
- public void testFieldMappingCannotOccurMoreThanOnce() {
- try {
- TestUtil.getValidatorUnderTest();
- fail( "You should not be able to define multiple field mappings per entity" );
- }
- catch ( ValidationException e ) {
- // success
- }
- }
-}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java 2009-09-11 11:15:49 UTC (rev 17506)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/xmlconfiguration/MultipleGetterDefinitionTest.java 2009-09-11 15:49:40 UTC (rev 17507)
@@ -1,60 +0,0 @@
-// $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;
-
-
-import javax.validation.ValidationException;
-
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecAssertions;
-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 static org.testng.Assert.fail;
-import org.testng.annotations.Test;
-
-import org.hibernate.jsr303.tck.util.TestUtil;
-
-/**
- * @author Hardy Ferentschik
- */
-@Artifact(artifactType = ArtifactType.JSR303)
-@Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
-@ValidationXml(value = "validation-MultipleGetterDefinitionTest.xml")
-@Resource(source = "user-constraints-MultipleGetterDefinitionTest.xml",
- destination = "WEB-INF/classes/org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleGetterDefinitionTest.xml")
-public class MultipleGetterDefinitionTest extends AbstractTest {
-
- @Test
- @SpecAssertions({
- @SpecAssertion(section = "7.1", id = "d"),
- @SpecAssertion(section = "7.1", id = "e")
- })
- public void testGetterMappingCannotOccurMoreThanOnce() {
- try {
- TestUtil.getValidatorUnderTest();
- fail( "You should not be able to define multiple getter mappings per entity" );
- }
- catch ( ValidationException e ) {
- // success
- }
- }
-}
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml 2009-09-11 11:15:49 UTC (rev 17506)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleBeanDefinitionTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
@@ -1,7 +0,0 @@
-<?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/configuration validation-configuration-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints.xml</constraint-mapping>
- <constraint-mapping>org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleBeanDefinitionTest.xml</constraint-mapping>
-</validation-config>
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleFieldDefinitionTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleFieldDefinitionTest.xml 2009-09-11 11:15:49 UTC (rev 17506)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleFieldDefinitionTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
@@ -1,8 +0,0 @@
-<?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/configuration validation-configuration-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <constraint-mapping>
- org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleFieldDefinitionTest.xml
- </constraint-mapping>
-</validation-config>
\ No newline at end of file
Deleted: beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleGetterDefinitionTest.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleGetterDefinitionTest.xml 2009-09-11 11:15:49 UTC (rev 17506)
+++ beanvalidation/trunk/validation-tck/src/main/resources/org/hibernate/jsr303/tck/tests/xmlconfiguration/validation-MultipleGetterDefinitionTest.xml 2009-09-11 15:49:40 UTC (rev 17507)
@@ -1,8 +0,0 @@
-<?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/configuration validation-configuration-1.0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <constraint-mapping>
- org/hibernate/jsr303/tck/tests/xmlconfiguration/user-constraints-MultipleGetterDefinitionTest.xml
- </constraint-mapping>
-</validation-config>
\ No newline at end of file
14 years, 7 months
- 1
- 0
Hibernate SVN: r17506 - in beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests: constraints/application and 9 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-11 07:15:49 -0400 (Fri, 11 Sep 2009)
New Revision: 17506
Added:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnknownProviderBootstrapTest.java
Removed:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnkownProviderBootstrapTest.java
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderResolverTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Citizen.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java
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/groupsequenceisolation/GroupSequenceIsolationTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.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/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/validation/ValidateValueTest.java
Log:
fixed some typos and cleaned up import statements
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderResolverTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderResolverTest.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/bootstrap/ValidationProviderResolverTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -25,9 +25,6 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import javax.validation.Configuration;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
import javax.validation.spi.ValidationProvider;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -35,7 +32,6 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ArtifactType;
import org.jboss.testharness.impl.packaging.Classes;
-import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Citizen.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Citizen.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Citizen.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -26,7 +26,7 @@
@SecurityCheck(groups = { Default.class, TightSecurity.class })
public interface Citizen {
@Pattern(regexp = "^[0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]$",
- message = "Personal number must be 10 digits with the last 4 seperated by a dash.")
+ message = "Personal number must be 10 digits with the last 4 separated by a dash.")
public String getPersonalNumber();
}
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/Visibility.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -17,9 +17,8 @@
*/
package org.hibernate.jsr303.tck.tests.constraints.application;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.Min;
import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Min;
/**
* @author Hardy Ferentschik
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/BoundariesConstraintValidator.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -29,7 +29,7 @@
public abstract class BoundariesConstraintValidator<T extends Annotation> implements ConstraintValidator<T, Integer> {
public static boolean initializeCalled = false;
public static int isValidCalls = 0;
- public static boolean throwRuntimeExceptionFromInitalize = false;
+ public static boolean throwRuntimeExceptionFromInitialize = false;
public static boolean throwRuntimeExceptionFromIsValid = false;
private int low;
@@ -37,8 +37,8 @@
protected void initialize(int low, int high) {
initializeCalled = true;
- if ( throwRuntimeExceptionFromInitalize ) {
- throwRuntimeExceptionFromInitalize = false;
+ if ( throwRuntimeExceptionFromInitialize ) {
+ throwRuntimeExceptionFromInitialize = false;
throw new RuntimeException( "Throwing a RuntimeException from BoundariesConstraintValidator.initialize" );
}
this.low = low;
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/customconstraint/CustomConstraintValidatorTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -53,7 +53,7 @@
@SpecAssertion(section = "2.4", id = "b"),
@SpecAssertion(section = "2.4", id = "e")
})
- public void testRightValidatorIsSlectedAndInializedCalled() {
+ public void testRightValidatorIsSelectedAndInitializedCalled() {
Validator validator = TestUtil.getValidatorUnderTest();
Shoe shoe = new Shoe();
shoe.size = -2;
@@ -70,7 +70,7 @@
);
assertTrue(
BoundariesConstraintValidator.initializeCalled,
- "Check initilize was called. Note this is not really ensuring that it was called before isValid. That is done in the actual implementation of the validator."
+ "Check initialize was called. Note this is not really ensuring that it was called before isValid. That is done in the actual implementation of the validator."
);
}
@@ -89,28 +89,28 @@
validator.validate( shoe );
assertTrue(
BoundariesConstraintValidator.isValidCalls > nbrOfValidCalls,
- "Ensure is valid hasbeen called."
+ "Ensure is valid has been called."
);
nbrOfValidCalls = BoundariesConstraintValidator.isValidCalls;
validator.validate( shoe );
assertTrue(
BoundariesConstraintValidator.isValidCalls > nbrOfValidCalls,
- "Ensure is valid hasbeen called."
+ "Ensure is valid has been called."
);
nbrOfValidCalls = BoundariesConstraintValidator.isValidCalls;
validator.validateProperty( shoe, "size" );
assertTrue(
BoundariesConstraintValidator.isValidCalls > nbrOfValidCalls,
- "Ensure is valid hasbeen called."
+ "Ensure is valid has been called."
);
nbrOfValidCalls = BoundariesConstraintValidator.isValidCalls;
validator.validateValue( Shoe.class, "size", 41 );
assertTrue(
BoundariesConstraintValidator.isValidCalls > nbrOfValidCalls,
- "Ensure is valid hasbeen called."
+ "Ensure is valid has been called."
);
}
@@ -214,6 +214,6 @@
public static class Freezer {
@Negative
- public int temprature;
+ public int temperature;
}
}
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -25,7 +25,6 @@
import javax.validation.Validator;
import javax.validation.constraints.NotNull;
import javax.validation.groups.Default;
-import javax.validation.metadata.BeanDescriptor;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -34,7 +33,6 @@
import org.jboss.testharness.impl.packaging.ArtifactType;
import org.jboss.testharness.impl.packaging.Classes;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import org.testng.annotations.Test;
@@ -44,7 +42,7 @@
import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations;
/**
- * Tests for redifining the default group sequence.
+ * Tests for redefining the default group sequence.
*
* @author Hardy Ferentschik
*/
@@ -118,7 +116,7 @@
Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validate( address );
- fail( "It shoud not be allowed to have Default.class in the group sequence of a class." );
+ fail( "It should not be allowed to have Default.class in the group sequence of a class." );
}
catch ( GroupDefinitionException e ) {
// success
@@ -135,7 +133,7 @@
Validator validator = TestUtil.getValidatorUnderTest();
try {
validator.validate( address );
- fail( "A valid group sequence definiton must contain the class itself as implicit default group." );
+ fail( "A valid group sequence definition must contain the class itself as implicit default group." );
}
catch ( GroupDefinitionException e ) {
// success
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/GroupTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -199,7 +199,7 @@
assertCorrectPropertyPaths( constraintViolations, "subtitle" );
book.setSubtitle( "Revised Edition" );
- author.setCompany( "JBoss a divison of RedHat" );
+ author.setCompany( "JBoss a division of RedHat" );
constraintViolations = validator.validate( book, First.class, Second.class, Last.class );
constraintViolation = constraintViolations.iterator().next();
@@ -261,27 +261,27 @@
public void testGroupSequences() {
Validator validator = TestUtil.getValidatorUnderTest();
- Dictionary dictonary = new Dictionary();
- dictonary.setTitle( "English - German" );
+ Dictionary dictionary = new Dictionary();
+ dictionary.setTitle( "English - German" );
Author author = new Author();
author.setLastName( "-" );
author.setFirstName( "-" );
author.setCompany( "Langenscheidt Publ." );
- dictonary.setAuthor( author );
+ dictionary.setAuthor( author );
- Set<ConstraintViolation<Dictionary>> constraintViolations = validator.validate( dictonary, DefaultAlias.class );
+ Set<ConstraintViolation<Dictionary>> constraintViolations = validator.validate( dictionary, DefaultAlias.class );
assertEquals( constraintViolations.size(), 0, "Wrong number of constraints" );
}
@Test
public void testValidationFailureInMultipleGroups() {
Validator validator = TestUtil.getValidatorUnderTest();
- Animal elepfant = new Animal();
- elepfant.setName( "" );
- elepfant.setDomain( Animal.Domain.EUKARYOTA );
+ Animal elephant = new Animal();
+ elephant.setName( "" );
+ elephant.setDomain( Animal.Domain.EUKARYOTA );
Set<ConstraintViolation<Animal>> constraintViolations = validator.validate(
- elepfant, First.class, Second.class
+ elephant, First.class, Second.class
);
assertEquals(
constraintViolations.size(),
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-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequence/SequenceResolutionTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -88,7 +88,7 @@
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
+ // if we validate against the sequence AllReverse we only get two violations since group First won't be executed
violations = validator.validate( car, AllReverse.class );
assertCorrectNumberOfViolations( violations, 2 );
}
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/groupsequenceisolation/GroupSequenceIsolationTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -83,7 +83,7 @@
b.encryptionKey = "not safe";
// when validating Default.class on B, you need to validate sequentially:
- // - @Max on size (Minnimal group)
+ // - @Max on size (Minimal group)
// - @Size on name and @Size on nickname (A is part of B)
// - @SafeEncryption on encryptionKey
Set<ConstraintViolation<B2>> violations = validator.validate( b );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/invalidconstraintdefinitions/InvalidConstraintDefinitionsTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -44,7 +44,7 @@
@SpecAssertion(section = "2.1.1", id = "b"),
@SpecAssertion(section = "8.2", id = "a")
})
- public void testConstraintDefinitionWithParamterStartingWithValid() {
+ public void testConstraintDefinitionWithParameterStartingWithValid() {
try {
Validator validator = TestUtil.getValidatorUnderTest();
validator.validate( new DummyEntityValidProperty() );
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/validatorresolution/CustomConstraint.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -30,7 +30,7 @@
import javax.validation.ConstraintValidatorContext;
/**
- * A test constraint which can lead to a error when trying to reslove the validator.
+ * A test constraint which can lead to a error when trying to resolve the validator.
*
* @author Hardy Ferentschik
*/
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-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/metadata/BeanDescriptorTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -105,7 +105,7 @@
@SpecAssertion(section = "5.1", id = "b"),
@SpecAssertion(section = "5.3", id = "a")
})
- public void testUnconstraintClass() {
+ public void testUnconstrainedClass() {
Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( UnconstraintEntity.class );
assertFalse( beanDescriptor.hasConstraints(), "There should be no direct constraints on the specified bean." );
@@ -175,7 +175,7 @@
@SpecAssertion(section = "5.1", id = "b"),
@SpecAssertion(section = "5.3", id = "b")
})
- public void testGetConstrainedPropertiesForUnconstraintEntity() {
+ public void testGetConstrainedPropertiesForUnconstrainedEntity() {
Validator validator = TestUtil.getValidatorUnderTest();
BeanDescriptor beanDescriptor = validator.getConstraintsForClass( UnconstraintEntity.class );
Set<PropertyDescriptor> constraintProperties = beanDescriptor.getConstrainedProperties();
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/traversableresolver/SnifferTraversableResolver.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/SnifferTraversableResolver.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -107,7 +107,7 @@
}
/**
- * Wrapper class for keeping track of the paramters for a single call to {@link SnifferTraversableResolver#isReachable} and {@link SnifferTraversableResolver#isCascadable}.
+ * Wrapper class for keeping track of the parameters for a single call to {@link SnifferTraversableResolver#isReachable} and {@link SnifferTraversableResolver#isCascadable}.
*/
private static final class Call {
private Object traversableObject;
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/traversableresolver/Suit.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/traversableresolver/Suit.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -17,11 +17,9 @@
*/
package org.hibernate.jsr303.tck.tests.traversableresolver;
-import javax.validation.GroupSequence;
import javax.validation.Valid;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
-import javax.validation.groups.Default;
/**
* @author Emmanuel Bernard
Copied: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnknownProviderBootstrapTest.java (from rev 17502, beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnkownProviderBootstrapTest.java)
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnknownProviderBootstrapTest.java (rev 0)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnknownProviderBootstrapTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -0,0 +1,46 @@
+// $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.validation;
+
+import javax.validation.Validation;
+import javax.validation.ValidationException;
+
+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.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.testng.annotations.Test;
+
+/**
+ * @author Hardy Ferentschik
+ */
+@Artifact(artifactType = ArtifactType.JSR303)
+@Resource(source = "javax.validation.spi.ValidationProvider",
+ destination = "WEB-INF/classes/META-INF/services/javax.validation.spi.ValidationProvider")
+@IntegrationTest
+public class UnknownProviderBootstrapTest extends AbstractTest {
+
+ @Test(expectedExceptions = ValidationException.class)
+ @SpecAssertion(section = "4.4.5", id = "f")
+ public void testUnknownProviderThrowsValidationException() {
+ Validation.byDefaultProvider().configure();
+ //ValidatorFactory factory = configuration.buildValidatorFactory();
+ }
+}
\ No newline at end of file
Property changes on: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnknownProviderBootstrapTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Deleted: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnkownProviderBootstrapTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnkownProviderBootstrapTest.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/UnkownProviderBootstrapTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -1,47 +0,0 @@
-// $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.validation;
-
-import javax.validation.Configuration;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-
-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.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Resource;
-import org.testng.annotations.Test;
-
-/**
- * @author Hardy Ferentschik
- */
-@Artifact(artifactType = ArtifactType.JSR303)
-@Resource(source = "javax.validation.spi.ValidationProvider",
- destination = "WEB-INF/classes/META-INF/services/javax.validation.spi.ValidationProvider")
-@IntegrationTest
-public class UnkownProviderBootstrapTest extends AbstractTest {
-
- @Test(expectedExceptions = ValidationException.class)
- @SpecAssertion(section = "4.4.5", id = "f")
- public void testUnkownProviderThrowsValiationException() {
- Validation.byDefaultProvider().configure();
- //ValidatorFactory factory = configuration.buildValidatorFactory();
- }
-}
\ No newline at end of file
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java 2009-09-10 15:45:31 UTC (rev 17505)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateValueTest.java 2009-09-11 11:15:49 UTC (rev 17506)
@@ -17,12 +17,10 @@
*/
package org.hibernate.jsr303.tck.tests.validation;
-import java.util.Set;
import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
-import javax.validation.constraints.NotNull;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.testharness.AbstractTest;
14 years, 7 months
- 1
- 0
Hibernate SVN: r17505 - beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-10 11:45:31 -0400 (Thu, 10 Sep 2009)
New Revision: 17505
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java
Log:
HV-222 - MessageInterpolationTest#testFallbackToDefaultLocale
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/messageinterpolation/MessageInterpolationTest.java 2009-09-10 14:16:48 UTC (rev 17504)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/messageinterpolation/MessageInterpolationTest.java 2009-09-10 15:45:31 UTC (rev 17505)
@@ -75,7 +75,7 @@
@SpecAssertion(section = "4.3.1", id = "e"),
@SpecAssertion(section = "4.3.1.1", id = "a")
})
- public void testSuccessfullInterpolationOfValidationMessagesValue() {
+ public void testSuccessfulInterpolationOfValidationMessagesValue() {
MessageInterpolator interpolator = getDefaultMessageInterpolator();
ConstraintDescriptor<?> descriptor = getDescriptorFor( DummyEntity.class, "foo" );
@@ -93,14 +93,14 @@
actual = interpolator.interpolate( "This {foo} just fine", context );
assertEquals( actual, expected, "Wrong substitution" );
- expected = "{} replacement worked {unkown}";
- actual = interpolator.interpolate( "{} {foo} {unkown}", context );
+ expected = "{} replacement worked {unknown}";
+ actual = interpolator.interpolate( "{} {foo} {unknown}", context );
assertEquals( actual, expected, "Wrong substitution" );
}
@Test
@SpecAssertion(section = "4.3.1.1", id = "b")
- public void testRecursiveMessageInterpoliation() {
+ public void testRecursiveMessageInterpolation() {
MessageInterpolator interpolator = getDefaultMessageInterpolator();
ConstraintDescriptor<?> descriptor = getDescriptorFor( DummyEntity.class, "fubar" );
MessageInterpolator.Context context = new TestContext( descriptor );
@@ -114,7 +114,7 @@
@Test
@SpecAssertion(section = "4.3.1", id = "d")
- public void testMessagesCanBeOverrridenAtConstraintLevel() {
+ public void testMessagesCanBeOverriddenAtConstraintLevel() {
Validator validator = TestUtil.getValidatorUnderTest();
Set<ConstraintViolation<DummyEntity>> constraintViolations = validator.validateProperty(
new DummyEntity(), "snafu"
@@ -169,12 +169,12 @@
@Test
@SpecAssertion(section = "4.3.1.1", id = "a")
- public void testUnkownTokenInterpolation() {
+ public void testUnknownTokenInterpolation() {
MessageInterpolator interpolator = getDefaultMessageInterpolator();
ConstraintDescriptor<?> descriptor = getDescriptorFor( DummyEntity.class, "foo" );
MessageInterpolator.Context context = new TestContext( descriptor );
- String expected = "{bar}"; // unkown token {}
+ String expected = "{bar}"; // unknown token {}
String actual = interpolator.interpolate( "{bar}", context );
assertEquals( actual, expected, "Wrong substitution" );
}
@@ -186,7 +186,7 @@
ConstraintDescriptor<?> descriptor = getDescriptorFor( Person.class, "birthday" );
MessageInterpolator.Context context = new TestContext( descriptor );
- String key = "{javax.validation.constraints.Past.message}"; // Past is a builtin constraint so the provider must provide a default message
+ String key = "{javax.validation.constraints.Past.message}"; // Past is a built-in constraint so the provider must provide a default message
String actual = interpolator.interpolate( key, context );
assertFalse(
key.equals( actual ),
@@ -222,20 +222,18 @@
@Test
@SpecAssertion(section = "4.3.1.1", id = "i")
- public void testFallbackToDefaultLocale() {
+ public void testIfNoLocaleIsSpecifiedTheDefaultLocaleIsAssumed() {
MessageInterpolator interpolator = getDefaultMessageInterpolator();
ConstraintDescriptor<?> descriptor = getDescriptorFor( DummyEntity.class, "foo" );
+ String messageTemplate = ( String ) descriptor.getAttributes().get( "message" );
MessageInterpolator.Context context = new TestContext( descriptor );
- String expected = "may not be null";
- String actual = interpolator.interpolate( ( String ) descriptor.getAttributes().get( "message" ), context );
- assertEquals( actual, expected, "Wrong substitution" );
-
- expected = "may not be null";
- actual = interpolator.interpolate(
- ( String ) descriptor.getAttributes().get( "message" ), context, Locale.JAPAN
+ String messageInterpolatedWithNoLocale = interpolator.interpolate( messageTemplate, context );
+ String messageInterpolatedWithDefaultLocale = interpolator.interpolate(
+ messageTemplate, context, Locale.getDefault()
);
- assertEquals( actual, expected, "Wrong substitution" );
+
+ assertEquals( messageInterpolatedWithNoLocale, messageInterpolatedWithDefaultLocale, "Wrong substitution" );
}
private ConstraintDescriptor<?> getDescriptorFor(Class<?> clazz, String propertyName) {
14 years, 7 months
- 1
- 0
Hibernate SVN: r17504 - validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-10 10:16:48 -0400 (Thu, 10 Sep 2009)
New Revision: 17504
Modified:
beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java
Log:
HV-224 - ConstraintValidatorContextTest#testDisableDefaultErrorWithoutAddingCustomError should raise a ValidationException
Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java 2009-09-10 13:29:31 UTC (rev 17503)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/validatorcontext/ConstraintValidatorContextTest.java 2009-09-10 14:16:48 UTC (rev 17504)
@@ -21,8 +21,8 @@
import java.util.Map;
import java.util.Set;
import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
import javax.validation.ValidationException;
+import javax.validation.Validator;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
@@ -30,7 +30,6 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ArtifactType;
import org.jboss.testharness.impl.packaging.Classes;
-import static org.testng.Assert.assertEquals;
import org.testng.annotations.Test;
import org.hibernate.jsr303.tck.util.TestUtil;
@@ -70,9 +69,7 @@
DummyValidator.setCustomErrorMessages( errors );
DummyBean bean = new DummyBean( "foobar" );
-
- Set<ConstraintViolation<DummyBean>> constraintViolations = validator.validate( bean );
- //assertEquals( constraintViolations.size(), 0, "Wrong number of constraints" );
+ validator.validate( bean );
}
@Test
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java 2009-09-10 13:29:31 UTC (rev 17503)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validator/engine/ConstraintValidatorContextImpl.java 2009-09-10 14:16:48 UTC (rev 17504)
@@ -21,6 +21,7 @@
import java.util.List;
import javax.validation.ConstraintValidatorContext;
import javax.validation.Path;
+import javax.validation.ValidationException;
import javax.validation.metadata.ConstraintDescriptor;
/**
@@ -56,6 +57,10 @@
}
public List<ErrorMessage> getErrorMessages() {
+ if(defaultDisabled && errorMessages.size() == 0) {
+ throw new ValidationException("At least one custom message must be created if the default error message gets disabled.");
+ }
+
List<ErrorMessage> returnedErrorMessages = new ArrayList<ErrorMessage>( errorMessages );
if ( !defaultDisabled ) {
returnedErrorMessages.add(
14 years, 7 months
- 1
- 0
Hibernate SVN: r17503 - beanvalidation/trunk/validation-tck/src/main/resources.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-09-10 09:29:31 -0400 (Thu, 10 Sep 2009)
New Revision: 17503
Modified:
beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
HV-223
Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-09-10 13:22:40 UTC (rev 17502)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml 2009-09-10 13:29:31 UTC (rev 17503)
@@ -940,6 +940,10 @@
by its name as per the JavaBeans convention: field level and getter level
constraints of the given name are all returned</text>
</assertion>
+ <assertion id="c">
+ <text>getConstraintsForProperty throws an IllegalArgumentException if the propertyName
+ parameter is null</text>
+ </assertion>
</section>
<section id="5.4" title="PropertyDescriptor">
<assertion id="a">
14 years, 7 months
- 1
- 0