Author: pete.muir(a)jboss.org Date: 2009-01-16 12:38:29 -0500 (Fri, 16 Jan 2009) New Revision: 1028 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/OtherSpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanModelTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/WolfSpider.java Removed: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DefangedTarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanModelTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java Log: move producer fields package Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -interface Animal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnimalStereotype.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnimalStereotype.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.RequestScoped; -import javax.webbeans.Stereotype; - -(a)Stereotype(requiredTypes=Animal.class) -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@interface AnimalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -class BlackWidow extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -class DaddyLongLegs extends Spider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -interface DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DefangedTarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DefangedTarantula.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DefangedTarantula.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,5 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; -class DefangedTarantula extends Tarantula -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -class FunnelWeaver<T> -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import javax.webbeans.ApplicationScoped; - -@ApplicationScoped -class LadybirdSpider extends Spider -{ - - public void spinWeb() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,39 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - - -@AnotherDeploymentType -class OtherSpiderProducer -{ - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - - @Produces @Tame public Tarantula produceTameTarantula = new DefangedTarantula(); - - @Produces public Tarantula produceTarantula = new Tarantula(); - - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow = new BlackWidow(); - - @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs = new DaddyLongLegs(); - - @Produces @Named @Production public LadybirdSpider getLadybirdSpider = new LadybirdSpider(); - - @Produces @AnimalStereotype public WolfSpider produceWolfSpider = new WolfSpider(); - - @Produces public Animal makeASpider = new WolfSpider(); - - @Produces public int getWolfSpiderSize = 4; - - @Produces public Spider[] getSpiders = ALL_SPIDERS; - - @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>(); - - @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); - - @Produces public Spider getNullSpider = null; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,34 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import javax.webbeans.Destructor; -import javax.webbeans.Disposes; -import javax.webbeans.Observes; -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -class OtherSpiderProducer_Broken -{ - - @Produces - public String observe(@Observes String foo) - { - return "foo"; - } - - @Produces - public String dispose(@Disposes String foo) - { - return "foo"; - } - - @Produces @Destructor - public String destroy() - { - return "foo"; - } - - @Produces @RequestScoped public Spider getRequestScopedSpider = null; - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,58 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import java.lang.reflect.Field; - -import javax.webbeans.IllegalProductException; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class ProducerFieldBeanLifecycleTest extends AbstractTest -{ - - @SuppressWarnings("unchecked") - @Test(groups={"producerField", "broken"}) @SpecAssertion(section="5.6") - public void testProducerFieldBeanCreate() throws Exception - { - Bean<OtherSpiderProducer> spiderProducer = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(spiderProducer); - Field method = OtherSpiderProducer.class.getField("produceTarantula"); - Bean<Tarantula> tarantulaBean = (Bean<Tarantula>) getProducerFieldBean(method, spiderProducer); - Tarantula tarantula = tarantulaBean.create(); - assert tarantula != null; - } - - @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.3") - public void testSpecializedBeanAlwaysUsed() - { - // TODO Placeholder - assert false; - } - - - @SuppressWarnings("unchecked") - @Test(groups={"producerField", "broken"}) @SpecAssertion(section={"3.5", "5.6", "8.3"}) - public void testProducerFieldReturnsNullIsDependent() throws Exception - { - Bean<OtherSpiderProducer> spiderProducer = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(spiderProducer); - Field method = OtherSpiderProducer.class.getField("getNullSpider"); - Bean<Spider> spiderBean = (Bean<Spider>) getProducerFieldBean(method, spiderProducer); - Spider spider = spiderBean.create(); - assert spider == null; - } - - @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"}) - public void testProducerFieldReturnsNullIsNotDependent() throws Exception - { - Bean<OtherSpiderProducer_Broken> spiderProducer = getSimpleBean(OtherSpiderProducer_Broken.class); - manager.addBean(spiderProducer); - Field method = OtherSpiderProducer_Broken.class.getField("getRequestScopedSpider"); - getProducerFieldBean(method, spiderProducer).create(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanModelTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanModelTest.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanModelTest.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,272 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import java.lang.reflect.Field; - -import javax.webbeans.Current; -import javax.webbeans.DefinitionException; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; -import javax.webbeans.manager.Bean; - -import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.jboss.webbeans.tck.impl.SpecVersion; -import org.jboss.webbeans.tck.tests.AbstractTest; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class ProducerFieldBeanModelTest extends AbstractTest -{ - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="2.5.3") - public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("produceTameTarantula"); - Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); - 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 - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("getFunnelWeaverSpider"); - getProducerFieldBean(field, bean); - } - - @Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.5") - public void testParameterizedReturnTypeWithWildcard() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("getAnotherFunnelWeaver"); - getProducerFieldBean(field, bean); - } - - @Test(groups={"stub", "producerField", "deployment"}) @SpecAssertion(section="3.5") - public void testBeanDeclaresMultipleProducerFields() - { - assert false; - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section={"3.5", "2.3.1"}) - public void testDefaultBindingType() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("produceTarantula"); - Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); - assert tarantulaModel.getBindings().size() == 1; - assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class); - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="3.5.1") - public void testApiTypeForClassReturn() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("produceTarantula"); - Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); - 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); - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="3.5.1") - public void testApiTypeForInterfaceReturn() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("makeASpider"); - Bean<Animal> animalModel = (Bean<Animal>) getProducerFieldBean(field, bean); - assert animalModel.getTypes().size() == 2; - assert animalModel.getTypes().contains(Animal.class); - assert animalModel.getTypes().contains(Object.class); - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="3.5.1") - public void testApiTypeForPrimitiveReturn() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("getWolfSpiderSize"); - Bean<Integer> intModel = (Bean<Integer>) getProducerFieldBean(field, bean); - assert intModel.getTypes().size() == 2; - assert intModel.getTypes().contains(int.class); - assert intModel.getTypes().contains(Object.class); - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section={"3.5.1", "2.2"}) - public void testApiTypeForArrayTypeReturn() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("getSpiders"); - Bean<Spider[]> spidersModel = (Bean<Spider[]>) getProducerFieldBean(field, bean); - assert spidersModel.getTypes().size() == 2; - assert spidersModel.getTypes().contains(Spider[].class); - assert spidersModel.getTypes().contains(Object.class); - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="3.5.2") - public void testBindingType() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("produceTameTarantula"); - Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); - assert tarantulaModel.getBindings().size() == 1; - assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="3.5.2") - public void testScopeType() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs"); - Bean<DaddyLongLegs> daddyLongLegsModel = (Bean<DaddyLongLegs>) getProducerFieldBean(field, bean); - assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class); - - // TODO Inherit scope from returned web bean? - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="3.5.2") - public void testDeploymentType() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("getLadybirdSpider"); - Bean<LadybirdSpider> ladybirdSpiderModel = (Bean<LadybirdSpider>) getProducerFieldBean(field, bean); - assert ladybirdSpiderModel.getDeploymentType().equals(Production.class); - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="3.5.2") - public void testNamedField() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = (Bean<BlackWidow>) getProducerFieldBean(field, bean); - assert blackWidowSpiderModel.getName().equals("blackWidow"); - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section="3.5.2") - public void testDefaultNamedField() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs"); - Bean<DaddyLongLegs> daddyLongLegsSpiderModel = (Bean<DaddyLongLegs>) getProducerFieldBean(field, bean); - 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; - } - - @SuppressWarnings("unchecked") - @Test(groups="producerField") @SpecAssertion(section={"2.7.2", "3.5.2", "2.2"}) - public void testStereotype() throws Exception - { - Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); - manager.addBean(bean); - Field field = OtherSpiderProducer.class.getField("produceWolfSpider"); - Bean<WolfSpider> wolfSpiderModel = (Bean<WolfSpider>) getProducerFieldBean(field, bean); - - - // TODO reimplement stereotype tests - //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1; - //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class); - - assert wolfSpiderModel.getScopeType().equals(RequestScoped.class); - } -} \ No newline at end of file Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -class Spider implements Animal -{ - - public final void layEggs() - { - - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.webbeans.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Tame -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java 2009-01-16 17:35:12 UTC (rev 1027) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.tests.implementation.producer; - -class WolfSpider implements Animal -{ - -} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Animal.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Animal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Animal.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +interface Animal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnimalStereotype.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnimalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnimalStereotype.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.RequestScoped; +import javax.webbeans.Stereotype; + +(a)Stereotype(requiredTypes=Animal.class) +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnimalStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnotherDeploymentType.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/AnotherDeploymentType.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/AnotherDeploymentType.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.DeploymentType; + +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +@Documented +@DeploymentType +@interface AnotherDeploymentType +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/BlackWidow.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/BlackWidow.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/BlackWidow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/BlackWidow.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +class BlackWidow extends Spider implements DeadlySpider +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DaddyLongLegs.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DaddyLongLegs.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DaddyLongLegs.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DaddyLongLegs.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +class DaddyLongLegs extends Spider +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DeadlyAnimal.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlyAnimal.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DeadlyAnimal.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +interface DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DeadlySpider.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DeadlySpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DeadlySpider.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DefangedTarantula.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/DefangedTarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DefangedTarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/DefangedTarantula.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,5 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; +class DefangedTarantula extends Tarantula +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/FunnelWeaver.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/FunnelWeaver.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/FunnelWeaver.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/FunnelWeaver.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +class FunnelWeaver<T> +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/FunnelWeaver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/LadybirdSpider.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/LadybirdSpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/LadybirdSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/LadybirdSpider.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +import javax.webbeans.ApplicationScoped; + +@ApplicationScoped +class LadybirdSpider extends Spider +{ + + public void spinWeb() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/OtherSpiderProducer.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/OtherSpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/OtherSpiderProducer.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,39 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +import javax.webbeans.Named; +import javax.webbeans.Produces; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + + +@AnotherDeploymentType +class OtherSpiderProducer +{ + + private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; + + @Produces @Tame public Tarantula produceTameTarantula = new DefangedTarantula(); + + @Produces public Tarantula produceTarantula = new Tarantula(); + + @Produces @Named("blackWidow") public BlackWidow produceBlackWidow = new BlackWidow(); + + @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs = new DaddyLongLegs(); + + @Produces @Named @Production public LadybirdSpider getLadybirdSpider = new LadybirdSpider(); + + @Produces @AnimalStereotype public WolfSpider produceWolfSpider = new WolfSpider(); + + @Produces public Animal makeASpider = new WolfSpider(); + + @Produces public int getWolfSpiderSize = 4; + + @Produces public Spider[] getSpiders = ALL_SPIDERS; + + @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>(); + + @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>(); + + @Produces public Spider getNullSpider = null; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/OtherSpiderProducer_Broken.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/OtherSpiderProducer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/OtherSpiderProducer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/OtherSpiderProducer_Broken.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,34 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +import javax.webbeans.Destructor; +import javax.webbeans.Disposes; +import javax.webbeans.Observes; +import javax.webbeans.Produces; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +class OtherSpiderProducer_Broken +{ + + @Produces + public String observe(@Observes String foo) + { + return "foo"; + } + + @Produces + public String dispose(@Disposes String foo) + { + return "foo"; + } + + @Produces @Destructor + public String destroy() + { + return "foo"; + } + + @Produces @RequestScoped public Spider getRequestScopedSpider = null; + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanLifecycleTest.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanLifecycleTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanLifecycleTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanLifecycleTest.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,58 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +import java.lang.reflect.Field; + +import javax.webbeans.IllegalProductException; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class ProducerFieldBeanLifecycleTest extends AbstractTest +{ + + @SuppressWarnings("unchecked") + @Test(groups={"producerField", "broken"}) @SpecAssertion(section="5.6") + public void testProducerFieldBeanCreate() throws Exception + { + Bean<OtherSpiderProducer> spiderProducer = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(spiderProducer); + Field method = OtherSpiderProducer.class.getField("produceTarantula"); + Bean<Tarantula> tarantulaBean = (Bean<Tarantula>) getProducerFieldBean(method, spiderProducer); + Tarantula tarantula = tarantulaBean.create(); + assert tarantula != null; + } + + @Test(groups={"stub", "specialization"}) @SpecAssertion(section="3.3.3") + public void testSpecializedBeanAlwaysUsed() + { + // TODO Placeholder + assert false; + } + + + @SuppressWarnings("unchecked") + @Test(groups={"producerField", "broken"}) @SpecAssertion(section={"3.5", "5.6", "8.3"}) + public void testProducerFieldReturnsNullIsDependent() throws Exception + { + Bean<OtherSpiderProducer> spiderProducer = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(spiderProducer); + Field method = OtherSpiderProducer.class.getField("getNullSpider"); + Bean<Spider> spiderBean = (Bean<Spider>) getProducerFieldBean(method, spiderProducer); + Spider spider = spiderBean.create(); + assert spider == null; + } + + @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"}) + public void testProducerFieldReturnsNullIsNotDependent() throws Exception + { + Bean<OtherSpiderProducer_Broken> spiderProducer = getSimpleBean(OtherSpiderProducer_Broken.class); + manager.addBean(spiderProducer); + Field method = OtherSpiderProducer_Broken.class.getField("getRequestScopedSpider"); + getProducerFieldBean(method, spiderProducer).create(); + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanModelTest.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/ProducerFieldBeanModelTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanModelTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/ProducerFieldBeanModelTest.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,272 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +import java.lang.reflect.Field; + +import javax.webbeans.Current; +import javax.webbeans.DefinitionException; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; +import javax.webbeans.manager.Bean; + +import org.jboss.webbeans.tck.impl.SpecAssertion; +import org.jboss.webbeans.tck.impl.SpecVersion; +import org.jboss.webbeans.tck.tests.AbstractTest; +import org.testng.annotations.Test; + +@SpecVersion("20081206") +public class ProducerFieldBeanModelTest extends AbstractTest +{ + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="2.5.3") + public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("produceTameTarantula"); + Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); + 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 + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("getFunnelWeaverSpider"); + getProducerFieldBean(field, bean); + } + + @Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.5") + public void testParameterizedReturnTypeWithWildcard() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("getAnotherFunnelWeaver"); + getProducerFieldBean(field, bean); + } + + @Test(groups={"stub", "producerField", "deployment"}) @SpecAssertion(section="3.5") + public void testBeanDeclaresMultipleProducerFields() + { + assert false; + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section={"3.5", "2.3.1"}) + public void testDefaultBindingType() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("produceTarantula"); + Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); + assert tarantulaModel.getBindings().size() == 1; + assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class); + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="3.5.1") + public void testApiTypeForClassReturn() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("produceTarantula"); + Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); + 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); + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="3.5.1") + public void testApiTypeForInterfaceReturn() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("makeASpider"); + Bean<Animal> animalModel = (Bean<Animal>) getProducerFieldBean(field, bean); + assert animalModel.getTypes().size() == 2; + assert animalModel.getTypes().contains(Animal.class); + assert animalModel.getTypes().contains(Object.class); + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="3.5.1") + public void testApiTypeForPrimitiveReturn() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("getWolfSpiderSize"); + Bean<Integer> intModel = (Bean<Integer>) getProducerFieldBean(field, bean); + assert intModel.getTypes().size() == 2; + assert intModel.getTypes().contains(int.class); + assert intModel.getTypes().contains(Object.class); + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section={"3.5.1", "2.2"}) + public void testApiTypeForArrayTypeReturn() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("getSpiders"); + Bean<Spider[]> spidersModel = (Bean<Spider[]>) getProducerFieldBean(field, bean); + assert spidersModel.getTypes().size() == 2; + assert spidersModel.getTypes().contains(Spider[].class); + assert spidersModel.getTypes().contains(Object.class); + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="3.5.2") + public void testBindingType() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("produceTameTarantula"); + Bean<Tarantula> tarantulaModel = (Bean<Tarantula>) getProducerFieldBean(field, bean); + assert tarantulaModel.getBindings().size() == 1; + assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class); + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="3.5.2") + public void testScopeType() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs"); + Bean<DaddyLongLegs> daddyLongLegsModel = (Bean<DaddyLongLegs>) getProducerFieldBean(field, bean); + assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class); + + // TODO Inherit scope from returned web bean? + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="3.5.2") + public void testDeploymentType() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("getLadybirdSpider"); + Bean<LadybirdSpider> ladybirdSpiderModel = (Bean<LadybirdSpider>) getProducerFieldBean(field, bean); + assert ladybirdSpiderModel.getDeploymentType().equals(Production.class); + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="3.5.2") + public void testNamedField() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("produceBlackWidow"); + Bean<BlackWidow> blackWidowSpiderModel = (Bean<BlackWidow>) getProducerFieldBean(field, bean); + assert blackWidowSpiderModel.getName().equals("blackWidow"); + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section="3.5.2") + public void testDefaultNamedField() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs"); + Bean<DaddyLongLegs> daddyLongLegsSpiderModel = (Bean<DaddyLongLegs>) getProducerFieldBean(field, bean); + 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; + } + + @SuppressWarnings("unchecked") + @Test(groups="producerField") @SpecAssertion(section={"2.7.2", "3.5.2", "2.2"}) + public void testStereotype() throws Exception + { + Bean<OtherSpiderProducer> bean = getSimpleBean(OtherSpiderProducer.class); + manager.addBean(bean); + Field field = OtherSpiderProducer.class.getField("produceWolfSpider"); + Bean<WolfSpider> wolfSpiderModel = (Bean<WolfSpider>) getProducerFieldBean(field, bean); + + + // TODO reimplement stereotype tests + //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1; + //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class); + + assert wolfSpiderModel.getScopeType().equals(RequestScoped.class); + } +} \ No newline at end of file Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Spider.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Spider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Spider.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +class Spider implements Animal +{ + + public final void layEggs() + { + + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Tame.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tame.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Tame.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Tame.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.webbeans.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Tarantula.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/Tarantula.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/Tarantula.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/WolfSpider.java (from rev 1022, tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/WolfSpider.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/WolfSpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/field/WolfSpider.java 2009-01-16 17:38:29 UTC (rev 1028) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.field; + +class WolfSpider implements Animal +{ + +}