Author: shane.bryzak(a)jboss.com Date: 2009-03-24 02:08:18 -0400 (Tue, 24 Mar 2009) New Revision: 2174 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 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/IndirectOrderProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java Log: fixed testIndirectSubClassInheritsPostConstructOnSuperclass(), added test for 4.2.bab Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-03-24 06:08:18 UTC (rev 2174) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; + +import javax.ejb.Stateful; + +@Stateful +public class DirectOrderProcessor extends OrderProcessor implements DirectOrderProcessorLocal +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-03-24 06:08:18 UTC (rev 2174) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; + +import javax.ejb.Local; + +@Local +public interface DirectOrderProcessorLocal +{ + void order(); +} 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-03-24 04:17:45 UTC (rev 2173) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-03-24 06:08:18 UTC (rev 2174) @@ -175,7 +175,24 @@ assert frankfurt.isSchlossDestroyed(); } - @Test(groups = "ri-broken") + @Test + @SpecAssertion(section = "4.2", id = "bab") + public void testDirectSubClassInheritsPostConstructOnSuperclass() throws Exception + { + OrderProcessor.postConstructCalled = false; + assert getCurrentManager().resolveByType(DirectOrderProcessorLocal.class).size() == 1; + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + getCurrentManager().getInstanceByType(DirectOrderProcessorLocal.class).order(); + } + }.run(); + assert OrderProcessor.postConstructCalled; + } + + @Test @SpecAssertion(section = "4.2", id = "bad") public void testIndirectSubClassInheritsPostConstructOnSuperclass() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-03-24 04:17:45 UTC (rev 2173) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-03-24 06:08:18 UTC (rev 2174) @@ -1,14 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; -import javax.ejb.Remove; import javax.ejb.Stateful; @Stateful public class IndirectOrderProcessor extends IntermediateOrderProcessor implements OrderProcessorLocal { - @Remove - public void remove() - { - - } + } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java 2009-03-24 04:17:45 UTC (rev 2173) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java 2009-03-24 06:08:18 UTC (rev 2174) @@ -3,7 +3,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -class OrderProcessor +public class OrderProcessor { public static boolean postConstructCalled = false;