Author: shane.bryzak(a)jboss.com Date: 2009-03-23 22:26:39 -0400 (Mon, 23 Mar 2009) New Revision: 2167 Modified: tck/trunk/impl/src/main/resources/tck-audit.xml Log: split assertions Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-03-24 02:19:20 UTC (rev 2166) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-03-24 02:26:39 UTC (rev 2167) @@ -2218,21 +2218,37 @@ <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _deployment 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 a deployment type.</text> </assertion> - <assertion id="da"> - <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, the scope types and deployment types explicitly declared by and inherited from the class X take precedence over default scopes and deployment types declared by stereotypes.</text> + <assertion id="daa"> + <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, the _scope types_ explicitly declared by and inherited from the class X take precedence over default _scopes_ declared by stereotypes.</text> </assertion> - <assertion id="db"> - <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, the scope types and deployment types explicitly declared by and inherited from the class X take precedence over default scopes and deployment types declared by stereotypes.</text> + <assertion id="dab"> + <text>For class X which is extended _directly_ by the bean class of a _simple_ bean Y, the _deployment types_ explicitly declared by and inherited from the class X take precedence over deployment _deployment types_ declared by stereotypes.</text> + </assertion> + + <assertion id="dba"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, the _scope types_ explicitly declared by and inherited from the class X take precedence over default _scopes_ declared by stereotypes.</text> </assertion> - <assertion id="dc"> - <text>For class X which is extended _indirectly_ by the bean class of a _simple_ bean Y, the scope types and deployment types explicitly declared by and inherited from the class X take precedence over default scopes and deployment types declared by stereotypes.</text> + <assertion id="dbb"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, the _deployment types_ explicitly declared by and inherited from the class X take precedence over default _deployment types_ declared by stereotypes.</text> + </assertion> + + <assertion id="dca"> + <text>For class X which is extended _indirectly_ by the bean class of a _simple_ bean Y, the _scope types_ explicitly declared by and inherited from the class X take precedence over default _scopes_ declared by stereotypes.</text> </assertion> + + <assertion id="dcb"> + <text>For class X which is extended _indirectly_ by the bean class of a _simple_ bean Y, the _deployment types_ explicitly declared by and inherited from the class X take precedence over default _deployment_ types declared by stereotypes.</text> + </assertion> - <assertion id="dd"> - <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, the scope types and deployment types explicitly declared by and inherited from the class X take precedence over default scopes and deployment types declared by stereotypes.</text> + <assertion id="dda"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, the _scope types_ explicitly declared by and inherited from the class X take precedence over default _scopes_ declared by stereotypes.</text> </assertion> + + <assertion id="ddb"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, the _deployment types_ explicitly declared by and inherited from the class X take precedence over _deployment types_ declared by stereotypes.</text> + </assertion> <assertion id="ea"> <text>For class X which is the bean class of a _simple_ bean Y declared using XML, if X is annotated with a _binding type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not explicitly declare an annotation of type Z using XML.</text>