Author: pete.muir(a)jboss.org Date: 2009-11-01 07:23:27 -0500 (Sun, 01 Nov 2009) New Revision: 4493 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java Log: remove use of old apis Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2009-11-01 12:14:10 UTC (rev 4492) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/container/event/ContainerEventTest.java 2009-11-01 12:23:27 UTC (rev 4493) @@ -16,14 +16,14 @@ */ package org.jboss.jsr299.tck.tests.extensions.container.event; +import static javax.enterprise.inject.spi.SessionBeanType.STATEFUL; +import static javax.enterprise.inject.spi.SessionBeanType.STATELESS; + import javax.ejb.Stateless; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.Annotated; import javax.enterprise.inject.spi.AnnotatedType; -import static javax.enterprise.inject.spi.SessionBeanType.STATELESS; -import static javax.enterprise.inject.spi.SessionBeanType.STATEFUL; - import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; @@ -124,7 +124,7 @@ @SpecAssertion(section="12.3", id="fb")}) public void testProcessSessionBeanFiredForStatelessSessionBean() { assert ProcessBeanObserver.getProcessStatelessSessionBeanEvent() != null; - validateStatelessSessionBean(ProcessBeanObserver.getProcessStatelessSessionBeanEvent().getAnnotatedSessionBeanClass()); + validateStatelessSessionBean(ProcessBeanObserver.getProcessStatelessSessionBeanEvent().getAnnotatedBeanClass()); } @Test @@ -134,7 +134,7 @@ @SpecAssertion(section="12.3", id="g")}) public void testProcessSessionBeanFiredForStatefulSessionBean() { assert ProcessBeanObserver.getProcessStatefulSessionBeanEvent() != null; - validateStatefulSessionBean(ProcessBeanObserver.getProcessStatefulSessionBeanEvent().getAnnotatedSessionBeanClass()); + validateStatefulSessionBean(ProcessBeanObserver.getProcessStatefulSessionBeanEvent().getAnnotatedBeanClass()); } @Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2009-11-01 12:14:10 UTC (rev 4492) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2009-11-01 12:23:27 UTC (rev 4493) @@ -48,8 +48,8 @@ assert ProcessBeanObserver.getElephantProcessSessionBean().getEjbName().equals("Rosie"); assert ProcessBeanObserver.getElephantProcessSessionBean().getSessionBeanType().equals(SessionBeanType.STATELESS); assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotated() instanceof AnnotatedType<?>; - assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotatedSessionBeanClass().getBaseType().equals(Elephant.class); assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotatedBeanClass().getBaseType().equals(Elephant.class); + assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotatedBeanClass().getBaseType().equals(Elephant.class); } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-11-01 12:14:10 UTC (rev 4492) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-11-01 12:23:27 UTC (rev 4493) @@ -105,7 +105,6 @@ assert bean != null; assert specializedBean != null; - assert specializedBean == getCurrentManager().getMostSpecializedBean(bean); assert specializedBean.getBeanClass().getSuperclass().equals(Lion.class); }