[webbeans-commits] Webbeans SVN: r1029 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests and 5 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-16 13:00:17 -0500 (Fri, 16 Jan 2009) New Revision: 1029 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Animal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnotherDeploymentType.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BrokenSpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlyAnimal.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlySpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Spider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tarantula.java Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java Log: Port producer method tests Deleted: 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 2009-01-16 17:38:29 UTC (rev 1028) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -1,72 +0,0 @@ -package org.jboss.webbeans.test; - -import java.lang.reflect.Method; - -import javax.webbeans.IllegalProductException; - -import org.jboss.webbeans.bean.ProducerMethodBean; -import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.test.beans.Spider; -import org.jboss.webbeans.test.beans.SpiderProducer; -import org.jboss.webbeans.test.beans.Tarantula; -import org.jboss.webbeans.test.beans.broken.BrokenSpiderProducer; -import org.testng.annotations.Test; - -@SpecVersion("20081206") -public class ProducerMethodBeanLifecycleTest extends AbstractTest -{ - - @Test(groups={"producerMethod", "broken"}) @SpecAssertion(section="5.6") - public void testProducerMethodBeanCreate() throws Exception - { - SimpleBean<SpiderProducer> spiderProducer = SimpleBean.of(SpiderProducer.class, manager); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("produceTarantula"); - ProducerMethodBean<Tarantula> tarantulaBean = ProducerMethodBean.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={"stub", "disposalMethod", "beanLifecycle"}) @SpecAssertion(section="3.3.4") - public void testDisposalMethodCalled() - { - // TODO Placeholder - assert false; - } - - @Test(groups={"stub", "disposalMethod", "beanLifecycle"}) @SpecAssertion(section="3.3.4") - public void testDisposalMethodHasParametersInjected() - { - // TODO Placeholder - assert false; - } - - - @Test(groups={"producerMethod", "broken"}) @SpecAssertion(section={"3.4", "5.6", "8.3"}) - public void testProducerMethodReturnsNullIsDependent() throws Exception - { - SimpleBean<SpiderProducer> spiderProducer = SimpleBean.of(SpiderProducer.class, manager); - manager.addBean(spiderProducer); - Method method = SpiderProducer.class.getMethod("getNullSpider"); - ProducerMethodBean<Spider> spiderBean = ProducerMethodBean.of(method, spiderProducer, manager); - Spider spider = spiderBean.create(); - assert spider == null; - } - - @Test(groups="producerMethod", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.4", "5.6"}) - public void testProducerMethodReturnsNullIsNotDependent() throws Exception - { - SimpleBean<BrokenSpiderProducer> spiderProducer = SimpleBean.of(BrokenSpiderProducer.class, manager); - manager.addBean(spiderProducer); - Method method = BrokenSpiderProducer.class.getMethod("getRequestScopedSpider"); - ProducerMethodBean.of(method, spiderProducer, manager).create(); - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-16 17:38:29 UTC (rev 1028) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/AbstractTest.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -53,7 +53,7 @@ return configuration().getBeans().createSimpleBean(beanClass); } - public <T> Bean<?> getProducerMethodBean(Method method, Bean<?> producerBean) + public <T> Bean<T> getProducerMethodBean(Method method, Bean<?> producerBean) { return configuration().getBeans().createProducerMethodBean(method, producerBean); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTest.java 2009-01-16 17:38:29 UTC (rev 1028) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/binding/BindingTest.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -150,7 +150,7 @@ Method method = SpiderProducer.class.getMethod("produceTameTarantula"); manager.addBean(getProducerMethodBean(method, spiderProducer)); method = SpiderProducer.class.getMethod("produceSpiderFromInjection", Tarantula.class); - Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducer); + Bean<Spider> spiderBean = getProducerMethodBean(method, spiderProducer); Spider spider = spiderBean.create(); assert spider != null; assert spider instanceof DefangedTarantula; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java 2009-01-16 17:38:29 UTC (rev 1028) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/common/CommonWebBeanTest.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -64,10 +64,10 @@ Bean<SpiderProducer> spiderProducerBean = getSimpleBean(SpiderProducer.class); manager.addBean(spiderProducerBean); Method method = SpiderProducer.class.getMethod("getWolfSpiderSize"); - Bean<Integer> bean = (Bean<Integer>) getProducerMethodBean(method, spiderProducerBean); + Bean<Integer> bean = getProducerMethodBean(method, spiderProducerBean); assert !bean.isNullable(); method = SpiderProducer.class.getMethod("makeASpider"); - Bean<Spider> spiderBean = (Bean<Spider>) getProducerMethodBean(method, spiderProducerBean); + Bean<Spider> spiderBean = getProducerMethodBean(method, spiderProducerBean); assert spiderBean.isNullable(); } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java 2009-01-16 17:38:29 UTC (rev 1028) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/definition/deployment/DeploymentTypeTest.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -68,7 +68,7 @@ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class); manager.addBean(bean); Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - Bean<BlackWidow> blackWidowSpiderModel = (Bean<BlackWidow>) getProducerMethodBean(method, bean); + Bean<BlackWidow> blackWidowSpiderModel = getProducerMethodBean(method, bean); assert blackWidowSpiderModel.getDeploymentType().equals(AnotherDeploymentType.class); } Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Animal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Animal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Animal.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + +interface Animal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnotherDeploymentType.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnotherDeploymentType.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + +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 +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnotherDeploymentType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BrokenSpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BrokenSpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BrokenSpiderProducer.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + +import javax.webbeans.Produces; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +class BrokenSpiderProducer +{ + + @Produces @RequestScoped public Spider getRequestScopedSpider() + { + return null; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BrokenSpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlyAnimal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlyAnimal.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlyAnimal.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + +interface DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlyAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlySpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlySpider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlySpider.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + +interface DeadlySpider extends DeadlyAnimal +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DeadlySpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,70 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + +import java.lang.reflect.Method; + +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 ProducerMethodBeanLifecycleTest extends AbstractTest +{ + + @Test(groups={"producerMethod", "broken"}) @SpecAssertion(section="5.6") + public void testProducerMethodBeanCreate() throws Exception + { + Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + manager.addBean(spiderProducer); + Method method = SpiderProducer.class.getMethod("produceTarantula"); + Bean<Tarantula> tarantulaBean = getProducerMethodBean(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; + } + + @Test(groups={"stub", "disposalMethod", "beanLifecycle"}) @SpecAssertion(section="3.3.4") + public void testDisposalMethodCalled() + { + // TODO Placeholder + assert false; + } + + @Test(groups={"stub", "disposalMethod", "beanLifecycle"}) @SpecAssertion(section="3.3.4") + public void testDisposalMethodHasParametersInjected() + { + // TODO Placeholder + assert false; + } + + + @Test(groups={"producerMethod", "broken"}) @SpecAssertion(section={"3.4", "5.6", "8.3"}) + public void testProducerMethodReturnsNullIsDependent() throws Exception + { + Bean<SpiderProducer> spiderProducer = getSimpleBean(SpiderProducer.class); + manager.addBean(spiderProducer); + Method method = SpiderProducer.class.getMethod("getNullSpider"); + Bean<Spider> spiderBean = getProducerMethodBean(method, spiderProducer); + Spider spider = spiderBean.create(); + assert spider == null; + } + + @Test(groups="producerMethod", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.4", "5.6"}) + public void testProducerMethodReturnsNullIsNotDependent() throws Exception + { + Bean<BrokenSpiderProducer> spiderProducer = getSimpleBean(BrokenSpiderProducer.class); + manager.addBean(spiderProducer); + Method method = BrokenSpiderProducer.class.getMethod("getRequestScopedSpider"); + getProducerMethodBean(method, spiderProducer).create(); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Spider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Spider.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Spider.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + + +class Spider implements Animal +{ + + public final void layEggs() + { + + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Spider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + +import javax.webbeans.Produces; + + +@AnotherDeploymentType +class SpiderProducer +{ + + @Produces public Tarantula produceTarantula() + { + return new Tarantula(); + } + + @Produces public Spider getNullSpider() + { + return null; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tarantula.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tarantula.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tarantula.java 2009-01-16 18:00:17 UTC (rev 1029) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.tests.implementation.producer.method; + +class Tarantula extends Spider implements DeadlySpider +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tarantula.java ___________________________________________________________________ Name: svn:mime-type + text/plain