BVTCK-155 Add a test for @OverridesAttribute default name()

tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/ConstraintCompositionTest.java

@@ -10,7 +10,9 @@
 import static org.hibernate.beanvalidation.tck.util.ConstraintViolationAssert.assertCorrectConstraintTypes;
 import static org.hibernate.beanvalidation.tck.util.ConstraintViolationAssert.assertCorrectConstraintViolationMessages;
 import static org.hibernate.beanvalidation.tck.util.ConstraintViolationAssert.assertNumberOfViolations;
+import static org.hibernate.beanvalidation.tck.util.ConstraintViolationAssert.assertThat;
 import static org.hibernate.beanvalidation.tck.util.ConstraintViolationAssert.pathWith;
+import static org.hibernate.beanvalidation.tck.util.ConstraintViolationAssert.violationOf;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
@@ -333,6 +335,20 @@ public void testMixedConstraintTargetsInComposingConstraintsCauseException() thr
 		);
 	}
 
+	@Test
+	@SpecAssertion(section = Sections.CONSTRAINTSDEFINITIONIMPLEMENTATION_CONSTRAINTCOMPOSITION, id = "o")
+	public void testOverridesAttributeWithDefaultName() {
+		Set<ConstraintViolation<DummyEntityWithDefaultAttributeName>> constraintViolations = getValidator().validate( DummyEntityWithDefaultAttributeName.valid() );
+		assertNumberOfViolations( constraintViolations, 0 );
+
+		constraintViolations = getValidator().validate( DummyEntityWithDefaultAttributeName.invalid() );
+		assertThat(constraintViolations).containsOnlyViolations(
+				violationOf( Pattern.class )
+						.withProperty( "zip" )
+						.withMessage( "Wrong zip code" )
+		);
+	}
+
 	private FrenchAddress getFrenchAddressWithoutZipCode() {
 		FrenchAddress address = new FrenchAddress();
 		address.setAddressline1( "10 rue des Treuils" );
@@ -385,4 +401,22 @@ private static class DummyEntityWithAnotherIllegallyComposedConstraint {
 		public void doSomething(int i) {
 		}
 	}
+
+	private static class DummyEntityWithDefaultAttributeName {
+
+		@FrenchZipcodeWithDefaultOverridesAttributeName
+		private String zip;
+
+		private static DummyEntityWithDefaultAttributeName valid() {
+			DummyEntityWithDefaultAttributeName entity = new DummyEntityWithDefaultAttributeName();
+			entity.zip = "69007";
+			return entity;
+		}
+
+		private static DummyEntityWithDefaultAttributeName invalid() {
+			DummyEntityWithDefaultAttributeName entity = new DummyEntityWithDefaultAttributeName();
+			entity.zip = "invalid";
+			return entity;
+		}
+	}
 }

tests/src/main/java/org/hibernate/beanvalidation/tck/tests/constraints/constraintcomposition/FrenchZipcodeWithDefaultOverridesAttributeName.java

@@ -0,0 +1,44 @@
+/**
+ * Bean Validation TCK
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.beanvalidation.tck.tests.constraints.constraintcomposition;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.OverridesAttribute;
+import javax.validation.Payload;
+import javax.validation.constraints.Pattern;
+
+
+/**
+ * @author Guillaume Smet
+ */
+@NotEmpty
+@Pattern(regexp = "bar")
+@Constraint(validatedBy = {})
+@Documented
+@Target({ METHOD, FIELD, TYPE })
+@Retention(RUNTIME)
+public @interface FrenchZipcodeWithDefaultOverridesAttributeName {
+
+	@OverridesAttribute(constraint = Pattern.class)
+	String message() default "Wrong zip code";
+
+	Class<?>[] groups() default { };
+
+	Class<? extends Payload>[] payload() default {};
+
+	@OverridesAttribute(constraint = Pattern.class)
+	String regexp() default "\\d*";
+}