[webbeans-commits] Webbeans SVN: r2910 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation: disposal/method/definition/broken1 and 7 other directories.

Author: dan.j.allen Date: 2009-06-27 00:48:41 -0400 (Sat, 27 Jun 2009) New Revision: 2910 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java Log: update section numbers to comply with 20090519 spec assertions Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -12,6 +12,9 @@ import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @BeansXml("beans.xml") public class DisposalMethodDefinitionTest extends AbstractJSR299Test @@ -20,13 +23,13 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "2.3.6", id = "c"), - @SpecAssertion(section = "3.4.6", id = "b"), - @SpecAssertion(section = "3.4.6", id = "c"), - @SpecAssertion(section = "3.4.6", id = "e"), - @SpecAssertion(section = "3.4.7", id = "b"), - @SpecAssertion(section = "3.4.8", id = "a"), - @SpecAssertion(section = "3.4.11", id = "a") + @SpecAssertion(section = "2.3.5", id = "c"), + @SpecAssertion(section = "3.4.5", id = "b"), + @SpecAssertion(section = "3.4.5", id = "c"), + @SpecAssertion(section = "3.4.5", id = "e"), + @SpecAssertion(section = "3.4.6", id = "ba"), + @SpecAssertion(section = "3.4.7", id = "a"), + @SpecAssertion(section = "3.4.9", id = "aa") }) public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception { @@ -48,8 +51,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "3.4.6", id = "a"), - @SpecAssertion(section = "3.4.7", id = "d") + @SpecAssertion(section = "3.4.5", id = "a"), + @SpecAssertion(section = "3.4.6", id = "ba") }) public void testDisposalMethodOnNonBean() throws Exception { @@ -74,10 +77,10 @@ * calls Manager.getInstanceToInject() to determine a value for each * parameter of a disposal method and calls the disposal method with those * parameter values - * @throws Exception + * @throws Exception */ @Test(groups = { "disposalMethod" }) - @SpecAssertion(section = "3.4.10", id = "a") + @SpecAssertion(section = "3.4.8", id = "a") public void testDisposalMethodParametersGetInjected() throws Exception { new RunInDependentContext() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/MultipleDisposeParametersDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -11,9 +11,7 @@ import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -22,9 +20,8 @@ { @Test @SpecAssertions({ - @SpecAssertion(section = "3.4.7", id = "a"), - @SpecAssertion(section = "3.4.8", id = "b"), - @SpecAssertion(section = "3.4.11", id = "b") + @SpecAssertion(section = "3.4.6", id = "a"), + @SpecAssertion(section = "3.4.7", id = "ba") }) public void testMultipleDisposeParameters() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken1; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken1/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -6,7 +6,6 @@ @AnotherDeploymentType class SpiderProducer_Broken { - @Produces public static Spider getSpider() { @@ -15,7 +14,5 @@ public static void destorySpider(@Disposes Spider spider, @Disposes Spider another) { - } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/ProducesUnallowedDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -9,16 +9,14 @@ import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) public class ProducesUnallowedDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4.8", id = "c") + @SpecAssertion(section = "3.4.7", id = "ca") public void testProducesUnallowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken2; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken2/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -6,7 +6,6 @@ @AnotherDeploymentType class SpiderProducer_Broken { - @Produces public static Spider getSpider() { @@ -16,7 +15,5 @@ @Produces public static void destorySpider(@Disposes Spider spider) { - } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/AnotherDeploymentType.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -16,5 +16,4 @@ @DeploymentType @interface AnotherDeploymentType { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/InitializerUnallowedDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -10,9 +10,7 @@ import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -20,7 +18,7 @@ public class InitializerUnallowedDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4.8", id = "d") + @SpecAssertion(section = "3.4.7", id = "da") public void testInitializerUnallowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken3; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken3/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -17,7 +17,6 @@ @Initializer public static void destorySpider(@Disposes Spider spider) { - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/ObserverParameterUnallowedDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4; - import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DefinitionError; @@ -10,9 +9,7 @@ import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @@ -20,7 +17,7 @@ public class ObserverParameterUnallowedDefinitionTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "3.4.8", id = "e") + @SpecAssertion(section = "3.4.7", id = "ea") public void testObserverParameterUnallowed() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken4; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken4/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -16,7 +16,6 @@ public static void destorySpider(@Disposes @Observes Spider spider) { - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Cat.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5; - -class Cat +class Cat { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/Spider.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,7 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5; - -class Spider +class Spider { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/SpiderProducer_Broken.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -15,12 +15,10 @@ public static void destorySpider(@Disposes Spider spider) { - } public static void destorySpider2(@Disposes Cat cat) { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken5/UnresolvedDisposalMethodDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,29 +1,25 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken5; -import javax.enterprise.inject.UnsatisfiedResolutionException; - import org.hibernate.tck.annotations.SpecAssertion; 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.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** - * - * Spec version: PRD2 - * + * Spec version: 20090519 */ @Artifact -(a)ExpectedDeploymentException(UnsatisfiedResolutionException.class) +(a)ExpectedDeploymentException(DefinitionError.class) @BeansXml("beans.xml") public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test { - @Test - @SpecAssertion(section = "3.4.7", id = "c") + @Test(groups = "ri-broken") + @SpecAssertion(section = "3.4.9", id = "ca") public void testUnresolvedDisposalMethod() { assert false; } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken6/DisposalMethodOnSessionBean.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.implementation.disposal.method.definition.broken6; - import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -12,6 +11,9 @@ import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact @ExpectedDeploymentException(DefinitionError.class) @IntegrationTest @@ -20,8 +22,8 @@ { @Test @SpecAssertions({ - @SpecAssertion(section = "3.4.6", id = "d"), - @SpecAssertion(section = "3.4.8", id = "f") + @SpecAssertion(section = "3.4.5", id = "d"), + @SpecAssertion(section = "3.4.7", id = "fa") }) public void testDisposalMethodNotBusinessOrStatic() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -2,6 +2,7 @@ import java.lang.annotation.Annotation; +import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; @@ -27,9 +28,10 @@ { @Test(groups = { "enterpriseBeans" }) @SpecAssertion(section = "3.3", id = "b") - public void testStatelessWithDependentScopeOK() + public void testStatelessMustBeDependentScoped() { assert getBeans(GiraffeLocal.class).size() == 1; + assert getBeans(GiraffeLocal.class).iterator().next().getScopeType().equals(Dependent.class); } @Test(groups = { "enterpriseBeans" }) @@ -47,16 +49,9 @@ } @Test(groups = { "enterpriseBeans" }) - @SpecAssertion(section = "3.3.2", id = "a") - public void testAnnotatedEnterpriseBean() - { - assert getBeans(GiraffeLocal.class).size() > 0; - } - - @Test(groups = { "enterpriseBeans" }) - @SpecAssertions( { - @SpecAssertion(section = "3.2.1", id = "f"), - @SpecAssertion(section = "3.3.3", id = "a"), + @SpecAssertions( { + @SpecAssertion(section = "3.2.1", id = "f"), + @SpecAssertion(section = "3.3.3", id = "a"), @SpecAssertion(section = "3.3.4", id = "c") } ) public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -7,5 +7,4 @@ @Dependent class Labrador { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionBean.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -4,6 +4,7 @@ import javax.ejb.Remove; import javax.ejb.Stateful; import javax.enterprise.inject.Current; +import javax.enterprise.inject.spi.BeanManager; @Stateful public class DependentSessionBean implements DependentSessionInterface @@ -18,9 +19,10 @@ } @Remove - public void anotherRemoveWithParameters(String reason) + public void anotherRemoveWithParameters(String reason, @Current BeanManager manager) { stateKeeper.setRemoveCalled(true); + assert manager == null; } @PreDestroy Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -1,13 +1,14 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.remove; import javax.ejb.Local; +import javax.enterprise.inject.spi.BeanManager; @Local public interface DependentSessionInterface { public void remove(); - public void anotherRemoveWithParameters(String reason); + public void anotherRemoveWithParameters(String reason, BeanManager manager); public void businessMethod(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-06-26 22:40:54 UTC (rev 2909) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-06-27 04:48:41 UTC (rev 2910) @@ -13,10 +13,9 @@ import org.testng.annotations.Test; /** - * + * Spec version: 20090519 + * * @author Nicklas Karlsson - * - * Spec version: PRD2 */ @Artifact @Packaging(EAR) @@ -37,7 +36,7 @@ DependentSessionInterface sessionBean = getInstanceByType(DependentSessionInterface.class); sessionBean.remove(); Bean<?> bean = getCurrentManager().getBeans(StateKeeper.class).iterator().next(); - StateKeeper stateKeeper = (StateKeeper) + StateKeeper stateKeeper = (StateKeeper) getCurrentManager().getReference(bean,StateKeeper.class, getCurrentManager().createCreationalContext(bean)); assert stateKeeper.isRemoveCalled(); } @@ -55,7 +54,7 @@ protected void execute() throws Exception { DependentSessionInterface sessionBean = getInstanceByType(DependentSessionInterface.class); - sessionBean.anotherRemoveWithParameters("required"); + sessionBean.anotherRemoveWithParameters("required", null); StateKeeper stateKeeper = getInstanceByType(StateKeeper.class); assert stateKeeper.isRemoveCalled(); } @@ -63,7 +62,7 @@ } @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle" }, expectedExceptions = UnsupportedOperationException.class) - @SpecAssertions({ + @SpecAssertions({ @SpecAssertion(section = "3.3.1", id = "b"), @SpecAssertion(section = "3.3.1", id = "c") })