[webbeans-commits] Webbeans SVN: r267 - in ri/trunk/webbeans-ri: src/test/java/org/jboss/webbeans/test and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Nov 6 12:04:17 EST 2008
Author: pete.muir at jboss.org
Date: 2008-11-06 12:04:17 -0500 (Thu, 06 Nov 2008)
New Revision: 267
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java
ri/trunk/webbeans-ri/testng.xml
Log:
Enable producer method tests
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java 2008-11-06 16:51:22 UTC (rev 266)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java 2008-11-06 17:04:17 UTC (rev 267)
@@ -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 @@
}
@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 @@
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 @@
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()
{
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-06 16:51:22 UTC (rev 266)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-11-06 17:04:17 UTC (rev 267)
@@ -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 @@
{
@Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="4.2")
- public void testPrimitiveTypesEquivalentToBoxedTypes()
+ public void testInjectionPerformsBoxingIfNecessary() throws Exception
{
- 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"}) @SpecAssertion(section="4.2")
- public void testInjectionPerformsBoxingIfNecessary()
- {
- assert false;
- }
-
- @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="4.2")
- public void testInjectionPerformsUnboxingIfNecessary()
- {
- assert false;
- }
-
@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")
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java 2008-11-06 16:51:22 UTC (rev 266)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java 2008-11-06 17:04:17 UTC (rev 267)
@@ -51,7 +51,7 @@
}
- @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);
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java 2008-11-06 17:04:17 UTC (rev 267)
@@ -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;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderNest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/testng.xml
===================================================================
--- ri/trunk/webbeans-ri/testng.xml 2008-11-06 16:51:22 UTC (rev 266)
+++ ri/trunk/webbeans-ri/testng.xml 2008-11-06 17:04:17 UTC (rev 267)
@@ -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" />
More information about the weld-commits
mailing list