Author: marius.bogoevici Date: 2009-10-16 16:36:42 -0400 (Fri, 16 Oct 2009) New Revision: 4162 Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java Log: Fix and enable tests Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java 2009-10-16 20:35:06 UTC (rev 4161) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BakedBean.java 2009-10-16 20:36:42 UTC (rev 4162) @@ -1,9 +1,11 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; +import java.io.Serializable; + import javax.enterprise.context.SessionScoped; @SessionScoped @BakedBinding -class BakedBean +class BakedBean implements Serializable { - + void bake() {} } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-10-16 20:35:06 UTC (rev 4161) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/BrokenInterceptor.java 2009-10-16 20:36:42 UTC (rev 4162) @@ -1,18 +1,25 @@ package org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter; +import java.io.Serializable; + import javax.enterprise.inject.Default; +import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; -@Interceptor @InterceptorType -class BrokenInterceptor -{ - public BrokenInterceptor(@Default Violation violation) {} - - @AroundInvoke +@Interceptor +@BakedBinding +class BrokenInterceptor implements Serializable +{ + @Inject + public BrokenInterceptor(@Default Violation violation) + { + } + + @AroundInvoke public Object invoke(InvocationContext ctx) throws Exception { return ctx.proceed(); - } + } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-16 20:35:06 UTC (rev 4161) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-10-16 20:36:42 UTC (rev 4162) @@ -6,14 +6,17 @@ 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.BeansXml; + import org.testng.annotations.Test; @Artifact +(a)BeansXml(&quot;beans.xml&quot;) @ExpectedDeploymentException(DeploymentError.class) @SpecVersion(spec="cdi", version="PFD2") public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test { - @Test(groups = { "contexts", "passivation", "ri-broken" }) + @Test(groups = { "contexts", "passivation"}) @SpecAssertion(section = "6.6.4", id = "aad") // WBRI-361 public void testPassivationCapableBeanWithNonPassivatingInterceptorFails() Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/beans.xml 2009-10-16 20:36:42 UTC (rev 4162) @@ -0,0 +1,5 @@ +<beans> + <interceptors> + <class>org.jboss.jsr299.tck.tests.context.passivating.broken.interceptorWithNonPassivatingBeanConstructorParameter.BrokenInterceptor</class> + </interceptors> +</beans> \ No newline at end of file