BVTCK-32 Adding test for getInvalidValue() for cross-parameter constr…

…aints
jakartaee · Jan 17, 2013 · a8d1099 · a8d1099
1 parent 935ad0c
commit a8d1099
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 3 deletions.
diff --git a/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/methodvalidation/User.java b/tests/src/main/java/org/hibernate/beanvalidation/tck/tests/methodvalidation/User.java
@@ -34,9 +34,6 @@ public interface Basic {
 	public interface Extended {
 	}
 
-	public User() {
-	}
-
 	//testOneViolation
 	public void setFirstName(@NotNull String firstName) {
 	}
@@ -86,6 +83,7 @@ public User(@NotNull(groups = Basic.class) String firstName, @Size(min = 3,
 	}
 
 	//testOneViolationFromCrossParameterConstraint
+	//testGetInvalidValueForCrossParameterConstraint
 	@MyCrossParameterConstraint
 	public void setAddress(String street, String houseNo) {
 	}
@@ -117,4 +115,13 @@ public void setAddress(String street, String houseNo, String city) {
 	})
 	public User(String street, String houseNo, String city) {
 	}
+
+	//testGetInvalidValueForCrossParameterConstraintOnParameterlessMethod
+	@MyCrossParameterConstraint
+	public void setAddress() {
+	}
+
+	@MyCrossParameterConstraint
+	public User() {
+	}
 }
diff --git a/...ibernate/beanvalidation/tck/tests/methodvalidation/ValidateConstructorParametersTest.java b/...ibernate/beanvalidation/tck/tests/methodvalidation/ValidateConstructorParametersTest.java
@@ -48,6 +48,7 @@
 import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPathNodeNames;
 import static org.hibernate.beanvalidation.tck.util.TestUtil.kinds;
 import static org.hibernate.beanvalidation.tck.util.TestUtil.names;
+import static org.testng.Assert.assertEquals;
 
 /**
  * @author Gunnar Morling
@@ -109,6 +110,8 @@ public void testOneViolationFromCrossParameterConstraint() throws Exception {
 		assertCorrectConstraintTypes( violations, MyCrossParameterConstraint.class );
 		assertCorrectPathNodeNames( violations, names( "User" ) );
 		assertCorrectPathDescriptorKinds( violations, kinds( Kind.CONSTRUCTOR ) );
+
+		assertEquals( violations.iterator().next().getInvalidValue(), parameterValues );
 	}
 
 	@Test
@@ -337,4 +340,35 @@ public void testUnexpectedType() throws Exception {
 
 		executableValidator.validateConstructorParameters( constructor, parameterValues );
 	}
+
+	@Test
+	@SpecAssertion(section = "5.2", id = "e")
+	public void testGetInvalidValueForCrossParameterConstraint() throws Exception {
+		Constructor<User> constructor = User.class.getConstructor( String.class, String.class );
+		Object[] parameterValues = new Object[] { "Bob", "Alice" };
+
+		Set<ConstraintViolation<User>> violations = executableValidator.validateConstructorParameters(
+				constructor,
+				parameterValues
+		);
+
+		assertCorrectNumberOfViolations( violations, 1 );
+		assertEquals( violations.iterator().next().getInvalidValue(), parameterValues );
+	}
+
+	@Test
+	@SpecAssertion(section = "5.2", id = "e")
+	public void testGetInvalidValueForCrossParameterConstraintOnParameterlessMethod()
+			throws Exception {
+		Constructor<User> constructor = User.class.getConstructor();
+		Object[] parameterValues = new Object[] { };
+
+		Set<ConstraintViolation<User>> violations = executableValidator.validateConstructorParameters(
+				constructor,
+				parameterValues
+		);
+
+		assertCorrectNumberOfViolations( violations, 1 );
+		assertEquals( violations.iterator().next().getInvalidValue(), parameterValues );
+	}
 }
diff --git a/.../java/org/hibernate/beanvalidation/tck/tests/methodvalidation/ValidateParametersTest.java b/.../java/org/hibernate/beanvalidation/tck/tests/methodvalidation/ValidateParametersTest.java
@@ -48,6 +48,7 @@
 import static org.hibernate.beanvalidation.tck.util.TestUtil.assertCorrectPathNodeNames;
 import static org.hibernate.beanvalidation.tck.util.TestUtil.kinds;
 import static org.hibernate.beanvalidation.tck.util.TestUtil.names;
+import static org.testng.Assert.assertEquals;
 
 /**
  * @author Gunnar Morling
@@ -365,4 +366,44 @@ public void testUnexpectedType() throws Exception {
 
 		executableValidator.validateParameters( object, method, parameterValues );
 	}
+
+
+	@Test
+	@SpecAssertion(section = "5.2", id = "e")
+	public void testGetInvalidValueForCrossParameterConstraint() throws Exception {
+		String methodName = "setAddress";
+
+		Object object = new User();
+		Method method = User.class.getMethod( methodName, String.class, String.class );
+		Object[] parameterValues = new Object[] { "Bob", "Alice" };
+
+		Set<ConstraintViolation<Object>> violations = executableValidator.validateParameters(
+				object,
+				method,
+				parameterValues
+		);
+
+		assertCorrectNumberOfViolations( violations, 1 );
+		assertEquals( violations.iterator().next().getInvalidValue(), parameterValues );
+	}
+
+	@Test
+	@SpecAssertion(section = "5.2", id = "e")
+	public void testGetInvalidValueForCrossParameterConstraintOnParameterlessMethod()
+			throws Exception {
+		String methodName = "setAddress";
+
+		Object object = new User();
+		Method method = User.class.getMethod( methodName );
+		Object[] parameterValues = new Object[] { };
+
+		Set<ConstraintViolation<Object>> violations = executableValidator.validateParameters(
+				object,
+				method,
+				parameterValues
+		);
+
+		assertCorrectNumberOfViolations( violations, 1 );
+		assertEquals( violations.iterator().next().getInvalidValue(), parameterValues );
+	}
 }