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

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-08-25 08:07:30 -0400 (Tue, 25 Aug 2009)
New Revision: 17406

Modified:
   beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Address.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/validatorfactory/CustomConstraintValidatorTest.java
   beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
Log:
reviewed tests which were marked as disabled

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Address.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Address.java	2009-08-25 10:22:20 UTC (rev 17405)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/Address.java	2009-08-25 12:07:30 UTC (rev 17406)
@@ -29,7 +29,7 @@
 @ZipCodeCoherenceChecker(groups = Address.HighLevelCoherence.class)
 public class Address {
 	@NotNull(groups = Default.class)
-	@Size(max = 50, message = "Streetnames cannot have more than {max} characters.")
+	@Size(max = 50, message = "Street names cannot have more than {max} characters.")
 	private String street;
 
 	@NotNull(groups = Default.class)
@@ -65,7 +65,7 @@
 	}
 
 	/**
-	 * Check conherence on the overall object
+	 * Check coherence on the overall object
 	 * Needs basic checking to be green first
 	 */
 	public interface HighLevelCoherence {

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-08-25 10:22:20 UTC (rev 17405)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/constraints/groups/DefaultGroupRedefinitionTest.java	2009-08-25 12:07:30 UTC (rev 17406)
@@ -79,27 +79,6 @@
 		assertCorrectConstraintViolationMessages( constraintViolations, "Zip code is not coherent." );
 	}
 
-	@Test(enabled = false)
-	@SpecAssertion(section = "3.4.3", id = "b")
-	public void testConstraintsHostedOnEntityZBelongToGroupZ() {
-		Validator validator = TestUtil.getValidatorUnderTest();
-		BeanDescriptor beanDescriptor = validator.getConstraintsForClass( Address.class );
-		assertTrue( beanDescriptor.isBeanConstrained() );
-
-		Address address = new Address();
-		Set<ConstraintViolation<Address>> violations = validator.validate( address );
-		assertTrue( violations.size() == 3, "All 3 @NotNull constraints should fail." );
-		assertAssertionType( violations );
-
-		violations = validator.validate( address, Default.class );
-		assertTrue( violations.size() == 3, "All 3 @NotNull constraints should fail." );
-		assertAssertionType( violations );
-
-		violations = validator.validate( address, Address.class );
-		assertTrue( violations.size() == 3, "All 3 @NotNull constraints should fail." );
-		assertAssertionType( violations );
-	}
-
 	@Test
 	@SpecAssertion(section = "3.4.3", id = "a")
 	public void testValidatingAgainstRedefinedDefaultGroup() {

Modified: beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java	2009-08-25 10:22:20 UTC (rev 17405)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validatorfactory/CustomConstraintValidatorTest.java	2009-08-25 12:07:30 UTC (rev 17406)
@@ -59,7 +59,7 @@
 	}
 
 	@SpecAssertion(section = "2.5", id = "c")
-	@Test(expectedExceptions = ValidationException.class, enabled = false)
+	@Test(expectedExceptions = ValidationException.class)
 	public void testValidationExceptionIsThrownInCaseFactoryReturnsNull() {
 		Configuration<?> config = TestUtil.getConfigurationUnderTest().constraintValidatorFactory(
 				new ConstraintValidatorFactory() {

Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml	2009-08-25 10:22:20 UTC (rev 17405)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml	2009-08-25 12:07:30 UTC (rev 17406)
@@ -401,7 +401,7 @@
                 this sequence expresses the sequence of groups that does substitute Default for this
                 class.</text>
         </assertion>
-        <assertion id="b">
+        <assertion id="b" testable="false">
             <text>Constraints hosted on a class A and belonging to the Default group (by default or
                 explicitly) implicitly belong to the group A</text>
         </assertion>