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

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-07-16 12:25:47 -0400 (Thu, 16 Jul 2009)
New Revision: 17111

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/graphnavigation/GraphNavigationTest.java
   beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
basic validation tests

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-16 15:51:23 UTC (rev 17110)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/ValidateTest.java	2009-07-16 16:25:47 UTC (rev 17111)
@@ -41,6 +41,7 @@
 import org.testng.annotations.Test;
 
 import org.hibernate.jsr303.tck.util.TestUtil;
+import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectNumberOfViolations;
 import static org.hibernate.jsr303.tck.util.TestUtil.assertCorrectPropertyPaths;
 
 /**
@@ -320,4 +321,45 @@
 				"The declared constraint does not explicitly define a group, hence Default is expected"
 		);
 	}
+
+	@Test
+	@SpecAssertion(section = "3.5", id = "b")
+	public void testOnlyFirstGroupInSequenceGetEvaluated() {
+		Validator validator = TestUtil.getDefaultValidator();
+		Car car = new Car( "USd-298" );
+
+		Set<ConstraintViolation<Car>> violations = validator.validateProperty(
+				car, "licensePlateNumber", First.class, Second.class
+		);
+		assertCorrectNumberOfViolations( violations, 1 );
+
+		car.setLicensePlateNumber( "USD-298" );
+		violations = validator.validateProperty(
+				car, "licensePlateNumber", First.class, Second.class
+		);
+		assertCorrectNumberOfViolations( violations, 0 );
+	}
+
+	class Car {
+		@Pattern(regexp = "[A-Z][A-Z][A-Z]-[0-9][0-9][0-9]", groups = { First.class, Second.class })
+		private String licensePlateNumber;
+
+		Car(String licensePlateNumber) {
+			this.licensePlateNumber = licensePlateNumber;
+		}
+
+		public String getLicensePlateNumber() {
+			return licensePlateNumber;
+		}
+
+		public void setLicensePlateNumber(String licensePlateNumber) {
+			this.licensePlateNumber = licensePlateNumber;
+		}
+	}
+
+	interface First {
+	}
+
+	interface Second {
+	}
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java	2009-07-16 15:51:23 UTC (rev 17110)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java	2009-07-16 16:25:47 UTC (rev 17111)
@@ -227,7 +227,16 @@
 		p.setChild( new Child() );
 		Validator validator = TestUtil.getDefaultValidator();
 		Set<ConstraintViolation<Parent>> errors = validator.validate( p, Parent.ProperOrder.class );
-		assertEquals( 1, errors.size() );
+		assertCorrectNumberOfViolations( errors, 1 );
 		assertCorrectPropertyPaths( errors, "child.name" );
 	}
+
+	@Test
+	@SpecAssertion(section = "3.5.1", id = "c")
+	public void testNullReferencesGetIgnored() {
+		Parent p = new Parent();
+		Validator validator = TestUtil.getDefaultValidator();
+		Set<ConstraintViolation<Parent>> errors = validator.validateProperty( p, "child" );
+		assertCorrectNumberOfViolations( errors, 0 );
+	}
 }
\ No newline at end of file

Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml	2009-07-16 15:51:23 UTC (rev 17110)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml	2009-07-16 16:25:47 UTC (rev 17111)
@@ -565,7 +565,7 @@
         <assertion id="b">
             <text>If no group is passed, the Default group is assumed</text>
         </assertion>
-        <assertion id="c">
+        <assertion id="c" testable="false">
             <text>When more than one group is evaluated and passed to the various validate methods,
                 order is not constrained</text>
         </assertion>