[webbeans-commits] Webbeans SVN: r280 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: beans and 1 other directory.

Author: gavin.king(a)jboss.com Date: 2008-11-07 13:34:54 -0500 (Fri, 07 Nov 2008) New Revision: 280 Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java Log: test predestroy enable specialization tests Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-11-07 17:50:49 UTC (rev 279) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-11-07 18:34:54 UTC (rev 280) @@ -13,8 +13,6 @@ import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.contexts.RequestContext; -import org.jboss.webbeans.test.beans.Farm; -import org.jboss.webbeans.test.beans.FarmOffice; import org.jboss.webbeans.test.beans.Fox; import org.jboss.webbeans.test.beans.FoxRun; import org.jboss.webbeans.test.beans.SpiderNest; @@ -51,18 +49,6 @@ farmHouseBean.create(); } - @Test(groups={"injection", "postConstruct"}) @SpecAssertion(section="4.2") - public void testPostConstruct() throws Exception - { - Bean<FarmOffice> farmOfficeBean = createSimpleWebBean(FarmOffice.class, manager); - Bean<Farm> farmBean = createSimpleWebBean(Farm.class, manager); - manager.addBean(farmOfficeBean); - manager.addBean(farmBean); - Farm farm = farmBean.create(); - assert farm.founded!=null; - assert farm.initialStaff==20; - } - @Test(groups={"injection", "clientProxy"}, expectedExceptions=ContextNotActiveException.class) @SpecAssertion(section="4.3") public void testInvokeNormalInjectedWebBeanWhenContextNotActive() { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-07 17:50:49 UTC (rev 279) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-11-07 18:34:54 UTC (rev 280) @@ -5,6 +5,8 @@ import javax.webbeans.manager.Bean; import org.jboss.webbeans.bean.SimpleBean; +import org.jboss.webbeans.test.beans.Farm; +import org.jboss.webbeans.test.beans.FarmOffice; import org.jboss.webbeans.test.beans.FishPond; import org.jboss.webbeans.test.beans.Goldfish; import org.jboss.webbeans.test.beans.RedSnapper; @@ -53,13 +55,13 @@ assert false; } - @Test(groups={"beanLifecycle", "ejb3"}) @SpecAssertion(section="5.3") + @Test(groups={"beanLifecycle", "commonAnnotations"}) @SpecAssertion(section="5.3") public void testCreateInjectsEjb() { assert false; } - @Test(groups={"beanLifecycle", "ejb3"}) @SpecAssertion(section="5.3") + @Test(groups={"beanLifecycle", "commonAnnotations"}) @SpecAssertion(section="5.3") public void testCreateInjectsPersistenceContext() { assert false; @@ -71,6 +73,21 @@ assert false; } + @Test(groups={"beanLifecycle", "lifecycleCallbacks"}) @SpecAssertion(section="5.3") + public void testPostConstructPreDestroy() throws Exception + { + Bean<FarmOffice> farmOfficeBean = createSimpleWebBean(FarmOffice.class, manager); + Bean<Farm> farmBean = createSimpleWebBean(Farm.class, manager); + manager.addBean(farmOfficeBean); + manager.addBean(farmBean); + Farm farm = farmBean.create(); + assert farm.founded!=null; + assert farm.initialStaff==20; + assert farm.closed==null; + farmBean.destroy(farm); + assert farm.closed!=null; + } + @Test(groups="injection") @SpecAssertion(section="5.3") public void testCreateInjectsFieldsDeclaredInJava() { @@ -81,12 +98,6 @@ assert tunaFarm.tuna != null; } - @Test(groups={"beanConstruction", "commonAnnotations"}) @SpecAssertion(section="5.3") - public void testPostConstructMethodCalled() - { - assert false; - } - @Test(groups="injection") public void testFieldMissingBindingAnnotationsAreNotInjected() { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-11-07 17:50:49 UTC (rev 279) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-11-07 18:34:54 UTC (rev 280) @@ -267,7 +267,7 @@ assert map.get(Integer.class).contains(new SynchronousAnnotationLiteral()); } - @Test(groups="specialization") @SpecAssertion(section="3.2.6") + @Test(groups="specializationInherit") @SpecAssertion(section="3.2.6") public void testSpecializedClassInheritsBindingTypes() { SimpleBeanModel<Tractor> bean = createSimpleModel(Tractor.class, manager); @@ -276,7 +276,7 @@ assert bean.getBindingTypes().contains( new AnnotationLiteral<HeavyDuty>() {} ); } - @Test(groups="specialization") @SpecAssertion(section="3.2.6") + @Test(groups="specializationInherit") @SpecAssertion(section="3.2.6") public void testSpecializedClassInheritsName() { SimpleBeanModel<Tractor> bean = createSimpleModel(Tractor.class, manager); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java 2008-11-07 17:50:49 UTC (rev 279) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farm.java 2008-11-07 18:34:54 UTC (rev 280) @@ -3,12 +3,14 @@ import java.util.Date; import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; import javax.webbeans.Current; public class Farm { public Date founded; + public Date closed; public int initialStaff; @Current @@ -21,4 +23,10 @@ initialStaff = farmOffice.noOfStaff; } + @PreDestroy + private void preDestroy() + { + closed = new Date(); + } + }