[webbeans-commits] Webbeans SVN: r1008 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: tck and 1 other directory.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu Jan 15 23:21:14 EST 2009
Author: shane.bryzak at jboss.com
Date: 2009-01-15 23:21:14 -0500 (Thu, 15 Jan 2009)
New Revision: 1008
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
Log:
ported tests to tck
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java 2009-01-16 04:20:11 UTC (rev 1007)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java 2009-01-16 04:21:14 UTC (rev 1008)
@@ -1,58 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.lang.reflect.Field;
-
-import javax.webbeans.IllegalProductException;
-
-import org.jboss.webbeans.bean.ProducerFieldBean;
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.beans.OtherSpiderProducer;
-import org.jboss.webbeans.test.beans.Spider;
-import org.jboss.webbeans.test.beans.Tarantula;
-import org.jboss.webbeans.test.beans.broken.OtherBrokenSpiderProducer;
-import org.testng.annotations.Test;
-
- at SpecVersion("20081206")
-public class ProducerFieldBeanLifecycleTest extends AbstractTest
-{
-
- @Test(groups={"producerField", "broken"}) @SpecAssertion(section="5.6")
- public void testProducerFieldBeanCreate() throws Exception
- {
- SimpleBean<OtherSpiderProducer> spiderProducer = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(spiderProducer);
- Field method = OtherSpiderProducer.class.getField("produceTarantula");
- ProducerFieldBean<Tarantula> tarantulaBean = ProducerFieldBean.of(method, spiderProducer, manager);
- Tarantula tarantula = tarantulaBean.create();
- assert tarantula != null;
- }
-
- @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.3")
- public void testSpecializedBeanAlwaysUsed()
- {
- // TODO Placeholder
- assert false;
- }
-
-
- @Test(groups={"producerField", "broken"}) @SpecAssertion(section={"3.5", "5.6", "8.3"})
- public void testProducerFieldReturnsNullIsDependent() throws Exception
- {
- SimpleBean<OtherSpiderProducer> spiderProducer = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(spiderProducer);
- Field method = OtherSpiderProducer.class.getField("getNullSpider");
- ProducerFieldBean<Spider> spiderBean = ProducerFieldBean.of(method, spiderProducer, manager);
- Spider spider = spiderBean.create();
- assert spider == null;
- }
-
- @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"})
- public void testProducerFieldReturnsNullIsNotDependent() throws Exception
- {
- SimpleBean<OtherBrokenSpiderProducer> spiderProducer = SimpleBean.of(OtherBrokenSpiderProducer.class, manager);
- manager.addBean(spiderProducer);
- Field method = OtherBrokenSpiderProducer.class.getField("getRequestScopedSpider");
- ProducerFieldBean.of(method, spiderProducer, manager).create();
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2009-01-16 04:20:11 UTC (rev 1007)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2009-01-16 04:21:14 UTC (rev 1008)
@@ -1,266 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.lang.reflect.Field;
-
-import javax.webbeans.Current;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
-
-import org.jboss.webbeans.bean.ProducerFieldBean;
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
-import org.jboss.webbeans.test.annotations.Tame;
-import org.jboss.webbeans.test.beans.Animal;
-import org.jboss.webbeans.test.beans.BlackWidow;
-import org.jboss.webbeans.test.beans.DaddyLongLegs;
-import org.jboss.webbeans.test.beans.DeadlyAnimal;
-import org.jboss.webbeans.test.beans.DeadlySpider;
-import org.jboss.webbeans.test.beans.LadybirdSpider;
-import org.jboss.webbeans.test.beans.OtherSpiderProducer;
-import org.jboss.webbeans.test.beans.Spider;
-import org.jboss.webbeans.test.beans.Tarantula;
-import org.jboss.webbeans.test.beans.WolfSpider;
-import org.testng.annotations.Test;
-
- at SpecVersion("20081206")
-public class ProducerFieldBeanModelTest extends AbstractTest
-{
-
- @Test(groups="producerField") @SpecAssertion(section="2.5.3")
- public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("produceTameTarantula");
- ProducerFieldBean<Tarantula> tarantulaModel = ProducerFieldBean.of(field, bean, manager);
- tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class);
- }
-
- /*@Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.5")
- public void testStaticField() throws Exception
- {
- SimpleBean<BeanWithStaticProducerField> bean = createSimpleBean(BeanWithStaticProducerField.class);
- manager.addBean(bean);
- Field field = BeanWithStaticProducerField.class.getField("getString");
- createProducerFieldBean(String.class, field, bean);
- }*/
-
- @Test(groups={"stub", "producerField", "enterpriseBeans", "stub"}, expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.5")
- public void testProducerFieldIsNotBusinessField() throws Exception
- {
- assert false;
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5")
- public void testParameterizedReturnType() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("getFunnelWeaverSpider");
- ProducerFieldBean.of(field, bean, manager);
- }
-
- @Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.5")
- public void testParameterizedReturnTypeWithWildcard() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("getAnotherFunnelWeaver");
- ProducerFieldBean.of(field, bean, manager);
- }
-
- @Test(groups={"stub", "producerField", "deployment"}) @SpecAssertion(section="3.5")
- public void testBeanDeclaresMultipleProducerFields()
- {
- assert false;
- }
-
- @Test(groups="producerField") @SpecAssertion(section={"3.5", "2.3.1"})
- public void testDefaultBindingType() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("produceTarantula");
- ProducerFieldBean<Tarantula> tarantulaModel = ProducerFieldBean.of(field, bean, manager);
- assert tarantulaModel.getBindings().size() == 1;
- assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class);
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5.1")
- public void testApiTypeForClassReturn() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("produceTarantula");
- ProducerFieldBean<Tarantula> tarantulaModel = ProducerFieldBean.of(field, bean, manager);
- assert tarantulaModel.getTypes().size() == 6;
- assert tarantulaModel.getTypes().contains(Tarantula.class);
- assert tarantulaModel.getTypes().contains(DeadlySpider.class);
- assert tarantulaModel.getTypes().contains(Spider.class);
- assert tarantulaModel.getTypes().contains(Animal.class);
- assert tarantulaModel.getTypes().contains(DeadlyAnimal.class);
- assert tarantulaModel.getTypes().contains(Object.class);
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5.1")
- public void testApiTypeForInterfaceReturn() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("makeASpider");
- ProducerFieldBean<Animal> animalModel = ProducerFieldBean.of(field, bean, manager);
- assert animalModel.getTypes().size() == 2;
- assert animalModel.getTypes().contains(Animal.class);
- assert animalModel.getTypes().contains(Object.class);
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5.1")
- public void testApiTypeForPrimitiveReturn() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("getWolfSpiderSize");
- ProducerFieldBean<Integer> intModel = ProducerFieldBean.of(field, bean, manager);
- assert intModel.getTypes().size() == 2;
- assert intModel.getTypes().contains(int.class);
- assert intModel.getTypes().contains(Object.class);
- }
-
- @Test(groups="producerField") @SpecAssertion(section={"3.5.1", "2.2"})
- public void testApiTypeForArrayTypeReturn() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("getSpiders");
- ProducerFieldBean<Spider[]> spidersModel = ProducerFieldBean.of(field, bean, manager);
- assert spidersModel.getTypes().size() == 2;
- assert spidersModel.getTypes().contains(Spider[].class);
- assert spidersModel.getTypes().contains(Object.class);
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5.2")
- public void testBindingType() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("produceTameTarantula");
- ProducerFieldBean<Tarantula> tarantulaModel = ProducerFieldBean.of(field, bean, manager);
- assert tarantulaModel.getBindings().size() == 1;
- assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class);
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5.2")
- public void testScopeType() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs");
- ProducerFieldBean<DaddyLongLegs> daddyLongLegsModel = ProducerFieldBean.of(field, bean, manager);
- assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class);
-
- // TODO Inherit scope from returned web bean?
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5.2")
- public void testDeploymentType() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("getLadybirdSpider");
- ProducerFieldBean<LadybirdSpider> ladybirdSpiderModel = ProducerFieldBean.of(field, bean, manager);
- assert ladybirdSpiderModel.getDeploymentType().equals(Production.class);
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5.2")
- public void testNamedField() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("produceBlackWidow");
- ProducerFieldBean<BlackWidow> blackWidowSpiderModel = ProducerFieldBean.of(field, bean, manager);
- assert blackWidowSpiderModel.getName().equals("blackWidow");
- }
-
- @Test(groups="producerField") @SpecAssertion(section="3.5.2")
- public void testDefaultNamedField() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs");
- ProducerFieldBean<DaddyLongLegs> daddyLongLegsSpiderModel = ProducerFieldBean.of(field, bean, manager);
- assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs");
- }
-
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
- public void testDisposalFieldNonStatic()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
- public void testDisposalFieldFieldDeclaredOnWebBeanImplementationClass()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
- public void testDisposalFieldBindingAnnotations()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
- public void testDisposalFieldDefaultBindingAnnotations()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
- public void testDisposalFieldDoesNotResolveToProducerField()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
- public void testDisposalFieldDeclaredOnEnabledBean()
- {
- // TODO Placeholder
- // TODO Move this
-
- assert false;
- }
-
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
- public void testBeanCanDeclareMultipleDisposalFields()
- {
- // TODO move this
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
- public void testProducerFieldHasNoMoreThanOneDisposalField()
- {
- // TODO move this
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups="producerField") @SpecAssertion(section={"2.7.2", "3.5.2", "2.2"})
- public void testStereotype() throws Exception
- {
- SimpleBean<OtherSpiderProducer> bean = SimpleBean.of(OtherSpiderProducer.class, manager);
- manager.addBean(bean);
- Field field = OtherSpiderProducer.class.getField("produceWolfSpider");
- ProducerFieldBean<WolfSpider> wolfSpiderModel = ProducerFieldBean.of(field, bean, manager);
- assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1;
- assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class);
- assert wolfSpiderModel.getScopeType().equals(RequestScoped.class);
- }
-}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-16 04:20:11 UTC (rev 1007)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/BeansImpl.java 2009-01-16 04:21:14 UTC (rev 1008)
@@ -1,5 +1,6 @@
package org.jboss.webbeans.test.tck;
+import java.lang.reflect.Field;
import java.lang.reflect.Method;
import javax.webbeans.manager.Bean;
@@ -7,6 +8,7 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.bean.AbstractClassBean;
import org.jboss.webbeans.bean.EnterpriseBean;
+import org.jboss.webbeans.bean.ProducerFieldBean;
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.tck.api.Beans;
@@ -38,6 +40,18 @@
throw new IllegalStateException("Cannot create a producer method from a bean that wasn't created by the RI " + declaringBean);
}
}
+
+ public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> declaringBean)
+ {
+ if (declaringBean instanceof AbstractClassBean)
+ {
+ return ProducerFieldBean.of(field, (AbstractClassBean<?>) declaringBean, CurrentManager.rootManager());
+ }
+ else
+ {
+ throw new IllegalStateException("Cannot create a producer field from a bean that wasn't created by the RI " + declaringBean);
+ }
+ }
public <T> Bean<T> createEnterpriseBean(Class<T> clazz)
{
More information about the weld-commits
mailing list