[hibernate-commits] Hibernate SVN: r17092 - in beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests: validation and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-07-15 07:47:38 -0400 (Wed, 15 Jul 2009)
New Revision: 17092

Modified:
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java
Log:
Added more test mappings

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java	2009-07-14 20:58:00 UTC (rev 17091)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/application/ValidationRequirementTest.java	2009-07-15 11:47:38 UTC (rev 17092)
@@ -20,6 +20,7 @@
 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.test.audit.annotations.SpecAssertions;
@@ -79,7 +80,6 @@
 		assertCorrectNumberOfViolations( violations, 0 );
 	}
 
-
 	@Test
 	@SpecAssertions({
 			@SpecAssertion(section = "3.1", id = "d"),
@@ -122,6 +122,26 @@
 		String expectedMessage = "Building costs are max {max} dollars.";
 		assertCorrectConstraintViolationMessages( violations, expectedMessage, expectedMessage );
 	}
+
+	@Test
+	@SpecAssertion(section = "3.1.2", id = "e")
+	public void testIgnoreStaticFieldsAndProperties() {
+		StaticFieldsAndProperties entity = new StaticFieldsAndProperties();
+
+		Validator validator = TestUtil.getDefaultValidator();
+		Set<ConstraintViolation<StaticFieldsAndProperties>> violations = validator.validate( entity );
+		assertCorrectNumberOfViolations( violations, 0 );
+	}
+
+	static class StaticFieldsAndProperties {
+		@NotNull
+		static Object staticField = null;
+
+		@NotNull
+		static Object getStaticProperty() {
+			return null;
+		}
+	}
 }
 
 interface DummyGroup {

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java	2009-07-14 20:58:00 UTC (rev 17091)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java	2009-07-15 11:47:38 UTC (rev 17092)
@@ -49,7 +49,7 @@
  * @author Hardy Ferentschik
  */
 @Artifact(artifactType = ArtifactType.JSR303)
- at Classes({TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class})
+ at Classes({ TestUtil.class, TestUtil.PathImpl.class, TestUtil.NodeImpl.class })
 public class ValidateTest extends AbstractTest {
 
 	@Test
@@ -177,7 +177,10 @@
 	}
 
 	@Test
-	@SpecAssertion(section = "4.2", id = "h")
+	@SpecAssertions({
+			@SpecAssertion(section = "2.4", id = "o"),
+			@SpecAssertion(section = "4.2", id = "h")
+	})
 	public void testGraphValidationWithList() {
 		Validator validator = TestUtil.getDefaultValidator();
 
@@ -199,11 +202,16 @@
 		assertEquals( "Everyone has a last name.", constraintViolation.getMessage(), "Wrong message" );
 		assertEquals( constraintViolation.getRootBean(), clint, "Wrong root entity" );
 		assertEquals( constraintViolation.getInvalidValue(), morgan.getLastName(), "Wrong value" );
-		assertCorrectPropertyPaths( constraintViolations, "playedWith[0].playedWith[1].lastName", "playedWith[1].lastName" );
+		assertCorrectPropertyPaths(
+				constraintViolations, "playedWith[0].playedWith[1].lastName", "playedWith[1].lastName"
+		);
 	}
 
 	@Test
-	@SpecAssertion(section = "4.2", id = "h")
+	@SpecAssertions({
+			@SpecAssertion(section = "2.4", id = "o"),
+			@SpecAssertion(section = "4.2", id = "h")
+	})
 	public void testGraphValidationWithArray() {
 		Validator validator = TestUtil.getDefaultValidator();
 
@@ -224,7 +232,9 @@
 		assertEquals( "Everyone has a last name.", constraintViolation.getMessage(), "Wrong message" );
 		assertEquals( constraintViolation.getRootBean(), clint, "Wrong root entity" );
 		assertEquals( constraintViolation.getInvalidValue(), morgan.getLastName(), "Wrong value" );
-		assertCorrectPropertyPaths( constraintViolations, "playedWith[0].playedWith[1].lastName", "playedWith[1].lastName" );
+		assertCorrectPropertyPaths(
+				constraintViolations, "playedWith[0].playedWith[1].lastName", "playedWith[1].lastName"
+		);
 	}
 
 	@Test(expectedExceptions = IllegalArgumentException.class)