Author: pete.muir(a)jboss.org Date: 2009-07-27 16:22:12 -0400 (Mon, 27 Jul 2009) New Revision: 3290 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/NonRuntimeBindingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java tck/trunk/impl/src/main/resources/tck-audit.xml Log: Fix assertions in inheritence, version tests Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/InactiveContextTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -1,25 +0,0 @@ -package org.jboss.jsr299.tck.tests.context; - -import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.RequestScoped; - -import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.testng.annotations.Test; - -@Artifact -@SpecVersion("20090519") -public class InactiveContextTest extends AbstractJSR299Test -{ - - @Test(expectedExceptions = { ContextNotActiveException.class }, groups = { "manager" }) - @SpecAssertion(section = "6.2", id = "m") - public void testGetContextWithNoActiveContextsFails() - { - getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); - getCurrentManager().getContext(RequestScoped.class); - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken10/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken10; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; @@ -13,7 +13,7 @@ @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("unknown") +@SpecVersion("20090625") public class UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken2/NonSerializableTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -1,10 +1,10 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken2; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -17,7 +17,7 @@ */ @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion("PRD2") +@SpecVersion("20090625") public class NonSerializableTest extends AbstractJSR299Test { @Test(groups = { "contexts", "passivation" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.context.request.ejb; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; @@ -17,7 +17,7 @@ @Artifact @IntegrationTest @Packaging(PackagingType.EAR) -@SpecVersion("20090519") +@SpecVersion("20090625") public class EJBRequestContextTest extends AbstractJSR299Test { /** Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -5,9 +5,9 @@ import javax.enterprise.inject.Any; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; @@ -27,7 +27,7 @@ public class EnterpriseBindingDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "4.1", id = "ad") + @SpecAssertion(section = "4.1", id = "an") public void testBindingDeclaredInheritedIsInherited() throws Exception { Set<? extends Annotation> bindings = getBeans(BorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings(); @@ -35,7 +35,7 @@ } @Test - @SpecAssertion(section = "4.1", id = "aj") + @SpecAssertion(section = "4.1", id = "ar") public void testBindingDeclaredInheritedIsIndirectlyInherited() { Set<? extends Annotation> bindings = getBeans(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -1,17 +1,17 @@ package org.jboss.jsr299.tck.tests.definition.scope.broken.tooManyScopes; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion("20090519") +@SpecVersion("20090625") public class TooManyScopesTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -2,9 +2,9 @@ import javax.enterprise.context.RequestScoped; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; @@ -12,17 +12,17 @@ @Artifact @Packaging(PackagingType.EAR) -@SpecVersion("20090519") +@SpecVersion("20090625") public class EnterpriseScopeDefinitionTest extends AbstractJSR299Test { - @Test @SpecAssertion(section="4.1", id = "bb") + @Test @SpecAssertion(section="4.1", id = "be") public void testScopeTypeDeclaredInheritedIsInherited() throws Exception { assert getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test - @SpecAssertion(section = "4.1", id = "bd") + @SpecAssertion(section = "4.1", id = "bh") public void testScopeTypeDeclaredInheritedIsIndirectlyInherited() { assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -3,9 +3,9 @@ import javax.enterprise.context.RequestScoped; import javax.enterprise.context.SessionScoped; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; @@ -19,28 +19,28 @@ public class EnterpriseStereotypeDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "4.1", id = "ae") + @SpecAssertion(section = "4.1", id = "ao") public void testStereotypeDeclaredInheritedIsInherited() throws Exception { assert getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test - @SpecAssertion(section = "4.1", id = "ak") + @SpecAssertion(section = "4.1", id = "as") public void testStereotypeDeclaredInheritedIsIndirectlyInherited() { assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class); } @Test - @SpecAssertion(section = "4.1", id = "hhh") + @SpecAssertion(section = "4.1", id = "hhj") public void testStereotypeScopeIsOverriddenByInheritedScope() { assert getBeans(ChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class); } @Test - @SpecAssertion(section = "4.1", id = "hhi") + @SpecAssertion(section = "4.1", id = "hhk") public void testStereotypeScopeIsOverriddenByIndirectlyInheritedScope() { assert getBeans(MexicanChihuahuaLocal.class).iterator().next().getScopeType().equals(SessionScoped.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -17,10 +17,10 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DeploymentError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @@ -34,10 +34,10 @@ */ @Artifact @ExpectedDeploymentException(DeploymentError.class) -@SpecVersion("20090519") +@SpecVersion("20090625") public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test { - @Test(groups={"incontainer-ri-broken", "broken"}) + @Test(groups={"incontainer-ri-broken", "rewrite"}) // TODO Needs Extension stuff adding // WBRI-312 @SpecAssertion(section = "11.5.3", id = "c") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/NonRuntimeBindingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/NonRuntimeBindingType.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/NonRuntimeBindingType.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -3,12 +3,15 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.PARAMETER; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import javax.enterprise.inject.BindingType; @Target( { FIELD, PARAMETER }) @BindingType +(a)Retention(RetentionPolicy.CLASS) @interface NonRuntimeBindingType { } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -4,9 +4,9 @@ import javax.enterprise.inject.spi.ObserverMethod; +import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; import org.jboss.testharness.impl.packaging.Packaging; @@ -21,7 +21,7 @@ @Artifact @Packaging(PackagingType.EAR) @IntegrationTest -@SpecVersion("20090519") +@SpecVersion("20090625") public class EnterpriseEventInheritenceTest extends AbstractJSR299Test { @Test(groups = { "events", "inheritance" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/broken/specializingAndSpecializedBeanHaveName/SpecializingAndSpecializedBeanHaveNameTest.java 2009-07-27 20:22:12 UTC (rev 3290) @@ -1,17 +1,17 @@ package org.jboss.jsr299.tck.tests.inheritance.specialization.producer.method.broken.specializingAndSpecializedBeanHaveName; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; @Artifact @ExpectedDeploymentException(DefinitionError.class) -@SpecVersion("20090519") +@SpecVersion("20090625") public class SpecializingAndSpecializedBeanHaveNameTest extends AbstractJSR299Test { Modified: tck/trunk/impl/src/main/resources/tck-audit.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 19:59:32 UTC (rev 3289) +++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-27 20:22:12 UTC (rev 3290) @@ -1399,7 +1399,39 @@ <assertion id="ak"> <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _stereotype_ 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> + + <assertion id="al"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, 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 declare an annotation of type Z.</text> + </assertion> + <assertion id="am"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text> + </assertion> + + <assertion id="an"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, 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 declare an annotation of type Z.</text> + </assertion> + + <assertion id="ao"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _stereotype_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare an annotation of type Z.</text> + </assertion> + + <assertion id="ap"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, 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 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> + + <assertion id="aq"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _stereotype_ 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> + + <assertion id="ar"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, 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 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> + + <assertion id="as"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _stereotype_ 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> + <assertion id="ba"> <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text> </assertion> @@ -1415,7 +1447,23 @@ <assertion id="bd"> <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope 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 scope type.</text> </assertion> + + <assertion id="be"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text> + </assertion> + <assertion id="bf"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text> + </assertion> + + <assertion id="bg"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _scope 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 scope type.</text> + </assertion> + + <assertion id="bh"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _scope 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 scope type.</text> + </assertion> + <assertion id="hhh"> <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text> </assertion> @@ -1423,6 +1471,14 @@ <assertion id="hhi"> <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text> </assertion> + + <assertion id="hhj"> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text> + </assertion> + + <assertion id="hhk"> + <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text> + </assertion> <assertion id="i" testable="false"> <text>For annotations defined by the bean specification, all built-in _scope types_ are declared |@Inherited|</text> @@ -1453,7 +1509,7 @@ </assertion> <assertion id="ab"> - <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares an injected field x then Y inherits x.</text> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares an injected field x then Y inherits x.</text> </assertion> <assertion id="ac"> @@ -1469,7 +1525,7 @@ </assertion> <assertion id="bab"> - <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X declares a _|@PostConstruct|_ method x() then Y inherits x() if and only if Y does not override the method x()</text> + <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X declares a _|@PostConstruct|_ method x() then Y inherits x() if and only if Y does not override the method x()</text> </assertion> <assertion id="bac">