Author: pete.muir(a)jboss.org Date: 2008-07-03 11:16:06 -0400 (Thu, 03 Jul 2008) New Revision: 39 Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Bear.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cheetah.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cougar.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Elephant.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Giraffe.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Leopard.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Lion.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Panther.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Puma.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Tiger.java Modified: ri/trunk/webbeans-impl/pom.xml ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/ComponentMetaModel.java ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/injectable/MethodMetaModel.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/ComponentMetaModelTest.java ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/ConstructorMetaModelTest.java Log: Tests for enterprise bean support Modified: ri/trunk/webbeans-impl/pom.xml =================================================================== --- ri/trunk/webbeans-impl/pom.xml 2008-07-03 13:02:30 UTC (rev 38) +++ ri/trunk/webbeans-impl/pom.xml 2008-07-03 15:16:06 UTC (rev 39) @@ -23,6 +23,12 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <scope>test</scope> + </dependency> </dependencies> Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/ComponentMetaModel.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/ComponentMetaModel.java 2008-07-03 13:02:30 UTC (rev 38) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/ComponentMetaModel.java 2008-07-03 15:16:06 UTC (rev 39) @@ -467,7 +467,7 @@ } if ("".equals(name) && (componentNameDefaulted || stereotypes.isComponentNameDefaulted())) { - if (ComponentType.SIMPLE.equals(componentType)) + if (ComponentType.SIMPLE.equals(componentType) || ComponentType.ENTERPRISE.equals(componentType)) { name = Strings.decapitalize(type.getSimpleName()); } Modified: ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/injectable/MethodMetaModel.java =================================================================== --- ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/injectable/MethodMetaModel.java 2008-07-03 13:02:30 UTC (rev 38) +++ ri/trunk/webbeans-impl/src/main/java/org/jboss/webbeans/injectable/MethodMetaModel.java 2008-07-03 15:16:06 UTC (rev 39) @@ -28,4 +28,10 @@ } } + public Method getMethod() + { + return method; + } + + } Modified: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/ComponentMetaModelTest.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/ComponentMetaModelTest.java 2008-07-03 13:02:30 UTC (rev 38) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/ComponentMetaModelTest.java 2008-07-03 15:16:06 UTC (rev 39) @@ -45,20 +45,30 @@ import org.jboss.webbeans.test.bindings.RiverFishStereotypeBinding; import org.jboss.webbeans.test.bindings.SynchronousBinding; import org.jboss.webbeans.test.components.Antelope; +import org.jboss.webbeans.test.components.Bear; import org.jboss.webbeans.test.components.Carp; import org.jboss.webbeans.test.components.Cat; import org.jboss.webbeans.test.components.Chair; +import org.jboss.webbeans.test.components.Cheetah; import org.jboss.webbeans.test.components.ComponentWithTooManyDeploymentTypes; import org.jboss.webbeans.test.components.ComponentWithTooManyScopeTypes; +import org.jboss.webbeans.test.components.Cougar; import org.jboss.webbeans.test.components.Cow; +import org.jboss.webbeans.test.components.Elephant; +import org.jboss.webbeans.test.components.Giraffe; import org.jboss.webbeans.test.components.Goldfish; import org.jboss.webbeans.test.components.Gorilla; import org.jboss.webbeans.test.components.Haddock; import org.jboss.webbeans.test.components.Horse; +import org.jboss.webbeans.test.components.Leopard; +import org.jboss.webbeans.test.components.Lion; import org.jboss.webbeans.test.components.Moose; import org.jboss.webbeans.test.components.Order; +import org.jboss.webbeans.test.components.Panther; import org.jboss.webbeans.test.components.Pig; +import org.jboss.webbeans.test.components.Puma; import org.jboss.webbeans.test.components.SeaBass; +import org.jboss.webbeans.test.components.Tiger; import org.jboss.webbeans.test.components.Tuna; import org.jboss.webbeans.test.mock.MockContainerImpl; import org.jboss.webbeans.util.AnnotatedItem; @@ -566,4 +576,152 @@ } } + @SuppressWarnings("unchecked") + @Test + public void testStateless() + { + ComponentMetaModel<Lion> lion = new ComponentMetaModel<Lion>(new ClassAnnotatedItem(Lion.class), emptyAnnotatedItem, container); + assert lion.getComponentType().equals(ComponentType.ENTERPRISE); + assert lion.getScopeType().annotationType().equals(Dependent.class); + annotationSetMatches(lion.getBindingTypes(), Current.class); + assert lion.getName().equals("lion"); + } + + @SuppressWarnings("unchecked") + @Test + public void testStatelessDefinedInXml() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + AnnotatedItem annotatedItem = new MutableAnnotatedItem(Giraffe.class, annotations); + + ComponentMetaModel<Giraffe> giraffe = new ComponentMetaModel<Giraffe>(new ClassAnnotatedItem(Giraffe.class), annotatedItem, container); + assert giraffe.getComponentType().equals(ComponentType.ENTERPRISE); + assert giraffe.getScopeType().annotationType().equals(Dependent.class); + annotationSetMatches(giraffe.getBindingTypes(), Current.class); + } + + @Test + public void testStatelessWithRequestScope() + { + boolean exception = false; + try + { + new ComponentMetaModel<Bear>(new ClassAnnotatedItem(Bear.class), emptyAnnotatedItem, container); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + // TODO Need EJB3.1 @Test + public void testSingleton() + { + //ComponentMetaModel<Lion> lion = new ComponentMetaModel<Lion>(new ClassAnnotatedItem(Lion.class), emptyAnnotatedItem, container); + //assert lion.getComponentType().equals(ComponentType.ENTERPRISE); + //assert lion.getScopeType().annotationType().equals(ApplicationScoped.class); + } + + // TODO Need EJB3.1 @Test + public void testSingletonWithRequestScope() + { + //ComponentMetaModel<Lion> lion = new ComponentMetaModel<Lion>(new ClassAnnotatedItem(Lion.class), emptyAnnotatedItem, container); + //assert lion.getComponentType().equals(ComponentType.ENTERPRISE); + //assert lion.getScopeType().annotationType().equals(ApplicationScoped.class); + } + + @SuppressWarnings("unchecked") + @Test + public void testStateful() + { + + ComponentMetaModel<Tiger> tiger = new ComponentMetaModel<Tiger>(new ClassAnnotatedItem(Tiger.class), emptyAnnotatedItem, container); + assert tiger.getComponentType().equals(ComponentType.ENTERPRISE); + annotationSetMatches(tiger.getBindingTypes(), Synchronous.class); + assert tiger.getRemoveMethod().getMethod().getName().equals("remove"); + assert tiger.getName() == null; + } + + @SuppressWarnings("unchecked") + @Test + public void testMultipleRemoveMethodsWithDestroys() + { + + ComponentMetaModel<Elephant> elephant = new ComponentMetaModel<Elephant>(new ClassAnnotatedItem(Elephant.class), emptyAnnotatedItem, container); + assert elephant.getComponentType().equals(ComponentType.ENTERPRISE); + assert elephant.getRemoveMethod().getMethod().getName().equals("remove2"); + } + + @SuppressWarnings("unchecked") + @Test + public void testMultipleRemoveMethodsWithoutDestroys() + { + boolean exception = false; + try + { + new ComponentMetaModel<Puma>(new ClassAnnotatedItem(Puma.class), emptyAnnotatedItem, container); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @SuppressWarnings("unchecked") + @Test + public void testMultipleRemoveMethodsWithMultipleDestroys() + { + boolean exception = false; + try + { + new ComponentMetaModel<Cougar>(new ClassAnnotatedItem(Cougar.class), emptyAnnotatedItem, container); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @SuppressWarnings("unchecked") + @Test + public void testNonStatefulEnterpriseComponentWithDestroys() + { + boolean exception = false; + try + { + new ComponentMetaModel<Cheetah>(new ClassAnnotatedItem(Cheetah.class), emptyAnnotatedItem, container); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @Test + public void testRemoveMethodWithDefaultBinding() + { + + ComponentMetaModel<Panther> panther = new ComponentMetaModel<Panther>(new ClassAnnotatedItem(Panther.class), emptyAnnotatedItem, container); + assert panther.getComponentType().equals(ComponentType.ENTERPRISE); + assert panther.getRemoveMethod().getMethod().getName().equals("remove"); + assert panther.getRemoveMethod().getParameters().size() == 1; + assert panther.getRemoveMethod().getParameters().get(0).getType().equals(String.class); + assert panther.getRemoveMethod().getParameters().get(0).getBindingTypes().length == 1; + assert panther.getRemoveMethod().getParameters().get(0).getBindingTypes()[0].annotationType().equals(Current.class); + } + + @SuppressWarnings("unchecked") + @Test + public void testMessageDriven() + { + ComponentMetaModel<Leopard> leopard = new ComponentMetaModel<Leopard>(new ClassAnnotatedItem(Leopard.class), emptyAnnotatedItem, container); + assert leopard.getComponentType().equals(ComponentType.ENTERPRISE); + annotationSetMatches(leopard.getBindingTypes(), Current.class); + } + + } Modified: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/ConstructorMetaModelTest.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/ConstructorMetaModelTest.java 2008-07-03 13:02:30 UTC (rev 38) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/ConstructorMetaModelTest.java 2008-07-03 15:16:06 UTC (rev 39) @@ -1,19 +1,14 @@ package org.jboss.webbeans.test; import java.lang.annotation.Annotation; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import javax.webbeans.Current; import org.jboss.webbeans.ComponentMetaModel; import org.jboss.webbeans.ContainerImpl; -import org.jboss.webbeans.bindings.StandardBinding; import org.jboss.webbeans.injectable.ConstructorMetaModel; import org.jboss.webbeans.test.annotations.Synchronous; -import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeBinding; -import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeBinding; import org.jboss.webbeans.test.components.Chicken; import org.jboss.webbeans.test.components.Donkey; import org.jboss.webbeans.test.components.Duck; Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,36 @@ +package org.jboss.webbeans.test; + +import org.jboss.webbeans.ejb.EjbMetaData; +import org.jboss.webbeans.test.components.Leopard; +import org.jboss.webbeans.test.components.Lion; +import org.jboss.webbeans.test.components.Tiger; +import org.junit.Test; + +public class EjbMetaDataTest +{ + + @Test + public void testStateless() + { + EjbMetaData<Lion> lion = new EjbMetaData<Lion>(Lion.class); + assert lion.isStateless(); + assert lion.getRemoveMethods() == null; + } + + @Test + public void testStateful() + { + EjbMetaData<Tiger> tiger = new EjbMetaData<Tiger>(Tiger.class); + assert tiger.isStateful(); + assert tiger.getRemoveMethods().size() == 1; + } + + @Test + public void testMessageDriven() + { + EjbMetaData<Leopard> leopard = new EjbMetaData<Leopard>(Leopard.class); + assert leopard.isMessageDriven(); + assert leopard.getRemoveMethods() == null; + } + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Bear.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Bear.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Bear.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Stateless; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +@Stateless +public class Bear +{ + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Bear.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cheetah.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cheetah.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cheetah.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Remove; +import javax.webbeans.Destroys; +import javax.webbeans.Production; + +@Production +public class Cheetah +{ + + @Remove @Destroys + public void remove() + { + + } + + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cheetah.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cougar.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cougar.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cougar.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,31 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Destroys; +import javax.webbeans.Production; + +@Production +@Stateful +public class Cougar +{ + + @Remove + public void remove() + { + + } + + @Remove @Destroys + public void remove1() + { + + } + + @Remove @Destroys + public void remove2() + { + + } + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Cougar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Elephant.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Elephant.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Elephant.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,25 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Destroys; +import javax.webbeans.Production; + +@Production +@Stateful +public class Elephant +{ + + @Remove + public void remove1() + { + + } + + @Remove @Destroys + public void remove2() + { + + } + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Elephant.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Giraffe.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Giraffe.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Giraffe.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Stateless; + +@Stateless +public class Giraffe +{ + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Giraffe.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Leopard.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Leopard.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Leopard.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.MessageDriven; +import javax.webbeans.Production; + +@Production +@MessageDriven +public class Leopard +{ + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Leopard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Lion.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Lion.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Lion.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Stateless; +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Stateless +@Named +public class Lion +{ + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Lion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Panther.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Panther.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Panther.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Production; + +@Production +@Stateful +public class Panther +{ + + @Remove + public void remove(String foo) + { + + } + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Panther.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Puma.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Puma.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Puma.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Stateful; +import javax.webbeans.Production; + +@Stateful +@Production +public class Puma +{ + + public void remove1() + { + + } + + public void remove2() + { + + } + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Puma.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Tiger.java =================================================================== --- ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Tiger.java (rev 0) +++ ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Tiger.java 2008-07-03 15:16:06 UTC (rev 39) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.test.components; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Synchronous; + +@Production +@Stateful +@Synchronous +public class Tiger +{ + + @Remove + public void remove() + { + + } + +} Property changes on: ri/trunk/webbeans-impl/src/test/java/org/jboss/webbeans/test/components/Tiger.java ___________________________________________________________________ Name: svn:mime-type + text/plain