[weld-commits] Weld SVN: r5583 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-22 11:33:13 -0500 (Fri, 22 Jan 2010)
New Revision: 5583

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java
Log:
Port WELD-255 to trunk

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java	2010-01-22 16:17:27 UTC (rev 5582)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java	2010-01-22 16:33:13 UTC (rev 5583)
@@ -23,14 +23,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;
    }
 
@@ -38,7 +39,7 @@
    {
       return postConstructCalledAfterSuperclassInitializer;
    }
-   
+
    @Override
    public boolean isInitializerCalledAfterSuperclassInjection()
    {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java	2010-01-22 16:17:27 UTC (rev 5582)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/PoorHenHouse.java	2010-01-22 16:33:13 UTC (rev 5583)
@@ -18,12 +18,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/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java	2010-01-22 16:17:27 UTC (rev 5582)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java	2010-01-22 16:33:13 UTC (rev 5583)
@@ -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()
    {