[webbeans-commits] Webbeans SVN: r453 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-07 14:06:30 -0500 (Sun, 07 Dec 2008)
New Revision: 453
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
Log:
Mark updated
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java 2008-12-07 19:03:52 UTC (rev 452)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java 2008-12-07 19:06:30 UTC (rev 453)
@@ -15,6 +15,7 @@
import org.jboss.webbeans.test.beans.broken.OtherBrokenSpiderProducer;
import org.testng.annotations.Test;
+@SpecVersion("20081206")
public class ProducerFieldBeanLifecycleTest extends AbstractTest
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2008-12-07 19:03:52 UTC (rev 452)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2008-12-07 19:06:30 UTC (rev 453)
@@ -27,6 +27,7 @@
import org.jboss.webbeans.test.beans.WolfSpider;
import org.testng.annotations.Test;
+@SpecVersion("20081206")
public class ProducerFieldBeanModelTest extends AbstractTest
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java 2008-12-07 19:03:52 UTC (rev 452)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java 2008-12-07 19:06:30 UTC (rev 453)
@@ -15,6 +15,7 @@
import org.jboss.webbeans.test.beans.broken.BrokenSpiderProducer;
import org.testng.annotations.Test;
+@SpecVersion("20081206")
public class ProducerMethodBeanLifecycleTest extends AbstractTest
{
Modified: 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 2008-12-07 19:03:52 UTC (rev 452)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-12-07 19:06:30 UTC (rev 453)
@@ -29,6 +29,7 @@
import org.jboss.webbeans.test.beans.broken.BrokenSpiderProducer;
import org.testng.annotations.Test;
+@SpecVersion("20081206")
public class ProducerMethodBeanModelTest extends AbstractTest
{
@@ -84,12 +85,6 @@
createProducerMethodBean(FunnelWeaver.class, method, bean);
}
- @Test(groups={"stub", "producerMethod", "deployment"}) @SpecAssertion(section="3.4")
- public void testBeanDeclaresMultipleProducerMethods()
- {
- assert false;
- }
-
@Test(groups="producerMethod") @SpecAssertion(section={"3.4", "2.3.1"})
public void testDefaultBindingType() throws Exception
{
15 years, 7 months
[webbeans-commits] Webbeans SVN: r452 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-07 14:03:52 -0500 (Sun, 07 Dec 2008)
New Revision: 452
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
Log:
Spec sections
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java 2008-12-07 18:57:18 UTC (rev 451)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java 2008-12-07 19:03:52 UTC (rev 452)
@@ -37,7 +37,7 @@
}
- @Test(groups="producerField") @SpecAssertion(section={"3.4", "5.6", "8.3"})
+ @Test(groups="producerField") @SpecAssertion(section={"3.5", "5.6", "8.3"})
public void testProducerFieldReturnsNullIsDependent() throws Exception
{
SimpleBean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
@@ -48,7 +48,7 @@
assert spider == null;
}
- @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.4", "5.6"})
+ @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.5", "5.6"})
public void testProducerFieldReturnsNullIsNotDependent() throws Exception
{
SimpleBean<OtherBrokenSpiderProducer> spiderProducer = createSimpleBean(OtherBrokenSpiderProducer.class);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2008-12-07 18:57:18 UTC (rev 451)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2008-12-07 19:03:52 UTC (rev 452)
@@ -25,7 +25,6 @@
import org.jboss.webbeans.test.beans.Spider;
import org.jboss.webbeans.test.beans.Tarantula;
import org.jboss.webbeans.test.beans.WolfSpider;
-import org.jboss.webbeans.test.beans.broken.OtherBrokenSpiderProducer;
import org.testng.annotations.Test;
public class ProducerFieldBeanModelTest extends AbstractTest
@@ -41,7 +40,7 @@
tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class);
}
- /*@Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ /*@Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.5")
public void testStaticField() throws Exception
{
SimpleBean<BeanWithStaticProducerField> bean = createSimpleBean(BeanWithStaticProducerField.class);
@@ -50,13 +49,13 @@
createProducerFieldBean(String.class, field, bean);
}*/
- @Test(groups={"stub", "producerField", "enterpriseBeans", "stub"}, expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ @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.4")
+ @Test(groups="producerField") @SpecAssertion(section="3.5")
public void testParameterizedReturnType() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -65,7 +64,7 @@
createProducerFieldBean(FunnelWeaver.class, field, bean);
}
- @Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ @Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.5")
public void testParameterizedReturnTypeWithWildcard() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -74,13 +73,13 @@
createProducerFieldBean(FunnelWeaver.class, field, bean);
}
- @Test(groups={"stub", "producerField", "deployment"}) @SpecAssertion(section="3.4")
+ @Test(groups={"stub", "producerField", "deployment"}) @SpecAssertion(section="3.5")
public void testBeanDeclaresMultipleProducerFields()
{
assert false;
}
- @Test(groups="producerField") @SpecAssertion(section={"3.4", "2.3.1"})
+ @Test(groups="producerField") @SpecAssertion(section={"3.5", "2.3.1"})
public void testDefaultBindingType() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -91,7 +90,7 @@
assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class);
}
- @Test(groups="producerField") @SpecAssertion(section="3.4.1")
+ @Test(groups="producerField") @SpecAssertion(section="3.5.1")
public void testApiTypeForClassReturn() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -107,7 +106,7 @@
assert tarantulaModel.getTypes().contains(Object.class);
}
- @Test(groups="producerField") @SpecAssertion(section="3.4.1")
+ @Test(groups="producerField") @SpecAssertion(section="3.5.1")
public void testApiTypeForInterfaceReturn() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -119,7 +118,7 @@
assert animalModel.getTypes().contains(Object.class);
}
- @Test(groups="producerField") @SpecAssertion(section="3.4.1")
+ @Test(groups="producerField") @SpecAssertion(section="3.5.1")
public void testApiTypeForPrimitiveReturn() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -131,7 +130,7 @@
assert intModel.getTypes().contains(Object.class);
}
- @Test(groups="producerField") @SpecAssertion(section={"3.4.1", "2.2"})
+ @Test(groups="producerField") @SpecAssertion(section={"3.5.1", "2.2"})
public void testApiTypeForArrayTypeReturn() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -143,7 +142,7 @@
assert spidersModel.getTypes().contains(Object.class);
}
- @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ @Test(groups="producerField") @SpecAssertion(section="3.5.2")
public void testBindingType() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -154,7 +153,7 @@
assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class);
}
- @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ @Test(groups="producerField") @SpecAssertion(section="3.5.2")
public void testScopeType() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -166,7 +165,7 @@
// TODO Inherit scope from returned web bean?
}
- @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ @Test(groups="producerField") @SpecAssertion(section="3.5.2")
public void testDeploymentType() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -176,7 +175,7 @@
assert ladybirdSpiderModel.getDeploymentType().equals(Production.class);
}
- @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ @Test(groups="producerField") @SpecAssertion(section="3.5.2")
public void testNamedField() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -186,7 +185,7 @@
assert blackWidowSpiderModel.getName().equals("blackWidow");
}
- @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ @Test(groups="producerField") @SpecAssertion(section="3.5.2")
public void testDefaultNamedField() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
@@ -196,35 +195,35 @@
assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs");
}
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
public void testDisposalFieldNonStatic()
{
// TODO Placeholder
assert false;
}
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
public void testDisposalFieldFieldDeclaredOnWebBeanImplementationClass()
{
// TODO Placeholder
assert false;
}
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
public void testDisposalFieldBindingAnnotations()
{
// TODO Placeholder
assert false;
}
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
public void testDisposalFieldDefaultBindingAnnotations()
{
// TODO Placeholder
assert false;
}
- @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
public void testDisposalFieldDoesNotResolveToProducerField()
{
// TODO Placeholder
@@ -256,7 +255,7 @@
assert false;
}
- @Test(groups="producerField") @SpecAssertion(section={"2.7.2", "3.4.2", "2.2"})
+ @Test(groups="producerField") @SpecAssertion(section={"2.7.2", "3.5.2", "2.2"})
public void testStereotype() throws Exception
{
SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
15 years, 7 months
[webbeans-commits] Webbeans SVN: r451 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-07 13:57:18 -0500 (Sun, 07 Dec 2008)
New Revision: 451
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java
Log:
Mark updated
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java 2008-12-07 18:53:25 UTC (rev 450)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InitializerMethodTest.java 2008-12-07 18:57:18 UTC (rev 451)
@@ -16,53 +16,53 @@
import org.jboss.webbeans.test.beans.broken.Shrike;
import org.testng.annotations.Test;
-@SpecVersion("PDR")
+@SpecVersion("20081206")
public class InitializerMethodTest extends AbstractTest
{
- @Test(expectedExceptions=DefinitionException.class, groups="initializerMethod") @SpecAssertion(section="3.7")
+ @Test(expectedExceptions=DefinitionException.class, groups="initializerMethod") @SpecAssertion(section="3.8")
public void testStaticInitializerMethodNotAllowed()
{
createSimpleBean(Dottrel.class);
}
- @Test(groups={"stub", "initializerMethod", "servlet"}) @SpecAssertion(section="3.7")
+ @Test(groups={"stub", "initializerMethod", "servlet"}) @SpecAssertion(section="3.8")
public void testInitializerMethodCalledOnServlet()
{
assert false;
}
- @Test(groups={"stub", "initializerMethod", "ejb3"}) @SpecAssertion(section="3.7")
+ @Test(groups={"stub", "initializerMethod", "ejb3"}) @SpecAssertion(section="3.8")
public void testInitializerMethodCalledOnEJBSessionBean()
{
assert false;
}
- @Test(groups={"stub", "initializerMethod", "ejb3"}) @SpecAssertion(section="3.7")
+ @Test(groups={"stub", "initializerMethod", "ejb3"}) @SpecAssertion(section="3.8")
public void testInitializerMethodCalledOnEJBMDB()
{
assert false;
}
- @Test(groups={"stub", "initializerMethod", "ejb3", "singletons"}) @SpecAssertion(section="3.7")
+ @Test(groups={"stub", "initializerMethod", "ejb3", "singletons"}) @SpecAssertion(section="3.8")
public void testInitializerMethodCalledOnEJBSingleton()
{
assert false;
}
- @Test(groups={"stub", "initializerMethod", "ejb3"}) @SpecAssertion(section="3.7")
+ @Test(groups={"stub", "initializerMethod", "ejb3"}) @SpecAssertion(section="3.8")
public void testInitializerMethodNotABusinessMethod()
{
assert false;
}
- @Test(groups={"stub", "initializerMethod", "interceptors"}) @SpecAssertion(section="3.7")
+ @Test(groups={"stub", "initializerMethod", "interceptors"}) @SpecAssertion(section="3.8")
public void testMethodInterceptorNotCalledOnInitializerMethod()
{
assert false;
}
- @Test(groups={"initializerMethod"}) @SpecAssertion(section={"3.7", "5.3", "3.7.2", "3.7.3"})
+ @Test(groups={"initializerMethod"}) @SpecAssertion(section={"3.8", "5.3", "3.8.2", "3.8.3"})
public void testMultipleInitializerMethodsAreCalled()
{
manager.addBean(createSimpleBean(Fox.class));
@@ -74,49 +74,49 @@
assert chickenHutch.chicken != null;
}
- @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section={"3.7.1", "3.4.2"})
+ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section={"3.8.1", "3.4.2"})
public void testInitializerMethodAnnotatedProduces()
{
createSimpleBean(Pheasant.class);
}
- @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
+ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1")
public void testInitializerMethodAnnotatedDestructor()
{
createSimpleBean(Shrike.class);
}
- @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
+ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1")
public void testInitializerMethodHasParameterAnnotatedDisposes()
{
createSimpleBean(Capercaillie.class);
}
- @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7.1")
+ @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1")
public void testInitializerMethodHasParameterAnnotatedObserves()
{
createSimpleBean(Grouse.class);
}
- @Test(groups={"stub", "initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.7.2")
+ @Test(groups={"stub", "initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.8.2")
public void testInitializerMethodDeclaredInXml()
{
assert false;
}
- @Test(groups={"stub", "initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.7.2")
+ @Test(groups={"stub", "initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.8.2")
public void testInitializerMethodDeclaredInXmlIgnoresBindingAnnotationsInJava()
{
assert false;
}
- @Test(groups={"stub", "initializerMethod", "webbeansxml"}, expectedExceptions=NonexistentMethodException.class) @SpecAssertion(section="3.7.2")
+ @Test(groups={"stub", "initializerMethod", "webbeansxml"}, expectedExceptions=NonexistentMethodException.class) @SpecAssertion(section="3.8.2")
public void testInitializerMethodDeclaredInXmlDoesNotExist()
{
assert false;
}
- @Test(groups={"stub", "initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.7.2")
+ @Test(groups={"stub", "initializerMethod", "webbeansxml"}) @SpecAssertion(section="3.8.2")
public void testBeanHasAllInitializerMethodsDeclaredInJavaAndXml()
{
assert false;
@@ -124,7 +124,7 @@
/*
- @Test(groups="initializerMethod") @SpecAssertion(section="3.7")
+ @Test(groups="initializerMethod") @SpecAssertion(section="3.8")
public void test
{
assert false;
15 years, 7 months
[webbeans-commits] Webbeans SVN: r450 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-07 13:53:25 -0500 (Sun, 07 Dec 2008)
New Revision: 450
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
Log:
Updates to 20081206
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2008-12-07 18:46:45 UTC (rev 449)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2008-12-07 18:53:25 UTC (rev 450)
@@ -18,13 +18,13 @@
import org.jboss.webbeans.util.Reflections;
import org.testng.annotations.Test;
-@SpecVersion("PDR")
+@SpecVersion("20081206")
public class ClientProxyTest extends AbstractTest
{
@Test(groups = "Reflections")
- @SpecAssertion(section = { "4.4", "5.8" })
- public void testReflectionsUsedForNormalScope()
+ @SpecAssertion(section = { "5.4" })
+ public void testClientProxyUsedForNormalScope()
{
Bean<Tuna> tunaBean = BeanFactory.createSimpleBean(Tuna.class);
manager.addBean(tunaBean);
@@ -33,8 +33,8 @@
}
@Test(groups = "Reflections")
- @SpecAssertion(section = { "4.4", "5.8" })
- public void testReflectionsNotUsedForPseudoScope()
+ @SpecAssertion(section = { "5.4" })
+ public void testClientProxyNotUsedForPseudoScope()
{
Bean<Fox> foxBean = BeanFactory.createSimpleBean(Fox.class);
Fox fox = manager.getInstance(foxBean);
@@ -54,8 +54,8 @@
}
@Test(groups = "Reflections")
- @SpecAssertion(section = "4.4")
- public void testSimpleWebBeanReflectionsIsSerializable() throws IOException, ClassNotFoundException
+ @SpecAssertion(section = "5.4")
+ public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException
{
Bean<TunedTuna> tunaBean = BeanFactory.createSimpleBean(TunedTuna.class);
manager.addBean(tunaBean);
@@ -68,7 +68,7 @@
}
@Test(groups = "Reflections", expectedExceptions = UnproxyableDependencyException.class)
- @SpecAssertion(section = "4.4.1")
+ @SpecAssertion(section = "5.4.1")
public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
{
Bean<FinalTuna> tunaBean = BeanFactory.createSimpleBean(FinalTuna.class);
@@ -78,8 +78,8 @@
}
@Test(groups = "Reflections")
- @SpecAssertion(section = "4.4.2")
- public void testReflectionsInvocation()
+ @SpecAssertion(section = "5.4.2")
+ public void testClientProxyInvocation()
{
Bean<TunedTuna> tunaBean = BeanFactory.createSimpleBean(TunedTuna.class);
manager.addBean(tunaBean);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-12-07 18:46:45 UTC (rev 449)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionTests.java 2008-12-07 18:53:25 UTC (rev 450)
@@ -25,11 +25,11 @@
import org.jboss.webbeans.test.beans.broken.FarmHouseProducer;
import org.testng.annotations.Test;
-@SpecVersion("PDR")
+@SpecVersion("20081206")
public class InjectionTests extends AbstractTest
{
- @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="4.2")
+ @Test(groups={"injection", "producerMethod"}) @SpecAssertion(section="5.2")
public void testInjectionPerformsBoxingIfNecessary() throws Exception
{
SimpleBean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class);
@@ -41,7 +41,7 @@
assert spiderNest.numberOfSpiders.equals(4);
}
- @Test(groups={"injection", "producerMethod"}, expectedExceptions=NullableDependencyException.class) @SpecAssertion(section="4.2")
+ @Test(groups={"injection", "producerMethod"}, expectedExceptions=NullableDependencyException.class) @SpecAssertion(section="5.2")
public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception
{
Bean<FarmHouse> farmHouseBean = createSimpleBean(FarmHouse.class);
@@ -50,7 +50,7 @@
farmHouseBean.create();
}
- @Test(groups={"injection", "clientProxy"}, expectedExceptions=ContextNotActiveException.class) @SpecAssertion(section="4.3")
+ @Test(groups={"injection", "clientProxy"}, expectedExceptions=ContextNotActiveException.class) @SpecAssertion(section="5.3")
public void testInvokeNormalInjectedWebBeanWhenContextNotActive()
{
SimpleBean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
@@ -63,7 +63,7 @@
tunaFarm.tuna.getName();
}
- @Test(groups="injection") @SpecAssertion(section="4.3")
+ @Test(groups="injection") @SpecAssertion(section="5.3")
public void testInvokeDependentScopeWhenContextNotActive()
{
Bean<FoxRun> foxRunBean = createSimpleBean(FoxRun.class);
@@ -73,7 +73,7 @@
assert foxRun.fox.getName().equals("gavin");
}
- @Test(groups="injection", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.6")
+ @Test(groups="injection", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7")
public void testInjectingStaticField()
{
SimpleBean<BeanWithStaticBoundField> bean = createSimpleBean(BeanWithStaticBoundField.class);
@@ -82,7 +82,7 @@
BeanWithStaticBoundField instance = bean.create();
}
- @Test(groups="injection",expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.6")
+ @Test(groups="injection",expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.7")
public void testInjectingFinalField()
{
SimpleBean<BeanWithFinalBoundField> bean = createSimpleBean(BeanWithFinalBoundField.class);
@@ -91,31 +91,31 @@
BeanWithFinalBoundField instance = bean.create();
}
- @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.6.2")
+ @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.7.2")
public void testInjectFieldsDeclaredInXml()
{
assert false;
}
- @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.6.2")
+ @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.7.2")
public void testInjectedFieldDeclaredInXmlIgnoresJavaAnnotations()
{
assert false;
}
- @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.6.2")
+ @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.7.2")
public void testInjectedFieldDeclaredInXmlAssumesCurrent()
{
assert false;
}
- @Test(groups={"stub", "injection", "webbeansxml"}, expectedExceptions=NonexistentFieldException.class) @SpecAssertion(section="3.6.2")
+ @Test(groups={"stub", "injection", "webbeansxml"}, expectedExceptions=NonexistentFieldException.class) @SpecAssertion(section="3.7.2")
public void testNonexistentFieldDefinedInXml()
{
assert false;
}
- @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.6.2")
+ @Test(groups={"stub", "injection", "webbeansxml"}) @SpecAssertion(section="3.7.2")
public void testInjectFieldsDeclaredInXmlAndJava()
{
assert false;
15 years, 7 months
[webbeans-commits] Webbeans SVN: r449 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-07 13:46:45 -0500 (Sun, 07 Dec 2008)
New Revision: 449
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByNameTest.java
Log:
mark tests up to date
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2008-12-07 18:44:32 UTC (rev 448)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2008-12-07 18:46:45 UTC (rev 449)
@@ -20,6 +20,7 @@
import org.jboss.webbeans.test.beans.Tuna;
import org.testng.annotations.Test;
+@SpecVersion("20081206")
public class InstantiationByNameTest extends AbstractTest
{
Modified: 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 2008-12-07 18:44:32 UTC (rev 448)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByNameTest.java 2008-12-07 18:46:45 UTC (rev 449)
@@ -13,7 +13,7 @@
import org.jboss.webbeans.test.beans.Tuna;
import org.testng.annotations.Test;
-@SpecVersion("PDR")
+@SpecVersion("20081206")
public class ResolutionByNameTest extends AbstractTest
{
15 years, 7 months
[webbeans-commits] Webbeans SVN: r448 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bean and 3 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-07 13:44:32 -0500 (Sun, 07 Dec 2008)
New Revision: 448
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByNameTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
Log:
Update tests for type safe and name based resolution and instantiation and implement manager injection
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -49,6 +49,7 @@
import javax.webbeans.manager.Manager;
import org.jboss.webbeans.bean.AbstractBean;
+import org.jboss.webbeans.bean.ManagerBean;
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.bean.proxy.ProxyPool;
import org.jboss.webbeans.contexts.ContextMap;
@@ -82,7 +83,7 @@
private List<Bean<?>> beans;
private Set<Decorator> decorators;
private Set<Interceptor> interceptors;
-
+
@SuppressWarnings("unchecked")
public ManagerImpl()
{
@@ -104,6 +105,7 @@
protected void initStandardBeans()
{
addBean(new SimpleBean<DefaultEnterpriseBeanLookup>(DefaultEnterpriseBeanLookup.class, this));
+ addBean(new ManagerBean(this));
}
/**
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -0,0 +1,84 @@
+/**
+ *
+ */
+package org.jboss.webbeans.bean;
+
+import java.lang.annotation.Annotation;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.webbeans.Dependent;
+import javax.webbeans.Standard;
+import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Manager;
+
+import org.jboss.webbeans.bindings.CurrentAnnotationLiteral;
+import org.jboss.webbeans.util.Reflections;
+
+public class ManagerBean extends Bean<Manager>
+{
+
+ private static Set<Class<?>> types = Reflections.getTypeHierachy(Manager.class);
+ private static final Set<Annotation> BINDING = new HashSet<Annotation>(Arrays.asList(new CurrentAnnotationLiteral()));
+
+ public ManagerBean(Manager manager)
+ {
+ super(manager);
+ }
+
+ @Override
+ public Manager create()
+ {
+ return getManager();
+ }
+
+ @Override
+ public void destroy(Manager instance)
+ {
+ //No -op
+ }
+
+ @Override
+ public Set<Annotation> getBindingTypes()
+ {
+ return BINDING;
+ }
+
+ @Override
+ public Class<? extends Annotation> getDeploymentType()
+ {
+ return Standard.class;
+ }
+
+ @Override
+ public String getName()
+ {
+ return null;
+ }
+
+ @Override
+ public Class<? extends Annotation> getScopeType()
+ {
+ return Dependent.class;
+ }
+
+ @Override
+ public Set<Class<?>> getTypes()
+ {
+ return types;
+ }
+
+ @Override
+ public boolean isNullable()
+ {
+ return true;
+ }
+
+ @Override
+ public boolean isSerializable()
+ {
+ return false;
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -27,6 +27,7 @@
import org.jboss.webbeans.test.beans.Tiger;
import org.jboss.webbeans.test.beans.Tuna;
import org.jboss.webbeans.test.ejb.model.valid.Hound;
+import org.jboss.webbeans.test.mock.MockManagerImpl;
import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
import org.testng.annotations.Test;
@@ -140,11 +141,14 @@
public void testRegisterProducerMethodBean()
{
bootstrap.registerBeans(TarantulaProducer.class);
- assert manager.getBeans().size() == 3;
+ assert manager.getBeans().size() == 4;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : manager.getBeans())
{
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
}
assert classes.containsKey(TarantulaProducer.class);
assert classes.containsKey(Tarantula.class);
@@ -158,12 +162,14 @@
public void testRegisterMultipleEnterpriseAndSimpleBean()
{
bootstrap.registerBeans(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class);
- assert manager.getBeans().size() == 9;
+ assert manager.getBeans().size() == 8 + MockManagerImpl.BUILT_IN_BEANS;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : manager.getBeans())
{
-
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
}
assert classes.containsKey(DefaultEnterpriseBeanLookup.class);
assert classes.containsKey(Hound.class);
@@ -196,12 +202,14 @@
{
bootstrap.boot(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class)), null, null));
- assert manager.getBeans().size() == 9;
+ assert manager.getBeans().size() == 10;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : manager.getBeans())
{
-
- classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ if (bean instanceof AbstractBean)
+ {
+ classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
+ }
}
assert classes.containsKey(DefaultEnterpriseBeanLookup.class);
assert classes.containsKey(Hound.class);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClientProxyTest.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -23,7 +23,7 @@
{
@Test(groups = "Reflections")
- @SpecAssertion(section = { "4.4", "4.8" })
+ @SpecAssertion(section = { "4.4", "5.8" })
public void testReflectionsUsedForNormalScope()
{
Bean<Tuna> tunaBean = BeanFactory.createSimpleBean(Tuna.class);
@@ -33,7 +33,7 @@
}
@Test(groups = "Reflections")
- @SpecAssertion(section = { "4.4", "4.8" })
+ @SpecAssertion(section = { "4.4", "5.8" })
public void testReflectionsNotUsedForPseudoScope()
{
Bean<Fox> foxBean = BeanFactory.createSimpleBean(Fox.class);
Modified: 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 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -45,13 +45,13 @@
@Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
public void testParameterizedTypeWithWildcardParameter()
{
- manager.resolveByType(new TypeLiteral<ParameterizedBean<?>>(){});
+ manager.getInstanceByType(new TypeLiteral<ParameterizedBean<?>>(){});
}
@Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
public <T> void testParameterizedTypeWithTypeParameter()
{
- manager.resolveByType(new TypeLiteral<ParameterizedBean<T>>(){});
+ manager.getInstanceByType(new TypeLiteral<ParameterizedBean<T>>(){});
}
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 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ManagerTest.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -1,21 +1,25 @@
package org.jboss.webbeans.test;
+import static org.jboss.webbeans.util.BeanFactory.createSimpleBean;
+
import javax.webbeans.ContextNotActiveException;
import javax.webbeans.RequestScoped;
import javax.webbeans.manager.Context;
import org.jboss.webbeans.contexts.AbstractContext;
import org.jboss.webbeans.contexts.RequestContext;
+import org.jboss.webbeans.test.beans.FishFarmOffice;
import org.testng.annotations.Test;
@SpecVersion("PDR")
public class ManagerTest extends AbstractTest
{
- @Test(groups={"stub", "manager", "injection", "deployment"}) @SpecAssertion(section="4.8")
+ @Test(groups={"manager", "injection", "deployment"}) @SpecAssertion(section="5.8")
public void testInjectingManager()
{
- assert false;
+ FishFarmOffice fishFarmOffice = createSimpleBean(FishFarmOffice.class).create();
+ assert fishFarmOffice.manager != null;
}
@Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) @SpecAssertion(section="8.6")
@@ -55,7 +59,7 @@
}
- @Test(groups={"stub", "manager", "ejb3"}) @SpecAssertion(section="4.8")
+ @Test(groups={"stub", "manager", "ejb3"}) @SpecAssertion(section="5.8")
public void testManagerLookupInJndi()
{
assert false;
@@ -64,7 +68,7 @@
/*
- @Test(groups="manager") @SpecAssertion(section="4.8")
+ @Test(groups="manager") @SpecAssertion(section="5.8")
public void test
{
assert false;
Modified: 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 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByNameTest.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -17,25 +17,25 @@
public class ResolutionByNameTest extends AbstractTest
{
- @Test(groups={"stub", "el"}) @SpecAssertion(section="4.10")
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11")
public void testELResolver()
{
assert false;
}
- @Test(groups={"stub", "el"}) @SpecAssertion(section="4.10.2")
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11.2")
public void testELResolverRegisteredWithJsf()
{
assert false;
}
- @Test(groups={"stub", "el"}) @SpecAssertion(section="4.10.2")
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11.2")
public void testELResolverRegisteredWithServlet()
{
assert false;
}
- @Test @SpecAssertion(section="4.10.1")
+ @Test @SpecAssertion(section="5.11.1")
public void testNamedBasedResolution()
{
@@ -67,7 +67,7 @@
assert manager.resolveByName("whitefish").contains(plaiceBean);
}
- @Test(groups="resolution") @SpecAssertion(section="4.10.1")
+ @Test(groups="resolution") @SpecAssertion(section="5.11.1")
public void testNoWebBeansFound() throws Exception
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -79,9 +79,15 @@
assert manager.resolveByName("foo").size() == 0;
}
+ @Test(groups="stub") @SpecAssertion(section="5.11.1")
+ public void testOnlyHigestPrecedenceResolved()
+ {
+ assert false;
+ }
+
/*
- @Test(groups="el") @SpecAssertion(section="4.10")
+ @Test(groups="el") @SpecAssertion(section="5.11")
public void test
{
assert false;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -37,11 +37,13 @@
import org.jboss.webbeans.test.beans.Spider;
import org.jboss.webbeans.test.beans.SpiderProducer;
import org.jboss.webbeans.test.beans.Tuna;
+import org.jboss.webbeans.test.beans.broken.ParameterizedBean;
import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral;
import org.jboss.webbeans.test.bindings.BindingTypeWithBindingAnnotationMemberAnnotationLiteral;
import org.jboss.webbeans.test.bindings.BindingTypeWithBindingArrayTypeMemberAnnotationLiteral;
import org.jboss.webbeans.test.bindings.ChunkyAnnotationLiteral;
import org.jboss.webbeans.test.bindings.ExpensiveAnnotationLiteral;
+import org.jboss.webbeans.test.mock.MockManagerImpl;
import org.testng.annotations.Test;
@SpecVersion("20081206")
@@ -61,7 +63,7 @@
}
@Test(groups="resolution") @SpecAssertion(section="5.9.2")
- public void testSingleApiTypeWithCurrent() throws Exception
+ public void testDefaultBindingTypeAssumed() throws Exception
{
AnnotatedField<Tuna> tunaField = new AnnotatedFieldImpl<Tuna>(FishFarm.class.getDeclaredField("tuna"), fishFarmClass);
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
@@ -71,6 +73,18 @@
assert possibleTargets.contains(tunaBean);
}
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ public void testParameterizedTypeWithWildcardParameter()
+ {
+ manager.resolveByType(new TypeLiteral<ParameterizedBean<?>>(){});
+ }
+
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ public <T> void testParameterizedTypeWithTypeParameter()
+ {
+ manager.resolveByType(new TypeLiteral<ParameterizedBean<T>>(){});
+ }
+
@Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.9.2")
public void testDuplicateBindingTypesUsed()
{
@@ -130,7 +144,7 @@
assert possibleTargets.contains(haddockBean);
}
- @Test(groups="resolution") @SpecAssertion(section={"5.9.2", "5.9.4"})
+ @Test(groups="resolution") @SpecAssertion(section={"5.9.2"})
public void testResolveByType() throws Exception
{
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
@@ -155,7 +169,7 @@
assert manager.resolveByType(Animal.class, new CurrentAnnotationLiteral()).contains(haddockBean);
}
- @Test(groups="injection") @SpecAssertion(section="2.3.5")
+ @Test(groups="injection") @SpecAssertion(section={"2.3.5","5.9.2.2"})
public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean()
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -235,8 +249,40 @@
assert manager.resolveByType(Animal.class, new AnnotationLiteral<Whitefish>() {}).contains(plaiceBean);
}
+
@Test(groups="resolution") @SpecAssertion(section="5.9.2")
+ public void testNoWebBeansFound() throws Exception
+ {
+ AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
+ Bean<Salmon> salmonBean = createSimpleBean(Salmon.class);
+ Bean<Sole> soleBean = createSimpleBean(Sole.class);
+ Bean<Plaice> plaiceBean = createSimpleBean(Plaice.class);
+ manager.addBean(plaiceBean);
+ manager.addBean(salmonBean);
+ manager.addBean(soleBean);
+
+ assert manager.resolveByType(Tuna.class, new CurrentAnnotationLiteral()).size() == 0;
+ }
+
+ @Test(groups="resolution") @SpecAssertion(section={"5.9.2", "2.2"})
+ public void testResolveObject() throws Exception
+ {
+ Bean<Salmon> salmonBean = createSimpleBean(Salmon.class);
+ Bean<Sole> soleBean = createSimpleBean(Sole.class);
+ Bean<Plaice> plaiceBean = createSimpleBean(Plaice.class);
+ manager.addBean(plaiceBean);
+ manager.addBean(salmonBean);
+ manager.addBean(soleBean);
+
+ assert manager.resolveByType(Object.class).size() == 3 + MockManagerImpl.BUILT_IN_BEANS;
+ assert manager.resolveByType(Object.class).contains(plaiceBean);
+ assert manager.resolveByType(Object.class).contains(salmonBean);
+ assert manager.resolveByType(Object.class).contains(soleBean);
+
+ }
+
+ @Test(groups="resolution") @SpecAssertion(section="5.9.2.1")
public void testResolveByTypeWithNonBindingMembers() throws Exception
{
AnnotatedField<Animal> veryExpensiveWhitefishField = new AnnotatedFieldImpl<Animal>(FishFarm.class.getDeclaredField("veryExpensiveWhitefish"), fishFarmClass);
@@ -266,37 +312,6 @@
assert beans.contains(roundWhiteFishBean);
}
- @Test(groups="resolution") @SpecAssertion(section="5.9.2")
- public void testNoWebBeansFound() throws Exception
- {
- AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
- Bean<Salmon> salmonBean = createSimpleBean(Salmon.class);
- Bean<Sole> soleBean = createSimpleBean(Sole.class);
- Bean<Plaice> plaiceBean = createSimpleBean(Plaice.class);
- manager.addBean(plaiceBean);
- manager.addBean(salmonBean);
- manager.addBean(soleBean);
-
- assert manager.resolveByType(Tuna.class, new CurrentAnnotationLiteral()).size() == 0;
- }
-
- @Test(groups="resolution") @SpecAssertion(section={"5.9.2", "2.2"})
- public void testResolveObject() throws Exception
- {
- Bean<Salmon> salmonBean = createSimpleBean(Salmon.class);
- Bean<Sole> soleBean = createSimpleBean(Sole.class);
- Bean<Plaice> plaiceBean = createSimpleBean(Plaice.class);
- manager.addBean(plaiceBean);
- manager.addBean(salmonBean);
- manager.addBean(soleBean);
-
- assert manager.resolveByType(Object.class).size() == 4;
- assert manager.resolveByType(Object.class).contains(plaiceBean);
- assert manager.resolveByType(Object.class).contains(salmonBean);
- assert manager.resolveByType(Object.class).contains(soleBean);
-
- }
-
@Test(groups="resolution", expectedExceptions=DefinitionException.class) @SpecAssertion(section="5.9.2.1")
public void testArrayValuedAnnotationMemberWithoutNonBinding()
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -38,6 +38,7 @@
import org.jboss.webbeans.test.beans.nonBeans.ServletRequestListenerBean;
import org.jboss.webbeans.test.beans.nonBeans.UIComponentBean;
import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral;
+import org.jboss.webbeans.test.mock.MockManagerImpl;
import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
import org.testng.annotations.Test;
@@ -88,21 +89,21 @@
public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans()
{
bootstrap.boot(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(FilterBean.class, HttpSessionListenerBean.class, ServletBean.class, ServletContextListenerBean.class, ServletRequestListenerBean.class)), null, null));
- assert manager.getBeans().size() == 1;
+ assert manager.getBeans().size() == MockManagerImpl.BUILT_IN_BEANS;
}
@Test
public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean()
{
bootstrap.boot(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(EnterpriseBeanWebBean.class)), null, null));
- assert manager.getBeans().size() == 1;
+ assert manager.getBeans().size() == MockManagerImpl.BUILT_IN_BEANS;
}
@Test
public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean()
{
bootstrap.boot(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(UIComponentBean.class)), null, null));
- assert manager.getBeans().size() == 1;
+ assert manager.getBeans().size() == MockManagerImpl.BUILT_IN_BEANS;
}
@Test(groups="stub")
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -0,0 +1,11 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Current;
+import javax.webbeans.manager.Manager;
+
+public class FishFarmOffice
+{
+
+ @Current public Manager manager;
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarmOffice.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-12-07 18:08:47 UTC (rev 447)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-12-07 18:44:32 UTC (rev 448)
@@ -12,6 +12,9 @@
public class MockManagerImpl extends ManagerImpl
{
+
+ public static int BUILT_IN_BEANS = 2;
+
private Object event = null;
private Annotation[] eventBindings = null;
private Class<? extends Object> observedEventType = null;
15 years, 7 months
[webbeans-commits] Webbeans SVN: r447 - in ri/trunk/webbeans-ri/src: test/java/org/jboss/webbeans/test and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-07 13:08:47 -0500 (Sun, 07 Dec 2008)
New Revision: 447
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java
Log:
Updates to instance resolution
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-07 17:55:49 UTC (rev 446)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-07 18:08:47 UTC (rev 447)
@@ -19,6 +19,9 @@
import java.io.InputStream;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -234,6 +237,17 @@
throw new IllegalArgumentException("Not a binding type " + annotation);
}
}
+ for (Type type : element.getActualTypeArguments())
+ {
+ if (type instanceof WildcardType)
+ {
+ throw new IllegalArgumentException("Cannot resolve a type parameterized with a wildcard " + element);
+ }
+ if (type instanceof TypeVariable)
+ {
+ throw new IllegalArgumentException("Cannot resolve a type parameterized with a type parameter " + element);
+ }
+ }
if (bindings.length > element.getMetaAnnotations(BindingType.class).size())
{
throw new DuplicateBindingTypeException(element.toString());
Modified: 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 2008-12-07 17:55:49 UTC (rev 446)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2008-12-07 18:08:47 UTC (rev 447)
@@ -5,6 +5,7 @@
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;
@@ -22,17 +23,18 @@
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.ParameterizedBean;
import org.jboss.webbeans.test.beans.broken.PlaiceFarm;
import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral;
import org.testng.annotations.Test;
-@SpecVersion("PDR")
+@SpecVersion("20081206")
public class InstantiationByTypeTest extends AbstractTest
{
private AnnotatedClass<FishFarm> fishFarmClass = new AnnotatedClassImpl<FishFarm>(FishFarm.class);
- @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="4.9")
+ @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="5.9")
public void testCurrentBindingTypeAssumed()
{
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
@@ -40,19 +42,32 @@
assert manager.getInstanceByType(Tuna.class) != null;
}
- @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="4.9")
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ public void testParameterizedTypeWithWildcardParameter()
+ {
+ manager.resolveByType(new TypeLiteral<ParameterizedBean<?>>(){});
+ }
+
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ public <T> void testParameterizedTypeWithTypeParameter()
+ {
+ manager.resolveByType(new TypeLiteral<ParameterizedBean<T>>(){});
+ }
+
+
+ @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.9")
public void testDuplicateBindingTypesUsed()
{
manager.getInstanceByType(Tuna.class, new CurrentAnnotationLiteral(), new CurrentAnnotationLiteral());
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="4.9")
+ @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="4.9")
+ @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="5.9")
public void testAmbiguousDependencies() throws Exception
{
AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
@@ -66,7 +81,7 @@
manager.getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){});
}
- @Test(expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="4.9")
+ @Test(expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="5.9")
public void testUnsatisfiedDependencies() throws Exception
{
AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
@@ -80,7 +95,7 @@
manager.getInstanceByType(Tuna.class, new CurrentAnnotationLiteral());
}
- @Test(expectedExceptions=UnproxyableDependencyException.class) @SpecAssertion(section="4.9")
+ @Test(expectedExceptions=UnproxyableDependencyException.class) @SpecAssertion(section="5.9")
public void testUnproxyableDependencies() throws Exception
{
AnnotatedField<Plaice> plaiceField = new AnnotatedFieldImpl<Plaice>(PlaiceFarm.class.getDeclaredField("plaice"), fishFarmClass);
@@ -92,7 +107,7 @@
/*
- @Test(groups="resolution") @SpecAssertion(section="4.9")
+ @Test(groups="resolution") @SpecAssertion(section="5.9")
public void test
{
assert false;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java 2008-12-07 17:55:49 UTC (rev 446)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java 2008-12-07 18:08:47 UTC (rev 447)
@@ -44,7 +44,7 @@
import org.jboss.webbeans.test.bindings.ExpensiveAnnotationLiteral;
import org.testng.annotations.Test;
-@SpecVersion("PDR")
+@SpecVersion("20081206")
public class ResolutionByTypeTest extends AbstractTest
{
@@ -60,7 +60,7 @@
assert tuna.getType().isAssignableFrom(Tuna.class);
}
- @Test(groups="resolution") @SpecAssertion(section="4.9.2")
+ @Test(groups="resolution") @SpecAssertion(section="5.9.2")
public void testSingleApiTypeWithCurrent() throws Exception
{
AnnotatedField<Tuna> tunaField = new AnnotatedFieldImpl<Tuna>(FishFarm.class.getDeclaredField("tuna"), fishFarmClass);
@@ -71,13 +71,13 @@
assert possibleTargets.contains(tunaBean);
}
- @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="4.9.2")
+ @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.9.2")
public void testDuplicateBindingTypesUsed()
{
manager.resolveByType(Tuna.class, new CurrentAnnotationLiteral(), new CurrentAnnotationLiteral());
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="4.9.2")
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9.2")
public void testNonBindingTypeUsed()
{
manager.resolveByType(Tuna.class, new AnotherDeploymentTypeAnnotationLiteral());
@@ -130,7 +130,7 @@
assert possibleTargets.contains(haddockBean);
}
- @Test(groups="resolution") @SpecAssertion(section={"4.9.2", "4.9.4"})
+ @Test(groups="resolution") @SpecAssertion(section={"5.9.2", "5.9.4"})
public void testResolveByType() throws Exception
{
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
@@ -188,7 +188,7 @@
assert manager.resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).contains(soleBean);
}
- @Test(groups="resolution") @SpecAssertion(section="4.9.2")
+ @Test(groups="resolution") @SpecAssertion(section="5.9.2")
public void testResolveByTypeWithTypeParameter() throws Exception
{
AnnotatedField<Farmer<ScottishFish>> scottishFishFarmerField = new AnnotatedFieldImpl<Farmer<ScottishFish>>(FishFarm.class.getDeclaredField("scottishFishFarmer"), fishFarmClass);
@@ -203,7 +203,7 @@
assert manager.resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).contains(scottishFishFarmerBean);
}
- @Test(groups={"resolution", "producerMethod"}) @SpecAssertion(section="4.9.2")
+ @Test(groups={"resolution", "producerMethod"}) @SpecAssertion(section="5.9.2")
public void testResolveByTypeWithArray() throws Exception
{
SimpleBean<SpiderProducer> spiderProducerBean = createSimpleBean(SpiderProducer.class);
@@ -218,7 +218,7 @@
assert manager.resolveByType(Spider[].class).size() == 1;
}
- @Test @SpecAssertion(section="4.9.2")
+ @Test @SpecAssertion(section="5.9.2")
public void testOnlyHighestEnabledPreecedenceWebBeansResolved() throws Exception
{
AnnotatedField<Animal> whiteFishField = new AnnotatedFieldImpl<Animal>(FishFarm.class.getDeclaredField("whiteFish"), fishFarmClass);
@@ -236,7 +236,7 @@
}
- @Test(groups="resolution") @SpecAssertion(section="4.9.2")
+ @Test(groups="resolution") @SpecAssertion(section="5.9.2")
public void testResolveByTypeWithNonBindingMembers() throws Exception
{
AnnotatedField<Animal> veryExpensiveWhitefishField = new AnnotatedFieldImpl<Animal>(FishFarm.class.getDeclaredField("veryExpensiveWhitefish"), fishFarmClass);
@@ -266,7 +266,7 @@
assert beans.contains(roundWhiteFishBean);
}
- @Test(groups="resolution") @SpecAssertion(section="4.9.2")
+ @Test(groups="resolution") @SpecAssertion(section="5.9.2")
public void testNoWebBeansFound() throws Exception
{
AnnotatedField<ScottishFish> whiteScottishFishField = new AnnotatedFieldImpl<ScottishFish>(FishFarm.class.getDeclaredField("whiteScottishFish"), fishFarmClass);
@@ -280,7 +280,7 @@
assert manager.resolveByType(Tuna.class, new CurrentAnnotationLiteral()).size() == 0;
}
- @Test(groups="resolution") @SpecAssertion(section={"4.9.2", "2.2"})
+ @Test(groups="resolution") @SpecAssertion(section={"5.9.2", "2.2"})
public void testResolveObject() throws Exception
{
Bean<Salmon> salmonBean = createSimpleBean(Salmon.class);
@@ -297,7 +297,7 @@
}
- @Test(groups="resolution", expectedExceptions=DefinitionException.class) @SpecAssertion(section="4.9.2.1")
+ @Test(groups="resolution", expectedExceptions=DefinitionException.class) @SpecAssertion(section="5.9.2.1")
public void testArrayValuedAnnotationMemberWithoutNonBinding()
{
manager.resolveByType(Animal.class, new BindingTypeWithBindingArrayTypeMemberAnnotationLiteral() {
@@ -310,7 +310,7 @@
});
}
- @Test(groups="resolution", expectedExceptions=DefinitionException.class) @SpecAssertion(section="4.9.2.1")
+ @Test(groups="resolution", expectedExceptions=DefinitionException.class) @SpecAssertion(section="5.9.2.1")
public void testAnnotationValuedAnnotationMemberWithoutNonBinding()
{
manager.resolveByType(Animal.class, new BindingTypeWithBindingAnnotationMemberAnnotationLiteral()
15 years, 7 months
[webbeans-commits] Webbeans SVN: r446 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: annotations and 2 other directories.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-12-07 12:55:49 -0500 (Sun, 07 Dec 2008)
New Revision: 446
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OtherSpiderProducer.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OtherBrokenSpiderProducer.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java
Log:
tests for producer fields
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanLifecycleTest.java 2008-12-07 17:55:49 UTC (rev 446)
@@ -0,0 +1,60 @@
+package org.jboss.webbeans.test;
+
+import static org.jboss.webbeans.util.BeanFactory.createProducerFieldBean;
+import static org.jboss.webbeans.util.BeanFactory.createSimpleBean;
+
+import java.lang.reflect.Field;
+
+import javax.webbeans.IllegalProductException;
+
+import org.jboss.webbeans.bean.ProducerFieldBean;
+import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.test.beans.OtherSpiderProducer;
+import org.jboss.webbeans.test.beans.Spider;
+import org.jboss.webbeans.test.beans.Tarantula;
+import org.jboss.webbeans.test.beans.broken.OtherBrokenSpiderProducer;
+import org.testng.annotations.Test;
+
+public class ProducerFieldBeanLifecycleTest extends AbstractTest
+{
+
+ @Test(groups="producerField") @SpecAssertion(section="5.6")
+ public void testProducerFieldBeanCreate() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(spiderProducer);
+ Field method = OtherSpiderProducer.class.getField("produceTarantula");
+ ProducerFieldBean<Tarantula> tarantulaBean = createProducerFieldBean(Tarantula.class, 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="producerField") @SpecAssertion(section={"3.4", "5.6", "8.3"})
+ public void testProducerFieldReturnsNullIsDependent() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(spiderProducer);
+ Field method = OtherSpiderProducer.class.getField("getNullSpider");
+ ProducerFieldBean<Spider> spiderBean = createProducerFieldBean(Spider.class, method, spiderProducer);
+ Spider spider = spiderBean.create();
+ assert spider == null;
+ }
+
+ @Test(groups="producerField", expectedExceptions=IllegalProductException.class) @SpecAssertion(section={"3.4", "5.6"})
+ public void testProducerFieldReturnsNullIsNotDependent() throws Exception
+ {
+ SimpleBean<OtherBrokenSpiderProducer> spiderProducer = createSimpleBean(OtherBrokenSpiderProducer.class);
+ manager.addBean(spiderProducer);
+ Field method = OtherBrokenSpiderProducer.class.getField("getRequestScopedSpider");
+ createProducerFieldBean(Spider.class, method, spiderProducer).create();
+ }
+
+}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2008-12-07 17:55:49 UTC (rev 446)
@@ -0,0 +1,270 @@
+package org.jboss.webbeans.test;
+
+import static org.jboss.webbeans.util.BeanFactory.createProducerFieldBean;
+import static org.jboss.webbeans.util.BeanFactory.createSimpleBean;
+
+import java.lang.reflect.Field;
+
+import javax.webbeans.Current;
+import javax.webbeans.DefinitionException;
+import javax.webbeans.Production;
+import javax.webbeans.RequestScoped;
+
+import org.jboss.webbeans.bean.ProducerFieldBean;
+import org.jboss.webbeans.bean.SimpleBean;
+import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
+import org.jboss.webbeans.test.annotations.Tame;
+import org.jboss.webbeans.test.beans.Animal;
+import org.jboss.webbeans.test.beans.BlackWidow;
+import org.jboss.webbeans.test.beans.DaddyLongLegs;
+import org.jboss.webbeans.test.beans.DeadlyAnimal;
+import org.jboss.webbeans.test.beans.DeadlySpider;
+import org.jboss.webbeans.test.beans.FunnelWeaver;
+import org.jboss.webbeans.test.beans.LadybirdSpider;
+import org.jboss.webbeans.test.beans.OtherSpiderProducer;
+import org.jboss.webbeans.test.beans.Spider;
+import org.jboss.webbeans.test.beans.Tarantula;
+import org.jboss.webbeans.test.beans.WolfSpider;
+import org.jboss.webbeans.test.beans.broken.OtherBrokenSpiderProducer;
+import org.testng.annotations.Test;
+
+public class ProducerFieldBeanModelTest extends AbstractTest
+{
+
+ @Test(groups="producerField") @SpecAssertion(section="2.5.3")
+ public void testProducerFieldInheritsDeploymentTypeOfDeclaringWebBean() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("produceTameTarantula");
+ ProducerFieldBean<Tarantula> tarantulaModel = createProducerFieldBean(Tarantula.class, field, bean);
+ tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class);
+ }
+
+ /*@Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ 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.4")
+ public void testProducerFieldIsNotBusinessField() throws Exception
+ {
+ assert false;
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4")
+ public void testParameterizedReturnType() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("getFunnelWeaverSpider");
+ createProducerFieldBean(FunnelWeaver.class, field, bean);
+ }
+
+ @Test(groups="producerField", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
+ public void testParameterizedReturnTypeWithWildcard() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("getAnotherFunnelWeaver");
+ createProducerFieldBean(FunnelWeaver.class, field, bean);
+ }
+
+ @Test(groups={"stub", "producerField", "deployment"}) @SpecAssertion(section="3.4")
+ public void testBeanDeclaresMultipleProducerFields()
+ {
+ assert false;
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section={"3.4", "2.3.1"})
+ public void testDefaultBindingType() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("produceTarantula");
+ ProducerFieldBean<Tarantula> tarantulaModel = createProducerFieldBean(Tarantula.class, field, bean);
+ assert tarantulaModel.getBindingTypes().size() == 1;
+ assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class);
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4.1")
+ public void testApiTypeForClassReturn() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("produceTarantula");
+ ProducerFieldBean<Tarantula> tarantulaModel = createProducerFieldBean(Tarantula.class, 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);
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4.1")
+ public void testApiTypeForInterfaceReturn() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("makeASpider");
+ ProducerFieldBean<Animal> animalModel = createProducerFieldBean(Animal.class, field, bean);
+ assert animalModel.getTypes().size() == 2;
+ assert animalModel.getTypes().contains(Animal.class);
+ assert animalModel.getTypes().contains(Object.class);
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4.1")
+ public void testApiTypeForPrimitiveReturn() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("getWolfSpiderSize");
+ ProducerFieldBean<Integer> intModel = createProducerFieldBean(int.class, field, bean);
+ assert intModel.getTypes().size() == 2;
+ assert intModel.getTypes().contains(int.class);
+ assert intModel.getTypes().contains(Object.class);
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section={"3.4.1", "2.2"})
+ public void testApiTypeForArrayTypeReturn() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("getSpiders");
+ ProducerFieldBean<Spider[]> spidersModel = createProducerFieldBean(Spider[].class, field, bean);
+ assert spidersModel.getTypes().size() == 2;
+ assert spidersModel.getTypes().contains(Spider[].class);
+ assert spidersModel.getTypes().contains(Object.class);
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ public void testBindingType() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("produceTameTarantula");
+ ProducerFieldBean<Tarantula> tarantulaModel = createProducerFieldBean(Tarantula.class, field, bean);
+ assert tarantulaModel.getBindingTypes().size() == 1;
+ assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class);
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ public void testScopeType() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs");
+ ProducerFieldBean<DaddyLongLegs> daddyLongLegsModel = createProducerFieldBean(DaddyLongLegs.class, field, bean);
+ assert daddyLongLegsModel.getScopeType().equals(RequestScoped.class);
+
+ // TODO Inherit scope from returned web bean?
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ public void testDeploymentType() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("getLadybirdSpider");
+ ProducerFieldBean<LadybirdSpider> ladybirdSpiderModel = createProducerFieldBean(LadybirdSpider.class, field, bean);
+ assert ladybirdSpiderModel.getDeploymentType().equals(Production.class);
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ public void testNamedField() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("produceBlackWidow");
+ ProducerFieldBean<BlackWidow> blackWidowSpiderModel = createProducerFieldBean(BlackWidow.class, field, bean);
+ assert blackWidowSpiderModel.getName().equals("blackWidow");
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section="3.4.2")
+ public void testDefaultNamedField() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("produceDaddyLongLegs");
+ ProducerFieldBean<DaddyLongLegs> daddyLongLegsSpiderModel = createProducerFieldBean(DaddyLongLegs.class, field, bean);
+ assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs");
+ }
+
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalFieldNonStatic()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalFieldFieldDeclaredOnWebBeanImplementationClass()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalFieldBindingAnnotations()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalFieldDefaultBindingAnnotations()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.4")
+ public void testDisposalFieldDoesNotResolveToProducerField()
+ {
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
+ public void testDisposalFieldDeclaredOnEnabledBean()
+ {
+ // TODO Placeholder
+ // TODO Move this
+
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
+ public void testBeanCanDeclareMultipleDisposalFields()
+ {
+ // TODO move this
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups={"stub", "disposalField"}) @SpecAssertion(section="3.3.5")
+ public void testProducerFieldHasNoMoreThanOneDisposalField()
+ {
+ // TODO move this
+ // TODO Placeholder
+ assert false;
+ }
+
+ @Test(groups="producerField") @SpecAssertion(section={"2.7.2", "3.4.2", "2.2"})
+ public void testStereotype() throws Exception
+ {
+ SimpleBean<OtherSpiderProducer> bean = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(bean);
+ Field field = OtherSpiderProducer.class.getField("produceWolfSpider");
+ ProducerFieldBean<WolfSpider> wolfSpiderModel = createProducerFieldBean(WolfSpider.class, field, bean);
+ assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().size() == 1;
+ assert wolfSpiderModel.getMergedStereotypes().getRequiredTypes().contains(Animal.class);
+ assert wolfSpiderModel.getScopeType().equals(RequestScoped.class);
+ }
+}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java 2008-12-07 17:50:01 UTC (rev 445)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java 2008-12-07 17:55:49 UTC (rev 446)
@@ -1,5 +1,6 @@
package org.jboss.webbeans.test.annotations;
+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;
@@ -13,7 +14,7 @@
import org.jboss.webbeans.test.beans.Animal;
@Stereotype(requiredTypes=Animal.class)
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@RequestScoped
public @interface AnimalStereotype
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OtherSpiderProducer.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OtherSpiderProducer.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OtherSpiderProducer.java 2008-12-07 17:55:49 UTC (rev 446)
@@ -0,0 +1,49 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Dependent;
+import javax.webbeans.Named;
+import javax.webbeans.Produces;
+import javax.webbeans.Production;
+import javax.webbeans.RequestScoped;
+
+import org.jboss.webbeans.test.annotations.AnimalStereotype;
+import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
+import org.jboss.webbeans.test.annotations.Tame;
+
+@AnotherDeploymentType
+public 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 @Dependent public final TrapdoorSpider produceTrapdoorSpider = new TrapdoorSpider();
+
+ @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 @Named("Shelob") public Tarantula produceShelob;
+
+ @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 String[] getStrings = new String[0];
+
+ @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>();
+
+ @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>();
+
+ @Produces public Spider getNullSpider = null;
+
+}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OtherBrokenSpiderProducer.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OtherBrokenSpiderProducer.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OtherBrokenSpiderProducer.java 2008-12-07 17:55:49 UTC (rev 446)
@@ -0,0 +1,36 @@
+package org.jboss.webbeans.test.beans.broken;
+
+import javax.webbeans.Destructor;
+import javax.webbeans.Disposes;
+import javax.webbeans.Observes;
+import javax.webbeans.Produces;
+import javax.webbeans.Production;
+import javax.webbeans.RequestScoped;
+
+import org.jboss.webbeans.test.beans.Spider;
+
+@Production
+public class OtherBrokenSpiderProducer
+{
+
+ @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;
+
+}
15 years, 7 months
[webbeans-commits] Webbeans SVN: r445 - in ri/trunk/webbeans-ri: src/main/java/org/jboss/webbeans and 8 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-07 12:50:01 -0500 (Sun, 07 Dec 2008)
New Revision: 445
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSF.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/Servlet.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EnterpriseBeanWebBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EntityBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/FilterBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/HttpSessionListenerBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletContextListenerBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletRequestListenerBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/UIComponentBean.java
Modified:
ri/trunk/webbeans-ri/pom.xml
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
Log:
Update to latest spec, better restrictions on what can be simple web beans
Modified: ri/trunk/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml 2008-12-07 17:46:04 UTC (rev 444)
+++ ri/trunk/webbeans-ri/pom.xml 2008-12-07 17:50:01 UTC (rev 445)
@@ -67,6 +67,11 @@
</dependency>
<dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</dependency>
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java 2008-12-07 17:46:04 UTC (rev 444)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -17,6 +17,13 @@
package org.jboss.webbeans.bootstrap;
+import static org.jboss.webbeans.ejb.EJB.ENTERPRISE_BEAN_CLASS;
+import static org.jboss.webbeans.jsf.JSF.UICOMPONENT_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.FILTER_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.HTTP_SESSION_LISTENER_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.SERVLET_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.SERVLET_CONTEXT_LISTENER_CLASS;
+import static org.jboss.webbeans.servlet.Servlet.SERVLET_REQUEST_LISTENER_CLASS;
import static org.jboss.webbeans.util.BeanFactory.createEnterpriseBean;
import static org.jboss.webbeans.util.BeanFactory.createEventBean;
import static org.jboss.webbeans.util.BeanFactory.createObserver;
@@ -125,53 +132,56 @@
Set<AbstractBean<?, ?>> beans = new HashSet<AbstractBean<?, ?>>();
for (Class<?> clazz : classes)
{
- AbstractClassBean<?> bean;
if (MetaDataCache.instance().getEjbMetaData(clazz).isEjb())
{
- bean = createEnterpriseBean(clazz);
+ createBean(createEnterpriseBean(clazz), beans);
}
- else
+ else if (isTypeSimpleWebBean(clazz))
{
- bean = createSimpleBean(clazz);
+ createBean(createSimpleBean(clazz), beans);
}
- beans.add(bean);
- CurrentManager.rootManager().getResolver().addInjectionPoints(bean.getInjectionPoints());
- for (AnnotatedMethod<Object> producerMethod : bean.getProducerMethods())
+ }
+ return beans;
+ }
+
+ public void createBean(AbstractClassBean<?> bean, Set<AbstractBean<?, ?>> beans)
+ {
+ beans.add(bean);
+ CurrentManager.rootManager().getResolver().addInjectionPoints(bean.getInjectionPoints());
+ for (AnnotatedMethod<Object> producerMethod : bean.getProducerMethods())
+ {
+ ProducerMethodBean<?> producerMethodBean = createProducerMethodBean(producerMethod, bean);
+ beans.add(producerMethodBean);
+ CurrentManager.rootManager().getResolver().addInjectionPoints(producerMethodBean.getInjectionPoints());
+ log.info("Web Bean: " + producerMethodBean);
+ }
+ for (AnnotatedField<Object> producerField : bean.getProducerFields())
+ {
+ ProducerFieldBean<?> producerFieldBean = createProducerFieldBean(producerField, bean);
+ beans.add(producerFieldBean);
+ log.info("Web Bean: " + producerFieldBean);
+ }
+ for (AnnotatedField<Object> eventField : bean.getEventFields())
+ {
+ EventBean<?> eventBean = createEventBean(eventField);
+ beans.add(eventBean);
+ CurrentManager.rootManager().getResolver().addInjectionPoints(eventBean.getInjectionPoints());
+ log.info("Web Bean: " + eventBean);
+ }
+ for (AnnotatedMethod<Object> observerMethod : bean.getObserverMethods())
+ {
+ ObserverImpl<?> observer = createObserver(observerMethod, bean);
+ if (observerMethod.getAnnotatedParameters(Observes.class).size() == 1)
{
- ProducerMethodBean<?> producerMethodBean = createProducerMethodBean(producerMethod, bean);
- beans.add(producerMethodBean);
- CurrentManager.rootManager().getResolver().addInjectionPoints(producerMethodBean.getInjectionPoints());
- log.info("Web Bean: " + producerMethodBean);
+ registerObserver(observer, observerMethod.getAnnotatedParameters(Observes.class).get(0).getType(), observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingTypesAsArray());
}
- for (AnnotatedField<Object> producerField : bean.getProducerFields())
+ else
{
- ProducerFieldBean<?> producerFieldBean = createProducerFieldBean(producerField, bean);
- beans.add(producerFieldBean);
- log.info("Web Bean: " + producerFieldBean);
+ throw new DefinitionException("Observer method can only have one parameter annotated @Observes " + observer);
}
- for (AnnotatedField<Object> eventField : bean.getEventFields())
- {
- EventBean<?> eventBean = createEventBean(eventField);
- beans.add(eventBean);
- CurrentManager.rootManager().getResolver().addInjectionPoints(eventBean.getInjectionPoints());
- log.info("Web Bean: " + eventBean);
- }
- for (AnnotatedMethod<Object> observerMethod : bean.getObserverMethods())
- {
- ObserverImpl<?> observer = createObserver(observerMethod, bean);
- if (observerMethod.getAnnotatedParameters(Observes.class).size() == 1)
- {
- registerObserver(observer, observerMethod.getAnnotatedParameters(Observes.class).get(0).getType(), observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingTypesAsArray());
- }
- else
- {
- throw new DefinitionException("Observer method can only have one parameter annotated @Observes " + observer);
- }
-
- }
- log.info("Web Bean: " + bean);
+
}
- return beans;
+ log.info("Web Bean: " + bean);
}
@@ -244,5 +254,10 @@
{
CurrentManager.rootManager().addObserver(observer, (Class<T>) eventType, bindings);
}
+
+ protected static boolean isTypeSimpleWebBean(Class<?> type)
+ {
+ return !SERVLET_CLASS.isAssignableFrom(type) && !FILTER_CLASS.isAssignableFrom(type) && !SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(type) && !HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(type) && !SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(type) && !ENTERPRISE_BEAN_CLASS.isAssignableFrom(type) && !UICOMPONENT_CLASS.isAssignableFrom(type);
+ }
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java 2008-12-07 17:46:04 UTC (rev 444)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -19,20 +19,16 @@
import java.lang.annotation.Annotation;
-import org.jboss.webbeans.util.Reflections;
+import org.jboss.webbeans.util.ApiAbstraction;
/**
* Utility class for EJB annotations etc
*
* @author Pete Muir
*/
-public class EJB
+public class EJB extends ApiAbstraction
{
- public @interface Dummy
- {
- }
-
// Annotation instances
public static final Class<? extends Annotation> STATELESS_ANNOTATION;
public static final Class<? extends Annotation> STATEFUL_ANNOTATION;
@@ -40,41 +36,23 @@
public static final Class<? extends Annotation> FAKE_MESSAGE_DRIVEN_ANNOTATION;
public static final Class<? extends Annotation> SINGLETON_ANNOTATION;
public static final Class<? extends Annotation> REMOVE_ANNOTATION;
+ public static final Class<?> ENTERPRISE_BEAN_CLASS;
/**
* Static initialization block
*/
static
{
- STATELESS_ANNOTATION = classForName("javax.ejb.Stateless");
- STATEFUL_ANNOTATION = classForName("javax.ejb.Stateful");
- MESSAGE_DRIVEN_ANNOTATION = classForName("javax.ejb.MessageDriven");
+ STATELESS_ANNOTATION = annotationTypeForName("javax.ejb.Stateless");
+ STATEFUL_ANNOTATION = annotationTypeForName("javax.ejb.Stateful");
+ MESSAGE_DRIVEN_ANNOTATION = annotationTypeForName("javax.ejb.MessageDriven");
// Fake MDB for tests
- FAKE_MESSAGE_DRIVEN_ANNOTATION = classForName("org.jboss.webbeans.test.annotations.MessageDriven");
+ FAKE_MESSAGE_DRIVEN_ANNOTATION = annotationTypeForName("org.jboss.webbeans.test.annotations.MessageDriven");
// FIXME Faking singleton for tests
- SINGLETON_ANNOTATION = classForName("org.jboss.webbeans.test.annotations.Singleton");
+ SINGLETON_ANNOTATION = annotationTypeForName("org.jboss.webbeans.test.annotations.Singleton");
// SINGLETON_ANNOTATION = classForName("javax.ejb.Singleton");
- REMOVE_ANNOTATION = classForName("javax.ejb.Remove");
+ REMOVE_ANNOTATION = annotationTypeForName("javax.ejb.Remove");
+ ENTERPRISE_BEAN_CLASS = classForName("javax.ejb.EnterpriseBean");
}
- /**
- * Initializes an annotation class
- *
- * @param name The name of the annotation class
- * @return The instance of the annotation. Returns a dummy if the class was
- * not found
- */
- @SuppressWarnings("unchecked")
- private static Class<? extends Annotation> classForName(String name)
- {
- try
- {
- return (Class<? extends Annotation>) Reflections.classForName(name);
- }
- catch (ClassNotFoundException cnfe)
- {
- return Dummy.class;
- }
- }
-
}
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSF.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSF.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSF.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,10 @@
+package org.jboss.webbeans.jsf;
+
+import org.jboss.webbeans.util.ApiAbstraction;
+
+public class JSF extends ApiAbstraction
+{
+
+ public static final Class<?> UICOMPONENT_CLASS = classForName("javax.faces.component.UIComponent");
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSF.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/Servlet.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/Servlet.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/Servlet.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,14 @@
+package org.jboss.webbeans.servlet;
+
+import org.jboss.webbeans.util.ApiAbstraction;
+
+public class Servlet extends ApiAbstraction
+{
+
+ public static final Class<?> SERVLET_CLASS = classForName("javax.servlet.Servlet");
+ public static final Class<?> FILTER_CLASS = classForName("javax.servlet.Filter");
+ public static final Class<?> SERVLET_CONTEXT_LISTENER_CLASS = classForName("javax.servlet.ServletContextListener");
+ public static final Class<?> HTTP_SESSION_LISTENER_CLASS = classForName("javax.servlet.http.HttpSessionListener");
+ public static final Class<?> SERVLET_REQUEST_LISTENER_CLASS = classForName("javax.servlet.ServletRequestListener");
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/Servlet.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,52 @@
+package org.jboss.webbeans.util;
+
+import java.lang.annotation.Annotation;
+
+public class ApiAbstraction
+{
+
+ public @interface DummyAnnotation
+ {
+ }
+
+
+ public interface Dummy
+ {
+ }
+
+ /**
+ * Initializes an annotation class
+ *
+ * @param name The name of the annotation class
+ * @return The instance of the annotation. Returns a dummy if the class was
+ * not found
+ */
+ @SuppressWarnings("unchecked")
+ protected static Class<? extends Annotation> annotationTypeForName(String name)
+ {
+ try
+ {
+ return (Class<? extends Annotation>) Reflections.classForName(name);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ return DummyAnnotation.class;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ protected static Class<?> classForName(String name)
+ {
+ try
+ {
+ return (Class<? extends Annotation>) Reflections.classForName(name);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ return Dummy.class;
+ }
+ }
+
+
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ApiAbstraction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2008-12-07 17:46:04 UTC (rev 444)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -63,6 +63,8 @@
return Class.forName(name);
}
}
+
+
/**
* Gets the property name from a getter method
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-12-07 17:46:04 UTC (rev 444)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -14,7 +14,7 @@
import org.jboss.webbeans.test.beans.TunaFarm;
import org.testng.annotations.Test;
-@SpecVersion("PDR")
+@SpecVersion("20081206")
public class SimpleBeanLifecycleTest extends AbstractTest
{
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-12-07 17:46:04 UTC (rev 444)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -3,7 +3,9 @@
import static org.jboss.webbeans.util.BeanFactory.createSimpleBean;
import java.lang.annotation.Annotation;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -28,10 +30,18 @@
import org.jboss.webbeans.test.beans.broken.ParameterizedBean;
import org.jboss.webbeans.test.beans.broken.OuterBean.InnerBean;
import org.jboss.webbeans.test.beans.broken.OuterBean.StaticInnerBean;
+import org.jboss.webbeans.test.beans.nonBeans.EnterpriseBeanWebBean;
+import org.jboss.webbeans.test.beans.nonBeans.FilterBean;
+import org.jboss.webbeans.test.beans.nonBeans.HttpSessionListenerBean;
+import org.jboss.webbeans.test.beans.nonBeans.ServletBean;
+import org.jboss.webbeans.test.beans.nonBeans.ServletContextListenerBean;
+import org.jboss.webbeans.test.beans.nonBeans.ServletRequestListenerBean;
+import org.jboss.webbeans.test.beans.nonBeans.UIComponentBean;
import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral;
+import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
import org.testng.annotations.Test;
-@SpecVersion("PDR")
+@SpecVersion("20081206")
public class SimpleBeanModelTest extends AbstractTest
{
@@ -68,9 +78,36 @@
}
- @Test(groups="deployment") @SpecAssertion(section="3.2")
- public void testOnlyOneWebBeanPerAnnotatedClass()
+ @Test(groups="stub")
+ public void testEntitiesNotDiscoveredAsSimpleBeans()
{
+ assert false;
+ }
+
+ @Test
+ public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans()
+ {
+ bootstrap.boot(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(FilterBean.class, HttpSessionListenerBean.class, ServletBean.class, ServletContextListenerBean.class, ServletRequestListenerBean.class)), null, null));
+ assert manager.getBeans().size() == 1;
+ }
+
+ @Test
+ public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean()
+ {
+ bootstrap.boot(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(EnterpriseBeanWebBean.class)), null, null));
+ assert manager.getBeans().size() == 1;
+ }
+
+ @Test
+ public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean()
+ {
+ bootstrap.boot(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(UIComponentBean.class)), null, null));
+ assert manager.getBeans().size() == 1;
+ }
+
+ @Test(groups="stub")
+ public void testEjbsNotDiscoveredAsSimpleBean()
+ {
}
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EnterpriseBeanWebBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EnterpriseBeanWebBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EnterpriseBeanWebBean.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,8 @@
+package org.jboss.webbeans.test.beans.nonBeans;
+
+import javax.ejb.EnterpriseBean;
+
+public class EnterpriseBeanWebBean implements EnterpriseBean
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EnterpriseBeanWebBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EntityBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EntityBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EntityBean.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,6 @@
+package org.jboss.webbeans.test.beans.nonBeans;
+
+public class EntityBean
+{
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/EntityBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/FilterBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/FilterBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/FilterBean.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,33 @@
+package org.jboss.webbeans.test.beans.nonBeans;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public class FilterBean implements Filter
+{
+
+ public void destroy()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2) throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void init(FilterConfig arg0) throws ServletException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/FilterBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/HttpSessionListenerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/HttpSessionListenerBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/HttpSessionListenerBean.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,20 @@
+package org.jboss.webbeans.test.beans.nonBeans;
+
+import javax.servlet.http.HttpSessionEvent;
+
+public class HttpSessionListenerBean implements javax.servlet.http.HttpSessionListener
+{
+
+ public void sessionCreated(HttpSessionEvent arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void sessionDestroyed(HttpSessionEvent arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/HttpSessionListenerBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletBean.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,44 @@
+package org.jboss.webbeans.test.beans.nonBeans;
+
+import java.io.IOException;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public class ServletBean implements Servlet
+{
+
+ public void destroy()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public ServletConfig getServletConfig()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getServletInfo()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void init(ServletConfig arg0) throws ServletException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void service(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletContextListenerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletContextListenerBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletContextListenerBean.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,21 @@
+package org.jboss.webbeans.test.beans.nonBeans;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+public class ServletContextListenerBean implements ServletContextListener
+{
+
+ public void contextDestroyed(ServletContextEvent arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void contextInitialized(ServletContextEvent arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletContextListenerBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletRequestListenerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletRequestListenerBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletRequestListenerBean.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,21 @@
+package org.jboss.webbeans.test.beans.nonBeans;
+
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletRequestListener;
+
+public class ServletRequestListenerBean implements ServletRequestListener
+{
+
+ public void requestDestroyed(ServletRequestEvent arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void requestInitialized(ServletRequestEvent arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/ServletRequestListenerBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/UIComponentBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/UIComponentBean.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/UIComponentBean.java 2008-12-07 17:50:01 UTC (rev 445)
@@ -0,0 +1,295 @@
+package org.jboss.webbeans.test.beans.nonBeans;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+import javax.faces.render.Renderer;
+
+public class UIComponentBean extends UIComponent
+{
+
+ @Override
+ protected void addFacesListener(FacesListener arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void broadcast(FacesEvent arg0) throws AbortProcessingException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void decode(FacesContext arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void encodeBegin(FacesContext arg0) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void encodeChildren(FacesContext arg0) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void encodeEnd(FacesContext arg0) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public UIComponent findComponent(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Map<String, Object> getAttributes()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int getChildCount()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public List<UIComponent> getChildren()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getClientId(FacesContext arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected FacesContext getFacesContext()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected FacesListener[] getFacesListeners(Class arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public UIComponent getFacet(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Map<String, UIComponent> getFacets()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Iterator<UIComponent> getFacetsAndChildren()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getFamily()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getId()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public UIComponent getParent()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected Renderer getRenderer(FacesContext arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getRendererType()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean getRendersChildren()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public ValueBinding getValueBinding(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isRendered()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void processDecodes(FacesContext arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void processRestoreState(FacesContext arg0, Object arg1)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Object processSaveState(FacesContext arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void processUpdates(FacesContext arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void processValidators(FacesContext arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void queueEvent(FacesEvent arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void removeFacesListener(FacesListener arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setId(String arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setParent(UIComponent arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setRendered(boolean arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setRendererType(String arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setValueBinding(String arg0, ValueBinding arg1)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public boolean isTransient()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void restoreState(FacesContext arg0, Object arg1)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Object saveState(FacesContext arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setTransient(boolean arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/nonBeans/UIComponentBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
[webbeans-commits] Webbeans SVN: r444 - ri/trunk/webbeans-api/src/main/java/javax/webbeans.
by webbeans-commits@lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2008-12-07 12:46:04 -0500 (Sun, 07 Dec 2008)
New Revision: 444
Modified:
ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java
Log:
allow these annotations on fields
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -17,6 +17,7 @@
package javax.webbeans;
+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;
@@ -33,7 +34,7 @@
* @author Pete Muir
*/
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
@ScopeType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -17,6 +17,7 @@
package javax.webbeans;
+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;
@@ -32,7 +33,7 @@
* @author Pete Muir
*/
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
@ScopeType(passivating = true)
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Dependent.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -17,6 +17,7 @@
package javax.webbeans;
+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;
@@ -32,7 +33,7 @@
* @author Pete Muir
*/
-@Target( { METHOD, TYPE })
+@Target( { METHOD, TYPE, FIELD })
@Retention(RUNTIME)
@Documented
@ScopeType(normal = false)
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -1,5 +1,6 @@
package javax.webbeans;
+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;
@@ -16,7 +17,7 @@
@Named
@RequestScoped
@Stereotype
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
public @interface Model
{
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Named.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -17,6 +17,7 @@
package javax.webbeans;
+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;
@@ -32,7 +33,7 @@
* @author Pete Muir
*/
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
public @interface Named
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Production.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -17,6 +17,7 @@
package javax.webbeans;
+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;
@@ -32,7 +33,7 @@
* @author Pete Muir
*/
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
@DeploymentType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/RequestScoped.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -17,6 +17,7 @@
package javax.webbeans;
+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;
@@ -32,7 +33,7 @@
* @author Pete Muir
*/
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
@ScopeType
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/SessionScoped.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -17,6 +17,7 @@
package javax.webbeans;
+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;
@@ -32,7 +33,7 @@
* @author Pete Muir
*/
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
@ScopeType(passivating = true)
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java 2008-12-07 17:44:40 UTC (rev 443)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Standard.java 2008-12-07 17:46:04 UTC (rev 444)
@@ -17,6 +17,7 @@
package javax.webbeans;
+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;
@@ -33,7 +34,7 @@
* @author Pete Muir
*/
-@Target( { TYPE, METHOD })
+@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
@Documented
@DeploymentType
15 years, 7 months