[webbeans-commits] Webbeans SVN: r1032 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 13:51:53 -0500 (Fri, 16 Jan 2009)
New Revision: 1032
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ResolutionByNameTest.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByNameTest.java
Log:
port resolution by name tests
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByNameTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByNameTest.java 2009-01-16 18:43:24 UTC (rev 1031)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByNameTest.java 2009-01-16 18:51:53 UTC (rev 1032)
@@ -1,97 +0,0 @@
-package org.jboss.webbeans.test;
-
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.test.beans.Cod;
-import org.jboss.webbeans.test.beans.Haddock;
-import org.jboss.webbeans.test.beans.Plaice;
-import org.jboss.webbeans.test.beans.Salmon;
-import org.jboss.webbeans.test.beans.SeaBass;
-import org.jboss.webbeans.test.beans.Sole;
-import org.jboss.webbeans.test.beans.Tuna;
-import org.testng.annotations.Test;
-
-@SpecVersion("20081206")
-public class ResolutionByNameTest extends AbstractTest
-{
-
- @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11")
- public void testELResolver()
- {
- assert false;
- }
-
- @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11.2")
- public void testELResolverRegisteredWithJsf()
- {
- assert false;
- }
-
- @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11.2")
- public void testELResolverRegisteredWithServlet()
- {
- assert false;
- }
-
- @Test @SpecAssertion(section="5.11.1")
- public void testNamedBasedResolution()
- {
-
- Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager);
- Bean<Cod> codBean = SimpleBean.of(Cod.class, manager);
- Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager);
- Bean<Sole> soleBean = SimpleBean.of(Sole.class, manager);
- Bean<SeaBass> seaBassBean = SimpleBean.of(SeaBass.class, manager);
- Bean<Haddock> haddockBean = SimpleBean.of(Haddock.class, manager);
- Bean<Plaice> plaiceBean = SimpleBean.of(Plaice.class, manager);
-
- manager.addBean(tunaBean);
- manager.addBean(codBean);
- manager.addBean(salmonBean);
- manager.addBean(soleBean);
- manager.addBean(haddockBean);
- manager.addBean(seaBassBean);
-
- assert manager.resolveByName("salmon").size() == 1;
- assert manager.resolveByName("salmon").contains(salmonBean);
-
- assert manager.resolveByName("whitefish").size() == 2;
- assert manager.resolveByName("whitefish").contains(codBean);
- assert manager.resolveByName("whitefish").contains(soleBean);
-
- manager.addBean(plaiceBean);
-
- assert manager.resolveByName("whitefish").size() == 1;
- assert manager.resolveByName("whitefish").contains(plaiceBean);
- }
-
- @Test(groups="resolution") @SpecAssertion(section="5.11.1")
- public void testNoWebBeansFound() throws Exception
- {
- Bean<Cod> codBean = SimpleBean.of(Cod.class, manager);
- Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager);
-
- manager.addBean(codBean);
- manager.addBean(salmonBean);
-
- assert manager.resolveByName("foo").size() == 0;
- }
-
- @Test(groups="stub") @SpecAssertion(section="5.11.1")
- public void testOnlyHigestPrecedenceResolved()
- {
- assert false;
- }
-
- /*
-
- @Test(groups="el") @SpecAssertion(section="5.11")
- public void test
- {
- assert false;
- }
-
- */
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ResolutionByNameTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-01-16 18:51:53 UTC (rev 1032)
@@ -0,0 +1,103 @@
+package org.jboss.webbeans.tck.tests.lookup.byname;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+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 ResolutionByNameTest extends AbstractTest
+{
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes();
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
+ }
+
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11")
+ public void testELResolver()
+ {
+ assert false;
+ }
+
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11.2")
+ public void testELResolverRegisteredWithJsf()
+ {
+ assert false;
+ }
+
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11.2")
+ public void testELResolverRegisteredWithServlet()
+ {
+ assert false;
+ }
+
+ @Test @SpecAssertion(section="5.11.1")
+ public void testNamedBasedResolution()
+ {
+
+ Bean<Tuna> tunaBean = getSimpleBean(Tuna.class);
+ Bean<Cod> codBean = getSimpleBean(Cod.class);
+ Bean<Salmon> salmonBean = getSimpleBean(Salmon.class);
+ Bean<Sole> soleBean = getSimpleBean(Sole.class);
+ Bean<SeaBass> seaBassBean = getSimpleBean(SeaBass.class);
+ Bean<Haddock> haddockBean = getSimpleBean(Haddock.class);
+ Bean<Plaice> plaiceBean = getSimpleBean(Plaice.class);
+
+ manager.addBean(tunaBean);
+ manager.addBean(codBean);
+ manager.addBean(salmonBean);
+ manager.addBean(soleBean);
+ manager.addBean(haddockBean);
+ manager.addBean(seaBassBean);
+
+ assert manager.resolveByName("salmon").size() == 1;
+ assert manager.resolveByName("salmon").contains(salmonBean);
+
+ assert manager.resolveByName("whitefish").size() == 2;
+ assert manager.resolveByName("whitefish").contains(codBean);
+ assert manager.resolveByName("whitefish").contains(soleBean);
+
+ manager.addBean(plaiceBean);
+
+ assert manager.resolveByName("whitefish").size() == 1;
+ assert manager.resolveByName("whitefish").contains(plaiceBean);
+ }
+
+ @Test(groups="resolution") @SpecAssertion(section="5.11.1")
+ public void testNoWebBeansFound() throws Exception
+ {
+ Bean<Cod> codBean = getSimpleBean(Cod.class);
+ Bean<Salmon> salmonBean = getSimpleBean(Salmon.class);
+
+ manager.addBean(codBean);
+ manager.addBean(salmonBean);
+
+ assert manager.resolveByName("foo").size() == 0;
+ }
+
+ @Test(groups="stub") @SpecAssertion(section="5.11.1")
+ public void testOnlyHigestPrecedenceResolved()
+ {
+ assert false;
+ }
+
+ /*
+
+ @Test(groups="el") @SpecAssertion(section="5.11")
+ public void test
+ {
+ assert false;
+ }
+
+ */
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/byname/ResolutionByNameTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1031 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 13:43:24 -0500 (Fri, 16 Jan 2009)
New Revision: 1031
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BeanWithStaticProducerMethod.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BlackWidow.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DaddyLongLegs.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DefangedTarantula.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/FunnelWeaver.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/LadybirdSpider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tame.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/WolfSpider.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BrokenSpiderProducer.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.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/SpiderProducer.java
Log:
Port producer method tests
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-16 18:14:20 UTC (rev 1030)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -141,6 +141,7 @@
initScopeType();
initTypes();
initProxyable();
+ checkRequiredTypesImplemented();
}
/**
@@ -334,6 +335,21 @@
throw new DefinitionException(getAnnotatedItem().getName() + " cannot have deployment type @Standard");
}
}
+
+ /**
+ * Validates that the required types are implemented
+ */
+ protected void checkRequiredTypesImplemented()
+ {
+ for (Class<?> requiredType : getMergedStereotypes().getRequiredTypes())
+ {
+ log.trace("Checking if required type " + requiredType + " is implemented");
+ if (!requiredType.isAssignableFrom(type))
+ {
+ throw new DefinitionException("Required type " + requiredType + " isn't implemented on " + type);
+ }
+ }
+ }
/**
* Binds the decorators to the proxy
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-16 18:14:20 UTC (rev 1030)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -77,7 +77,6 @@
protected void init()
{
super.init();
- checkRequiredTypesImplemented();
checkScopeAllowed();
checkBeanImplementation();
// TODO Interceptors
@@ -153,21 +152,6 @@
}
/**
- * Validates that the required types are implemented
- */
- protected void checkRequiredTypesImplemented()
- {
- for (Class<?> requiredType : getMergedStereotypes().getRequiredTypes())
- {
- log.trace("Checking if required type " + requiredType + " is implemented");
- if (!requiredType.isAssignableFrom(type))
- {
- throw new DefinitionException("Required type " + requiredType + " isn't implemented on " + type);
- }
- }
- }
-
- /**
* Validate that the scope type is allowed by the stereotypes on the bean and
* the bean type
*/
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2009-01-16 18:14:20 UTC (rev 1030)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -1,298 +0,0 @@
-package org.jboss.webbeans.test;
-
-import java.lang.reflect.Method;
-
-import javax.webbeans.Current;
-import javax.webbeans.DefinitionException;
-import javax.webbeans.Production;
-import javax.webbeans.RequestScoped;
-
-import org.jboss.webbeans.bean.ProducerMethodBean;
-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.Spider;
-import org.jboss.webbeans.test.beans.SpiderProducer;
-import org.jboss.webbeans.test.beans.Tarantula;
-import org.jboss.webbeans.test.beans.WolfSpider;
-import org.jboss.webbeans.test.beans.broken.BeanWithStaticProducerMethod;
-import org.jboss.webbeans.test.beans.broken.BrokenSpiderProducer;
-import org.testng.annotations.Test;
-
-@SpecVersion("20081206")
-public class ProducerMethodBeanModelTest extends AbstractTest
-{
-
- @Test(groups="producerMethod") @SpecAssertion(section="2.5.3")
- public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("produceTameTarantula");
- ProducerMethodBean<Tarantula> tarantulaModel = ProducerMethodBean.of(method, bean, manager);
- tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class);
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4")
- public void testStaticMethod() throws Exception
- {
- SimpleBean<BeanWithStaticProducerMethod> bean = SimpleBean.of(BeanWithStaticProducerMethod.class, manager);
- manager.addBean(bean);
- Method method = BeanWithStaticProducerMethod.class.getMethod("getString");
- ProducerMethodBean.of(method, bean, manager);
- }
-
- @Test(groups={"stub", "producerMethod", "enterpriseBeans", "stub"}, expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
- public void testProducerMethodIsNotBusinessMethod() throws Exception
- {
- assert false;
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4")
- public void testParameterizedReturnType() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("getFunnelWeaverSpider");
- ProducerMethodBean.of(method, bean, manager);
- }
-
- @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
- public void testParameterizedReturnTypeWithWildcard() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("getAnotherFunnelWeaver");
- ProducerMethodBean.of(method, bean, manager);
- }
-
- @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
- public void testParameterizedReturnTypeWithTypeParameter() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("getFunnelWeaver");
- ProducerMethodBean.of(method, bean, manager);
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section={"3.4", "2.3.1"})
- public void testDefaultBindingType() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("produceTarantula");
- ProducerMethodBean<Tarantula> tarantulaModel = ProducerMethodBean.of(method, bean, manager);
- assert tarantulaModel.getBindings().size() == 1;
- assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class);
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
- public void testApiTypeForClassReturn() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("produceTarantula");
- ProducerMethodBean<Tarantula> tarantulaModel = ProducerMethodBean.of(method, 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="producerMethod") @SpecAssertion(section="3.4.1")
- public void testApiTypeForInterfaceReturn() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("makeASpider");
- ProducerMethodBean<Animal> animalModel = ProducerMethodBean.of(method, bean, manager);
- assert animalModel.getTypes().size() == 2;
- assert animalModel.getTypes().contains(Animal.class);
- assert animalModel.getTypes().contains(Object.class);
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
- public void testApiTypeForPrimitiveReturn() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("getWolfSpiderSize");
- ProducerMethodBean<Integer> intModel = ProducerMethodBean.of(method, bean, manager);
- assert intModel.getTypes().size() == 2;
- assert intModel.getTypes().contains(int.class);
- assert intModel.getTypes().contains(Object.class);
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section={"3.4.1", "2.2"})
- public void testApiTypeForArrayTypeReturn() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("getSpiders");
- ProducerMethodBean<Spider[]> spidersModel = ProducerMethodBean.of(method, bean, manager);
- assert spidersModel.getTypes().size() == 2;
- assert spidersModel.getTypes().contains(Spider[].class);
- assert spidersModel.getTypes().contains(Object.class);
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
- public void testBindingType() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("produceTameTarantula");
- ProducerMethodBean<Tarantula> tarantulaModel = ProducerMethodBean.of(method, bean, manager);
- assert tarantulaModel.getBindings().size() == 1;
- assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class);
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
- public void testScopeType() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs");
- ProducerMethodBean<DaddyLongLegs> daddyLongLegsModel = ProducerMethodBean.of(method, bean, manager);
- assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class);
-
- // TODO Inherit scope from returned web bean?
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
- public void testDeploymentType() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("getLadybirdSpider");
- ProducerMethodBean<LadybirdSpider> ladybirdSpiderModel = ProducerMethodBean.of(method, bean, manager);
- assert ladybirdSpiderModel.getDeploymentType().equals(Production.class);
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
- public void testNamedMethod() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("produceBlackWidow");
- ProducerMethodBean<BlackWidow> blackWidowSpiderModel = ProducerMethodBean.of(method, bean, manager);
- assert blackWidowSpiderModel.getName().equals("blackWidow");
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
- public void testDefaultNamedMethod() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs");
- ProducerMethodBean<DaddyLongLegs> daddyLongLegsSpiderModel = ProducerMethodBean.of(method, bean, manager);
- assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs");
- }
-
- @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
- public void testProducerMethodAnnotatedDestructor() throws Exception
- {
- SimpleBean<BrokenSpiderProducer> bean = SimpleBean.of(BrokenSpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = BrokenSpiderProducer.class.getMethod("destroy");
- ProducerMethodBean.of(method, bean, manager);
- }
-
- @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
- public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception
- {
- SimpleBean<BrokenSpiderProducer> bean = SimpleBean.of(BrokenSpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = BrokenSpiderProducer.class.getMethod("dispose", String.class);
- ProducerMethodBean.of(method, bean, manager);
- }
-
- @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
- public void testProducerMethodWithParameterAnnotatedObserves() throws Exception
- {
- SimpleBean<BrokenSpiderProducer> bean = SimpleBean.of(BrokenSpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = BrokenSpiderProducer.class.getMethod("observe", String.class);
- ProducerMethodBean.of(method, bean, manager);
- }
-
- @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
- public void testDisposalMethodNonStatic()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
- public void testDisposalMethodMethodDeclaredOnWebBeanImplementationClass()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
- public void testDisposalMethodBindingAnnotations()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
- public void testDisposalMethodDefaultBindingAnnotations()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
- public void testDisposalMethodDoesNotResolveToProducerMethod()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.5")
- public void testDisposalMethodDeclaredOnEnabledBean()
- {
- // TODO Placeholder
- // TODO Move this
-
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.5")
- public void testBeanCanDeclareMultipleDisposalMethods()
- {
- // TODO move this
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.5")
- public void testProducerMethodHasNoMoreThanOneDisposalMethod()
- {
- // TODO move this
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups="producerMethod") @SpecAssertion(section={"2.7.2", "3.4.2", "2.2"})
- public void testStereotype() throws Exception
- {
- SimpleBean<SpiderProducer> bean = SimpleBean.of(SpiderProducer.class, manager);
- manager.addBean(bean);
- Method method = SpiderProducer.class.getMethod("produceWolfSpider");
- ProducerMethodBean<WolfSpider> wolfSpiderModel = ProducerMethodBean.of(method, bean, manager);
- assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1;
- assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class);
- assert wolfSpiderModel.getScopeType().equals(RequestScoped.class);
- }
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnimalStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/AnimalStereotype.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,21 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+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/method/AnimalStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BeanWithStaticProducerMethod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BeanWithStaticProducerMethod.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BeanWithStaticProducerMethod.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+import javax.webbeans.Produces;
+import javax.webbeans.Production;
+
+@Production
+class BeanWithStaticProducerMethod
+{
+
+ @Produces public static String getString()
+ {
+ return "Pete";
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BeanWithStaticProducerMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BlackWidow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BlackWidow.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BlackWidow.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+class BlackWidow extends Spider implements DeadlySpider
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BlackWidow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: 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 2009-01-16 18:14:20 UTC (rev 1030)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/BrokenSpiderProducer.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -1,16 +0,0 @@
-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;
- }
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DaddyLongLegs.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DaddyLongLegs.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DaddyLongLegs.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+class DaddyLongLegs extends Spider
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DaddyLongLegs.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DefangedTarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DefangedTarantula.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DefangedTarantula.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+class DefangedTarantula extends Tarantula
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/DefangedTarantula.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/FunnelWeaver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/FunnelWeaver.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/FunnelWeaver.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+class FunnelWeaver<T>
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/FunnelWeaver.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/LadybirdSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/LadybirdSpider.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/LadybirdSpider.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+import javax.webbeans.ApplicationScoped;
+
+@ApplicationScoped
+class LadybirdSpider extends Spider
+{
+
+ public void spinWeb()
+ {
+
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/LadybirdSpider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: 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 2009-01-16 18:14:20 UTC (rev 1030)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanLifecycleTest.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -61,9 +61,9 @@
@Test(groups="producerMethod", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.4", "5.6"})
public void testProducerMethodReturnsNullIsNotDependent() throws Exception
{
- Bean<BrokenSpiderProducer> spiderProducer = getSimpleBean(BrokenSpiderProducer.class);
+ Bean<SpiderProducer_Broken> spiderProducer = getSimpleBean(SpiderProducer_Broken.class);
manager.addBean(spiderProducer);
- Method method = BrokenSpiderProducer.class.getMethod("getRequestScopedSpider");
+ Method method = SpiderProducer_Broken.class.getMethod("getRequestScopedSpider");
getProducerMethodBean(method, spiderProducer).create();
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,295 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+import java.lang.reflect.Method;
+
+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 ProducerMethodBeanModelTest extends AbstractTest
+{
+
+ @Test(groups="producerMethod") @SpecAssertion(section="2.5.3")
+ public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("produceTameTarantula");
+ Bean<Tarantula> tarantulaModel = getProducerMethodBean(method, bean);
+ tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4")
+ public void testStaticMethod() throws Exception
+ {
+ Bean<BeanWithStaticProducerMethod> bean = getSimpleBean(BeanWithStaticProducerMethod.class);
+ manager.addBean(bean);
+ Method method = BeanWithStaticProducerMethod.class.getMethod("getString");
+ getProducerMethodBean(method, bean);
+ }
+
+ @Test(groups={"stub", "producerMethod", "enterpriseBeans", "stub"}, expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ public void testProducerMethodIsNotBusinessMethod() throws Exception
+ {
+ assert false;
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4")
+ public void testParameterizedReturnType() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("getFunnelWeaverSpider");
+ getProducerMethodBean(method, bean);
+ }
+
+ @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ public void testParameterizedReturnTypeWithWildcard() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("getAnotherFunnelWeaver");
+ getProducerMethodBean(method, bean);
+ }
+
+ @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ public void testParameterizedReturnTypeWithTypeParameter() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("getFunnelWeaver");
+ getProducerMethodBean(method, bean);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section={"3.4", "2.3.1"})
+ public void testDefaultBindingType() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("produceTarantula");
+ Bean<Tarantula> tarantulaModel = getProducerMethodBean(method, bean);
+ assert tarantulaModel.getBindings().size() == 1;
+ assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
+ public void testApiTypeForClassReturn() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("produceTarantula");
+ Bean<Tarantula> tarantulaModel = getProducerMethodBean(method, 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);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
+ public void testApiTypeForInterfaceReturn() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("makeASpider");
+ Bean<Animal> animalModel = getProducerMethodBean(method, bean);
+ assert animalModel.getTypes().size() == 2;
+ assert animalModel.getTypes().contains(Animal.class);
+ assert animalModel.getTypes().contains(Object.class);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
+ public void testApiTypeForPrimitiveReturn() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("getWolfSpiderSize");
+ Bean<Integer> intModel = getProducerMethodBean(method, bean);
+ assert intModel.getTypes().size() == 2;
+ assert intModel.getTypes().contains(int.class);
+ assert intModel.getTypes().contains(Object.class);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section={"3.4.1", "2.2"})
+ public void testApiTypeForArrayTypeReturn() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("getSpiders");
+ Bean<Spider[]> spidersModel = getProducerMethodBean(method, bean);
+ assert spidersModel.getTypes().size() == 2;
+ assert spidersModel.getTypes().contains(Spider[].class);
+ assert spidersModel.getTypes().contains(Object.class);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
+ public void testBindingType() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("produceTameTarantula");
+ Bean<Tarantula> tarantulaModel = getProducerMethodBean(method, bean);
+ assert tarantulaModel.getBindings().size() == 1;
+ assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
+ public void testScopeType() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs");
+ Bean<DaddyLongLegs> daddyLongLegsModel = getProducerMethodBean(method, bean);
+ assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class);
+
+ // TODO Inherit scope from returned web bean?
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
+ public void testDeploymentType() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("getLadybirdSpider");
+ Bean<LadybirdSpider> ladybirdSpiderModel = getProducerMethodBean(method, bean);
+ assert ladybirdSpiderModel.getDeploymentType().equals(Production.class);
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
+ public void testNamedMethod() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("produceBlackWidow");
+ Bean<BlackWidow> blackWidowSpiderModel = getProducerMethodBean(method, bean);
+ assert blackWidowSpiderModel.getName().equals("blackWidow");
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
+ public void testDefaultNamedMethod() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs");
+ Bean<DaddyLongLegs> daddyLongLegsSpiderModel = getProducerMethodBean(method, bean);
+ assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs");
+ }
+
+ @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ public void testProducerMethodAnnotatedDestructor() throws Exception
+ {
+ Bean<SpiderProducer_Broken> bean = getSimpleBean(SpiderProducer_Broken.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer_Broken.class.getMethod("destroy");
+ getProducerMethodBean(method, bean);
+ }
+
+ @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception
+ {
+ Bean<SpiderProducer_Broken> bean = getSimpleBean(SpiderProducer_Broken.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer_Broken.class.getMethod("dispose", String.class);
+ getProducerMethodBean(method, bean);
+ }
+
+ @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ public void testProducerMethodWithParameterAnnotatedObserves() throws Exception
+ {
+ Bean<SpiderProducer_Broken> bean = getSimpleBean(SpiderProducer_Broken.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer_Broken.class.getMethod("observe", String.class);
+ getProducerMethodBean(method, bean);
+ }
+
+ @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalMethodNonStatic()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalMethodMethodDeclaredOnWebBeanImplementationClass()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalMethodBindingAnnotations()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalMethodDefaultBindingAnnotations()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalMethodDoesNotResolveToProducerMethod()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.5")
+ public void testDisposalMethodDeclaredOnEnabledBean()
+ {
+ // TODO Placeholder
+ // TODO Move this
+
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.5")
+ public void testBeanCanDeclareMultipleDisposalMethods()
+ {
+ // TODO move this
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalMethod"}) @SpecAssertion(section="3.3.5")
+ public void testProducerMethodHasNoMoreThanOneDisposalMethod()
+ {
+ // TODO move this
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups="producerMethod") @SpecAssertion(section={"2.7.2", "3.4.2", "2.2"})
+ public void testStereotypeSpecifiesScope() throws Exception
+ {
+ Bean<SpiderProducer> bean = getSimpleBean(SpiderProducer.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer.class.getMethod("produceWolfSpider");
+ Bean<WolfSpider> wolfSpider = getProducerMethodBean(method, bean);
+ //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1;
+ //assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class);
+ assert wolfSpider.getScopeType().equals(RequestScoped.class);
+ }
+
+ @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section={"2.7.2", "3.4.2", "2.2"})
+ public void testStereotypeEnforcesTypes() throws Exception
+ {
+ Bean<SpiderProducer_Broken> bean = getSimpleBean(SpiderProducer_Broken.class);
+ manager.addBean(bean);
+ Method method = SpiderProducer_Broken.class.getMethod("produceInteger");
+ getProducerMethodBean(method, bean);
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/ProducerMethodBeanModelTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: 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 2009-01-16 18:14:20 UTC (rev 1030)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -1,12 +1,21 @@
package org.jboss.webbeans.tck.tests.implementation.producer.method;
+import javax.webbeans.Named;
import javax.webbeans.Produces;
+import javax.webbeans.Production;
+import javax.webbeans.RequestScoped;
-
@AnotherDeploymentType
class SpiderProducer
{
+ private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() };
+
+ @Produces @Tame public Tarantula produceTameTarantula()
+ {
+ return new DefangedTarantula();
+ }
+
@Produces public Tarantula produceTarantula()
{
return new Tarantula();
@@ -16,5 +25,55 @@
{
return null;
}
+
+ @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider()
+ {
+ return new FunnelWeaver<Spider>();
+ }
+
+ @Produces public FunnelWeaver<?> getAnotherFunnelWeaver()
+ {
+ return new FunnelWeaver<Object>();
+ }
+
+ @Produces public <T> FunnelWeaver<T> getFunnelWeaver()
+ {
+ return new FunnelWeaver<T>();
+ }
+
+ @Produces public Animal makeASpider()
+ {
+ return new WolfSpider();
+ }
+
+ @Produces public int getWolfSpiderSize()
+ {
+ return 4;
+ }
+
+ @Produces public Spider[] getSpiders()
+ {
+ return ALL_SPIDERS;
+ }
+
+ @Produces @Named @RequestScoped public DaddyLongLegs produceDaddyLongLegs()
+ {
+ return new DaddyLongLegs();
+ }
+ @Produces @Named @Production public LadybirdSpider getLadybirdSpider()
+ {
+ return new LadybirdSpider();
+ }
+
+ @Produces @Named("blackWidow") public BlackWidow produceBlackWidow()
+ {
+ return new BlackWidow();
+ }
+
+ @Produces @AnimalStereotype public WolfSpider produceWolfSpider()
+ {
+ return new WolfSpider();
+ }
+
}
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer_Broken.java (from rev 1029, 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/SpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer_Broken.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,42 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+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 SpiderProducer_Broken
+{
+
+ @Produces @RequestScoped public Spider getRequestScopedSpider()
+ {
+ return null;
+ }
+
+ @Produces @Destructor
+ public String destroy()
+ {
+ return "foo";
+ }
+
+ @Produces
+ public String dispose(@Disposes String foo)
+ {
+ return "foo";
+ }
+
+ @Produces
+ public String observe(@Observes String foo)
+ {
+ return "foo";
+ }
+
+ @Produces @AnimalStereotype public Integer produceInteger()
+ {
+ return 1;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/SpiderProducer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tame.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tame.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+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
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/Tame.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/WolfSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/WolfSpider.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/WolfSpider.java 2009-01-16 18:43:24 UTC (rev 1031)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.tests.implementation.producer.method;
+
+class WolfSpider implements Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer/method/WolfSpider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1030 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-01-16 13:14:20 -0500 (Fri, 16 Jan 2009)
New Revision: 1030
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RecluseSpider.java
Modified:
ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RecluseSpider.java
Log:
Repaired many of the EventBus tests and allow AnnotationLiteral to compare values even if annotation is package scoped.
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java 2009-01-16 18:00:17 UTC (rev 1029)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java 2009-01-16 18:14:20 UTC (rev 1030)
@@ -156,6 +156,10 @@
{
try
{
+ if (!method.isAccessible())
+ {
+ method.setAccessible(true);
+ }
return method.invoke(instance);
}
catch (IllegalArgumentException e)
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RecluseSpider.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RecluseSpider.java 2009-01-16 18:00:17 UTC (rev 1029)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RecluseSpider.java 2009-01-16 18:14:20 UTC (rev 1030)
@@ -1,20 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.webbeans.IfExists;
-import javax.webbeans.Observes;
-import javax.webbeans.RequestScoped;
-
-/**
- * Simple web bean that conditionally listens to events.
- *
- */
-@RequestScoped
-public class RecluseSpider
-{
- public static boolean notified = false;
-
- public void observe(@Observes @IfExists String someEvent)
- {
- notified = true;
- }
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java 2009-01-16 18:00:17 UTC (rev 1029)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java 2009-01-16 18:14:20 UTC (rev 1030)
@@ -113,7 +113,7 @@
manager.fireEvent(anEvent, new AnimalStereotypeAnnotationLiteral());
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.3")
public void testManagerAddObserver()
{
@@ -164,7 +164,7 @@
assert foundObserver;
}
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.3")
public void testManagerRemoveObserver()
{
@@ -198,7 +198,7 @@
assert resolvedObservers.isEmpty();
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
@SpecAssertion(section = "8.3")
public void testMultipleInstancesOfSameBindingTypeWhenAddingObserverFails()
{
@@ -214,7 +214,7 @@
manager.addObserver(observer, AnEventType.class, new AnimalStereotypeAnnotationLiteral());
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
@SpecAssertion(section = "8.3")
public void testMultipleInstancesOfSameBindingTypeWhenRemovingObserverFails()
{
@@ -435,7 +435,7 @@
* Tests that a conditional observer is not notified of events until after it
* is created by some other separate action.
*/
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.5.5")
public void testConditionalObserver()
{
@@ -443,7 +443,7 @@
manager.fireEvent("New string event");
// Should not be notified since bean is not instantiated yet
- assert !RecluseSpider.notified;
+ assert !RecluseSpider.isNotified();
// Now instantiate the bean and fire another event
try
@@ -453,7 +453,7 @@
assert bean != null;
manager.fireEvent("Another event");
- assert RecluseSpider.notified;
+ assert RecluseSpider.isNotified();
}
finally
{
@@ -556,7 +556,7 @@
manager.fireEvent(new Integer(1));
}
- @Test(groups = { "broken", "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
+ @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
@SpecAssertion(section = "8.6")
public void testDuplicateBindingsToFireFails()
{
@@ -573,7 +573,7 @@
}
}
- @Test(groups = { "broken", "events" }, expectedExceptions={ DuplicateBindingTypeException.class })
+ @Test(groups = { "events" }, expectedExceptions={ DuplicateBindingTypeException.class })
@SpecAssertion(section = "8.6")
public void testDuplicateBindingsToObservesFails()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RecluseSpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RecluseSpider.java 2009-01-16 18:00:17 UTC (rev 1029)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/RecluseSpider.java 2009-01-16 18:14:20 UTC (rev 1030)
@@ -11,10 +11,15 @@
@RequestScoped
class RecluseSpider
{
- public static boolean notified = false;
+ private static boolean notified = false;
public void observe(@Observes @IfExists String someEvent)
{
notified = true;
}
+
+ public static boolean isNotified()
+ {
+ return notified;
+ }
}
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1029 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests and 5 other directories.
by webbeans-commits＠lists.jboss.org
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
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1028 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/producer: field and 1 other directory.
by webbeans-commits＠lists.jboss.org
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
+{
+
+}
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1027 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 12:35:12 -0500 (Fri, 16 Jan 2009)
New Revision: 1027
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/context/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/context/ContextTest.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java
Log:
Move contexts to tck
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2009-01-16 17:26:15 UTC (rev 1026)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2009-01-16 17:35:12 UTC (rev 1027)
@@ -1,55 +0,0 @@
-package org.jboss.webbeans.test;
-
-import javax.webbeans.ContextNotActiveException;
-import javax.webbeans.RequestScoped;
-import javax.webbeans.manager.Context;
-
-import org.jboss.webbeans.context.RequestContext;
-import org.testng.annotations.Test;
-
-@SpecVersion("PDR")
-public class ManagerTest extends AbstractTest
-{
-
-
- @Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) @SpecAssertion(section="8.6")
- public void testGetContextWithNoActiveContextsFails()
- {
- RequestContext.INSTANCE.setActive(false);
- manager.getContext(RequestScoped.class);
- }
-
- @Test(expectedExceptions={IllegalArgumentException.class}, groups={"manager"}) @SpecAssertion(section="8.6")
- public void testGetContextWithTooManyActiveContextsFails()
- {
- Context firstContext = new RequestContext() {};
- Context secondContext = new RequestContext() {};
- manager.addContext(firstContext);
- manager.addContext(secondContext);
- manager.getContext(RequestScoped.class);
- assert true;
- }
-
- @Test(expectedExceptions={ContextNotActiveException.class}, groups={"stub", "manager"}) @SpecAssertion(section="8.6")
- public void testGetContextWithNoRegisteredContextsFails()
- {
- manager.getContext(RequestScoped.class);
- assert false;
- }
-
- @Test(groups={"manager"}) @SpecAssertion(section="8.6")
- public void testGetContextReturnsActiveContext()
- {
- manager.getContext(RequestScoped.class);
- }
-
- /*
-
- @Test(groups="manager") @SpecAssertion(section="5.8")
- public void test
- {
- assert false;
- }
-
- */
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/context/ContextTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/context/ContextTest.java 2009-01-16 17:35:12 UTC (rev 1027)
@@ -0,0 +1,74 @@
+package org.jboss.webbeans.tck.tests.context;
+
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
+import java.lang.annotation.Annotation;
+
+import javax.webbeans.ContextNotActiveException;
+import javax.webbeans.RequestScoped;
+import javax.webbeans.manager.Context;
+import javax.webbeans.manager.Contextual;
+
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.jboss.webbeans.tck.tests.AbstractTest;
+import org.testng.annotations.Test;
+
+public class ContextTest extends AbstractTest
+{
+
+ private @interface Dummy
+ {
+
+ }
+
+ private static class DummyContext implements Context
+ {
+
+ public <T> T get(Contextual<T> bean, boolean create)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Class<? extends Annotation> getScopeType()
+ {
+ return Dummy.class;
+ }
+
+ public boolean isActive()
+ {
+ return true;
+ }
+
+ }
+
+ @Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) @SpecAssertion(section="8.6")
+ public void testGetContextWithNoActiveContextsFails()
+ {
+ configuration().getContexts().setInactive(configuration().getContexts().getRequestContext());
+ manager.getContext(RequestScoped.class);
+ }
+
+ @Test(expectedExceptions={IllegalArgumentException.class}, groups={"manager"}) @SpecAssertion(section="8.6")
+ public void testGetContextWithTooManyActiveContextsFails()
+ {
+ Context firstContext = new DummyContext() {};
+ Context secondContext = new DummyContext() {};
+ manager.addContext(firstContext);
+ manager.addContext(secondContext);
+ manager.getContext(Dummy.class);
+ }
+
+ @Test(expectedExceptions={ContextNotActiveException.class}, groups={"stub", "manager"}) @SpecAssertion(section="8.6")
+ public void testGetContextWithNoRegisteredContextsFails()
+ {
+ manager.getContext(RequestScoped.class);
+ assert false;
+ }
+
+ @Test(groups={"manager"}) @SpecAssertion(section="8.6")
+ public void testGetContextReturnsActiveContext()
+ {
+ manager.getContext(RequestScoped.class);
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/context/ContextTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1026 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 12:26:15 -0500 (Fri, 16 Jan 2009)
New Revision: 1026
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/FishFarmOffice.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/JmsModelTest.java
Log:
port manager tests, fix build problem
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2009-01-16 17:19:05 UTC (rev 1025)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2009-01-16 17:26:15 UTC (rev 1026)
@@ -4,22 +4,14 @@
import javax.webbeans.RequestScoped;
import javax.webbeans.manager.Context;
-import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.context.RequestContext;
-import org.jboss.webbeans.test.beans.FishFarmOffice;
import org.testng.annotations.Test;
@SpecVersion("PDR")
public class ManagerTest extends AbstractTest
{
+
- @Test(groups={"manager", "injection", "deployment"}) @SpecAssertion(section="5.8")
- public void testInjectingManager()
- {
- FishFarmOffice fishFarmOffice = SimpleBean.of(FishFarmOffice.class, manager).create();
- assert fishFarmOffice.manager != null;
- }
-
@Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) @SpecAssertion(section="8.6")
public void testGetContextWithNoActiveContextsFails()
{
@@ -51,13 +43,6 @@
manager.getContext(RequestScoped.class);
}
- @Test(groups={"stub", "manager", "ejb3"}) @SpecAssertion(section="5.8")
- public void testManagerLookupInJndi()
- {
- assert false;
- }
-
-
/*
@Test(groups="manager") @SpecAssertion(section="5.8")
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/JmsModelTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/JmsModelTest.java 2009-01-16 17:19:05 UTC (rev 1025)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/JmsModelTest.java 2009-01-16 17:26:15 UTC (rev 1026)
@@ -2,8 +2,8 @@
import javax.webbeans.DefinitionException;
-import org.jboss.webbeans.test.AbstractTest;
-import org.jboss.webbeans.test.SpecAssertion;
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.jboss.webbeans.tck.tests.AbstractTest;
import org.testng.annotations.Test;
public class JmsModelTest extends AbstractTest
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/FishFarmOffice.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/FishFarmOffice.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/FishFarmOffice.java 2009-01-16 17:26:15 UTC (rev 1026)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.manager;
+
+import javax.webbeans.Current;
+import javax.webbeans.manager.Manager;
+
+class FishFarmOffice
+{
+
+ @Current public Manager manager;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/FishFarmOffice.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java 2009-01-16 17:26:15 UTC (rev 1026)
@@ -0,0 +1,24 @@
+package org.jboss.webbeans.tck.tests.lookup.manager;
+
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.jboss.webbeans.tck.tests.AbstractTest;
+import org.testng.annotations.Test;
+
+public class ManagerTest extends AbstractTest
+{
+
+ @Test(groups={"manager", "injection", "deployment"}) @SpecAssertion(section="5.8")
+ public void testInjectingManager()
+ {
+ FishFarmOffice fishFarmOffice = getSimpleBean(FishFarmOffice.class).create();
+ assert fishFarmOffice.manager != null;
+ }
+
+
+ @Test(groups={"stub", "manager", "ejb3"}) @SpecAssertion(section="5.8")
+ public void testManagerLookupInJndi()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/manager/ManagerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1025 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 12:19:05 -0500 (Fri, 16 Jan 2009)
New Revision: 1025
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/JmsModelTest.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java
Log:
move jms tests
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java 2009-01-16 17:13:57 UTC (rev 1024)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java 2009-01-16 17:19:05 UTC (rev 1025)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.test;
-
-import javax.webbeans.DefinitionException;
-
-import org.testng.annotations.Test;
-
-public class JmsModelTest extends AbstractTest
-{
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "jms"}) @SpecAssertion(section="2.6")
- public void testJmsEndpointHasName()
- {
- assert false;
- }
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/JmsModelTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/JmsModelTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/implementation/jms/JmsModelTest.java 2009-01-16 17:19:05 UTC (rev 1025)
@@ -0,0 +1,18 @@
+package org.jboss.webbeans.tck.tests.implementation.jms;
+
+import javax.webbeans.DefinitionException;
+
+import org.jboss.webbeans.test.AbstractTest;
+import org.jboss.webbeans.test.SpecAssertion;
+import org.testng.annotations.Test;
+
+public class JmsModelTest extends AbstractTest
+{
+
+ @Test(expectedExceptions=DefinitionException.class, groups={"stub", "jms"}) @SpecAssertion(section="2.6")
+ public void testJmsEndpointHasName()
+ {
+ assert false;
+ }
+
+}
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1024 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 12:13:57 -0500 (Fri, 16 Jan 2009)
New Revision: 1024
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java
Log:
oops
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java 2009-01-16 17:08:53 UTC (rev 1023)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/injection/InjectionTest.java 2009-01-16 17:13:57 UTC (rev 1024)
@@ -57,7 +57,7 @@
manager.addBean(tunaBean);
TunaFarm tunaFarm = tunaFarmBean.create();
assert tunaFarm.tuna != null;
- configuration().getContexts().setActive(configuration().getContexts().getRequestContext());
+ configuration().getContexts().setInactive(configuration().getContexts().getRequestContext());
tunaFarm.tuna.getName();
}
17 years, 3 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1023 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-01-16 12:08:53 -0500 (Fri, 16 Jan 2009)
New Revision: 1023
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Animal.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentTypeLiteral.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Chunky.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Cod.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/FinalTuna_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ParameterizedBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Salmon.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ScottishFish.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Sole.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Whitefish.java
Removed:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java
Log:
port instantiation by type tests
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2009-01-16 17:05:57 UTC (rev 1022)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -1,115 +0,0 @@
-package org.jboss.webbeans.test;
-
-import javax.webbeans.AmbiguousDependencyException;
-import javax.webbeans.AnnotationLiteral;
-import javax.webbeans.DuplicateBindingTypeException;
-import javax.webbeans.TypeLiteral;
-import javax.webbeans.UnproxyableDependencyException;
-import javax.webbeans.UnsatisfiedDependencyException;
-import javax.webbeans.manager.Bean;
-
-import org.jboss.webbeans.bean.SimpleBean;
-import org.jboss.webbeans.binding.CurrentBinding;
-import org.jboss.webbeans.context.DependentContext;
-import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.AnnotatedField;
-import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
-import org.jboss.webbeans.introspector.jlr.AnnotatedFieldImpl;
-import org.jboss.webbeans.test.annotations.Whitefish;
-import org.jboss.webbeans.test.beans.Cod;
-import org.jboss.webbeans.test.beans.FishFarm;
-import org.jboss.webbeans.test.beans.Salmon;
-import org.jboss.webbeans.test.beans.ScottishFish;
-import org.jboss.webbeans.test.beans.Sole;
-import org.jboss.webbeans.test.beans.Tuna;
-import org.jboss.webbeans.test.beans.broken.FinalTuna;
-import org.jboss.webbeans.test.beans.broken.ParameterizedBean;
-import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral;
-import org.jboss.webbeans.util.BeanValidation;
-import org.testng.annotations.Test;
-
-@SpecVersion("20081206")
-public class InstantiationByTypeTest extends AbstractTest
-{
-
- private AnnotatedClass<FishFarm> fishFarmClass = new AnnotatedClassImpl<FishFarm>(FishFarm.class);
-
- @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="5.9")
- public void testCurrentBindingTypeAssumed()
- {
- Bean<Tuna> tunaBean = SimpleBean.of(Tuna.class, manager);
- manager.addBean(tunaBean);
- assert manager.getInstanceByType(Tuna.class) != null;
- }
-
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
- public void testParameterizedTypeWithWildcardParameter()
- {
- manager.getInstanceByType(new TypeLiteral<ParameterizedBean<?>>(){});
- }
-
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
- public <T> void testParameterizedTypeWithTypeParameter()
- {
- manager.getInstanceByType(new TypeLiteral<ParameterizedBean<T>>(){});
- }
-
-
- @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.9")
- public void testDuplicateBindingTypesUsed()
- {
- manager.getInstanceByType(Tuna.class, new CurrentBinding(), new CurrentBinding());
- }
-
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
- public void testNonBindingTypeUsed()
- {
- manager.getInstanceByType(Tuna.class, new AnotherDeploymentTypeAnnotationLiteral());
- }
-
- @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="5.9")
- public void testAmbiguousDependencies() throws Exception
- {
- AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
- Bean<Cod> codBean = SimpleBean.of(Cod.class, manager);
- Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager);
- Bean<Sole> soleBean = SimpleBean.of(Sole.class, manager);
- manager.addBean(codBean);
- manager.addBean(salmonBean);
- manager.addBean(soleBean);
- manager.getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){});
- }
-
- @Test(expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="5.9")
- public void testUnsatisfiedDependencies() throws Exception
- {
- AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
- Bean<Cod> codBean = SimpleBean.of(Cod.class, manager);
- Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager);
- Bean<Sole> soleBean = SimpleBean.of(Sole.class, manager);
- manager.addBean(codBean);
- manager.addBean(salmonBean);
- manager.addBean(soleBean);
- manager.getInstanceByType(Tuna.class, new CurrentBinding());
- }
-
- @Test(expectedExceptions=UnproxyableDependencyException.class) @SpecAssertion(section="5.9")
- public void testUnproxyableDependencies() throws Exception
- {
- Bean<FinalTuna> FinalTunaBean = SimpleBean.of(FinalTuna.class, manager);
- manager.addBean(FinalTunaBean);
- BeanValidation.validate(manager.getBeans());
- manager.getInstanceByType(FinalTuna.class, new AnnotationLiteral<Whitefish>(){});
- }
-
- /*
-
- @Test(groups="resolution") @SpecAssertion(section="5.9")
- public void test
- {
- assert false;
- }
-
- */
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Animal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Animal.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+interface Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Animal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentType.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+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/lookup/typesafe/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentTypeLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentTypeLiteral.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentTypeLiteral.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,8 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+import javax.webbeans.AnnotationLiteral;
+
+class AnotherDeploymentTypeLiteral extends AnnotationLiteral<AnotherDeploymentType> implements AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/AnotherDeploymentTypeLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Chunky.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Chunky.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,24 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+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 Chunky
+{
+
+ boolean realChunky();
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Chunky.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Cod.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Cod.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,13 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+import javax.webbeans.Named;
+import javax.webbeans.Production;
+
+@Production
+@Whitefish
+@Chunky(realChunky=true)
+@Named("whitefish")
+class Cod implements ScottishFish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Cod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/FinalTuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/FinalTuna_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/FinalTuna_Broken.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+import javax.webbeans.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+final class FinalTuna_Broken
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/FinalTuna_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,106 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import javax.webbeans.AmbiguousDependencyException;
+import javax.webbeans.AnnotationLiteral;
+import javax.webbeans.DuplicateBindingTypeException;
+import javax.webbeans.TypeLiteral;
+import javax.webbeans.UnproxyableDependencyException;
+import javax.webbeans.UnsatisfiedDependencyException;
+import javax.webbeans.manager.Bean;
+
+import org.jboss.webbeans.tck.impl.SpecAssertion;
+import org.jboss.webbeans.tck.impl.SpecVersion;
+import org.jboss.webbeans.tck.impl.literals.CurrentBinding;
+import org.jboss.webbeans.tck.tests.AbstractTest;
+import org.testng.annotations.Test;
+
+@SpecVersion("20081206")
+public class InstantiationByTypeTest extends AbstractTest
+{
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ List<Class<? extends Annotation>> deploymentTypes = super.getEnabledDeploymentTypes();
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
+ }
+
+ @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="5.9")
+ public void testCurrentBindingTypeAssumed()
+ {
+ Bean<Tuna> tunaBean = getSimpleBean(Tuna.class);
+ manager.addBean(tunaBean);
+ assert manager.getInstanceByType(Tuna.class) != null;
+ }
+
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ public void testParameterizedTypeWithWildcardParameter()
+ {
+ manager.getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){});
+ }
+
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ public <T> void testParameterizedTypeWithTypeParameter()
+ {
+ manager.getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){});
+ }
+
+
+ @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.9")
+ public void testDuplicateBindingTypesUsed()
+ {
+ manager.getInstanceByType(Tuna.class, new CurrentBinding(), new CurrentBinding());
+ }
+
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ public void testNonBindingTypeUsed()
+ {
+ manager.getInstanceByType(Tuna.class, new AnotherDeploymentTypeLiteral());
+ }
+
+ @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="5.9")
+ public void testAmbiguousDependencies() throws Exception
+ {
+ Bean<Cod> codBean = getSimpleBean(Cod.class);
+ Bean<Salmon> salmonBean = getSimpleBean(Salmon.class);
+ Bean<Sole> soleBean = getSimpleBean(Sole.class);
+ manager.addBean(codBean);
+ manager.addBean(salmonBean);
+ manager.addBean(soleBean);
+ manager.getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){});
+ }
+
+ @Test(expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="5.9")
+ public void testUnsatisfiedDependencies() throws Exception
+ {
+ Bean<Cod> codBean = getSimpleBean(Cod.class);
+ Bean<Salmon> salmonBean = getSimpleBean(Salmon.class);
+ Bean<Sole> soleBean = getSimpleBean(Sole.class);
+ manager.addBean(codBean);
+ manager.addBean(salmonBean);
+ manager.addBean(soleBean);
+ manager.getInstanceByType(Tuna.class, new CurrentBinding());
+ }
+
+ @Test(expectedExceptions=UnproxyableDependencyException.class) @SpecAssertion(section="5.9")
+ public void testUnproxyableDependencies() throws Exception
+ {
+ deployBeans(FinalTuna_Broken.class);
+ manager.getInstanceByType(FinalTuna_Broken.class, new AnnotationLiteral<Whitefish>(){});
+ }
+
+ /*
+
+ @Test(groups="resolution") @SpecAssertion(section="5.9")
+ public void test
+ {
+ assert false;
+ }
+
+ */
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/InstantiationByTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ParameterizedBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ParameterizedBean_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ParameterizedBean_Broken.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+class ParameterizedBean_Broken<T>
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ParameterizedBean_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Salmon.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Salmon.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Salmon.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+import javax.webbeans.Named;
+import javax.webbeans.Production;
+
+@Production
+@Named
+class Salmon implements ScottishFish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Salmon.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ScottishFish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ScottishFish.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ScottishFish.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,7 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+
+interface ScottishFish extends Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/ScottishFish.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Sole.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Sole.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,12 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+import javax.webbeans.Named;
+import javax.webbeans.Production;
+
+@Production
+@Whitefish
+@Named("whitefish")
+class Sole implements ScottishFish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Sole.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Tuna.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Tuna.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,15 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+import javax.webbeans.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+class Tuna
+{
+
+ public String getName()
+ {
+ return "Ophir";
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Tuna.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Whitefish.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Whitefish.java 2009-01-16 17:08:53 UTC (rev 1023)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.tck.tests.lookup.typesafe;
+
+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 Whitefish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/lookup/typesafe/Whitefish.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 3 months
- 1
- 0