Author: shane.bryzak(a)jboss.com Date: 2009-09-20 22:47:18 -0400 (Sun, 20 Sep 2009) New Revision: 3710 Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml Log: section 4 assertions Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-09-21 02:09:51 UTC (rev 3709) +++ tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-09-21 02:47:18 UTC (rev 3710) @@ -1470,14 +1470,14 @@ <section id="4.1" title="Inheritance of type-level metadata"> <group> - <text>Suppose a class X is extended directly or indirectly by the bean class of a managed bean or session bean Y. If X is annotated with a binding type, stereotype or interceptor binding type Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text> + <text>Suppose a class X is extended directly or indirectly by the bean class of a managed bean or session bean Y. If X is annotated with a qualifier type, stereotype or interceptor binding type Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares an annotation of type Z.</text> <assertion id="aa"> - <text>Test binding type for directly extended managed bean annotated |@Inherited| is inherited.</text> + <text>Test qualifier type for directly extended managed bean annotated |@Inherited| is inherited.</text> </assertion> <assertion id="aaa"> - <text>Test binding type for directly extended managed bean not annotated |@Inherited| is not inherited.</text> + <text>Test qualifier type for directly extended managed bean not annotated |@Inherited| is not inherited.</text> </assertion> <assertion id="ab"> @@ -1497,11 +1497,11 @@ </assertion> <assertion id="ag"> - <text>Test binding type for indirectly extended managed bean annotated |@Inherited| is inherited.</text> + <text>Test qualifier type for indirectly extended managed bean annotated |@Inherited| is inherited.</text> </assertion> <assertion id="aga"> - <text>Test binding type for indirectly extended managed bean not annotated |@Inherited| is not inherited.</text> + <text>Test qualifier type for indirectly extended managed bean not annotated |@Inherited| is not inherited.</text> </assertion> <assertion id="ah"> @@ -1521,11 +1521,11 @@ </assertion> <assertion id="al"> - <text>Test binding type for directly extended session bean annotated |@Inherited| is inherited.</text> + <text>Test qualifier type for directly extended session bean annotated |@Inherited| is inherited.</text> </assertion> <assertion id="ala"> - <text>Test binding type for directly extended session bean not annotated |@Inherited| is not inherited.</text> + <text>Test qualifier type for directly extended session bean not annotated |@Inherited| is not inherited.</text> </assertion> <assertion id="am"> @@ -1545,11 +1545,11 @@ </assertion> <assertion id="ap"> - <text>Test binding type for indirectly extended session bean annotated |@Inherited| is inherited.</text> + <text>Test qualifier type for indirectly extended session bean annotated |@Inherited| is inherited.</text> </assertion> <assertion id="apa"> - <text>Test binding type for indirectly extended session bean not annotated |@Inherited| is not inherited.</text> + <text>Test qualifier type for indirectly extended session bean not annotated |@Inherited| is not inherited.</text> </assertion> <assertion id="aq"> @@ -1774,7 +1774,7 @@ <section id="4.3" title="Specialization"> <assertion id="a" testable="false"> - <text>If two beans both support a certain bean type, and share at least one binding, then they are both eligible for injection to any injection point with that declared type and binding.</text> + <text>If two beans both support a certain bean type, and share at least one qualifier, then they are both eligible for injection to any injection point with that declared type and binding.</text> </assertion> <assertion id="ca"> @@ -1797,7 +1797,7 @@ </assertion> <assertion id="j"> - <text>A bean X that specializes bean Y will include all bindings of Y, together with all bindings declared explicitly by X.</text> + <text>A bean X that specializes bean Y will include all qualifiers of Y, together with all qualifiers declared explicitly by X.</text> </assertion> <assertion id="k"> @@ -1805,7 +1805,7 @@ </assertion> <group> - <text>If X declares a name explicitly, using @Named, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> + <text>If X declares a name explicitly, using |@Named|, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text> <assertion id="la"> <text>Test that a specializing producer method with a name throws a deployment exception.</text> @@ -1825,43 +1825,6 @@ </assertion> </section> - <section id="4.3.2" title="Most specialized enabled bean for a bean"> - <group> - <text>Non-static producer methods, producer fields, disposal methods and observer methods of a bean are invoked upon an instance of the most specialized enabled bean that specializes the bean, as defined by Section 5.6.6, "Invocation of producer or disposal methods", Section 5.6.7, "Access to producer field values" and Section 5.6.8, "Invocation of observer methods".</text> - - <assertion id="aa"> - <text>Test with non-static producer method on an enterprise bean.</text> - </assertion> - - <assertion id="ab"> - <text>Test with non-static producer method on a managed bean.</text> - </assertion> - - <assertion id="b"> - <text>Test with non-static producer field.</text> - </assertion> - - <assertion id="c"> - <text>Test with non-static disposal method.</text> - </assertion> - - <assertion id="d"> - <text>Test with non-static observer method.</text> - </assertion> - </group> - - </section> - - <section id="4.3.3" title="Inconsistent specialization"> - <assertion id="c"> - <text>If, for an enabled bean X that directly specializes a second bean Y, there is another enabled bean that directly specializes Y, we say that inconsistent specialization exists. The container automatically detects inconsistent specialization and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text> - </assertion> - - <assertion id="d"> - <text>If, for an enabled bean X that directly specializes a second bean Y, there is an injection point that matches Y and not X, according to the typesafe resolution algorithm defined in Section 5.3 "Typesafe resolution", we say that inconsistent specialization exists. The container automatically detects inconsistent specialization and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text> - </assertion> - </section> - <section id="5" title="Dependency injection, lookup, and EL"> <assertion id="b">