Author: pete.muir(a)jboss.org Date: 2010-09-19 18:10:53 -0400 (Sun, 19 Sep 2010) New Revision: 7016 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml Log: CDITCK-181 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2010-09-17 11:27:26 UTC (rev 7015) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2010-09-19 22:10:53 UTC (rev 7016) @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.Set; +import javax.enterprise.context.spi.Context; import javax.enterprise.event.TransactionPhase; import javax.enterprise.inject.spi.ObserverMethod; @@ -64,9 +65,10 @@ }) public void testStaticObserverMethodInvoked() { + Context requestContext = getCurrentConfiguration().getContexts().getRequestContext(); try { - getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext()); + getCurrentConfiguration().getContexts().setInactive(requestContext); StaticObserver.reset(); getCurrentManager().fireEvent(new Delivery()); assert StaticObserver.isDeliveryReceived(); @@ -74,7 +76,7 @@ } finally { - getCurrentConfiguration().getContexts().setActive(getCurrentConfiguration().getContexts().getRequestContext()); + getCurrentConfiguration().getContexts().setActive(requestContext); } } Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2010-09-17 11:27:26 UTC (rev 7015) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/ClientProxyTest.java 2010-09-19 22:10:53 UTC (rev 7016) @@ -19,8 +19,7 @@ import java.io.IOException; import javax.enterprise.context.ContextNotActiveException; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; +import javax.enterprise.context.spi.Context; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; @@ -70,7 +69,8 @@ public void testInactiveScope() throws Exception { assert getCurrentConfiguration().getContexts().getRequestContext().isActive(); - setContextInactive(getCurrentConfiguration().getContexts().getRequestContext()); + Context ctx = getCurrentConfiguration().getContexts().getRequestContext(); + setContextInactive(ctx); assert !getCurrentConfiguration().getContexts().getRequestContext().isActive(); try { @@ -79,7 +79,7 @@ finally { // need to set request scope active again, some other tests will fail otherwise - setContextActive(getCurrentConfiguration().getContexts().getRequestContext()); + setContextActive(ctx); } } } Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-09-17 11:27:26 UTC (rev 7015) +++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-09-19 22:10:53 UTC (rev 7016) @@ -351,6 +351,18 @@ <exclude name="testSpecializingBeanHasNameOfSpecializedBean" /> </methods> </class> + + <!-- CDITCK-181 --> + <class name="org.jboss.jsr299.tck.tests.lookup.clientProxy.ClientProxyTest"> + <methods> + <exclude name="testInactiveScope" /> + </methods> + </class> + <class name="org.jboss.jsr299.tck.tests.event.EventTest"> + <methods> + <exclude name="testStaticObserverMethodInvoked" /> + </methods> + </class> <!-- Issues in Weld (the RI) --> Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-09-17 11:27:26 UTC (rev 7015) +++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-09-19 22:10:53 UTC (rev 7016) @@ -96,6 +96,18 @@ </methods> </class> + <!-- CDITCK-181 --> + <class name="org.jboss.jsr299.tck.tests.lookup.clientProxy.ClientProxyTest"> + <methods> + <exclude name="testInactiveScope" /> + </methods> + </class> + <class name="org.jboss.jsr299.tck.tests.event.EventTest"> + <methods> + <exclude name="testStaticObserverMethodInvoked" /> + </methods> + </class> + <!-- Issues in Weld (the RI) --> <!-- WELD-401 -->