[weld-commits] Weld SVN: r4160 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor.

Author: marius.bogoevici Date: 2009-10-16 16:34:18 -0400 (Fri, 16 Oct 2009) New Revision: 4160 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/District.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/Espoo_Broken.java Log: Fix and enable tests Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java 2009-10-16 20:22:51 UTC (rev 4159) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/BrokenInterceptor.java 2009-10-16 20:34:18 UTC (rev 4160) @@ -1,15 +1,22 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor; +import java.io.Serializable; + import javax.inject.Inject; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; +import javax.interceptor.AroundInvoke; -@Interceptor -class BrokenInterceptor +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; + +@Interceptor @City +(a)BeansXml("beans.xml") +class BrokenInterceptor implements Serializable { @Inject public void init(District district) {} - + + @AroundInvoke public Object intercept(InvocationContext ctx) throws Exception { return ctx.proceed(); Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/City.java 2009-10-16 20:34:18 UTC (rev 4160) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor; + +import java.lang.annotation.Documented; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Target; + +import javax.interceptor.InterceptorBinding; + +@Documented +@Retention(RUNTIME) +@Target({METHOD, TYPE}) +@InterceptorBinding +public @interface City +{ +} Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/District.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/District.java 2009-10-16 20:22:51 UTC (rev 4159) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/District.java 2009-10-16 20:34:18 UTC (rev 4160) @@ -1,9 +1,7 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor; -import javax.enterprise.context.Dependent; -@Dependent -class District +public class District { public void ping() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-10-16 20:22:51 UTC (rev 4159) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-10-16 20:34:18 UTC (rev 4160) @@ -8,15 +8,18 @@ import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; + import org.testng.annotations.Test; @Artifact @Packaging(PackagingType.EAR) @ExpectedDeploymentException(DeploymentError.class) @SpecVersion(spec="cdi", version="PFD2") +(a)BeansXml("beans.xml") public class EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken" }) + @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "6.6.4", id = "bdc") //WBRI-361 public void testSessionBeanWithNonPassivatingInitializerParamInInterceptorFails() Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/Espoo_Broken.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/Espoo_Broken.java 2009-10-16 20:22:51 UTC (rev 4159) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/Espoo_Broken.java 2009-10-16 20:34:18 UTC (rev 4160) @@ -3,11 +3,10 @@ import javax.ejb.Remove; import javax.ejb.Stateful; import javax.enterprise.context.SessionScoped; -import javax.interceptor.Interceptors; @Stateful @SessionScoped -(a)Interceptors(BrokenInterceptor.class) +@City class Espoo_Broken implements EspooLocal_Broken { @Remove