[webbeans-commits] Webbeans SVN: r152 - in ri/trunk/webbeans-ri: src/test/java/org/jboss/webbeans/test and 5 other directories.

Author: pete.muir(a)jboss.org Date: 2008-10-25 15:29:44 -0400 (Sat, 25 Oct 2008) New Revision: 152 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanModelTest.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 ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.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 ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cougar.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goat.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goose.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Gorilla.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithFinalProducerMethod.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithStaticProducerMethod.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithTooManyDeploymentTypes.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Carp.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pig.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/PlaiceFarm.java Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ComponentDeploymentTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentLifecycleTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Carp.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithFinalProducerMethod.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithStaticProducerMethod.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithTooManyDeploymentTypes.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterComponent.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pig.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Animal.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Antelope.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Bear.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/BlackWidow.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cat.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chair.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chicken.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cod.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ComponentWithTooManyScopeTypes.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cow.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DaddyLongLegs.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DangerCall.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlyAnimal.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlySpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DefangedTarantula.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Donkey.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Duck.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Giraffe.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goat.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goldfish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goose.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Gorilla.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Haddock.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Horse.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/LadybirdSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Leopard.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Lion.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Moose.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Order.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Panther.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Plaice.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Puma.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Salmon.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFish.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFishFarmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SeaBass.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sheep.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sole.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Spider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SpiderProducer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tarantula.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tiger.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TrapdoorSpider.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tuna.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Turkey.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/ Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContextTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.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/NameBasedResolutionTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypeModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeSafeResolutionTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalOrderStereotype.java 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/FishStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MammalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RequestScopedAnimalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RiverFishStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockObserverImpl.java ri/trunk/webbeans-ri/testng.xml Log: Replace all instances of component with bean Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ComponentDeploymentTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,108 @@ +package org.jboss.webbeans.test; + +import org.testng.annotations.Test; + +@SpecVersion("20080605") +public class BeanDeploymentTest +{ + + + @Test(groups="specialization") @SpecAssertion(section="3.1.4") + public void testOnlySpecializedSimpleBeanDeployed() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.1.4") + public void testSpecializedSimpleBeanExtends() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.1.4") + public void testSpecializedSimpleBeanHasSameBindingAnnotations() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.1.4") + public void testSpecializedSimpleBeanHasSameName() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.2.4") + public void testOnlySpecializedEnterpriseBeanDeployed() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.2.4") + public void testSpecializedEnterpriseBeanExtends() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.2.4") + public void testSpecializedEnterpriseBeanHasSameBindingAnnotations() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.2.4") + public void testSpecializedEnterpriseBeanHasSameName() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.2.4") + public void testSpecializedEnterpriseBeanAllLocalInterfaces() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.2.4") + public void testSpecializedEnterpriseBeanSupportsBeanClassLocalView() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.3.3") + public void testOnlySpecializedProducerMethodBeanDeployed() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.3.3") + public void testSpecializedProducerMethodBeanDirectlyOverrides() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.3.3") + public void testSpecializedProducerMethodBeanHasSameBindingAnnotations() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.3.3") + public void testSpecializedProducerMethodBeanHasSameName() + { + // TODO Placeholder + assert false; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BeanDeploymentTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -14,10 +14,10 @@ import org.jboss.webbeans.model.bean.SimpleBeanModel; import org.jboss.webbeans.test.annotations.Asynchronous; import org.jboss.webbeans.test.annotations.Synchronous; +import org.jboss.webbeans.test.beans.Antelope; +import org.jboss.webbeans.test.beans.Cat; +import org.jboss.webbeans.test.beans.Order; import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral; -import org.jboss.webbeans.test.components.Antelope; -import org.jboss.webbeans.test.components.Cat; -import org.jboss.webbeans.test.components.Order; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -10,8 +10,8 @@ import org.jboss.webbeans.introspector.AnnotatedType; import org.jboss.webbeans.introspector.SimpleAnnotatedType; -import org.jboss.webbeans.test.components.Antelope; -import org.jboss.webbeans.test.components.Order; +import org.jboss.webbeans.test.beans.Antelope; +import org.jboss.webbeans.test.beans.Order; import org.testng.annotations.Test; public class ClassAnnotatedItemTest Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ComponentDeploymentTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ComponentDeploymentTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ComponentDeploymentTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,108 +0,0 @@ -package org.jboss.webbeans.test; - -import org.testng.annotations.Test; - -@SpecVersion("20080605") -public class ComponentDeploymentTest -{ - - - @Test(groups="specialization") @SpecAssertion(section="3.1.4") - public void testOnlySpecializedSimpleComponentDeployed() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.1.4") - public void testSpecializedSimpleComponentExtends() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.1.4") - public void testSpecializedSimpleComponentHasSameBindingAnnotations() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.1.4") - public void testSpecializedSimpleComponentHasSameName() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.2.4") - public void testOnlySpecializedEnterpriseComponentDeployed() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.2.4") - public void testSpecializedEnterpriseComponentExtends() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.2.4") - public void testSpecializedEnterpriseComponentHasSameBindingAnnotations() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.2.4") - public void testSpecializedEnterpriseComponentHasSameName() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.2.4") - public void testSpecializedEnterpriseComponentAllLocalInterfaces() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.2.4") - public void testSpecializedEnterpriseComponentSupportsBeanClassLocalView() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.3.3") - public void testOnlySpecializedProducerMethodComponentDeployed() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.3.3") - public void testSpecializedProducerMethodComponentDirectlyOverrides() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.3.3") - public void testSpecializedProducerMethodComponentHasSameBindingAnnotations() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.3.3") - public void testSpecializedProducerMethodComponentHasSameName() - { - // TODO Placeholder - assert false; - } - -} Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -8,14 +8,14 @@ import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.bean.SimpleBeanModel; import org.jboss.webbeans.test.annotations.Synchronous; -import org.jboss.webbeans.test.components.Chicken; -import org.jboss.webbeans.test.components.Donkey; -import org.jboss.webbeans.test.components.Duck; -import org.jboss.webbeans.test.components.Goat; -import org.jboss.webbeans.test.components.Goose; -import org.jboss.webbeans.test.components.Order; -import org.jboss.webbeans.test.components.Sheep; -import org.jboss.webbeans.test.components.Turkey; +import org.jboss.webbeans.test.beans.Chicken; +import org.jboss.webbeans.test.beans.Donkey; +import org.jboss.webbeans.test.beans.Duck; +import org.jboss.webbeans.test.beans.Goat; +import org.jboss.webbeans.test.beans.Goose; +import org.jboss.webbeans.test.beans.Order; +import org.jboss.webbeans.test.beans.Sheep; +import org.jboss.webbeans.test.beans.Turkey; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContextTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContextTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContextTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -9,7 +9,7 @@ import org.jboss.webbeans.BeanImpl; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.bean.SimpleBeanModel; -import org.jboss.webbeans.test.components.Tuna; +import org.jboss.webbeans.test.beans.Tuna; import org.jboss.webbeans.test.util.Util; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -18,8 +18,8 @@ import org.jboss.webbeans.model.bean.SimpleBeanModel; import org.jboss.webbeans.test.annotations.AnotherDeploymentType; import org.jboss.webbeans.test.annotations.Asynchronous; +import org.jboss.webbeans.test.beans.Tuna; import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral; -import org.jboss.webbeans.test.components.Tuna; import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.test.mock.MockObserverImpl; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EjbMetaDataTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +1,9 @@ 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.jboss.webbeans.test.beans.Leopard; +import org.jboss.webbeans.test.beans.Lion; +import org.jboss.webbeans.test.beans.Tiger; import org.testng.annotations.Test; public class EjbMetaDataTest Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentLifecycleTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.test; + +import org.testng.annotations.Test; + +public class EnterpriseBeanLifecycleTest +{ + + @Test(groups="beanLifecycle") @SpecAssertion(section="3.2.3") + public void testInjectonOfParametersIntoRemoveMethod() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.2.4") + public void testSpecializedBeanAlwaysUsed() + { + // TODO Placeholder + assert false; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanLifecycleTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java (from rev 150, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,178 @@ +package org.jboss.webbeans.test; + +import static org.jboss.webbeans.test.util.Util.getEmptyAnnotatedItem; + +import java.lang.annotation.Annotation; +import java.util.HashMap; +import java.util.Map; + +import javax.webbeans.Current; +import javax.webbeans.Dependent; + +import org.jboss.webbeans.introspector.AnnotatedType; +import org.jboss.webbeans.introspector.SimpleAnnotatedType; +import org.jboss.webbeans.model.bean.AbstractEnterpriseBeanModel; +import org.jboss.webbeans.model.bean.EnterpriseBeanModel; +import org.jboss.webbeans.test.annotations.Synchronous; +import org.jboss.webbeans.test.beans.Bear; +import org.jboss.webbeans.test.beans.Cheetah; +import org.jboss.webbeans.test.beans.Cougar; +import org.jboss.webbeans.test.beans.Elephant; +import org.jboss.webbeans.test.beans.Giraffe; +import org.jboss.webbeans.test.beans.Leopard; +import org.jboss.webbeans.test.beans.Lion; +import org.jboss.webbeans.test.beans.Panther; +import org.jboss.webbeans.test.beans.Puma; +import org.jboss.webbeans.test.beans.Tiger; +import org.jboss.webbeans.util.Reflections; +import org.testng.annotations.Test; + +public class EnterpriseBeanModelTest extends AbstractTest +{ + + @Test @SpecAssertion(section="2.7.2") + public void testSingleStereotype() + { + assert false; + } + + @SuppressWarnings("unchecked") + @Test + public void testStateless() + { + EnterpriseBeanModel<Lion> lion = new EnterpriseBeanModel<Lion>(new SimpleAnnotatedType<Lion>(Lion.class), getEmptyAnnotatedItem(Lion.class), manager); + assert lion.getScopeType().equals(Dependent.class); + Reflections.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>(); + AnnotatedType annotatedItem = new SimpleAnnotatedType(Giraffe.class, annotations); + + EnterpriseBeanModel<Giraffe> giraffe = new EnterpriseBeanModel<Giraffe>(new SimpleAnnotatedType(Giraffe.class), annotatedItem, manager); + assert giraffe.getScopeType().equals(Dependent.class); + Reflections.annotationSetMatches(giraffe.getBindingTypes(), Current.class); + } + + @Test + public void testStatelessWithRequestScope() + { + boolean exception = false; + try + { + new EnterpriseBeanModel<Bear>(new SimpleAnnotatedType<Bear>(Bear.class), getEmptyAnnotatedItem(Bear.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @Test(groups="ejb3") + public void testSingleton() + { + assert false; + } + + @Test(groups="ejb3") + public void testSingletonWithRequestScope() + { + assert false; + } + + @SuppressWarnings("unchecked") + @Test + public void testStateful() + { + + AbstractEnterpriseBeanModel<Tiger> tiger = new EnterpriseBeanModel<Tiger>(new SimpleAnnotatedType(Tiger.class), getEmptyAnnotatedItem(Tiger.class), manager); + Reflections.annotationSetMatches(tiger.getBindingTypes(), Synchronous.class); + assert tiger.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("remove"); + assert tiger.getName() == null; + } + + @SuppressWarnings("unchecked") + @Test + public void testMultipleRemoveMethodsWithDestroys() + { + + AbstractEnterpriseBeanModel<Elephant> elephant = new EnterpriseBeanModel<Elephant>(new SimpleAnnotatedType(Elephant.class), getEmptyAnnotatedItem(Elephant.class), manager); + assert elephant.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("remove2"); + } + + @SuppressWarnings("unchecked") + @Test + public void testMultipleRemoveMethodsWithoutDestroys() + { + boolean exception = false; + try + { + new EnterpriseBeanModel<Puma>(new SimpleAnnotatedType(Puma.class), getEmptyAnnotatedItem(Puma.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @SuppressWarnings("unchecked") + @Test + public void testMultipleRemoveMethodsWithMultipleDestroys() + { + boolean exception = false; + try + { + new EnterpriseBeanModel<Cougar>(new SimpleAnnotatedType(Cougar.class), getEmptyAnnotatedItem(Cougar.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @SuppressWarnings("unchecked") + @Test + public void testNonStatefulEnterpriseBeanWithDestroys() + { + boolean exception = false; + try + { + new EnterpriseBeanModel<Cheetah>(new SimpleAnnotatedType(Cheetah.class), getEmptyAnnotatedItem(Cheetah.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @SuppressWarnings("unchecked") + @Test + public void testRemoveMethodWithDefaultBinding() + { + + AbstractEnterpriseBeanModel<Panther> panther = new EnterpriseBeanModel<Panther>(new SimpleAnnotatedType<Panther>(Panther.class), getEmptyAnnotatedItem(Panther.class), manager); + + assert panther.getRemoveMethod().getAnnotatedItem().getDelegate().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().size() == 1; + assert Reflections.annotationSetMatches(panther.getRemoveMethod().getParameters().get(0).getBindingTypes(), Current.class); + } + + @SuppressWarnings("unchecked") + @Test + public void testMessageDriven() + { + AbstractEnterpriseBeanModel<Leopard> leopard = new EnterpriseBeanModel<Leopard>(new SimpleAnnotatedType(Leopard.class), getEmptyAnnotatedItem(Leopard.class), manager); + Reflections.annotationSetMatches(leopard.getBindingTypes(), Current.class); + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentLifecycleTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentLifecycleTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test; - -import org.testng.annotations.Test; - -public class EnterpriseComponentLifecycleTest -{ - - @Test(groups="componentLifecycle") @SpecAssertion(section="3.2.3") - public void testInjectonOfParametersIntoRemoveMethod() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.2.4") - public void testSpecializedComponentAlwaysUsed() - { - // TODO Placeholder - assert false; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,182 +0,0 @@ -package org.jboss.webbeans.test; - -import static org.jboss.webbeans.test.util.Util.getEmptyAnnotatedItem; - -import java.lang.annotation.Annotation; -import java.util.HashMap; -import java.util.Map; - -import javax.webbeans.Current; -import javax.webbeans.Dependent; - -import org.jboss.webbeans.introspector.AnnotatedType; -import org.jboss.webbeans.introspector.SimpleAnnotatedType; -import org.jboss.webbeans.model.bean.AbstractEnterpriseBeanModel; -import org.jboss.webbeans.model.bean.EnterpriseBeanModel; -import org.jboss.webbeans.test.annotations.Synchronous; -import org.jboss.webbeans.test.components.Bear; -import org.jboss.webbeans.test.components.Cheetah; -import org.jboss.webbeans.test.components.Cougar; -import org.jboss.webbeans.test.components.Elephant; -import org.jboss.webbeans.test.components.Giraffe; -import org.jboss.webbeans.test.components.Leopard; -import org.jboss.webbeans.test.components.Lion; -import org.jboss.webbeans.test.components.Panther; -import org.jboss.webbeans.test.components.Puma; -import org.jboss.webbeans.test.components.Tiger; -import org.jboss.webbeans.util.Reflections; -import org.testng.annotations.Test; - -public class EnterpriseComponentModelTest extends AbstractTest -{ - - @Test @SpecAssertion(section="2.7.2") - public void testSingleStereotype() - { - assert false; - } - - @SuppressWarnings("unchecked") - @Test - public void testStateless() - { - EnterpriseBeanModel<Lion> lion = new EnterpriseBeanModel<Lion>(new SimpleAnnotatedType<Lion>(Lion.class), getEmptyAnnotatedItem(Lion.class), manager); - assert lion.getScopeType().equals(Dependent.class); - Reflections.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>(); - AnnotatedType annotatedItem = new SimpleAnnotatedType(Giraffe.class, annotations); - - EnterpriseBeanModel<Giraffe> giraffe = new EnterpriseBeanModel<Giraffe>(new SimpleAnnotatedType(Giraffe.class), annotatedItem, manager); - assert giraffe.getScopeType().equals(Dependent.class); - Reflections.annotationSetMatches(giraffe.getBindingTypes(), Current.class); - } - - @Test - public void testStatelessWithRequestScope() - { - boolean exception = false; - try - { - new EnterpriseBeanModel<Bear>(new SimpleAnnotatedType<Bear>(Bear.class), getEmptyAnnotatedItem(Bear.class), manager); - } - 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), getEmptyAnnotatedItem(), manager); - //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), getEmptyAnnotatedItem(), manager); - //assert lion.getComponentType().equals(ComponentType.ENTERPRISE); - //assert lion.getScopeType().annotationType().equals(ApplicationScoped.class); - } - - @SuppressWarnings("unchecked") - @Test - public void testStateful() - { - - AbstractEnterpriseBeanModel<Tiger> tiger = new EnterpriseBeanModel<Tiger>(new SimpleAnnotatedType(Tiger.class), getEmptyAnnotatedItem(Tiger.class), manager); - Reflections.annotationSetMatches(tiger.getBindingTypes(), Synchronous.class); - assert tiger.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("remove"); - assert tiger.getName() == null; - } - - @SuppressWarnings("unchecked") - @Test - public void testMultipleRemoveMethodsWithDestroys() - { - - AbstractEnterpriseBeanModel<Elephant> elephant = new EnterpriseBeanModel<Elephant>(new SimpleAnnotatedType(Elephant.class), getEmptyAnnotatedItem(Elephant.class), manager); - assert elephant.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("remove2"); - } - - @SuppressWarnings("unchecked") - @Test - public void testMultipleRemoveMethodsWithoutDestroys() - { - boolean exception = false; - try - { - new EnterpriseBeanModel<Puma>(new SimpleAnnotatedType(Puma.class), getEmptyAnnotatedItem(Puma.class), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - } - - @SuppressWarnings("unchecked") - @Test - public void testMultipleRemoveMethodsWithMultipleDestroys() - { - boolean exception = false; - try - { - new EnterpriseBeanModel<Cougar>(new SimpleAnnotatedType(Cougar.class), getEmptyAnnotatedItem(Cougar.class), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - } - - @SuppressWarnings("unchecked") - @Test - public void testNonStatefulEnterpriseComponentWithDestroys() - { - boolean exception = false; - try - { - new EnterpriseBeanModel<Cheetah>(new SimpleAnnotatedType(Cheetah.class), getEmptyAnnotatedItem(Cheetah.class), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - } - - @SuppressWarnings("unchecked") - @Test - public void testRemoveMethodWithDefaultBinding() - { - - AbstractEnterpriseBeanModel<Panther> panther = new EnterpriseBeanModel<Panther>(new SimpleAnnotatedType<Panther>(Panther.class), getEmptyAnnotatedItem(Panther.class), manager); - - assert panther.getRemoveMethod().getAnnotatedItem().getDelegate().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().size() == 1; - assert Reflections.annotationSetMatches(panther.getRemoveMethod().getParameters().get(0).getBindingTypes(), Current.class); - } - - @SuppressWarnings("unchecked") - @Test - public void testMessageDriven() - { - AbstractEnterpriseBeanModel<Leopard> leopard = new EnterpriseBeanModel<Leopard>(new SimpleAnnotatedType(Leopard.class), getEmptyAnnotatedItem(Leopard.class), manager); - Reflections.annotationSetMatches(leopard.getBindingTypes(), Current.class); - } - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java (from rev 150, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,97 @@ +package org.jboss.webbeans.test; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import javax.webbeans.Dependent; +import javax.webbeans.Event; +import javax.webbeans.Standard; + +import org.jboss.webbeans.event.EventImpl; +import org.jboss.webbeans.injectable.BeanConstructor; +import org.jboss.webbeans.introspector.SimpleAnnotatedField; +import org.jboss.webbeans.model.bean.EventBeanModel; +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; +import org.jboss.webbeans.test.beans.DangerCall; +import org.jboss.webbeans.test.mock.MockManagerImpl; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Unit tests for the bean model used only for the container supplied + * Event bean. + * + * @author David Allen + * + */ +public class EventBeanModelTest +{ + private MockManagerImpl manager = null; + private EventBeanModel<EventImpl<DangerCall>> eventBeanModel = null; + EventImpl<DangerCall> eventModelField = null; + + @BeforeMethod + public void before() throws Exception + { + List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + enabledDeploymentTypes.add(Standard.class); + enabledDeploymentTypes.add(AnotherDeploymentType.class); + manager = new MockManagerImpl(enabledDeploymentTypes); + Field eventModelField = this.getClass().getDeclaredField("eventModelField"); + eventBeanModel = new EventBeanModel<EventImpl<DangerCall>>( + new SimpleAnnotatedField<EventImpl<DangerCall>>(eventModelField), + new SimpleAnnotatedField<EventImpl<DangerCall>>(eventModelField), + manager); + + } + + /** + * The name should always be null since this type of bean is not allowed to have a name. + */ + @Test(groups = "eventbus") + public void testName() + { + assert eventBeanModel.getName() == null; + } + + /** + * The scope type should always be @Dependent + */ + @Test(groups = "eventbus") + public void testScopeType() + { + assert eventBeanModel.getScopeType().equals(Dependent.class); + } + + /** + * The deployment type should always be @Standard + */ + @Test(groups = "eventbus") + public void testDeploymentType() + { + assert eventBeanModel.getDeploymentType().equals(Standard.class); + } + + @Test(groups = "eventbus") + public void testApiTypes() + { + Set<Class<?>> apis = eventBeanModel.getApiTypes(); + assert apis.size() >= 1; + for (Class<?> api : apis) + { + api.equals(Event.class); + } + } + + @Test(groups = "eventbus") + public void testConstructor() + { + BeanConstructor<EventImpl<DangerCall>> constructor = eventBeanModel.getConstructor(); + assert constructor != null; + Event<DangerCall> event = constructor.invoke(manager); + assert event != null; + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,97 +0,0 @@ -package org.jboss.webbeans.test; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import javax.webbeans.Dependent; -import javax.webbeans.Event; -import javax.webbeans.Standard; - -import org.jboss.webbeans.event.EventImpl; -import org.jboss.webbeans.injectable.BeanConstructor; -import org.jboss.webbeans.introspector.SimpleAnnotatedField; -import org.jboss.webbeans.model.bean.EventBeanModel; -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.test.components.DangerCall; -import org.jboss.webbeans.test.mock.MockManagerImpl; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -/** - * Unit tests for the component model used only for the container supplied - * Event component. - * - * @author David Allen - * - */ -public class EventComponentModelTest -{ - private MockManagerImpl manager = null; - private EventBeanModel<EventImpl<DangerCall>> eventBeanModel = null; - EventImpl<DangerCall> eventModelField = null; - - @BeforeMethod - public void before() throws Exception - { - List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); - enabledDeploymentTypes.add(Standard.class); - enabledDeploymentTypes.add(AnotherDeploymentType.class); - manager = new MockManagerImpl(enabledDeploymentTypes); - Field eventModelField = this.getClass().getDeclaredField("eventModelField"); - eventBeanModel = new EventBeanModel<EventImpl<DangerCall>>( - new SimpleAnnotatedField<EventImpl<DangerCall>>(eventModelField), - new SimpleAnnotatedField<EventImpl<DangerCall>>(eventModelField), - manager); - - } - - /** - * The name should always be null since this type of component is not allowed to have a name. - */ - @Test(groups = "eventbus") - public void testName() - { - assert eventBeanModel.getName() == null; - } - - /** - * The scope type should always be @Dependent - */ - @Test(groups = "eventbus") - public void testScopeType() - { - assert eventBeanModel.getScopeType().equals(Dependent.class); - } - - /** - * The deployment type should always be @Standard - */ - @Test(groups = "eventbus") - public void testDeploymentType() - { - assert eventBeanModel.getDeploymentType().equals(Standard.class); - } - - @Test(groups = "eventbus") - public void testApiTypes() - { - Set<Class<?>> apis = eventBeanModel.getApiTypes(); - assert apis.size() >= 1; - for (Class<?> api : apis) - { - api.equals(Event.class); - } - } - - @Test(groups = "eventbus") - public void testConstructor() - { - BeanConstructor<EventImpl<DangerCall>> constructor = eventBeanModel.getConstructor(); - assert constructor != null; - Event<DangerCall> event = constructor.invoke(manager); - assert event != null; - } -} Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -13,18 +13,18 @@ import org.jboss.webbeans.test.annotations.AnotherDeploymentType; import org.jboss.webbeans.test.annotations.Synchronous; import org.jboss.webbeans.test.annotations.Tame; +import org.jboss.webbeans.test.beans.DangerCall; import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; import org.jboss.webbeans.test.bindings.TameAnnotationLiteral; -import org.jboss.webbeans.test.components.DangerCall; import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; /** - * Tests for the implementation of an Event component. + * Tests for the implementation of an Event bean * * @author David Allen * @@ -55,10 +55,10 @@ // Create a test annotation for the event and use it to construct the // event object Annotation[] annotations = new Annotation[] { new AnimalStereotypeAnnotationLiteral() }; - EventImpl<DangerCall> eventComponent = new EventImpl<DangerCall>(); - eventComponent.setEventBindings(annotations); - eventComponent.setManager(manager); - eventComponent.fire(anEvent, new TameAnnotationLiteral(), + EventImpl<DangerCall> eventBean = new EventImpl<DangerCall>(); + eventBean.setEventBindings(annotations); + eventBean.setManager(manager); + eventBean.fire(anEvent, new TameAnnotationLiteral(), new SynchronousAnnotationLiteral()); assert anEvent.equals(manager.getEvent()); assert Reflections.annotationSetMatches(manager.getEventBindings(), @@ -69,7 +69,7 @@ boolean duplicateDetected = false; try { - eventComponent.fire(anEvent, new TameAnnotationLiteral(), + eventBean.fire(anEvent, new TameAnnotationLiteral(), new TameAnnotationLiteral()); } catch (DuplicateBindingTypeException e) { @@ -81,7 +81,7 @@ boolean nonBindingTypeDetected = false; try { - eventComponent.fire(anEvent, new FishStereotypeAnnotationLiteral()); + eventBean.fire(anEvent, new FishStereotypeAnnotationLiteral()); } catch (IllegalArgumentException e) { 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-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByNameTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -11,11 +11,11 @@ import org.jboss.webbeans.injectable.InjectableField; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.bean.SimpleBeanModel; -import org.jboss.webbeans.test.components.Cod; -import org.jboss.webbeans.test.components.FishFarm; -import org.jboss.webbeans.test.components.Salmon; -import org.jboss.webbeans.test.components.ScottishFish; -import org.jboss.webbeans.test.components.Sole; +import org.jboss.webbeans.test.beans.Cod; +import org.jboss.webbeans.test.beans.FishFarm; +import org.jboss.webbeans.test.beans.Salmon; +import org.jboss.webbeans.test.beans.ScottishFish; +import org.jboss.webbeans.test.beans.Sole; import org.testng.annotations.Test; public class InstantiationByNameTest extends AbstractTest 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-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InstantiationByTypeTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -15,14 +15,14 @@ import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.bean.SimpleBeanModel; import org.jboss.webbeans.test.annotations.Whitefish; -import org.jboss.webbeans.test.components.Cod; -import org.jboss.webbeans.test.components.FishFarm; -import org.jboss.webbeans.test.components.Plaice; -import org.jboss.webbeans.test.components.Salmon; -import org.jboss.webbeans.test.components.ScottishFish; -import org.jboss.webbeans.test.components.Sole; -import org.jboss.webbeans.test.components.Tuna; -import org.jboss.webbeans.test.components.broken.PlaiceFarm; +import org.jboss.webbeans.test.beans.Cod; +import org.jboss.webbeans.test.beans.FishFarm; +import org.jboss.webbeans.test.beans.Plaice; +import org.jboss.webbeans.test.beans.Salmon; +import org.jboss.webbeans.test.beans.ScottishFish; +import org.jboss.webbeans.test.beans.Sole; +import org.jboss.webbeans.test.beans.Tuna; +import org.jboss.webbeans.test.beans.broken.PlaiceFarm; import org.testng.annotations.Test; public class InstantiationByTypeTest extends AbstractTest Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameBasedResolutionTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameBasedResolutionTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameBasedResolutionTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -7,13 +7,13 @@ import org.jboss.webbeans.BeanImpl; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.bean.SimpleBeanModel; -import org.jboss.webbeans.test.components.Cod; -import org.jboss.webbeans.test.components.Haddock; -import org.jboss.webbeans.test.components.Plaice; -import org.jboss.webbeans.test.components.Salmon; -import org.jboss.webbeans.test.components.SeaBass; -import org.jboss.webbeans.test.components.Sole; -import org.jboss.webbeans.test.components.Tuna; +import org.jboss.webbeans.test.beans.Cod; +import org.jboss.webbeans.test.beans.Haddock; +import org.jboss.webbeans.test.beans.Plaice; +import org.jboss.webbeans.test.beans.Salmon; +import org.jboss.webbeans.test.beans.SeaBass; +import org.jboss.webbeans.test.beans.Sole; +import org.jboss.webbeans.test.beans.Tuna; import org.testng.annotations.Test; public class NameBasedResolutionTest extends AbstractTest { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -18,8 +18,8 @@ import org.jboss.webbeans.model.bean.SimpleBeanModel; import org.jboss.webbeans.test.annotations.AnotherDeploymentType; import org.jboss.webbeans.test.annotations.Asynchronous; +import org.jboss.webbeans.test.beans.Tuna; import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral; -import org.jboss.webbeans.test.components.Tuna; import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.test.mock.MockObserverImpl; import org.testng.annotations.BeforeMethod; Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanLifecycleTest.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentLifecycleTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanLifecycleTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,29 @@ +package org.jboss.webbeans.test; + +import org.testng.annotations.Test; + +public class ProducerExpressionBeanLifecycleTest +{ + + @Test(groups={"beanLifecycle", "producerExpression"}) @SpecAssertion(section="3.4") + public void testNonDependentProducerExpressionThatReturnsNull() + { + // TODO Placeholder + assert false; + } + + @Test(groups={"beanLifecycle", "producerExpression"}) @SpecAssertion(section="3.4") + public void testDependentProducerExpressionThatReturnsNull() + { + // TODO Placeholder + assert false; + } + + @Test(groups={"beanLifecycle", "producerExpression"}) @SpecAssertion(section="3.4") + public void testProducerExpressionHasValidRuntimeApiType() + { + // TODO Placeholder + assert false; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanLifecycleTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanModelTest.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanModelTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,33 @@ +package org.jboss.webbeans.test; + +import org.testng.annotations.Test; + +public class ProducerExpressionBeanModelTest extends AbstractTest +{ + + @Test(groups="producerExpression") @SpecAssertion(section="3.4") + public void testApiTypes() + { + assert false; + } + + @Test(groups="producerExpression") @SpecAssertion(section="3.4") + public void testFinalProducerExpression() + { + assert false; + } + + @Test(groups="producerExpression") @SpecAssertion(section="3.4") + public void testFinalDependentProducerExpression() + { + assert false; + } + + @Test(groups="producerExpression") @SpecAssertion(section="3.4.2") + public void testProducerExpressionCannotHaveDefaultName() + { + assert false; + } + + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionBeanModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentLifecycleTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentLifecycleTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,29 +0,0 @@ -package org.jboss.webbeans.test; - -import org.testng.annotations.Test; - -public class ProducerExpressionComponentLifecycleTest -{ - - @Test(groups={"componentLifecycle", "producerExpression"}) @SpecAssertion(section="3.4") - public void testNonDependentProducerExpressionThatReturnsNull() - { - // TODO Placeholder - assert false; - } - - @Test(groups={"componentLifecycle", "producerExpression"}) @SpecAssertion(section="3.4") - public void testDependentProducerExpressionThatReturnsNull() - { - // TODO Placeholder - assert false; - } - - @Test(groups={"componentLifecycle", "producerExpression"}) @SpecAssertion(section="3.4") - public void testProducerExpressionHasValidRuntimeApiType() - { - // TODO Placeholder - assert false; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,33 +0,0 @@ -package org.jboss.webbeans.test; - -import org.testng.annotations.Test; - -public class ProducerExpressionComponentModelTest extends AbstractTest -{ - - @Test(groups="producerExpression") @SpecAssertion(section="3.4") - public void testApiTypes() - { - assert false; - } - - @Test(groups="producerExpression") @SpecAssertion(section="3.4") - public void testFinalProducerExpression() - { - assert false; - } - - @Test(groups="producerExpression") @SpecAssertion(section="3.4") - public void testFinalDependentProducerExpression() - { - assert false; - } - - @Test(groups="producerExpression") @SpecAssertion(section="3.4.2") - public void testProducerExpressionCannotHaveDefaultName() - { - assert false; - } - - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentLifecycleTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,43 @@ +package org.jboss.webbeans.test; + +import org.testng.annotations.Test; + +public class ProducerMethodBeanLifecycleTest +{ + + @Test(groups="beanLifecycle") @SpecAssertion(section="3.3") + public void testNonDependentProducerMethodThatReturnsNull() + { + // TODO Placeholder + assert false; + } + + @Test(groups="beanLifecycle") @SpecAssertion(section="3.3") + public void testDependentProducerMethodThatReturnsNull() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.3.3") + public void testSpecializedBeanAlwaysUsed() + { + // TODO Placeholder + assert false; + } + + @Test(groups={"disposalMethod", "beanLifecycle"}) @SpecAssertion(section="3.3.4") + public void testDisposalMethodCalled() + { + // TODO Placeholder + assert false; + } + + @Test(groups={"disposalMethod", "beanLifecycle"}) @SpecAssertion(section="3.3.4") + public void testDisposalMethodHasParametersInjected() + { + // TODO Placeholder + assert false; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanLifecycleTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java (from rev 150, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,216 @@ +package org.jboss.webbeans.test; + +import static org.jboss.webbeans.test.util.Util.getEmptyAnnotatedItem; + +import java.lang.reflect.Method; + +import javax.webbeans.Current; +import javax.webbeans.Dependent; + +import org.jboss.webbeans.introspector.SimpleAnnotatedMethod; +import org.jboss.webbeans.introspector.SimpleAnnotatedType; +import org.jboss.webbeans.model.bean.ProducerMethodBeanModel; +import org.jboss.webbeans.model.bean.SimpleBeanModel; +import org.jboss.webbeans.test.annotations.Tame; +import org.jboss.webbeans.test.beans.Animal; +import org.jboss.webbeans.test.beans.BlackWidow; +import org.jboss.webbeans.test.beans.DaddyLongLegs; +import org.jboss.webbeans.test.beans.DeadlyAnimal; +import org.jboss.webbeans.test.beans.DeadlySpider; +import org.jboss.webbeans.test.beans.LadybirdSpider; +import org.jboss.webbeans.test.beans.Spider; +import org.jboss.webbeans.test.beans.SpiderProducer; +import org.jboss.webbeans.test.beans.Tarantula; +import org.jboss.webbeans.test.beans.TrapdoorSpider; +import org.jboss.webbeans.test.beans.broken.BeanWithFinalProducerMethod; +import org.jboss.webbeans.test.beans.broken.BeanWithStaticProducerMethod; +import org.testng.annotations.Test; + +public class ProducerMethodBeanModelTest extends AbstractTest +{ + + @Test @SpecAssertion(section="3.3") + public void testStaticMethod() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<BeanWithStaticProducerMethod> model = new SimpleBeanModel<BeanWithStaticProducerMethod>(new SimpleAnnotatedType<BeanWithStaticProducerMethod>(BeanWithStaticProducerMethod.class), getEmptyAnnotatedItem(BeanWithStaticProducerMethod.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = BeanWithStaticProducerMethod.class.getMethod("getString"); + boolean exception = false; + try + { + new ProducerMethodBeanModel<String>(new SimpleAnnotatedMethod<String>(method), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @Test @SpecAssertion(section="3.3") + public void testApiTypes() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = SpiderProducer.class.getMethod("produceTarantula"); + ProducerMethodBeanModel<Tarantula> tarantulaModel = new ProducerMethodBeanModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); + assert tarantulaModel.getApiTypes().contains(Tarantula.class); + assert tarantulaModel.getApiTypes().contains(DeadlySpider.class); + assert tarantulaModel.getApiTypes().contains(Spider.class); + assert tarantulaModel.getApiTypes().contains(Animal.class); + assert tarantulaModel.getApiTypes().contains(DeadlyAnimal.class); + assert !tarantulaModel.getApiTypes().contains(Object.class); + } + + @Test @SpecAssertion(section="3.3.1") + public void testDefaultBindingType() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = SpiderProducer.class.getMethod("produceTarantula"); + ProducerMethodBeanModel<Tarantula> tarantulaModel = new ProducerMethodBeanModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); + assert tarantulaModel.getBindingTypes().size() == 1; + assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class); + } + + @Test + public void testBindingType() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = SpiderProducer.class.getMethod("produceTameTarantula"); + ProducerMethodBeanModel<Tarantula> tarantulaModel = new ProducerMethodBeanModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); + assert tarantulaModel.getBindingTypes().size() == 1; + assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class); + } + + @Test @SpecAssertion(section="3.3") + public void testFinalMethod() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<BeanWithFinalProducerMethod> model = new SimpleBeanModel<BeanWithFinalProducerMethod>(new SimpleAnnotatedType<BeanWithFinalProducerMethod>(BeanWithFinalProducerMethod.class), getEmptyAnnotatedItem(BeanWithFinalProducerMethod.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = BeanWithFinalProducerMethod.class.getMethod("getString"); + boolean exception = false; + try + { + new ProducerMethodBeanModel<String>(new SimpleAnnotatedMethod<String>(method), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @Test @SpecAssertion(section="3.3") + public void testFinalMethodWithDependentScope() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = SpiderProducer.class.getMethod("produceTrapdoorSpider"); + ProducerMethodBeanModel<TrapdoorSpider> trapdoorSpiderModel = new ProducerMethodBeanModel<TrapdoorSpider>(new SimpleAnnotatedMethod<TrapdoorSpider>(method), manager); + assert trapdoorSpiderModel.getScopeType().equals(Dependent.class); + } + + @Test @SpecAssertion(section="3.3.6") + public void testNamedMethod() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = SpiderProducer.class.getMethod("produceBlackWidow"); + ProducerMethodBeanModel<BlackWidow> blackWidowSpiderModel = new ProducerMethodBeanModel<BlackWidow>(new SimpleAnnotatedMethod<BlackWidow>(method), manager); + assert blackWidowSpiderModel.getName().equals("blackWidow"); + } + + @Test @SpecAssertion(section="3.3.6") + public void testDefaultNamedMethod() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs"); + ProducerMethodBeanModel<DaddyLongLegs> daddyLongLegsSpiderModel = new ProducerMethodBeanModel<DaddyLongLegs>(new SimpleAnnotatedMethod<DaddyLongLegs>(method), manager); + assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs"); + } + + @Test @SpecAssertion(section="3.3.6") + public void testDefaultNamedJavaBeanMethod() throws SecurityException, NoSuchMethodException + { + SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addBeanModel(model); + Method method = SpiderProducer.class.getMethod("getLadybirdSpider"); + ProducerMethodBeanModel<LadybirdSpider> ladybirdSpiderModel = new ProducerMethodBeanModel<LadybirdSpider>(new SimpleAnnotatedMethod<LadybirdSpider>(method), manager); + assert ladybirdSpiderModel.getName().equals("ladybirdSpider"); + } + + @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") + public void testDisposalMethodNonStatic() + { + // TODO Placeholder + assert false; + } + + @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") + public void testDisposalMethodMethodDeclaredOnWebBeanImplementationClass() + { + // TODO Placeholder + assert false; + } + + @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") + public void testDisposalMethodBindingAnnotations() + { + // TODO Placeholder + assert false; + } + + @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") + public void testDisposalMethodDefaultBindingAnnotations() + { + // TODO Placeholder + assert false; + } + + @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") + public void testDisposalMethodDoesNotResolveToProducerMethod() + { + // TODO Placeholder + assert false; + } + + @Test(groups="disposalMethod") @SpecAssertion(section="3.3.5") + public void testDisposalMethodDeclaredOnEnabledBean() + { + // TODO Placeholder + // TODO Move this + + assert false; + } + + @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") + public void testBeanCanDeclareMultipleDisposalMethods() + { + // TODO move this + // TODO Placeholder + assert false; + } + + @Test(groups="disposalMethod") @SpecAssertion(section="3.3.5") + public void testProducerMethodHasNoMoreThanOneDisposalMethod() + { + // TODO move this + // TODO Placeholder + assert false; + } + + @Test @SpecAssertion(section="2.7.2") + public void testSingleStereotype() + { + assert false; + } + + @Test @SpecAssertion(section="2.7.2") + public void testStereotypeOnNonProducerMethod() + { + assert false; + } +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentLifecycleTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentLifecycleTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,43 +0,0 @@ -package org.jboss.webbeans.test; - -import org.testng.annotations.Test; - -public class ProducerMethodComponentLifecycleTest -{ - - @Test(groups="componentLifecycle") @SpecAssertion(section="3.3") - public void testNonDependentProducerMethodThatReturnsNull() - { - // TODO Placeholder - assert false; - } - - @Test(groups="componentLifecycle") @SpecAssertion(section="3.3") - public void testDependentProducerMethodThatReturnsNull() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.3.3") - public void testSpecializedComponentAlwaysUsed() - { - // TODO Placeholder - assert false; - } - - @Test(groups={"disposalMethod", "componentLifecycle"}) @SpecAssertion(section="3.3.4") - public void testDisposalMethodCalled() - { - // TODO Placeholder - assert false; - } - - @Test(groups={"disposalMethod", "componentLifecycle"}) @SpecAssertion(section="3.3.4") - public void testDisposalMethodHasParametersInjected() - { - // TODO Placeholder - assert false; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,216 +0,0 @@ -package org.jboss.webbeans.test; - -import static org.jboss.webbeans.test.util.Util.getEmptyAnnotatedItem; - -import java.lang.reflect.Method; - -import javax.webbeans.Current; -import javax.webbeans.Dependent; - -import org.jboss.webbeans.introspector.SimpleAnnotatedMethod; -import org.jboss.webbeans.introspector.SimpleAnnotatedType; -import org.jboss.webbeans.model.bean.ProducerMethodBeanModel; -import org.jboss.webbeans.model.bean.SimpleBeanModel; -import org.jboss.webbeans.test.annotations.Tame; -import org.jboss.webbeans.test.components.Animal; -import org.jboss.webbeans.test.components.BlackWidow; -import org.jboss.webbeans.test.components.DaddyLongLegs; -import org.jboss.webbeans.test.components.DeadlyAnimal; -import org.jboss.webbeans.test.components.DeadlySpider; -import org.jboss.webbeans.test.components.LadybirdSpider; -import org.jboss.webbeans.test.components.Spider; -import org.jboss.webbeans.test.components.SpiderProducer; -import org.jboss.webbeans.test.components.Tarantula; -import org.jboss.webbeans.test.components.TrapdoorSpider; -import org.jboss.webbeans.test.components.broken.ComponentWithFinalProducerMethod; -import org.jboss.webbeans.test.components.broken.ComponentWithStaticProducerMethod; -import org.testng.annotations.Test; - -public class ProducerMethodComponentModelTest extends AbstractTest -{ - - @Test @SpecAssertion(section="3.3") - public void testStaticMethod() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<ComponentWithStaticProducerMethod> componentModel = new SimpleBeanModel<ComponentWithStaticProducerMethod>(new SimpleAnnotatedType<ComponentWithStaticProducerMethod>(ComponentWithStaticProducerMethod.class), getEmptyAnnotatedItem(ComponentWithStaticProducerMethod.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = ComponentWithStaticProducerMethod.class.getMethod("getString"); - boolean exception = false; - try - { - new ProducerMethodBeanModel<String>(new SimpleAnnotatedMethod<String>(method), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - } - - @Test @SpecAssertion(section="3.3") - public void testApiTypes() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<SpiderProducer> componentModel = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = SpiderProducer.class.getMethod("produceTarantula"); - ProducerMethodBeanModel<Tarantula> tarantulaModel = new ProducerMethodBeanModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); - assert tarantulaModel.getApiTypes().contains(Tarantula.class); - assert tarantulaModel.getApiTypes().contains(DeadlySpider.class); - assert tarantulaModel.getApiTypes().contains(Spider.class); - assert tarantulaModel.getApiTypes().contains(Animal.class); - assert tarantulaModel.getApiTypes().contains(DeadlyAnimal.class); - assert !tarantulaModel.getApiTypes().contains(Object.class); - } - - @Test @SpecAssertion(section="3.3.1") - public void testDefaultBindingType() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<SpiderProducer> componentModel = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = SpiderProducer.class.getMethod("produceTarantula"); - ProducerMethodBeanModel<Tarantula> tarantulaModel = new ProducerMethodBeanModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); - assert tarantulaModel.getBindingTypes().size() == 1; - assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class); - } - - @Test - public void testBindingType() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<SpiderProducer> componentModel = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - ProducerMethodBeanModel<Tarantula> tarantulaModel = new ProducerMethodBeanModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); - assert tarantulaModel.getBindingTypes().size() == 1; - assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class); - } - - @Test @SpecAssertion(section="3.3") - public void testFinalMethod() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<ComponentWithFinalProducerMethod> componentModel = new SimpleBeanModel<ComponentWithFinalProducerMethod>(new SimpleAnnotatedType<ComponentWithFinalProducerMethod>(ComponentWithFinalProducerMethod.class), getEmptyAnnotatedItem(ComponentWithFinalProducerMethod.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = ComponentWithFinalProducerMethod.class.getMethod("getString"); - boolean exception = false; - try - { - new ProducerMethodBeanModel<String>(new SimpleAnnotatedMethod<String>(method), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - } - - @Test @SpecAssertion(section="3.3") - public void testFinalMethodWithDependentScope() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<SpiderProducer> componentModel = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = SpiderProducer.class.getMethod("produceTrapdoorSpider"); - ProducerMethodBeanModel<TrapdoorSpider> trapdoorSpiderModel = new ProducerMethodBeanModel<TrapdoorSpider>(new SimpleAnnotatedMethod<TrapdoorSpider>(method), manager); - assert trapdoorSpiderModel.getScopeType().equals(Dependent.class); - } - - @Test @SpecAssertion(section="3.3.6") - public void testNamedMethod() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<SpiderProducer> componentModel = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - ProducerMethodBeanModel<BlackWidow> blackWidowSpiderModel = new ProducerMethodBeanModel<BlackWidow>(new SimpleAnnotatedMethod<BlackWidow>(method), manager); - assert blackWidowSpiderModel.getName().equals("blackWidow"); - } - - @Test @SpecAssertion(section="3.3.6") - public void testDefaultNamedMethod() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<SpiderProducer> componentModel = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs"); - ProducerMethodBeanModel<DaddyLongLegs> daddyLongLegsSpiderModel = new ProducerMethodBeanModel<DaddyLongLegs>(new SimpleAnnotatedMethod<DaddyLongLegs>(method), manager); - assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs"); - } - - @Test @SpecAssertion(section="3.3.6") - public void testDefaultNamedJavaBeanMethod() throws SecurityException, NoSuchMethodException - { - SimpleBeanModel<SpiderProducer> componentModel = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); - manager.getModelManager().addBeanModel(componentModel); - Method method = SpiderProducer.class.getMethod("getLadybirdSpider"); - ProducerMethodBeanModel<LadybirdSpider> ladybirdSpiderModel = new ProducerMethodBeanModel<LadybirdSpider>(new SimpleAnnotatedMethod<LadybirdSpider>(method), manager); - assert ladybirdSpiderModel.getName().equals("ladybirdSpider"); - } - - @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") - public void testDisposalMethodNonStatic() - { - // TODO Placeholder - assert false; - } - - @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") - public void testDisposalMethodMethodDeclaredOnWebBeanImplementationClass() - { - // TODO Placeholder - assert false; - } - - @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") - public void testDisposalMethodBindingAnnotations() - { - // TODO Placeholder - assert false; - } - - @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") - public void testDisposalMethodDefaultBindingAnnotations() - { - // TODO Placeholder - assert false; - } - - @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") - public void testDisposalMethodDoesNotResolveToProducerMethod() - { - // TODO Placeholder - assert false; - } - - @Test(groups="disposalMethod") @SpecAssertion(section="3.3.5") - public void testDisposalMethodDeclaredOnEnabledComponent() - { - // TODO Placeholder - // TODO Move this - - assert false; - } - - @Test(groups="disposalMethod") @SpecAssertion(section="3.3.4") - public void testComponentCanDeclareMultipleDisposalMethods() - { - // TODO move this - // TODO Placeholder - assert false; - } - - @Test(groups="disposalMethod") @SpecAssertion(section="3.3.5") - public void testProducerMethodHasNoMoreThanOneDisposalMethod() - { - // TODO move this - // TODO Placeholder - assert false; - } - - @Test @SpecAssertion(section="2.7.2") - public void testSingleStereotype() - { - assert false; - } - - @Test @SpecAssertion(section="2.7.2") - public void testStereotypeOnNonProducerMethod() - { - assert false; - } -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentLifecycleTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.test; + +import org.testng.annotations.Test; + +public class RemoteBeanLifecycleTest +{ + + @Test(groups="beanLifecycle") @SpecAssertion(section="3.5.3") + public void testRemoveMethodCalledCausesContainerToRemoveInstance() + { + assert false; + } + + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteBeanLifecycleTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentLifecycleTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentLifecycleTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.test; - -import org.testng.annotations.Test; - -public class RemoteComponentLifecycleTest -{ - - @Test(groups="componentLifecycle") @SpecAssertion(section="3.5.3") - public void testRemoveMethodCalledCausesContainerToRemoveInstance() - { - assert false; - } - - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,93 +0,0 @@ -package org.jboss.webbeans.test; - - -public class RemoteComponentModelTest -{ - - /*private ManagerImpl container; - private AnnotatedType<?> emptyAnnotatedItem; - - @BeforeMethod - public void before() - { - emptyAnnotatedItem = new SimpleAnnotatedType(null, new HashMap<Class<? extends Annotation>, Annotation>()); - container = new MockContainerImpl(null); - } - - @Test @SpecAssertion(section="2.7.2") - public void testSingleStereotype() - { - assert false; - } - - @Test @SpecAssertion(section="3.5") - public void testApiTypes() throws SecurityException, NoSuchMethodException - { - RemoteComponentModel<Baboon> baboonModel = new RemoteComponentModel<Baboon>(new SimpleAnnotatedType<Baboon>(Baboon.class), emptyAnnotatedItem, container); - assert baboonModel.getApiTypes().contains(Baboon.class); - assert baboonModel.getApiTypes().contains(Animal.class); - } - - @Test @SpecAssertion(section="3.5.4") - public void testDefaultName() throws SecurityException, NoSuchMethodException - { - RemoteComponentModel<TameOrangutan> tameApeModel = new RemoteComponentModel<TameOrangutan>(new SimpleAnnotatedType<TameOrangutan>(TameOrangutan.class), emptyAnnotatedItem, container); - assert tameApeModel.getName().equals("tameOrangutan"); - } - - @Test @SpecAssertion(section="3.5.1") - public void testDefaultBindingType() throws SecurityException, NoSuchMethodException - { - RemoteComponentModel<Baboon> baboonModel = new RemoteComponentModel<Baboon>(new SimpleAnnotatedType<Baboon>(Baboon.class), emptyAnnotatedItem, container); - assert baboonModel.getBindingTypes().size() == 1; - assert baboonModel.getBindingTypes().iterator().next().annotationType().equals(Current.class); - } - - @Test - public void testBindingType() throws SecurityException, NoSuchMethodException - { - RemoteComponentModel<TameOrangutan> tameOrangutanModel = new RemoteComponentModel<TameOrangutan>(new SimpleAnnotatedType<TameOrangutan>(TameOrangutan.class), emptyAnnotatedItem, container); - assert tameOrangutanModel.getBindingTypes().size() == 1; - assert tameOrangutanModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class); - } - - @Test(groups="remoteComponentInXml") @SpecAssertion(section="3.5.2") - public void testRemoteComponentDeclaredInXml() - { - assert false; - } - - @Test @SpecAssertion(section="3.5.3") - public void testSFSBMustHaveRemoveMethod() - { - // TODO How do we check this? - } - - @Test(expectedExceptions=RuntimeException.class) @SpecAssertion(section="3.5.3") - public void testRemoveMethodCannotHaveParameters() - { - RemoteComponentModel<Chimpanzee> chimpanzeeModel = new RemoteComponentModel<Chimpanzee>(new SimpleAnnotatedType<Chimpanzee>(Chimpanzee.class), emptyAnnotatedItem, container); - } - - @Test(expectedExceptions=RuntimeException.class) @SpecAssertion(section="3.5.3") - public void testCannotHaveMultipleRemoveMethods() - { - RemoteComponentModel<Gibbon> gibbonModel = new RemoteComponentModel<Gibbon>(new SimpleAnnotatedType<Gibbon>(Gibbon.class), emptyAnnotatedItem, container); - } - - @Test @SpecAssertion(section="3.5.3") - public void testRemoveMethod() - { - RemoteComponentModel<TameOrangutan> tameOrangutanModel = new RemoteComponentModel<TameOrangutan>(new SimpleAnnotatedType<TameOrangutan>(TameOrangutan.class), emptyAnnotatedItem, container); - assert tameOrangutanModel.getRemoveMethod().getMethod().getName().equals("removeOrangutan"); - RemoteComponentModel<Orangutan> orangutanModel = new RemoteComponentModel<Orangutan>(new SimpleAnnotatedType<Orangutan>(Orangutan.class), emptyAnnotatedItem, container); - assert orangutanModel.getRemoveMethod().getMethod().getName().equals("removeOrangutan"); - } - - @Test @SpecAssertion(section="2.7.2") - public void testStereotypeOnOtherInterface() - { - assert false; - }*/ - -} Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -19,14 +19,14 @@ import org.jboss.webbeans.test.annotations.AnimalStereotype; import org.jboss.webbeans.test.annotations.FishStereotype; import org.jboss.webbeans.test.annotations.RiverFishStereotype; +import org.jboss.webbeans.test.beans.Antelope; +import org.jboss.webbeans.test.beans.BeanWithTooManyScopeTypes; +import org.jboss.webbeans.test.beans.Haddock; +import org.jboss.webbeans.test.beans.Order; +import org.jboss.webbeans.test.beans.SeaBass; import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.RiverFishStereotypeAnnotationLiteral; -import org.jboss.webbeans.test.components.Antelope; -import org.jboss.webbeans.test.components.ComponentWithTooManyScopeTypes; -import org.jboss.webbeans.test.components.Haddock; -import org.jboss.webbeans.test.components.Order; -import org.jboss.webbeans.test.components.SeaBass; import org.testng.annotations.Test; public class ScopeTypeTest extends AbstractTest @@ -69,7 +69,7 @@ boolean exception = false; try { - new SimpleBeanModel<ComponentWithTooManyScopeTypes>(new SimpleAnnotatedType<ComponentWithTooManyScopeTypes>(ComponentWithTooManyScopeTypes.class), getEmptyAnnotatedItem(ComponentWithTooManyScopeTypes.class), manager); + new SimpleBeanModel<BeanWithTooManyScopeTypes>(new SimpleAnnotatedType<BeanWithTooManyScopeTypes>(BeanWithTooManyScopeTypes.class), getEmptyAnnotatedItem(BeanWithTooManyScopeTypes.class), manager); } catch (Exception e) { Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentLifecycleTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.test; + +import org.testng.annotations.Test; + +public class SimpleBeanLifecycleTest +{ + + @Test(groups="beanLifecycle") @SpecAssertion(section="3.1.3") + public void testInjectionOfParametersIntoBeanConstructor() + { + // TODO Placeholder + assert false; + } + + @Test(groups="specialization") @SpecAssertion(section="3.1.4") + public void testSpecializedBeanAlwaysUsed() + { + // TODO Placeholder + assert false; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanLifecycleTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java (from rev 150, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,356 @@ +package org.jboss.webbeans.test; + +import static org.jboss.webbeans.test.util.Util.getEmptyAnnotatedItem; + +import java.lang.annotation.Annotation; +import java.util.HashMap; +import java.util.Map; + +import javax.webbeans.AnnotationLiteral; +import javax.webbeans.Current; +import javax.webbeans.Dependent; +import javax.webbeans.Named; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +import org.jboss.webbeans.bindings.CurrentAnnotationLiteral; +import org.jboss.webbeans.bindings.DependentAnnotationLiteral; +import org.jboss.webbeans.introspector.AnnotatedType; +import org.jboss.webbeans.introspector.SimpleAnnotatedType; +import org.jboss.webbeans.model.bean.SimpleBeanModel; +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; +import org.jboss.webbeans.test.annotations.FishStereotype; +import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType; +import org.jboss.webbeans.test.annotations.HornedMammalStereotype; +import org.jboss.webbeans.test.annotations.Synchronous; +import org.jboss.webbeans.test.beans.Antelope; +import org.jboss.webbeans.test.beans.Chair; +import org.jboss.webbeans.test.beans.Cow; +import org.jboss.webbeans.test.beans.Goldfish; +import org.jboss.webbeans.test.beans.Gorilla; +import org.jboss.webbeans.test.beans.Haddock; +import org.jboss.webbeans.test.beans.Horse; +import org.jboss.webbeans.test.beans.Moose; +import org.jboss.webbeans.test.beans.Order; +import org.jboss.webbeans.test.beans.SeaBass; +import org.jboss.webbeans.test.beans.Tuna; +import org.jboss.webbeans.test.beans.broken.BeanWithTooManyDeploymentTypes; +import org.jboss.webbeans.test.beans.broken.Carp; +import org.jboss.webbeans.test.beans.broken.Pig; +import org.jboss.webbeans.test.beans.broken.OuterBean.InnerBean; +import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; +import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral; +import org.jboss.webbeans.test.bindings.HornedMamalStereotypeAnnotationLiteral; +import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; +import org.jboss.webbeans.util.Reflections; +import org.testng.annotations.Test; + +@SpecVersion("20080925") +public class SimpleBeanModelTest extends AbstractTest +{ + + private abstract class NamedAnnotationLiteral extends AnnotationLiteral<Named> implements Named {} + + // **** TESTS FOR DEPLOYMENT TYPE **** // + + @Test @SpecAssertion(section="2.5.3") + public void testTooManyDeploymentTypes() + { + boolean exception = false; + try + { + new SimpleBeanModel<BeanWithTooManyDeploymentTypes>(new SimpleAnnotatedType<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class), getEmptyAnnotatedItem(BeanWithTooManyDeploymentTypes.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @Test @SpecAssertion(section="2.5.4") + public void testXmlDeploymentTypeOverridesJava() + { + Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); + xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); + AnnotatedType<BeanWithTooManyDeploymentTypes> xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedType<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); + + SimpleBeanModel<BeanWithTooManyDeploymentTypes> model = new SimpleBeanModel<BeanWithTooManyDeploymentTypes>(new SimpleAnnotatedType<BeanWithTooManyDeploymentTypes>(BeanWithTooManyDeploymentTypes.class), xmlDefinedDeploymentTypeAnnotatedItem, manager); + assert model.getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test @SpecAssertion(section="2.5.5") + public void testXmlDefaultDeploymentType() + { + AnnotatedType<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedType<Antelope>(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); + SimpleBeanModel<Antelope> antelope = new SimpleBeanModel<Antelope>(getEmptyAnnotatedItem(Antelope.class), antelopeAnnotatedItem, manager); + assert antelope.getDeploymentType().equals(Production.class); + } + + @Test @SpecAssertion(section="2.5.4") + public void testXmlRespectsJavaDeploymentType() + { + AnnotatedType<Tuna> annotatedItem = new SimpleAnnotatedType<Tuna>(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); + SimpleBeanModel<Tuna> tuna = new SimpleBeanModel<Tuna>(new SimpleAnnotatedType<Tuna>(Tuna.class), annotatedItem, manager); + assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); + } + + @Test @SpecAssertion(section="2.5.7") + public void testDeploymentTypePrecedenceSelection() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(HornedMammalStereotype.class, new HornedMamalStereotypeAnnotationLiteral()); + AnnotatedType<Moose> annotatedItem = new SimpleAnnotatedType<Moose>(Moose.class, annotations); + + SimpleBeanModel<Moose> moose = new SimpleBeanModel<Moose>(new SimpleAnnotatedType<Moose>(Moose.class), annotatedItem, manager); + assert moose.getDeploymentType().equals(HornedAnimalDeploymentType.class); + + } + + @Test @SpecAssertion(section="2.7.2") + public void testDeploymentTypeSpecifiedAndStereotyped() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral()); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + assert trout.getScopeType().equals(RequestScoped.class); + } + + // **** TESTS FOR SCOPES **** // + + + + // **** TESTS FOR BEAN NAME **** / + + @Test @SpecAssertion(section="2.6.1") + public void testDefaultNamed() + { + SimpleBeanModel<Haddock> haddock = new SimpleBeanModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedItem(Haddock.class), manager); + assert haddock.getName() != null; + assert haddock.getName().equals("haddock"); + } + + @Test @SpecAssertion(section="2.6.2") + public void testDefaultXmlNamed() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral() { + + public String value() + { + return ""; + } + + }); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + + assert trout.getName() != null; + assert trout.getName().equals("seaBass"); + } + + @Test @SpecAssertion(section="2.6.2") + public void testNonDefaultXmlNamed() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral(){ + + public String value() + { + return "aTrout"; + } + + }); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + + assert trout.getName().equals("aTrout"); + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamed() + { + SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedItem(SeaBass.class), manager); + assert trout.getName() == null; + } + + @Test @SpecAssertion(section="2.6.1") + public void testNonDefaultNamed() + { + SimpleBeanModel<Moose> moose = new SimpleBeanModel<Moose>(new SimpleAnnotatedType<Moose>(Moose.class), getEmptyAnnotatedItem(Moose.class), manager); + assert moose.getName().equals("aMoose"); + } + + + // **** TESTS FOR STEREOTYPES **** // + + @SuppressWarnings("unchecked") + @Test @SpecAssertion(section="2.7.3") + public void testStereotypeDeclaredInXmlAndJava() + { + Map<Class<? extends Annotation>, Annotation> orderXmlAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); + orderXmlAnnotations.put(Current.class, new CurrentAnnotationLiteral()); + orderXmlAnnotations.put(Synchronous.class, new SynchronousAnnotationLiteral()); + orderXmlAnnotations.put(Named.class, new NamedAnnotationLiteral (){ + + public String value() + { + return "currentSynchronousOrder"; + } + + }); + AnnotatedType currentSynchronousOrderAnnotatedItem = new SimpleAnnotatedType(Order.class, orderXmlAnnotations); + + SimpleBeanModel<Order> order = new SimpleBeanModel<Order>(new SimpleAnnotatedType(Order.class), currentSynchronousOrderAnnotatedItem, manager); + assert Production.class.equals(order.getDeploymentType()); + assert "currentSynchronousOrder".equals(order.getName()); + assert order.getBindingTypes().size() == 2; + assert Reflections.annotationSetMatches(order.getBindingTypes(), Current.class, Synchronous.class); + assert order.getScopeType().equals(Dependent.class); + } + + @Test @SpecAssertion(section="2.7.2") + public void testSingleStereotype() + { + SimpleBeanModel<Gorilla> gorilla = new SimpleBeanModel<Gorilla>(new SimpleAnnotatedType<Gorilla>(Gorilla.class), getEmptyAnnotatedItem(Gorilla.class), manager); + assert gorilla.getName() == null; + assert gorilla.getDeploymentType().equals(Production.class); + assert gorilla.getBindingTypes().iterator().next().annotationType().equals(Current.class); + assert gorilla.getScopeType().equals(RequestScoped.class); + } + + @Test @SpecAssertion(section="2.7.4") + public void testRequiredTypeIsImplemented() + { + try + { + new SimpleBeanModel<Gorilla>(new SimpleAnnotatedType<Gorilla>(Gorilla.class), getEmptyAnnotatedItem(Gorilla.class), manager); + } + catch (Exception e) + { + assert false; + } + + } + + @Test(expectedExceptions=Exception.class) @SpecAssertion(section="2.7.4") + public void testRequiredTypeIsNotImplemented() + { + new SimpleBeanModel<Chair>(new SimpleAnnotatedType<Chair>(Chair.class), getEmptyAnnotatedItem(Chair.class), manager); + } + + @Test @SpecAssertion(section="2.7.4") + public void testScopeIsSupported() + { + try + { + new SimpleBeanModel<Goldfish>(new SimpleAnnotatedType<Goldfish>(Goldfish.class), getEmptyAnnotatedItem(Goldfish.class), manager); + } + catch (Exception e) + { + assert false; + } + + } + + @Test(expectedExceptions=Exception.class) @SpecAssertion(section="2.7.4") + public void testScopeIsNotSupported() + { + new SimpleBeanModel<Carp>(new SimpleAnnotatedType<Carp>(Carp.class), getEmptyAnnotatedItem(Carp.class), manager); + } + + @Test @SpecAssertion(section="2.7.2") + public void testMultipleStereotypes() + { + assert false; + } + + //*** BEAN CLASS CHECKS ****// + + @Test + public void testAbstractClassIsNotAllowed() + { + boolean exception = false; + try + { + new SimpleBeanModel<Cow>(new SimpleAnnotatedType<Cow>(Cow.class), getEmptyAnnotatedItem(Cow.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @Test + public void testInnerClassIsNotAllowed() + { + boolean exception = false; + try + { + new SimpleBeanModel<InnerBean>(new SimpleAnnotatedType<InnerBean>(InnerBean.class), getEmptyAnnotatedItem(InnerBean.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + } + + @Test + public void testFinalClassMustBeDependentScoped() + { + boolean exception = false; + try + { + new SimpleBeanModel<Horse>(new SimpleAnnotatedType<Horse>(Horse.class), getEmptyAnnotatedItem(Horse.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Dependent.class, new DependentAnnotationLiteral()); + AnnotatedType<Horse> annotatedItem = new SimpleAnnotatedType<Horse>(Horse.class, annotations); + try + { + new SimpleBeanModel<Horse>(new SimpleAnnotatedType<Horse>(Horse.class), annotatedItem, manager); + } + catch (Exception e) + { + assert false; + } + } + + @Test + public void testClassWithFinalMethodMustBeDependentScoped() + { + boolean exception = false; + try + { + new SimpleBeanModel<Pig>(new SimpleAnnotatedType<Pig>(Pig.class), getEmptyAnnotatedItem(Pig.class), manager); + } + catch (Exception e) + { + exception = true; + } + assert exception; + + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Dependent.class, new DependentAnnotationLiteral()); + AnnotatedType<Pig> annotatedItem = new SimpleAnnotatedType<Pig>(Pig.class, annotations); + try + { + new SimpleBeanModel<Pig>(new SimpleAnnotatedType<Pig>(Pig.class), annotatedItem, manager); + } + catch (Exception e) + { + assert false; + } + } + + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentLifecycleTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentLifecycleTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentLifecycleTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test; - -import org.testng.annotations.Test; - -public class SimpleComponentLifecycleTest -{ - - @Test(groups="componentLifecycle") @SpecAssertion(section="3.1.3") - public void testInjectionOfParametersIntoComponentConstructor() - { - // TODO Placeholder - assert false; - } - - @Test(groups="specialization") @SpecAssertion(section="3.1.4") - public void testSpecializedComponentAlwaysUsed() - { - // TODO Placeholder - assert false; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,356 +0,0 @@ -package org.jboss.webbeans.test; - -import static org.jboss.webbeans.test.util.Util.getEmptyAnnotatedItem; - -import java.lang.annotation.Annotation; -import java.util.HashMap; -import java.util.Map; - -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.Current; -import javax.webbeans.Dependent; -import javax.webbeans.Named; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.bindings.CurrentAnnotationLiteral; -import org.jboss.webbeans.bindings.DependentAnnotationLiteral; -import org.jboss.webbeans.introspector.AnnotatedType; -import org.jboss.webbeans.introspector.SimpleAnnotatedType; -import org.jboss.webbeans.model.bean.SimpleBeanModel; -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.test.annotations.FishStereotype; -import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType; -import org.jboss.webbeans.test.annotations.HornedMammalStereotype; -import org.jboss.webbeans.test.annotations.Synchronous; -import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.HornedMamalStereotypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; -import org.jboss.webbeans.test.components.Antelope; -import org.jboss.webbeans.test.components.Chair; -import org.jboss.webbeans.test.components.Cow; -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.Moose; -import org.jboss.webbeans.test.components.Order; -import org.jboss.webbeans.test.components.SeaBass; -import org.jboss.webbeans.test.components.Tuna; -import org.jboss.webbeans.test.components.broken.Carp; -import org.jboss.webbeans.test.components.broken.ComponentWithTooManyDeploymentTypes; -import org.jboss.webbeans.test.components.broken.Pig; -import org.jboss.webbeans.test.components.broken.OuterComponent.InnerComponent; -import org.jboss.webbeans.util.Reflections; -import org.testng.annotations.Test; - -@SpecVersion("20080925") -public class SimpleComponentModelTest extends AbstractTest -{ - - private abstract class NamedAnnotationLiteral extends AnnotationLiteral<Named> implements Named {} - - // **** TESTS FOR DEPLOYMENT TYPE **** // - - @Test @SpecAssertion(section="2.5.3") - public void testTooManyDeploymentTypes() - { - boolean exception = false; - try - { - new SimpleBeanModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType<ComponentWithTooManyDeploymentTypes>(ComponentWithTooManyDeploymentTypes.class), getEmptyAnnotatedItem(ComponentWithTooManyDeploymentTypes.class), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - } - - @Test @SpecAssertion(section="2.5.4") - public void testXmlDeploymentTypeOverridesJava() - { - Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); - xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); - AnnotatedType<ComponentWithTooManyDeploymentTypes> xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedType<ComponentWithTooManyDeploymentTypes>(ComponentWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); - - SimpleBeanModel<ComponentWithTooManyDeploymentTypes> component = new SimpleBeanModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType<ComponentWithTooManyDeploymentTypes>(ComponentWithTooManyDeploymentTypes.class), xmlDefinedDeploymentTypeAnnotatedItem, manager); - assert component.getDeploymentType().equals(AnotherDeploymentType.class); - } - - @Test @SpecAssertion(section="2.5.5") - public void testXmlDefaultDeploymentType() - { - AnnotatedType<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedType<Antelope>(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); - SimpleBeanModel<Antelope> antelope = new SimpleBeanModel<Antelope>(getEmptyAnnotatedItem(Antelope.class), antelopeAnnotatedItem, manager); - assert antelope.getDeploymentType().equals(Production.class); - } - - @Test @SpecAssertion(section="2.5.4") - public void testXmlRespectsJavaDeploymentType() - { - AnnotatedType<Tuna> annotatedItem = new SimpleAnnotatedType<Tuna>(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); - SimpleBeanModel<Tuna> tuna = new SimpleBeanModel<Tuna>(new SimpleAnnotatedType<Tuna>(Tuna.class), annotatedItem, manager); - assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); - } - - @Test @SpecAssertion(section="2.5.7") - public void testDeploymentTypePrecedenceSelection() - { - Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(HornedMammalStereotype.class, new HornedMamalStereotypeAnnotationLiteral()); - AnnotatedType<Moose> annotatedItem = new SimpleAnnotatedType<Moose>(Moose.class, annotations); - - SimpleBeanModel<Moose> moose = new SimpleBeanModel<Moose>(new SimpleAnnotatedType<Moose>(Moose.class), annotatedItem, manager); - assert moose.getDeploymentType().equals(HornedAnimalDeploymentType.class); - - } - - @Test @SpecAssertion(section="2.7.2") - public void testDeploymentTypeSpecifiedAndStereotyped() - { - Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral()); - AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); - SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); - assert trout.getScopeType().equals(RequestScoped.class); - } - - // **** TESTS FOR SCOPES **** // - - - - // **** TESTS FOR COMPONENT NAME **** / - - @Test @SpecAssertion(section="2.6.1") - public void testDefaultNamed() - { - SimpleBeanModel<Haddock> haddock = new SimpleBeanModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedItem(Haddock.class), manager); - assert haddock.getName() != null; - assert haddock.getName().equals("haddock"); - } - - @Test @SpecAssertion(section="2.6.2") - public void testDefaultXmlNamed() - { - Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral() { - - public String value() - { - return ""; - } - - }); - AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); - SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); - - assert trout.getName() != null; - assert trout.getName().equals("seaBass"); - } - - @Test @SpecAssertion(section="2.6.2") - public void testNonDefaultXmlNamed() - { - Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral(){ - - public String value() - { - return "aTrout"; - } - - }); - AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); - SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); - - assert trout.getName().equals("aTrout"); - } - - @Test @SpecAssertion(section="2.6.4") - public void testNotNamed() - { - SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedItem(SeaBass.class), manager); - assert trout.getName() == null; - } - - @Test @SpecAssertion(section="2.6.1") - public void testNonDefaultNamed() - { - SimpleBeanModel<Moose> moose = new SimpleBeanModel<Moose>(new SimpleAnnotatedType<Moose>(Moose.class), getEmptyAnnotatedItem(Moose.class), manager); - assert moose.getName().equals("aMoose"); - } - - - // **** TESTS FOR STEREOTYPES **** // - - @SuppressWarnings("unchecked") - @Test @SpecAssertion(section="2.7.3") - public void testStereotypeDeclaredInXmlAndJava() - { - Map<Class<? extends Annotation>, Annotation> orderXmlAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); - orderXmlAnnotations.put(Current.class, new CurrentAnnotationLiteral()); - orderXmlAnnotations.put(Synchronous.class, new SynchronousAnnotationLiteral()); - orderXmlAnnotations.put(Named.class, new NamedAnnotationLiteral (){ - - public String value() - { - return "currentSynchronousOrder"; - } - - }); - AnnotatedType currentSynchronousOrderAnnotatedItem = new SimpleAnnotatedType(Order.class, orderXmlAnnotations); - - SimpleBeanModel<Order> order = new SimpleBeanModel<Order>(new SimpleAnnotatedType(Order.class), currentSynchronousOrderAnnotatedItem, manager); - assert Production.class.equals(order.getDeploymentType()); - assert "currentSynchronousOrder".equals(order.getName()); - assert order.getBindingTypes().size() == 2; - assert Reflections.annotationSetMatches(order.getBindingTypes(), Current.class, Synchronous.class); - assert order.getScopeType().equals(Dependent.class); - } - - @Test @SpecAssertion(section="2.7.2") - public void testSingleStereotype() - { - SimpleBeanModel<Gorilla> gorilla = new SimpleBeanModel<Gorilla>(new SimpleAnnotatedType<Gorilla>(Gorilla.class), getEmptyAnnotatedItem(Gorilla.class), manager); - assert gorilla.getName() == null; - assert gorilla.getDeploymentType().equals(Production.class); - assert gorilla.getBindingTypes().iterator().next().annotationType().equals(Current.class); - assert gorilla.getScopeType().equals(RequestScoped.class); - } - - @Test @SpecAssertion(section="2.7.4") - public void testRequiredTypeIsImplemented() - { - try - { - new SimpleBeanModel<Gorilla>(new SimpleAnnotatedType<Gorilla>(Gorilla.class), getEmptyAnnotatedItem(Gorilla.class), manager); - } - catch (Exception e) - { - assert false; - } - - } - - @Test(expectedExceptions=Exception.class) @SpecAssertion(section="2.7.4") - public void testRequiredTypeIsNotImplemented() - { - new SimpleBeanModel<Chair>(new SimpleAnnotatedType<Chair>(Chair.class), getEmptyAnnotatedItem(Chair.class), manager); - } - - @Test @SpecAssertion(section="2.7.4") - public void testScopeIsSupported() - { - try - { - new SimpleBeanModel<Goldfish>(new SimpleAnnotatedType<Goldfish>(Goldfish.class), getEmptyAnnotatedItem(Goldfish.class), manager); - } - catch (Exception e) - { - assert false; - } - - } - - @Test(expectedExceptions=Exception.class) @SpecAssertion(section="2.7.4") - public void testScopeIsNotSupported() - { - new SimpleBeanModel<Carp>(new SimpleAnnotatedType<Carp>(Carp.class), getEmptyAnnotatedItem(Carp.class), manager); - } - - @Test @SpecAssertion(section="2.7.2") - public void testMultipleStereotypes() - { - assert false; - } - - //*** COMPONENT CLASS CHECKS ****// - - @Test - public void testAbstractClassIsNotAllowed() - { - boolean exception = false; - try - { - new SimpleBeanModel<Cow>(new SimpleAnnotatedType<Cow>(Cow.class), getEmptyAnnotatedItem(Cow.class), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - } - - @Test - public void testInnerClassIsNotAllowed() - { - boolean exception = false; - try - { - new SimpleBeanModel<InnerComponent>(new SimpleAnnotatedType<InnerComponent>(InnerComponent.class), getEmptyAnnotatedItem(InnerComponent.class), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - } - - @Test - public void testFinalClassMustBeDependentScoped() - { - boolean exception = false; - try - { - new SimpleBeanModel<Horse>(new SimpleAnnotatedType<Horse>(Horse.class), getEmptyAnnotatedItem(Horse.class), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - - Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Dependent.class, new DependentAnnotationLiteral()); - AnnotatedType<Horse> annotatedItem = new SimpleAnnotatedType<Horse>(Horse.class, annotations); - try - { - new SimpleBeanModel<Horse>(new SimpleAnnotatedType<Horse>(Horse.class), annotatedItem, manager); - } - catch (Exception e) - { - assert false; - } - } - - @Test - public void testClassWithFinalMethodMustBeDependentScoped() - { - boolean exception = false; - try - { - new SimpleBeanModel<Pig>(new SimpleAnnotatedType<Pig>(Pig.class), getEmptyAnnotatedItem(Pig.class), manager); - } - catch (Exception e) - { - exception = true; - } - assert exception; - - Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Dependent.class, new DependentAnnotationLiteral()); - AnnotatedType<Pig> annotatedItem = new SimpleAnnotatedType<Pig>(Pig.class, annotations); - try - { - new SimpleBeanModel<Pig>(new SimpleAnnotatedType<Pig>(Pig.class), annotatedItem, manager); - } - catch (Exception e) - { - assert false; - } - } - - -} Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypeModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypeModelTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypeModelTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -14,8 +14,8 @@ import org.jboss.webbeans.test.annotations.broken.StereotypeWithNonEmptyNamed; import org.jboss.webbeans.test.annotations.broken.StereotypeWithTooManyDeploymentTypes; import org.jboss.webbeans.test.annotations.broken.StereotypeWithTooManyScopeTypes; -import org.jboss.webbeans.test.components.Animal; -import org.jboss.webbeans.test.components.Order; +import org.jboss.webbeans.test.beans.Animal; +import org.jboss.webbeans.test.beans.Order; import org.testng.annotations.Test; @SpecVersion("20080925") Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeSafeResolutionTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeSafeResolutionTest.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeSafeResolutionTest.java 2008-10-25 19:29:44 UTC (rev 152) @@ -17,19 +17,19 @@ import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.bean.SimpleBeanModel; import org.jboss.webbeans.test.annotations.Whitefish; +import org.jboss.webbeans.test.beans.Animal; +import org.jboss.webbeans.test.beans.Cod; +import org.jboss.webbeans.test.beans.Farmer; +import org.jboss.webbeans.test.beans.FishFarm; +import org.jboss.webbeans.test.beans.Haddock; +import org.jboss.webbeans.test.beans.Plaice; +import org.jboss.webbeans.test.beans.Salmon; +import org.jboss.webbeans.test.beans.ScottishFish; +import org.jboss.webbeans.test.beans.ScottishFishFarmer; +import org.jboss.webbeans.test.beans.SeaBass; +import org.jboss.webbeans.test.beans.Sole; +import org.jboss.webbeans.test.beans.Tuna; import org.jboss.webbeans.test.bindings.ChunkyAnnotationLiteral; -import org.jboss.webbeans.test.components.Animal; -import org.jboss.webbeans.test.components.Cod; -import org.jboss.webbeans.test.components.Farmer; -import org.jboss.webbeans.test.components.FishFarm; -import org.jboss.webbeans.test.components.Haddock; -import org.jboss.webbeans.test.components.Plaice; -import org.jboss.webbeans.test.components.Salmon; -import org.jboss.webbeans.test.components.ScottishFish; -import org.jboss.webbeans.test.components.ScottishFishFarmer; -import org.jboss.webbeans.test.components.SeaBass; -import org.jboss.webbeans.test.components.Sole; -import org.jboss.webbeans.test.components.Tuna; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalOrderStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalOrderStereotype.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalOrderStereotype.java 2008-10-25 19:29:44 UTC (rev 152) @@ -8,8 +8,8 @@ import javax.webbeans.Stereotype; -import org.jboss.webbeans.test.components.Animal; -import org.jboss.webbeans.test.components.Order; +import org.jboss.webbeans.test.beans.Animal; +import org.jboss.webbeans.test.beans.Order; @Stereotype(requiredTypes={Animal.class, Order.class}) @Target( { TYPE }) 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-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/AnimalStereotype.java 2008-10-25 19:29:44 UTC (rev 152) @@ -9,7 +9,7 @@ import javax.webbeans.RequestScoped; import javax.webbeans.Stereotype; -import org.jboss.webbeans.test.components.Animal; +import org.jboss.webbeans.test.beans.Animal; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java 2008-10-25 19:29:44 UTC (rev 152) @@ -9,7 +9,7 @@ import javax.webbeans.ApplicationScoped; import javax.webbeans.Stereotype; -import org.jboss.webbeans.test.components.Animal; +import org.jboss.webbeans.test.beans.Animal; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java 2008-10-25 19:29:44 UTC (rev 152) @@ -8,7 +8,7 @@ import javax.webbeans.Stereotype; -import org.jboss.webbeans.test.components.Animal; +import org.jboss.webbeans.test.beans.Animal; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MammalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MammalStereotype.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/MammalStereotype.java 2008-10-25 19:29:44 UTC (rev 152) @@ -8,7 +8,7 @@ import javax.webbeans.Stereotype; -import org.jboss.webbeans.test.components.Animal; +import org.jboss.webbeans.test.beans.Animal; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RequestScopedAnimalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RequestScopedAnimalStereotype.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RequestScopedAnimalStereotype.java 2008-10-25 19:29:44 UTC (rev 152) @@ -9,7 +9,7 @@ import javax.webbeans.RequestScoped; import javax.webbeans.Stereotype; -import org.jboss.webbeans.test.components.Animal; +import org.jboss.webbeans.test.beans.Animal; @Stereotype(requiredTypes=Animal.class, supportedScopes=RequestScoped.class) @Target( { TYPE }) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RiverFishStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RiverFishStereotype.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/RiverFishStereotype.java 2008-10-25 19:29:44 UTC (rev 152) @@ -9,7 +9,7 @@ import javax.webbeans.ApplicationScoped; import javax.webbeans.Stereotype; -import org.jboss.webbeans.test.components.Animal; +import org.jboss.webbeans.test.beans.Animal; @Stereotype(requiredTypes=Animal.class) @Target( { TYPE }) Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Animal.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public interface Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Antelope.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class Antelope implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Antelope.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Remote; +import javax.webbeans.Production; + +@Remote +@Production +// TODO @BoundTo("/beans/baboon") +public interface Baboon extends Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ComponentWithTooManyScopeTypes.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.ConversationScoped; +import javax.webbeans.RequestScoped; + +@RequestScoped +@ConversationScoped +public class BeanWithTooManyScopeTypes +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BeanWithTooManyScopeTypes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Bear.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Stateless; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +@Stateless +public class Bear +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Bear.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/BlackWidow.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class BlackWidow extends Spider implements DeadlySpider +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlackWidow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.test.beans; + +import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; +import org.jboss.webbeans.test.beans.Animal; + +@RequestScopedAnimalStereotype +public class Carp implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Carp.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cat.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Synchronous; + +@Production +@Synchronous +public class Cat +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cat.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chair.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import org.jboss.webbeans.test.annotations.AnimalStereotype; + +@AnimalStereotype +public class Chair +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chair.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Remove; +import javax.webbeans.Destructor; +import javax.webbeans.Production; + +@Production +public class Cheetah +{ + + @Remove @Destructor + public void remove() + { + + } + + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cheetah.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chicken.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Initializer; +import javax.webbeans.Production; + +@Production +public class Chicken +{ + + @Initializer + public Chicken(String foo) + { + } + + @Initializer + public Chicken(String foo, Double bar) + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Chicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java (from rev 144, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cod.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Chunky; +import org.jboss.webbeans.test.annotations.Whitefish; + +@Production +@Whitefish +@Chunky(realChunky=true) +@Named("whitefish") +public class Cod implements ScottishFish +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cougar.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cougar.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cougar.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,31 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Destructor; +import javax.webbeans.Production; + +@Production +@Stateful +public class Cougar +{ + + @Remove + public void remove() + { + + } + + @Remove @Destructor + public void remove1() + { + + } + + @Remove @Destructor + public void remove2() + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cougar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cow.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +@Production +public abstract class Cow +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DaddyLongLegs.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class DaddyLongLegs extends Spider +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DaddyLongLegs.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DangerCall.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +@Production +public class DangerCall +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DangerCall.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlyAnimal.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public interface DeadlyAnimal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlyAnimal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlySpider.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public interface DeadlySpider extends DeadlyAnimal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DeadlySpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DefangedTarantula.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class DefangedTarantula extends Tarantula +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/DefangedTarantula.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Donkey.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +@Production +public class Donkey +{ + + public Donkey(String foo) + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Donkey.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Duck.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Synchronous; + +@Production +public class Duck +{ + + public Duck(String foo) + { + // TODO Auto-generated constructor stub + } + + public Duck(String foo, @Synchronous Integer bar) + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Duck.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,25 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Remove; +import javax.ejb.Stateful; +import javax.webbeans.Destructor; +import javax.webbeans.Production; + +@Production +@Stateful +public class Elephant +{ + + @Remove + public void remove1() + { + + } + + @Remove @Destructor + public void remove2() + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Elephant.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farmer.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +@Production +public class Farmer<T> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Farmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java (from rev 144, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,37 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Current; +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Chunky; +import org.jboss.webbeans.test.annotations.Whitefish; + +@Production +public class FishFarm +{ + + @SuppressWarnings("unused") + @Current + private Tuna tuna; + + @SuppressWarnings("unused") + @Current + private Animal animal; + + @SuppressWarnings("unused") + @Whitefish + private ScottishFish whiteScottishFish; + + @SuppressWarnings("unused") + @Whitefish + private Animal whiteFish; + + @SuppressWarnings("unused") + @Whitefish @Chunky(realChunky=true) + private Animal realChunkyWhiteFish; + + @SuppressWarnings("unused") + @Current + private Farmer<ScottishFish> scottishFishFarmer; + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/FishFarm.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Giraffe.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Stateless; + +@Stateless +public class Giraffe +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Giraffe.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goat.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goat.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goat.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goat.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,23 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Asynchronous; +import org.jboss.webbeans.test.annotations.Synchronous; + +@Production +public class Goat +{ + + public Goat(@Synchronous String foo) + { + // TODO Auto-generated constructor stub + } + + public Goat(@Asynchronous String foo, String bar) + { + // TODO Auto-generated constructor stub + } + + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goat.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goldfish.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; + +@RequestScopedAnimalStereotype +@RequestScoped +@Production +public class Goldfish implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goldfish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goose.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goose.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goose.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goose.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Initializer; +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Synchronous; + +@Production +public class Goose +{ + + public Goose(@Synchronous String foo) + { + // TODO Auto-generated constructor stub + } + + @Initializer + public Goose(String foo, String bar) + { + // TODO Auto-generated constructor stub + } + + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Goose.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Gorilla.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Gorilla.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Gorilla.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Gorilla.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.AnimalStereotype; + +@AnimalStereotype +@Production +public class Gorilla implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Gorilla.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Haddock.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Whitefish; + +@Production +@Named +public class Haddock implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Haddock.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Horse.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +public final class Horse +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Horse.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/LadybirdSpider.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class LadybirdSpider extends Spider +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/LadybirdSpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Leopard.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.MessageDriven; +import javax.webbeans.Production; + +@Production +@MessageDriven +public class Leopard +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Leopard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Lion.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Stateless; +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Stateless +@Named +public class Lion +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Lion.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Moose.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Named; + +import org.jboss.webbeans.test.annotations.MammalStereotype; + +@MammalStereotype +@Named("aMoose") +public class Moose implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Moose.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Remote; +import javax.webbeans.Destructor; +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Remote +@Production +//TODO @BoundTo("/beans/orangutan") +@Named +public interface Orangutan extends Animal +{ + + @Destructor + public void removeOrangutan(); + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Order.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +@Production +public class Order +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Order.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Panther.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.test.beans; + +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-ri/src/test/java/org/jboss/webbeans/test/beans/Panther.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java (from rev 148, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Plaice.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Named; +import javax.webbeans.RequestScoped; + +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; +import org.jboss.webbeans.test.annotations.Whitefish; + +@AnotherDeploymentType +@Whitefish +@Named("whitefish") +@RequestScoped +public final class Plaice implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Plaice.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Puma.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.test.beans; + +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-ri/src/test/java/org/jboss/webbeans/test/beans/Puma.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java (from rev 144, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Salmon.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +@Production +@Named +public class Salmon implements ScottishFish +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Salmon.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFish.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public interface ScottishFish extends Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFish.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java (from rev 144, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFishFarmer.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +@Production +public class ScottishFishFarmer extends Farmer<ScottishFish> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/ScottishFishFarmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SeaBass.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,11 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +public class SeaBass implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SeaBass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sheep.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Initializer; +import javax.webbeans.Production; + +@Production +public class Sheep +{ + + + public Sheep(String foo) + { + + } + + @Initializer + public Sheep(String foo, Double bar) + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sheep.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java (from rev 144, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sole.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Named; +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Whitefish; + +@Production +@Whitefish +@Named("whitefish") +public class Sole implements ScottishFish +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Sole.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Spider.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class Spider implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Spider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SpiderProducer.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,44 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Dependent; +import javax.webbeans.Named; +import javax.webbeans.Produces; +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Tame; + +@Production +public class SpiderProducer +{ + + @Produces @Tame public Tarantula produceTameTarantula() + { + return new DefangedTarantula(); + } + + @Produces public Tarantula produceTarantula() + { + return new Tarantula(); + } + + @Produces @Dependent public final TrapdoorSpider produceTrapdoorSpider() + { + return new TrapdoorSpider(); + } + + @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() + { + return new BlackWidow(); + } + + @Produces @Named public DaddyLongLegs produceDaddyLongLegs() + { + return new DaddyLongLegs(); + } + + @Produces @Named public LadybirdSpider getLadybirdSpider() + { + return new LadybirdSpider(); + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SpiderProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,17 @@ +package org.jboss.webbeans.test.beans; + +import javax.ejb.Remote; +import javax.webbeans.Named; +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Tame; + +@Remote +@Production +// TODO @BoundTo("/beans/tame/orangutan") +@Tame +@Named +public interface TameOrangutan extends Orangutan +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tarantula.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class Tarantula extends Spider implements DeadlySpider +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tarantula.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tiger.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,21 @@ +package org.jboss.webbeans.test.beans; + +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-ri/src/test/java/org/jboss/webbeans/test/beans/Tiger.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TrapdoorSpider.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class TrapdoorSpider +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TrapdoorSpider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tuna.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; + +@AnotherDeploymentType +public class Tuna +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Tuna.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Turkey.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,19 @@ +package org.jboss.webbeans.test.beans; + +import javax.webbeans.Production; + +@Production +public class Turkey +{ + + public Turkey(String foo) + { + + } + + public Turkey(String foo, Integer bar) + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Turkey.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken (from rev 140, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken) Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithFinalProducerMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithFinalProducerMethod.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithFinalProducerMethod.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.beans.broken; + +import javax.webbeans.Produces; +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +public class BeanWithFinalProducerMethod +{ + + @Produces @RequestScoped public final String getString() + { + return "Pete"; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithFinalProducerMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithStaticProducerMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithStaticProducerMethod.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithStaticProducerMethod.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.test.beans.broken; + +import javax.webbeans.Produces; +import javax.webbeans.Production; + +@Production +public class BeanWithStaticProducerMethod +{ + + @Produces public static String getString() + { + return "Pete"; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithStaticProducerMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithTooManyDeploymentTypes.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithTooManyDeploymentTypes.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithTooManyDeploymentTypes.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,12 @@ +package org.jboss.webbeans.test.beans.broken; + +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; + +@Production +@AnotherDeploymentType +public class BeanWithTooManyDeploymentTypes +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BeanWithTooManyDeploymentTypes.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Carp.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java 2008-10-24 12:42:57 UTC (rev 140) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Carp.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,10 +0,0 @@ -package org.jboss.webbeans.test.components.broken; - -import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; -import org.jboss.webbeans.test.components.Animal; - -@RequestScopedAnimalStereotype -public class Carp implements Animal -{ - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Carp.java (from rev 151, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Carp.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Carp.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.test.beans.broken; + +import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; +import org.jboss.webbeans.test.beans.Animal; + +@RequestScopedAnimalStereotype +public class Carp implements Animal +{ + +} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Chimpanzee.java 2008-10-24 12:42:57 UTC (rev 140) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.components.broken; - -import javax.ejb.Remote; -import javax.webbeans.Destructor; -import javax.webbeans.Production; - -@Remote -// TODO @BoundTo("/beans/Chimpanzee") -@Production -public interface Chimpanzee -{ - - @Destructor - public void remove(String foo); - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java (from rev 151, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Chimpanzee.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.beans.broken; + +import javax.ejb.Remote; +import javax.webbeans.Destructor; +import javax.webbeans.Production; + +@Remote +// TODO @BoundTo("/beans/Chimpanzee") +@Production +public interface Chimpanzee +{ + + @Destructor + public void remove(String foo); + +} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithFinalProducerMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/ComponentWithFinalProducerMethod.java 2008-10-24 12:42:57 UTC (rev 140) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithFinalProducerMethod.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.components.broken; - -import javax.webbeans.Produces; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -public class ComponentWithFinalProducerMethod -{ - - @Produces @RequestScoped public final String getString() - { - return "Pete"; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithStaticProducerMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/ComponentWithStaticProducerMethod.java 2008-10-24 12:42:57 UTC (rev 140) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithStaticProducerMethod.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.test.components.broken; - -import javax.webbeans.Produces; -import javax.webbeans.Production; - -@Production -public class ComponentWithStaticProducerMethod -{ - - @Produces public static String getString() - { - return "Pete"; - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithTooManyDeploymentTypes.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/ComponentWithTooManyDeploymentTypes.java 2008-10-24 12:42:57 UTC (rev 140) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ComponentWithTooManyDeploymentTypes.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.components.broken; - -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; - -@Production -@AnotherDeploymentType -public class ComponentWithTooManyDeploymentTypes -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Gibbon.java 2008-10-24 12:42:57 UTC (rev 140) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,19 +0,0 @@ -package org.jboss.webbeans.test.components.broken; - -import javax.ejb.Remote; -import javax.webbeans.Destructor; -import javax.webbeans.Production; - -@Remote -// TODO @BoundTo("/beans/Chimpanzee") -@Production -public interface Gibbon -{ - - @Destructor - public void remove(); - - @Destructor - public void removeAgain(); - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java (from rev 151, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Gibbon.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,19 @@ +package org.jboss.webbeans.test.beans.broken; + +import javax.ejb.Remote; +import javax.webbeans.Destructor; +import javax.webbeans.Production; + +@Remote +// TODO @BoundTo("/beans/Chimpanzee") +@Production +public interface Gibbon +{ + + @Destructor + public void remove(); + + @Destructor + public void removeAgain(); + +} Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.beans.broken; + +import javax.webbeans.Production; + +public class OuterBean +{ + + @Production + public class InnerBean + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterComponent.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/OuterComponent.java 2008-10-24 12:42:57 UTC (rev 140) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterComponent.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.components.broken; - -import javax.webbeans.Production; - -public class OuterComponent -{ - - @Production - public class InnerComponent - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pig.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Pig.java 2008-10-24 12:42:57 UTC (rev 140) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pig.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.components.broken; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -public class Pig -{ - - public final void washPig() - { - - } - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pig.java (from rev 151, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Pig.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pig.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Pig.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.beans.broken; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +public class Pig +{ + + public final void washPig() + { + + } + +} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/PlaiceFarm.java (from rev 151, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/PlaiceFarm.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/PlaiceFarm.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/PlaiceFarm.java 2008-10-25 19:29:44 UTC (rev 152) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.beans.broken; + +import javax.webbeans.Production; + +import org.jboss.webbeans.test.annotations.Whitefish; +import org.jboss.webbeans.test.beans.Plaice; + +@Production +public class PlaiceFarm +{ + + @SuppressWarnings("unused") + @Whitefish + private Plaice plaice; + +} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Animal.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Animal.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Animal.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public interface Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Antelope.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Antelope.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Antelope.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public class Antelope implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Baboon.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Remote; -import javax.webbeans.Production; - -@Remote -@Production -// TODO @BoundTo("/beans/baboon") -public interface Baboon extends Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Bear.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Bear.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Bear.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Stateless; -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -@Stateless -public class Bear -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/BlackWidow.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/BlackWidow.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/BlackWidow.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public class BlackWidow extends Spider implements DeadlySpider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,10 +0,0 @@ -package org.jboss.webbeans.test.components; - -import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; -import org.jboss.webbeans.test.components.Animal; - -@RequestScopedAnimalStereotype -public class Carp implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cat.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cat.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cat.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Synchronous; - -@Production -@Synchronous -public class Cat -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chair.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chair.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chair.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.components; - -import org.jboss.webbeans.test.annotations.AnimalStereotype; - -@AnimalStereotype -public class Chair -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cheetah.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Remove; -import javax.webbeans.Destructor; -import javax.webbeans.Production; - -@Production -public class Cheetah -{ - - @Remove @Destructor - public void remove() - { - - } - - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chicken.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chicken.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Chicken.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Initializer; -import javax.webbeans.Production; - -@Production -public class Chicken -{ - - @Initializer - public Chicken(String foo) - { - } - - @Initializer - public Chicken(String foo, Double bar) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cod.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cod.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cod.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Chunky; -import org.jboss.webbeans.test.annotations.Whitefish; - -@Production -@Whitefish -@Chunky(realChunky=true) -@Named("whitefish") -public class Cod implements ScottishFish -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ComponentWithTooManyScopeTypes.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ComponentWithTooManyScopeTypes.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ComponentWithTooManyScopeTypes.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.ConversationScoped; -import javax.webbeans.RequestScoped; - -@RequestScoped -@ConversationScoped -public class ComponentWithTooManyScopeTypes -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cougar.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,31 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Destructor; -import javax.webbeans.Production; - -@Production -@Stateful -public class Cougar -{ - - @Remove - public void remove() - { - - } - - @Remove @Destructor - public void remove1() - { - - } - - @Remove @Destructor - public void remove2() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cow.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cow.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Cow.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -@Production -public abstract class Cow -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DaddyLongLegs.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DaddyLongLegs.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DaddyLongLegs.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public class DaddyLongLegs extends Spider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DangerCall.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DangerCall.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DangerCall.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -@Production -public class DangerCall -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlyAnimal.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlyAnimal.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlyAnimal.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public interface DeadlyAnimal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlySpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlySpider.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DeadlySpider.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public interface DeadlySpider extends DeadlyAnimal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DefangedTarantula.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DefangedTarantula.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/DefangedTarantula.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public class DefangedTarantula extends Tarantula -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Donkey.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Donkey.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Donkey.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -@Production -public class Donkey -{ - - public Donkey(String foo) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Duck.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Duck.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Duck.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,21 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Synchronous; - -@Production -public class Duck -{ - - public Duck(String foo) - { - // TODO Auto-generated constructor stub - } - - public Duck(String foo, @Synchronous Integer bar) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Elephant.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,25 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.webbeans.Destructor; -import javax.webbeans.Production; - -@Production -@Stateful -public class Elephant -{ - - @Remove - public void remove1() - { - - } - - @Remove @Destructor - public void remove2() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farmer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farmer.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farmer.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -@Production -public class Farmer<T> -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,37 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Current; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Chunky; -import org.jboss.webbeans.test.annotations.Whitefish; - -@Production -public class FishFarm -{ - - @SuppressWarnings("unused") - @Current - private Tuna tuna; - - @SuppressWarnings("unused") - @Current - private Animal animal; - - @SuppressWarnings("unused") - @Whitefish - private ScottishFish whiteScottishFish; - - @SuppressWarnings("unused") - @Whitefish - private Animal whiteFish; - - @SuppressWarnings("unused") - @Whitefish @Chunky(realChunky=true) - private Animal realChunkyWhiteFish; - - @SuppressWarnings("unused") - @Current - private Farmer<ScottishFish> scottishFishFarmer; - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Giraffe.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Giraffe.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Giraffe.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Stateless; - -@Stateless -public class Giraffe -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goat.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goat.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goat.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,23 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Asynchronous; -import org.jboss.webbeans.test.annotations.Synchronous; - -@Production -public class Goat -{ - - public Goat(@Synchronous String foo) - { - // TODO Auto-generated constructor stub - } - - public Goat(@Asynchronous String foo, String bar) - { - // TODO Auto-generated constructor stub - } - - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goldfish.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goldfish.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goldfish.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; - -@RequestScopedAnimalStereotype -@RequestScoped -@Production -public class Goldfish implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goose.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goose.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Goose.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,24 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Initializer; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Synchronous; - -@Production -public class Goose -{ - - public Goose(@Synchronous String foo) - { - // TODO Auto-generated constructor stub - } - - @Initializer - public Goose(String foo, String bar) - { - // TODO Auto-generated constructor stub - } - - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Gorilla.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Gorilla.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Gorilla.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.AnimalStereotype; - -@AnimalStereotype -@Production -public class Gorilla implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Haddock.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Haddock.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Haddock.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Whitefish; - -@Production -@Named -public class Haddock implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Horse.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Horse.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Horse.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -public final class Horse -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/LadybirdSpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/LadybirdSpider.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/LadybirdSpider.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public class LadybirdSpider extends Spider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Leopard.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Leopard.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Leopard.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.MessageDriven; -import javax.webbeans.Production; - -@Production -@MessageDriven -public class Leopard -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Lion.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Lion.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Lion.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Stateless; -import javax.webbeans.Named; -import javax.webbeans.Production; - -@Production -@Stateless -@Named -public class Lion -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Moose.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Moose.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Moose.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,12 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Named; - -import org.jboss.webbeans.test.annotations.MammalStereotype; - -@MammalStereotype -@Named("aMoose") -public class Moose implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Orangutan.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Remote; -import javax.webbeans.Destructor; -import javax.webbeans.Named; -import javax.webbeans.Production; - -@Remote -@Production -//TODO @BoundTo("/beans/orangutan") -@Named -public interface Orangutan extends Animal -{ - - @Destructor - public void removeOrangutan(); - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Order.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Order.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Order.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -@Production -public class Order -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Panther.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Panther.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Panther.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,18 +0,0 @@ -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) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Plaice.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Plaice.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Plaice.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Named; -import javax.webbeans.RequestScoped; - -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.test.annotations.Whitefish; - -@AnotherDeploymentType -@Whitefish -@Named("whitefish") -@RequestScoped -public final class Plaice implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Puma.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Puma.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Puma.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,21 +0,0 @@ -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() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Salmon.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Salmon.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Salmon.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -@Production -@Named -public class Salmon implements ScottishFish -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFish.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFish.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFish.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public interface ScottishFish extends Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFishFarmer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFishFarmer.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/ScottishFishFarmer.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -@Production -public class ScottishFishFarmer extends Farmer<ScottishFish> -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SeaBass.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SeaBass.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SeaBass.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,11 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -public class SeaBass implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sheep.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sheep.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sheep.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Initializer; -import javax.webbeans.Production; - -@Production -public class Sheep -{ - - - public Sheep(String foo) - { - - } - - @Initializer - public Sheep(String foo, Double bar) - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sole.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sole.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Sole.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,14 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Named; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Whitefish; - -@Production -@Whitefish -@Named("whitefish") -public class Sole implements ScottishFish -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Spider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Spider.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Spider.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public class Spider implements Animal -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SpiderProducer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SpiderProducer.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/SpiderProducer.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,44 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Dependent; -import javax.webbeans.Named; -import javax.webbeans.Produces; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Tame; - -@Production -public class SpiderProducer -{ - - @Produces @Tame public Tarantula produceTameTarantula() - { - return new DefangedTarantula(); - } - - @Produces public Tarantula produceTarantula() - { - return new Tarantula(); - } - - @Produces @Dependent public final TrapdoorSpider produceTrapdoorSpider() - { - return new TrapdoorSpider(); - } - - @Produces @Named("blackWidow") public BlackWidow produceBlackWidow() - { - return new BlackWidow(); - } - - @Produces @Named public DaddyLongLegs produceDaddyLongLegs() - { - return new DaddyLongLegs(); - } - - @Produces @Named public LadybirdSpider getLadybirdSpider() - { - return new LadybirdSpider(); - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TameOrangutan.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.ejb.Remote; -import javax.webbeans.Named; -import javax.webbeans.Production; - -import org.jboss.webbeans.test.annotations.Tame; - -@Remote -@Production -// TODO @BoundTo("/beans/tame/orangutan") -@Tame -@Named -public interface TameOrangutan extends Orangutan -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tarantula.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tarantula.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tarantula.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public class Tarantula extends Spider implements DeadlySpider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tiger.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tiger.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tiger.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,21 +0,0 @@ -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() - { - - } - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TrapdoorSpider.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TrapdoorSpider.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/TrapdoorSpider.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.test.components; - -public class TrapdoorSpider -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tuna.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tuna.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Tuna.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.test.components; - -import org.jboss.webbeans.test.annotations.AnotherDeploymentType; - -@AnotherDeploymentType -public class Tuna -{ - -} Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Turkey.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Turkey.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Turkey.java 2008-10-25 19:29:44 UTC (rev 152) @@ -1,19 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; - -@Production -public class Turkey -{ - - public Turkey(String foo) - { - - } - - public Turkey(String foo, Integer bar) - { - - } - -} Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockObserverImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockObserverImpl.java 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockObserverImpl.java 2008-10-25 19:29:44 UTC (rev 152) @@ -17,10 +17,10 @@ - public MockObserverImpl(BeanModel<?, ?> componentModel, + public MockObserverImpl(BeanModel<?, ?> beanModel, InjectableMethod<?> observer, Class<T> eventType) { - super(componentModel, observer, eventType); + super(beanModel, observer, eventType); } @Override Modified: ri/trunk/webbeans-ri/testng.xml =================================================================== --- ri/trunk/webbeans-ri/testng.xml 2008-10-25 19:25:45 UTC (rev 151) +++ ri/trunk/webbeans-ri/testng.xml 2008-10-25 19:29:44 UTC (rev 152) @@ -6,14 +6,14 @@ <groups> <run> <exclude name="specialization" /> - <exclude name="componentLifecycle" /> + <exclude name="beanLifecycle" /> <exclude name="deployment" /> <exclude name="disposalMethod" /> <exclude name="producerExpression" /> - <exclude name="remoteComponentInXml" /> <exclude name="eventbus" /> <exclude name="injection" /> <exclude name="contexts" /> + <exclude name="ejb3" /> </run> </groups> <packages>