[weld-commits] Weld SVN: r4624 - in cdi-tck/trunk/impl/src/main: resources and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-11-03 13:36:28 -0500 (Tue, 03 Nov 2009)
New Revision: 4624

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java
   cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
split out assertions

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java	2009-11-03 18:30:41 UTC (rev 4623)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/AlternativeMetadataTest.java	2009-11-03 18:36:28 UTC (rev 4624)
@@ -49,9 +49,9 @@
 public class AlternativeMetadataTest extends AbstractJSR299Test
 {
    @Test(groups = "ri-broken")
-   @SpecAssertion(section = "11.4", id = "h")
+   @SpecAssertion(section = "11.4", id = "ha")
    // WELD-200
-   public void testGetBaseTypeUsedToDetermineTypeOfInjectionPoing() {
+   public void testGetBaseTypeUsedToDetermineTypeOfInjectionPoint() {
       // The base type of the fruit injection point is overridden to TropicalFruit
       assert GroceryWrapper.isGetBaseTypeOfFruitFieldUsed();
       assert getInstanceByType(Grocery.class, new AnyLiteral()).getFruit().getMetadata().getType().equals(TropicalFruit.class);

Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml	2009-11-03 18:30:41 UTC (rev 4623)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml	2009-11-03 18:36:28 UTC (rev 4624)
@@ -5418,10 +5418,30 @@
     <group> 
       <text>The container must use the operations of |Annotated| and its subinterfaces to discover program element types and annotations, instead of directly calling the Java Reflection API. In particular, the container must call |Annotated.getBaseType()| to determine the type of an injection point, event parameter or disposed parameter, call |Annotated.getTypeClosure()| to determine the bean types of any kind of bean, call |Annotated.getAnnotations()| to determine the scope, qualifiers, stereotypes and interceptor bindings of a bean, call |Annotated.isAnnotationPresent()| and |Annotated.getAnnotation()| to read any bean annotations defined by this specification, and call |AnnotatedType.getConstructors()|, |AnnotatedType.getMethods()| and |AnnotatedType.getFields()| to determine the members of a bean class.</text>
       
-      <assertion id="h">
-         <text>Check that |getBaseType()| is used to determine the type of _an injection point_. The base type should be different from the orignal type specified in the class definition</text>
+      <assertion id="ha">
+         <text>Check that |getBaseType()| is used to determine the type of _a field injection point_. The base type should be different from the orignal type specified in the class definition</text>
       </assertion>
       
+      <assertion id="hb">
+         <text>Check that |getBaseType()| is used to determine the type of _an initializer method injection point_. The base type should be different from the orignal type specified in the class definition</text>
+      </assertion>
+      
+      <assertion id="hc">
+         <text>Check that |getBaseType()| is used to determine the type of _a constructor injection point_. The base type should be different from the orignal type specified in the class definition</text>
+      </assertion>
+      
+      <assertion id="hd">
+         <text>Check that |getBaseType()| is used to determine the type of _a producer method injection point_. The base type should be different from the orignal type specified in the class definition</text>
+      </assertion>
+      
+      <assertion id="he">
+         <text>Check that |getBaseType()| is used to determine the type of _a observer method injection point_. The base type should be different from the orignal type specified in the class definition</text>
+      </assertion>
+      
+      <assertion id="hf">
+         <text>Check that |getBaseType()| is used to determine the type of _a disposer method injection point_. The base type should be different from the orignal type specified in the class definition</text>
+      </assertion>
+      
       <assertion id="i">
          <text>Check that |getBaseType()| is used to determine the type of _an event parameter_. The base type should be different from the orignal type specified in the class definition</text>
       </assertion>