Enable producer method tests

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@267 1c488680-804c-0410-94cd-c6b725194a0e
weld · Nov 6, 2008 · e6dc5fb · e6dc5fb
1 parent b3e2017
commit e6dc5fb
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 31 deletions.
diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java
@@ -1,14 +1,21 @@
 package org.jboss.webbeans.test;
 
+import static org.jboss.webbeans.test.util.Util.createProducerMethodBean;
 import static org.jboss.webbeans.test.util.Util.createSimpleWebBean;
 
+import java.lang.reflect.Method;
+
 import javax.webbeans.ContextNotActiveException;
 import javax.webbeans.Dependent;
 import javax.webbeans.manager.Bean;
 
+import org.jboss.webbeans.bean.ProducerMethodBean;
+import org.jboss.webbeans.bean.SimpleBean;
 import org.jboss.webbeans.contexts.DependentContext;
 import org.jboss.webbeans.test.beans.Fox;
 import org.jboss.webbeans.test.beans.FoxRun;
+import org.jboss.webbeans.test.beans.SpiderProducer;
+import org.jboss.webbeans.test.beans.Tarantula;
 import org.testng.annotations.Test;
 
 @SpecVersion("PDR")
@@ -32,9 +39,17 @@ public void testInstanceUsedForElEvalutionNotShared()
    }
 
    @Test(groups={"contexts", "producerMethod"}) @SpecAssertion(section="8.3")
-   public void testInstanceUsedForProducerMethodNotShared()
+   public void testInstanceUsedForProducerMethodNotShared() throws Exception
    {
-      assert false;
+      SimpleBean<SpiderProducer> spiderProducer = createSimpleWebBean(SpiderProducer.class, manager); 
+      manager.addBean(spiderProducer);
+      Method method = SpiderProducer.class.getMethod("produceTarantula");
+      ProducerMethodBean<Tarantula> tarantulaBean = createProducerMethodBean(Tarantula.class, method, manager, spiderProducer);
+      Tarantula tarantula = tarantulaBean.create();
+      Tarantula tarantula2 = tarantulaBean.create();
+      assert tarantula != null;
+      assert tarantula2 != null;
+      assert tarantula != tarantula2;
    }
 
    @Test(groups={"contexts", "observerMethod"}) @SpecAssertion(section="8.3")
@@ -70,12 +85,6 @@ public void testContextIsInactive()
       manager.getContext(Dependent.class).isActive();
    }
 
-   @Test(groups={"contexts", "producerMethod"}) @SpecAssertion(section="8.3")
-   public void testContextIsActiveWhenInvokingProducerMethod()
-   {
-      assert false;
-   }
-
    @Test(groups={"contexts", "observerMethod"}) @SpecAssertion(section="8.3")
    public void testContextIsActiveWhenInvokingObserverMethod()
    {
@@ -164,12 +173,6 @@ public void testDependentsDestroyedWhenElEvaluationCompletes()
       assert false;
    }
 
-   @Test(groups={"contexts", "producerMethod"}) @SpecAssertion(section="8.3")
-   public void testDependentsDestroyedWhenProducerMethodEvaluationCompletes()
-   {
-      assert false;
-   }
-
    @Test(groups={"contexts", "observerMethod"}) @SpecAssertion(section="8.3")
    public void testDependentsDestroyedWhenObserverMethodEvaluationCompletes()
    {

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
@@ -13,6 +13,8 @@
 import org.jboss.webbeans.bean.SimpleBean;
 import org.jboss.webbeans.test.beans.Fox;
 import org.jboss.webbeans.test.beans.FoxRun;
+import org.jboss.webbeans.test.beans.SpiderNest;
+import org.jboss.webbeans.test.beans.SpiderProducer;
 import org.jboss.webbeans.test.beans.Tuna;
 import org.jboss.webbeans.test.beans.broken.BeanWithFinalBoundField;
 import org.jboss.webbeans.test.beans.broken.BeanWithStaticBoundField;
@@ -25,29 +27,23 @@ public class InjectionTests extends AbstractTest
 {
 
    @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="4.2")
-   public void testPrimitiveTypesEquivalentToBoxedTypes()
+   public void testInjectionPerformsBoxingIfNecessary() throws Exception
    {
-      assert false;
-   }
-
-   @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="4.2")
-   public void testInjectionPerformsBoxingIfNecessary()
-   {
-      assert false;
-   }
-
-   @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="4.2")
-   public void testInjectionPerformsUnboxingIfNecessary()
-   {
-      assert false;
+      SimpleBean<SpiderProducer> spiderProducer = createSimpleWebBean(SpiderProducer.class, manager);
+      manager.addBean(spiderProducer);
+      Bean<SpiderNest> spiderNestBean = createSimpleWebBean(SpiderNest.class, manager);
+      manager.addBean(createProducerMethodBean(Integer.class, SpiderProducer.class.getMethod("getWolfSpiderSize"), manager, spiderProducer));
+      SpiderNest spiderNest = spiderNestBean.create();
+      assert spiderNest.numberOfSpiders != null;
+      assert spiderNest.numberOfSpiders.equals(4);
    }
 
    @Test(groups={"injection", "producerMethod"}, expectedExceptions=NullableDependencyException.class) @SpecAssertion(section="4.2")
    public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception
    {
       Bean<FarmHouse> farmHouseBean = createSimpleWebBean(FarmHouse.class, manager);
       manager.addBean(createProducerMethodBean(Integer.class, FarmHouseProducer.class.getMethod("getNumberOfBedrooms"), manager));
-      FarmHouse farmHouse = farmHouseBean.create();
+      farmHouseBean.create();
    }
 
    @Test(groups={"injection", "clientProxy"}, expectedExceptions=ContextNotActiveException.class) @SpecAssertion(section="4.3")

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java
@@ -51,7 +51,7 @@ public void testDisposalMethodHasParametersInjected()
    }
 
 
-   @Test(groups="producerMethod") @SpecAssertion(section={"3.4", "5.6"})
+   @Test(groups="producerMethod") @SpecAssertion(section={"3.4", "5.6", "8.3"})
    public void testProducerMethodReturnsNullIsDependent() throws Exception
    {
       SimpleBean<SpiderProducer> spiderProducer = createSimpleWebBean(SpiderProducer.class, manager); 

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java
@@ -0,0 +1,16 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Initializer;
+
+public class SpiderNest
+{
+
+   public Integer numberOfSpiders;
+
+   @Initializer
+   public SpiderNest(Integer numberOfSpiders)
+   {
+      this.numberOfSpiders = numberOfSpiders; 
+   }
+
+}
diff --git a/webbeans-ri/testng.xml b/webbeans-ri/testng.xml
@@ -8,7 +8,7 @@
             <exclude name="specialization" />
             <exclude name="deployment" />
             <exclude name="disposalMethod" />
-            <exclude name="producerMethod" />
+
             <exclude name="observerMethod" />
             <exclude name="deferredEvent" />
             <exclude name="ejb3" />