Author: pete.muir(a)jboss.org Date: 2010-01-22 11:39:43 -0500 (Fri, 22 Jan 2010) New Revision: 5590 Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/javax.enterprise.inject.spi.Extension cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/javax.enterprise.inject.spi.Extension cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/javax.enterprise.inject.spi.Extension Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java Log: port WELD-306 to trunk Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2010-01-22 16:38:38 UTC (rev 5589) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2010-01-22 16:39:43 UTC (rev 5590) @@ -45,8 +45,7 @@ @SpecVersion(spec="cdi", version="20091101") public class AddDefinitionErrorTest extends AbstractJSR299Test { - @Test(groups={"jboss-as-broken", "rewrite"}) - // WBRI-312 + @Test(groups={"rewrite"}) @SpecAssertions({ @SpecAssertion(section = "11.5.2", id = "ca"), @SpecAssertion(section = "12.2", id = "c") @@ -55,13 +54,5 @@ { assert false; } - - // FIXME need to communicate state of container at the time of failure - // @Override - // @AfterClass(alwaysRun = true, groups = "scaffold") - // public void afterClass() throws Exception - // { - // super.afterClass(); - // assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterBeanDiscovery observer methods should have been called"; - // } + } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2010-01-22 16:38:38 UTC (rev 5589) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2010-01-22 16:39:43 UTC (rev 5590) @@ -23,6 +23,7 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -34,26 +35,16 @@ * @author Dan Allen */ @Artifact +(a)Extension(value="javax.enterprise.inject.spi.Extension") @ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") public class AddDeploymentProblemTest extends AbstractJSR299Test { - @Test(groups={"rewrite", "jboss-as-broken"}) - // TODO Needs Extension stuff adding - // WBRI-312 + @Test(groups={"rewrite"}) @SpecAssertion(section = "11.5.3", id = "b") public void testObserverDeploymentProblemTreatedAsDeploymentError() { assert false; } - // FIXME need to communicate state of container at the time of failure - // @Override - // @AfterClass(alwaysRun = true, groups = "scaffold") - // public void afterClass() throws Exception - // { - // super.afterClass(); - // assert BeanDiscoveryObserver.getInvocationCount() == 2 : "All AfterDeploymentValidation observer methods should have been called"; - // } - } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java 2010-01-22 16:38:38 UTC (rev 5589) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/BeanDiscoveryObserver.java 2010-01-22 16:39:43 UTC (rev 5590) @@ -18,8 +18,9 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterDeploymentValidation; +import javax.enterprise.inject.spi.Extension; -class BeanDiscoveryObserver +public class BeanDiscoveryObserver implements Extension { private static int invocationCount = 0; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2010-01-22 16:38:38 UTC (rev 5589) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2010-01-22 16:39:43 UTC (rev 5590) @@ -22,6 +22,7 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -34,11 +35,10 @@ @Artifact @ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") +(a)Extension(value="javax.enterprise.inject.spi.Extension") public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test { - @Test(groups={"jboss-as-broken", "rewrite"}) - //TODO Needs Extension stuff adding - // WBRI-312 + @Test(groups={"rewrite"}) @SpecAssertion(section = "11.5.2", id = "g") public void testObserverFailureTreatedAsDefinitionError() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java 2010-01-22 16:38:38 UTC (rev 5589) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/BeanDiscoveryObserver.java 2010-01-22 16:39:43 UTC (rev 5590) @@ -18,8 +18,9 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.Extension; -class BeanDiscoveryObserver +public class BeanDiscoveryObserver implements Extension { public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2010-01-22 16:38:38 UTC (rev 5589) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2010-01-22 16:39:43 UTC (rev 5590) @@ -23,6 +23,7 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.Extension; import org.testng.annotations.Test; /** @@ -35,14 +36,15 @@ @Artifact @ExpectedDeploymentException(DeploymentFailure.class) @SpecVersion(spec="cdi", version="20091101") +(a)Extension(value="javax.enterprise.inject.spi.Extension") public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test { - @Test(groups={"jboss-as-broken", "rewrite"}) - // TODO Needs Extension stuff adding - // WBRI-312 + + @Test(groups={"rewrite"}) @SpecAssertion(section = "11.5.3", id = "c") public void testObserverFailureTreatedAsDeploymentError() { assert false; } + } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java 2010-01-22 16:38:38 UTC (rev 5589) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/BeanDiscoveryObserver.java 2010-01-22 16:39:43 UTC (rev 5590) @@ -18,8 +18,9 @@ import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterDeploymentValidation; +import javax.enterprise.inject.spi.Extension; -class BeanDiscoveryObserver +public class BeanDiscoveryObserver implements Extension { public void afterDeploymentValidation(@Observes AfterDeploymentValidation event) { Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/javax.enterprise.inject.spi.Extension =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/javax.enterprise.inject.spi.Extension (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/javax.enterprise.inject.spi.Extension 2010-01-22 16:39:43 UTC (rev 5590) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem.BeanDiscoveryObserver Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/javax.enterprise.inject.spi.Extension =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/javax.enterprise.inject.spi.Extension (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/javax.enterprise.inject.spi.Extension 2010-01-22 16:39:43 UTC (rev 5590) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver.BeanDiscoveryObserver \ No newline at end of file Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/javax.enterprise.inject.spi.Extension =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/javax.enterprise.inject.spi.Extension (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/javax.enterprise.inject.spi.Extension 2010-01-22 16:39:43 UTC (rev 5590) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver.BeanDiscoveryObserver \ No newline at end of file