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

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Thu Jan 8 20:12:11 EST 2009


Author: dallen6
Date: 2009-01-08 20:12:11 -0500 (Thu, 08 Jan 2009)
New Revision: 838

Modified:
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionPointTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanLifecycleTest.java
Log:
A little refactoring on the tests and an update to specialization tests.

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java	2009-01-08 23:00:43 UTC (rev 837)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java	2009-01-09 01:12:11 UTC (rev 838)
@@ -15,6 +15,7 @@
 import org.jboss.webbeans.bean.AbstractClassBean;
 import org.jboss.webbeans.bean.EnterpriseBean;
 import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
 import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType;
 import org.jboss.webbeans.test.mock.MockBootstrap;
@@ -86,4 +87,13 @@
       return in.readObject();
    }
 
+   protected void activateDependentContext()
+   {
+      DependentContext.INSTANCE.setActive(true);
+   }
+   
+   protected void deactivateDependentContext()
+   {
+      DependentContext.INSTANCE.setActive(false);
+   }
 }

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java	2009-01-08 23:00:43 UTC (rev 837)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java	2009-01-09 01:12:11 UTC (rev 838)
@@ -2,75 +2,75 @@
 
 import org.testng.annotations.Test;
 
- at SpecVersion("20080605")
+ at SpecVersion("20081222")
 public class BeanDeploymentTest
 {
 
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.1.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.6")
    public void testOnlySpecializedSimpleBeanDeployed()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.1.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.6")
    public void testSpecializedSimpleBeanExtends()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.1.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.6")
    public void testSpecializedSimpleBeanHasSameBindingAnnotations()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.1.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.6")
    public void testSpecializedSimpleBeanHasSameName()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.6")
    public void testOnlySpecializedEnterpriseBeanDeployed()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.6")
    public void testSpecializedEnterpriseBeanExtends()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.6")
    public void testSpecializedEnterpriseBeanHasSameBindingAnnotations()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.6")
    public void testSpecializedEnterpriseBeanHasSameName()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.6")
    public void testSpecializedEnterpriseBeanAllLocalInterfaces()
    {
       // TODO Placeholder
       assert false;
    }
    
-   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.2.4")
+   @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.6")
    public void testSpecializedEnterpriseBeanSupportsBeanClassLocalView()
    {
       // TODO Placeholder

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java	2009-01-08 23:00:43 UTC (rev 837)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java	2009-01-09 01:12:11 UTC (rev 838)
@@ -7,7 +7,6 @@
 import javax.webbeans.manager.Bean;
 
 import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.test.beans.Fox;
 import org.jboss.webbeans.test.beans.Tuna;
 import org.jboss.webbeans.test.beans.TunedTuna;
@@ -36,13 +35,13 @@
       Bean<Fox> foxBean = SimpleBean.of(Fox.class, manager);
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          Fox fox = manager.getInstance(foxBean);
          assert !Reflections.isProxy(fox);
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
    

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java	2009-01-08 23:00:43 UTC (rev 837)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java	2009-01-09 01:12:11 UTC (rev 838)
@@ -11,7 +11,6 @@
 import javax.webbeans.TypeLiteral;
 import javax.webbeans.manager.Bean;
 
-import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.test.beans.AuroraFinch;
 import org.jboss.webbeans.test.beans.BananaSpider;
 import org.jboss.webbeans.test.beans.BirdCage;
@@ -487,7 +486,7 @@
       // Now instantiate the bean and fire another event
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          RecluseSpider bean = manager.getInstanceByType(RecluseSpider.class);
          assert bean != null;
          
@@ -496,7 +495,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -583,6 +582,7 @@
       webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TeaCupPomeranian.class));
       webBeansBootstrap.boot();
       List<Bean<?>> beans = manager.getBeans();
+      assert !beans.isEmpty();
       manager.fireEvent("Another event");
    }
 
@@ -593,6 +593,7 @@
       webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TeaCupPomeranian.class));
       webBeansBootstrap.boot();
       List<Bean<?>> beans = manager.getBeans();
+      assert !beans.isEmpty();
       manager.fireEvent(new Integer(1));
    }
 
@@ -604,13 +605,13 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          SweeWaxbill bean = manager.getInstanceByType(SweeWaxbill.class);
          bean.methodThatFiresEvent();
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -622,13 +623,13 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          SweeWaxbill bean = manager.getInstanceByType(SweeWaxbill.class);
          bean.methodThatRegistersObserver();
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -640,13 +641,13 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          OwlFinch bean = manager.getInstanceByType(OwlFinch.class);
          bean.methodThatFiresEvent();
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -658,13 +659,13 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          OwlFinch bean = manager.getInstanceByType(OwlFinch.class);
          bean.methodThatRegistersObserver();
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -676,7 +677,7 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          BlueFacedParrotFinch bean = manager.getInstanceByType(BlueFacedParrotFinch.class);
          bean.methodThatRegistersObserver();
 
@@ -685,7 +686,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -697,7 +698,7 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          StarFinch starFinch = manager.getInstanceByType(StarFinch.class);
          FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
          BirdCage birdCage = manager.getInstanceByType(BirdCage.class);
@@ -708,7 +709,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -720,7 +721,7 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          OrangeCheekedWaxbill bird = manager.getInstanceByType(OrangeCheekedWaxbill.class);
          FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
          assert bird != null;
@@ -729,7 +730,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -750,7 +751,7 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          EuropeanGoldfinch bird = manager.getInstanceByType(EuropeanGoldfinch.class);
          FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
          assert bird != null;
@@ -759,7 +760,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -771,7 +772,7 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          AuroraFinch bird = manager.getInstanceByType(AuroraFinch.class);
          FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
          assert bird != null;
@@ -779,7 +780,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -791,13 +792,13 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          CommonWaxbill bean = manager.getInstanceByType(CommonWaxbill.class);
          assert bean != null;
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -809,14 +810,14 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          BlackRumpedWaxbill bean = manager.getInstanceByType(BlackRumpedWaxbill.class);
          webBeansBootstrap.boot();
          assert bean != null;
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -828,13 +829,13 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          GoldbreastWaxbill bean = manager.getInstanceByType(GoldbreastWaxbill.class);
          assert bean != null;
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -846,13 +847,13 @@
       webBeansBootstrap.boot();
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          JavaSparrow bean = manager.getInstanceByType(JavaSparrow.class);
          assert bean != null;
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionPointTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionPointTest.java	2009-01-08 23:00:43 UTC (rev 837)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionPointTest.java	2009-01-09 01:12:11 UTC (rev 838)
@@ -30,7 +30,6 @@
 import javax.webbeans.manager.Bean;
 
 import org.jboss.webbeans.binding.CurrentBinding;
-import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.test.annotations.AnimalStereotype;
 import org.jboss.webbeans.test.beans.BeanWithInjectionPointMetadata;
 import org.jboss.webbeans.test.beans.ConstructorInjectionPointBean;
@@ -58,7 +57,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -67,7 +66,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -81,7 +80,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -92,7 +91,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -106,7 +105,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -114,7 +113,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -128,7 +127,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -138,7 +137,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -152,7 +151,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -160,7 +159,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -181,7 +180,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          ConstructorInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(ConstructorInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -189,7 +188,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -203,7 +202,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -211,7 +210,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -225,7 +224,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -236,7 +235,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -250,7 +249,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -258,7 +257,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -272,7 +271,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -280,7 +279,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -294,7 +293,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -302,7 +301,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 
@@ -316,7 +315,7 @@
       // Get an instance of the bean which has another bean injected into it
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
@@ -324,7 +323,7 @@
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
 }

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java	2009-01-08 23:00:43 UTC (rev 837)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java	2009-01-09 01:12:11 UTC (rev 838)
@@ -4,7 +4,6 @@
 import javax.webbeans.manager.Bean;
 
 import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.introspector.AnnotatedClass;
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
@@ -73,12 +72,12 @@
       
       try
       {
-         DependentContext.INSTANCE.setActive(true);
+         activateDependentContext();
          assert manager.getInstanceByName("salmon") instanceof Salmon;
       }
       finally
       {
-         DependentContext.INSTANCE.setActive(false);
+         deactivateDependentContext();
       }
    }
    

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanLifecycleTest.java	2009-01-08 23:00:43 UTC (rev 837)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanLifecycleTest.java	2009-01-09 01:12:11 UTC (rev 838)
@@ -3,7 +3,6 @@
 import javax.webbeans.UnremovedException;
 
 import org.jboss.webbeans.bean.EnterpriseBean;
-import org.jboss.webbeans.context.DependentContext;
 import org.jboss.webbeans.test.AbstractTest;
 import org.jboss.webbeans.test.SpecAssertion;
 import org.jboss.webbeans.test.SpecVersion;
@@ -57,7 +56,7 @@
    public void testRemoveMethodCalled()
    {
       visited = false;
-      DependentContext.INSTANCE.setActive(true);
+      activateDependentContext();
       EnterpriseBean<GoodDoggie> bean = EnterpriseBean.of(GoodDoggie.class, manager);
       manager.addBean(bean);
       GoodDoggie doggie = manager.getInstance(bean);




More information about the weld-commits mailing list