Author: pete.muir(a)jboss.org Date: 2009-10-29 15:35:18 -0400 (Thu, 29 Oct 2009) New Revision: 4419 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java Log: disable tests which use deprecated api on BeanManager for now Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2009-10-29 19:34:25 UTC (rev 4418) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2009-10-29 19:35:18 UTC (rev 4419) @@ -22,7 +22,7 @@ public class ContextDestroysBeansTest extends AbstractJSR299Test { - @Test(groups = { "contexts", "rewrite" }) + @Test(groups = { "contexts", "broken" }) @SpecAssertions( { @SpecAssertion(section = "6.2", id = "p"), @SpecAssertion(section = "6.3", id = "d") @@ -32,7 +32,7 @@ MyContextual bean = new MyContextual(getCurrentManager()); bean.setShouldReturnNullInstances(false); // TODO Remove use of this deprecated API - getCurrentManager().addBean(bean); + //getCurrentManager().addBean(bean); Context sessionContext = getCurrentManager().getContext(SessionScoped.class); CreationalContext<MySessionBean> creationalContext = getCurrentManager().createCreationalContext(bean); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-10-29 19:34:25 UTC (rev 4418) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-10-29 19:35:18 UTC (rev 4419) @@ -43,7 +43,7 @@ assert fourth.getId() == 10; } - @Test(groups = { "contexts", "rewrite" }) + @Test(groups = { "contexts", "broken" }) @SpecAssertions( { @SpecAssertion(section = "6.2", id = "l") } ) @@ -52,7 +52,7 @@ MyContextual bean = new MyContextual(getCurrentManager()); bean.setShouldReturnNullInstances(false); // TODO Remove use of this deprecated API - getCurrentManager().addBean(bean); + //getCurrentManager().addBean(bean); CreationalContext<MySessionBean> creationalContext = new MockCreationalContext<MySessionBean>(); MySessionBean newBean = getCurrentManager().getContext(SessionScoped.class).get(bean, creationalContext); @@ -60,7 +60,7 @@ assert bean.isCreateCalled(); } - @Test(groups = { "contexts" , "rewrite"}) + @Test(groups = { "contexts" , "broken"}) @SpecAssertion(section = "6.2", id = "nb") public void testGetMayNotReturnNullUnlessContextualCreateReturnsNull() { @@ -69,7 +69,7 @@ MyContextual bean = new MyContextual(getCurrentManager()); bean.setShouldReturnNullInstances(true); // TODO Remove use of this deprecated API - getCurrentManager().addBean(bean); + //getCurrentManager().addBean(bean); CreationalContext<MySessionBean> creationalContext = new MockCreationalContext<MySessionBean>(); assert getCurrentManager().getContext(SessionScoped.class).get(bean, creationalContext) == null; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-10-29 19:34:25 UTC (rev 4418) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-10-29 19:35:18 UTC (rev 4419) @@ -98,17 +98,6 @@ assert instance.getTheNumber() == 100; } - @SuppressWarnings("unchecked") - private <T> boolean testSerialize(Bean<T> bean) throws IOException, ClassNotFoundException - { - getCurrentManager().addBean(bean); - T instance = getCurrentManager().getContext(bean.getScope()).get(bean); - byte[] data = serialize(instance); - T resurrected = (T) deserialize(data); - assert resurrected != null; - return resurrected.toString().equals(instance.toString()); - } - @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "6.6.4", id = "aaba") public void testBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK()