Author: pete.muir(a)jboss.org Date: 2009-06-03 19:00:24 -0400 (Wed, 03 Jun 2009) New Revision: 2756 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java Log: Fix test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-03 22:46:13 UTC (rev 2755) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-03 23:00:24 UTC (rev 2756) @@ -214,19 +214,20 @@ assert OrderProcessor.preDestroyCalled; } - @Test(groups = "ri-broken") + @Test @SpecAssertion(section = "4.2", id = "bbd") public void testIndirectSubClassInheritsPreDestroyOnSuperclass() throws Exception { OrderProcessor.preDestroyCalled = false; - assert getCurrentManager().getBeans(IndirectOrderProcessor.class).size() == 1; + assert getCurrentManager().getBeans(OrderProcessorLocal.class).size() == 1; new RunInDependentContext() { @Override protected void execute() throws Exception { - Bean<IndirectOrderProcessor> bean = getCurrentManager().getBeans(IndirectOrderProcessor.class).iterator().next(); - IndirectOrderProcessor instance = getCurrentManager().getInstanceByType(IndirectOrderProcessor.class); + Bean<OrderProcessorLocal> bean = getCurrentManager().getBeans(OrderProcessorLocal.class).iterator().next(); + OrderProcessorLocal instance = getCurrentManager().getInstanceByType(OrderProcessorLocal.class); + instance.order(); destroyAndRemoveBeanInstance(bean, instance); } }.run(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-06-03 22:46:13 UTC (rev 2755) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-06-03 23:00:24 UTC (rev 2756) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -class IntermediateOrderProcessor extends OrderProcessor +public class IntermediateOrderProcessor extends OrderProcessor { } \ No newline at end of file