Author: pete.muir(a)jboss.org Date: 2010-01-07 11:49:41 -0500 (Thu, 07 Jan 2010) New Revision: 5392 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java Log: WELD-255 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java 2010-01-07 16:35:00 UTC (rev 5391) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java 2010-01-07 16:49:41 UTC (rev 5392) @@ -7,14 +7,15 @@ public class MegaPoorHenHouse extends PoorHenHouse implements MegaPoorHenHouseLocal { private boolean postConstructCalledAfterSuperclassInitializer = false; - + public Fox getFox() { return fox; } - + @PostConstruct - public void postConstruct() { + public void postConstruct() + { postConstructCalledAfterSuperclassInitializer = initializerCalledAfterSuperclassInjection; } @@ -22,7 +23,7 @@ { return postConstructCalledAfterSuperclassInitializer; } - + @Override public boolean isInitializerCalledAfterSuperclassInjection() { Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2010-01-07 16:35:00 UTC (rev 5391) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java 2010-01-07 16:49:41 UTC (rev 5392) @@ -2,12 +2,13 @@ import javax.inject.Inject; -class PoorHenHouse extends HenHouse +public class PoorHenHouse extends HenHouse { protected boolean initializerCalledAfterSuperclassInjection = false; - + @Inject - public void initialize() { + public void initialize() + { initializerCalledAfterSuperclassInjection = fox != null; } Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java 2010-01-07 16:35:00 UTC (rev 5391) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java 2010-01-07 16:49:41 UTC (rev 5392) @@ -32,7 +32,7 @@ public class SessionBeanInjectionOrderingTest extends AbstractJSR299Test { - @Test(groups="jboss-as-broken") + @Test @SpecAssertion(section = "5.5.2", id = "bb") public void testInitializerCalledAfterFieldInjectionOfSuperclass() { @@ -40,7 +40,7 @@ assert house.isInitializerCalledAfterSuperclassInjection(); } - @Test(groups="jboss-as-broken") + @Test @SpecAssertion(section = "5.5.2", id = "bf") public void testPostConstructCalledAfterInitializerOfSuperclass() {