[hibernate-commits] Hibernate SVN: r17103 - in beanvalidation/trunk/validation-tck/src/main: resources and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2009-07-15 11:34:58 -0400 (Wed, 15 Jul 2009)
New Revision: 17103

Modified:
   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:


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-15 15:25:24 UTC (rev 17102)
+++ beanvalidation/trunk/validation-tck/src/main/java/org/hibernate/jsr303/tck/tests/validation/graphnavigation/GraphNavigationTest.java	2009-07-15 15:34:58 UTC (rev 17103)
@@ -176,6 +176,10 @@
 	}
 
 	@Test
+	@SpecAssertions({
+			@SpecAssertion(section = "3.4.2", id = "b"),
+			@SpecAssertion(section = "3.4.2", id = "d")
+	})
 	public void testFullGraphValidationBeforeNextGroupInSequence() {
 		Parent p = new Parent();
 		p.setChild( new Child() );

Modified: beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml
===================================================================
--- beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml	2009-07-15 15:25:24 UTC (rev 17102)
+++ beanvalidation/trunk/validation-tck/src/main/resources/tck-audit.xml	2009-07-15 15:34:58 UTC (rev 17103)
@@ -281,38 +281,32 @@
                 are used</text>
         </assertion>
         <assertion id="c">
-            <text>Collection-valued, array-valued or Iterable fields and properties may also be
-                decorated with the @Valid annota- tion. This causes the contents of the collection,
-                array or iterator to be validated</text>
+            <text>Array of objects is supported by @Valid. The content of the array is validated.</text>
         </assertion>
         <assertion id="d">
-            <text>Array of objects is supported by @Valid</text>
+            <text>java.util.Collection is supported by @Valid. The content of the collection is validated.</text>
         </assertion>
-        <assertion id="e" >
-            <text>java.util.Collection is supported by @Valid
-                 </text>
+        <assertion id="e">
+            <text>java.util.Set is supported by @Valid. The content of the Set is validated.</text>
         </assertion>
         <assertion id="f">
-            <text>java.util.Set is supported by @Valid</text>
+            <text>java.util.List is supported by @Valid. The content of the list is validated.</text>
         </assertion>
-        <assertion  id="g">
-            <text>java.util.List is supported by @Valid</text>
+        <assertion id="g">
+            <text>java.util.Map is supported by @Valid</text>
         </assertion>
-        <assertion  id="h">
-            <text>java.util.Map is supported by @Valid
-                </text>
+        <assertion id="h">
+            <text>java.lang.Iterable is supported by @Valid. The elements of the iterable are validated</text>
         </assertion>
         <assertion id="i">
-            <text>java.lang.Iterable is supported by @Valid</text>
-        </assertion>  
-        <assertion id="j">
             <text>For Map, the value of each entry is validated (the key is not validated)</text>
         </assertion>
-        <assertion id="k">
-            <text>Like regular references, the type of the collection, array or Iterable element is determined at runtime and the constraint
-                definitions for this particular type are used</text>
+        <assertion id="j">
+            <text>Like regular references, the type of the collection, array or Iterable element is
+                determined at runtime and the constraint definitions for this particular type are
+                used</text>
         </assertion>
-        <assertion id="l">
+        <assertion id="k">
             <text>The @Valid annotation is applied recursively</text>
         </assertion>
     </section>
@@ -940,7 +934,8 @@
                 constraint</text>
         </assertion>
         <assertion id="g">
-            <text>getPayload returns the payloads the constraint hosts or an empty set if none</text>
+            <text>getPayload returns the payloads the constraint hosts or an empty set if
+                none</text>
         </assertion>
 
     </section>
@@ -998,7 +993,8 @@
 
     <section id="7" title="XML deployment descriptor">
         <assertion id="a" testable="true">
-            <text>If the xml configuration file does not validate against the given xsd files a ValidationException is raised. </text>
+            <text>If the xml configuration file does not validate against the given xsd files a
+                ValidationException is raised. </text>
         </assertion>
     </section>
     <section id="7.1" title="Constraint definition and declaration">