[weld-commits] Weld SVN: r4661 - in core/trunk/tests/src/test/java/org/jboss/weld/test: activities and 62 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Wed Nov 4 12:59:46 EST 2009
Author: pete.muir at jboss.org
Date: 2009-11-04 12:59:43 -0500 (Wed, 04 Nov 2009)
New Revision: 4661
Added:
core/trunk/tests/src/test/java/org/jboss/weld/test/NewEnterpriseBeanTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBeanLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/ActivitiesTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Cow.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Dummy.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Field.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Fox.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/NightTime.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Tame.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Bean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Child.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/DeclaringTypeTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/ExampleTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Parent.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/
core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/
core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/
core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/
core/trunk/tests/src/test/java/org/jboss/weld/test/el/
core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/
core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/Beer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/BeerProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/ELResolverTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/BowlerHatException.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Cat.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/CatLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EjbDescriptorLookupTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EnterpriseBeanTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Fedora.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/FedoraImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Hat.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/HatRemote.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/
core/trunk/tests/src/test/java/org/jboss/weld/test/event/
core/trunk/tests/src/test/java/org/jboss/weld/test/event/Bar.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/EventQualifierTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/NormalScopedBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/SimpleEventTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/Updated.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/
core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/
core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Ball.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Defender.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Goalkeeper.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Pass.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivation.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivationInterceptor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivationTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Shot.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/
core/trunk/tests/src/test/java/org/jboss/weld/test/named/
core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/
core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/
core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/
core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/ProxyTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Bar.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Baz.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooBase.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupFoo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupInstanceTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Special.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Weld256Test.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri293/
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/PreinstantiateBeanManagerTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WeldBean.java
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/Cat.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/CatLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/EjbDescriptorLookupTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Beer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/BeerProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/ELResolverTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/extensions/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Bar.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/EventQualifierTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Ball.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Defender.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Goalkeeper.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Pass.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivation.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationInterceptor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Shot.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Weld256Test.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/WeldBean.java
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/BeanWithInjection.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/MyBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/SameBeanTypeInChildActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/SpecialBindingType.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Cow.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Donkey.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Dummy.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Dusk.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/ELCurrentActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/EventCurrentActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Field.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Horse.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InactiveScopeTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InjectedManagerCurrentActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InstanceCurrentActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/JndiManagerCurrentActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NightTime.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NonNormalScope.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NonNormalScopeTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Tame.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/AnnotatedTypeDecoratorTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotated.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedCallable.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedConstructor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedField.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedMember.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedMethod.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedParameter.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedType.java
core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/NotAnnotated.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Animal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/BootstrapTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Salmon.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/ScottishFish.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/SeaBass.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Sole.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Tuna.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Whitefish.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/BootstrapTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/Tuna.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Animal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/BootstrapTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Elephant.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/ElephantLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Hound.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/HoundLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Panther.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/PantherLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Salmon.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/ScottishFish.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/SeaBass.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Sole.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Synchronous.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tame.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tiger.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/TigerLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tuna.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Whitefish.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Animal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/BootstrapTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DeadlySpider.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Spider.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Tame.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Tarantula.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/BootstrapTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Elephant.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/ElephantLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Hound.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/HoundLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Panther.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/PantherLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Synchronous.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Tame.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Tiger.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/TigerLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/BootstrapTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/Hound.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/HoundLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/Tame.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/ManagerTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ApplicationScopedObject.java
core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ApplicationScopedTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ContextTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ParameterizedTypeScoped.java
core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ParameterizedTypeScopedTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/PassivatingContextTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/StringHolder.java
core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleBeanImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecorator1.java
core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecorator2.java
core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecoratorTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/AlteStadt.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/BeanImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/BeanLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/DirectOrderProcessor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/DirectOrderProcessorLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/FrankfurtAmMain.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GeschichtslosStadt.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Giessen.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GrossStadt.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GutenbergMuseum.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/IndirectOrderProcessor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/IntermediateOrderProcessor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Kassel.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/KleinStadt.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/LandgraffenSchloss.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Mainz.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Marburg.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/MockCreationalContext.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/NeueStadt.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/OrderProcessor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/OrderProcessorLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/RoemerPassage.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Schloss.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/SchoeneStadt.java
core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/UniStadt.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/AbstractHtmlUnitTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/TxEventTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/Updated.java
core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/ExceptionHandlingTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/FooException.java
core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Large.java
core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Lorry_Broken.java
core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Ship.java
core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/ShipProducer_Broken.java
core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/ExtensionTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/SimpleExtension.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Ball.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/BallImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Defender.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/EnterpriseBeanInterceptionTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Goalkeeper.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Pass.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Referee.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Shot.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/TimeBound.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Ball.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Defender.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Ejb3InterceptionModelTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Goalkeeper.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Referee.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/TimeBound.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Ball.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Defender.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/InterceptorWithNonSerializableFieldOnPassivatingBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Pass.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Team.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Ball.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Defender.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/NonPassivatingInterceptorOnPassivatingBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Pass.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/PrimaryInterceptionBinding.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SecondaryInterceptionBinding.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBeanImpl.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBeanWithStereotype.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleDecorator.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptorStereotype.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptorTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/TwoBindingsInterceptor.java
core/trunk/tests/src/test/java/org/jboss/weld/test/named/Important.java
core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBinding.java
core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBindingTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/NewSimpleBeanTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/WrappedSimpleBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/ExampleTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/External.java
core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/Random.java
core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/WebBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/IntegerCollectionInjection.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ListInstance.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ListStringInstance.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedCollectionInjection.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedListInjection.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedProducerTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/Target.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Car.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/CarFactory.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/FooDisposer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/FooProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Government.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Important.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/IntInjection.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/ManagerProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/ManagerProducerTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerWithBinding.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerWithBindingTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NullProducerTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/EnterpriseBeanProxyTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/Mouse.java
core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/MouseLocal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Bar.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/CircularDependencyTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentLooping.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentLoopingProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentSelfConsumingDependentProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Farm.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Fish.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Foo.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/NormalLooping.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/NormalLoopingProducer.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/SelfConsumingDependent.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Violation.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Water.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/AbstractFactory.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/DummyParent.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/IntFactory.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/IntegerFactory.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/SomeBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/Weld279Test.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri293/ContextualReferenceTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri293/Sheep.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Animal.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/AnimalOrderStereotype.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/AnimalStereotype.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Order.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/RequestScopedAnimalStereotype.java
core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/StereotypesTest.java
Log:
reorg tests
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/NewEnterpriseBeanTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/NewEnterpriseBeanTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/NewEnterpriseBeanTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,72 @@
+package org.jboss.weld.test;
+
+import java.util.Set;
+
+import javax.enterprise.inject.New;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.bean.NewSessionBean;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.introspector.WeldAnnotated;
+import org.jboss.weld.literal.NewLiteral;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class NewEnterpriseBeanTest extends AbstractWeldTest
+{
+
+ private static final New NEW_LITERAL = new NewLiteral()
+ {
+
+ public java.lang.Class<?> value()
+ {
+ return WrappedEnterpriseBean.class;
+ }
+
+ };
+
+ private SessionBean<WrappedEnterpriseBeanLocal> wrappedEnterpriseBean;
+ private NewSessionBean<WrappedEnterpriseBeanLocal> newEnterpriseBean;
+
+ public void initNewBean()
+ {
+ Set<Bean<?>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class);
+ assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).size() == 1;
+ assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof SessionBean;
+ wrappedEnterpriseBean = (SessionBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next();
+
+ assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1;
+ assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewSessionBean;
+ newEnterpriseBean = (NewSessionBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next();
+
+ }
+
+ @Test(groups = { "new", "broken" })
+ public void testNewBeanHasImplementationClassOfInjectionPointType()
+ {
+ initNewBean();
+ assert newEnterpriseBean.getType().equals(WrappedEnterpriseBean.class);
+ }
+
+ @Test(groups = { "new" })
+ public void testNewBeanHasSameInitializerMethodsAsWrappedBean()
+ {
+ initNewBean();
+ assert newEnterpriseBean.getInitializerMethods().equals(wrappedEnterpriseBean.getInitializerMethods());
+ }
+
+ @Test(groups = { "new" })
+ public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
+ {
+ initNewBean();
+ Set<? extends WeldAnnotated<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getAnnotatedInjectionPoints();
+ Set<? extends WeldAnnotated<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getAnnotatedInjectionPoints();
+ assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/NewEnterpriseBeanTest.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBean.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBean.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,14 @@
+package org.jboss.weld.test;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.enterprise.context.SessionScoped;
+
+ at SessionScoped
+ at Stateful
+class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal
+{
+ @Remove
+ public void bye() {
+ }
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBean.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBeanLocal.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBeanLocal.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBeanLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,9 @@
+package org.jboss.weld.test;
+
+import javax.ejb.Local;
+
+ at Local
+public interface WrappedEnterpriseBeanLocal
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/WrappedEnterpriseBeanLocal.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/ActivitiesTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/activities/ActivitiesTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/ActivitiesTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,302 @@
+package org.jboss.weld.test.activities;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.context.spi.Contextual;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.bean.ForwardingBean;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+
+/**
+ *
+ * Spec version: 20090519
+ *
+ */
+ at Artifact
+public class ActivitiesTest extends AbstractWeldTest
+{
+
+ private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
+
+ static
+ {
+ DEFAULT_BINDINGS.add(new DefaultLiteral());
+ }
+
+ private Bean<?> createDummyBean(BeanManager beanManager, final Type injectionPointType)
+ {
+ final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>();
+ final Set<Type> types = new HashSet<Type>();
+ final Set<Annotation> bindings = new HashSet<Annotation>();
+ bindings.add(new AnnotationLiteral<Tame>() {});
+ types.add(Object.class);
+ final Bean<?> bean = new Bean<Object>()
+ {
+
+ public Set<Annotation> getQualifiers()
+ {
+ return bindings;
+ }
+
+ public Set<InjectionPoint> getInjectionPoints()
+ {
+ return injectionPoints;
+ }
+
+ public String getName()
+ {
+ return null;
+ }
+
+ public Class<? extends Annotation> getScope()
+ {
+ return Dependent.class;
+ }
+
+ public Set<Type> getTypes()
+ {
+ return types;
+ }
+
+ public boolean isNullable()
+ {
+ return false;
+ }
+
+ public Object create(CreationalContext<Object> creationalContext)
+ {
+ return null;
+ }
+
+ public void destroy(Object instance, CreationalContext<Object> creationalContext)
+ {
+
+ }
+
+ public Class<?> getBeanClass()
+ {
+ return Object.class;
+ }
+
+ public boolean isAlternative()
+ {
+ return false;
+ }
+
+ public Set<Class<? extends Annotation>> getStereotypes()
+ {
+ return Collections.emptySet();
+ }
+
+ };
+ InjectionPoint injectionPoint = new InjectionPoint()
+ {
+
+ public Bean<?> getBean()
+ {
+ return bean;
+ }
+
+ public Set<Annotation> getQualifiers()
+ {
+ return DEFAULT_BINDINGS;
+ }
+
+ public Member getMember()
+ {
+ return null;
+ }
+
+ public Type getType()
+ {
+ return injectionPointType;
+ }
+
+ public Annotated getAnnotated()
+ {
+ return null;
+ }
+
+ public boolean isDelegate()
+ {
+ return false;
+ }
+
+ public boolean isTransient()
+ {
+ return false;
+ }
+
+ };
+ injectionPoints.add(injectionPoint);
+ return bean;
+ }
+
+ private static class DummyContext implements Context
+ {
+
+ public <T> T get(Contextual<T> contextual)
+ {
+ return null;
+ }
+
+ public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext)
+ {
+ return null;
+ }
+
+ public Class<? extends Annotation> getScope()
+ {
+ return Dummy.class;
+ }
+
+ public boolean isActive()
+ {
+ return false;
+ }
+
+ }
+
+ @Test
+ public void testBeanBelongingToParentActivityBelongsToChildActivity()
+ {
+ assert getBeans(Cow.class).size() == 1;
+ Contextual<?> bean = getBeans(Cow.class).iterator().next();
+ BeanManager childActivity = getCurrentManager().createActivity();
+ assert childActivity.getBeans(Cow.class).size() == 1;
+ assert childActivity.getBeans(Cow.class).iterator().next().equals(bean);
+ }
+
+ @Test
+ public void testBeanBelongingToParentActivityCanBeInjectedIntoChildActivityBean()
+ {
+ assert getBeans(Cow.class).size() == 1;
+ Contextual<?> bean = getBeans(Cow.class).iterator().next();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
+ Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
+ childActivity.addBean(dummyBean);
+ assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null;
+ }
+
+// @Test
+// public void testObserverBelongingToParentActivityBelongsToChildActivity()
+// {
+// assert getCurrentManager().resolveObservers(new NightTime()).size() == 1;
+// Observer<?> observer = getCurrentManager().resolveObservers(new NightTime()).iterator().next();
+// BeanManager childActivity = getCurrentManager().createActivity();
+// assert childActivity.resolveObservers(new NightTime()).size() == 1;
+// assert childActivity.resolveObservers(new NightTime()).iterator().next().equals(observer);
+// }
+
+ @Test
+ public void testObserverBelongingToParentFiresForChildActivity()
+ {
+ Fox.setObserved(false);
+ BeanManager childActivity = getCurrentManager().createActivity();
+ childActivity.fireEvent(new NightTime());
+ assert Fox.isObserved();
+ }
+
+ @Test
+ public void testContextObjectBelongingToParentBelongsToChild()
+ {
+ Context context = new DummyContext()
+ {
+
+ @Override
+ public boolean isActive()
+ {
+ return true;
+ }
+
+ };
+ getCurrentManager().addContext(context);
+ BeanManager childActivity = getCurrentManager().createActivity();
+ assert childActivity.getContext(Dummy.class) != null;
+ }
+
+ @Test
+ public void testBeanBelongingToChildActivityCannotBeInjectedIntoParentActivityBean()
+ {
+ assert getBeans(Cow.class).size() == 1;
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
+ Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
+ childActivity.addBean(dummyBean);
+ assert getBeans(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0;
+ }
+
+ @Test(expectedExceptions=UnsatisfiedResolutionException.class)
+ public void testInstanceProcessedByParentActivity()
+ {
+ Context dummyContext = new DummyContext();
+ getCurrentManager().addContext(dummyContext);
+ assert getBeans(Cow.class).size() == 1;
+ final Bean<Cow> bean = getBeans(Cow.class).iterator().next();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
+ final Set<Annotation> bindingTypes = new HashSet<Annotation>();
+ bindingTypes.add(new AnnotationLiteral<Tame>() {});
+ childActivity.addBean(new ForwardingBean<Cow>()
+ {
+
+ @Override
+ protected Bean<Cow> delegate()
+ {
+ return bean;
+ }
+
+ @Override
+ public Set<Annotation> getQualifiers()
+ {
+ return bindingTypes;
+ }
+
+ @Override
+ public Set<Class<? extends Annotation>> getStereotypes()
+ {
+ return Collections.emptySet();
+ }
+
+ });
+ createContextualInstance(Field.class).get();
+ }
+
+ @Test
+ public void testObserverBelongingToChildDoesNotFireForParentActivity()
+ {
+
+// BeanManager childActivity = getCurrentManager().createActivity();
+// ObserverMethod<NightTime> observer = new Observer<NightTime>()
+// {
+//
+// public boolean notify(NightTime event)
+// {
+// assert false;
+// return false;
+// }
+//
+// };
+// //TODO Fix this test to use an observer method in a child activity
+//// childActivity.addObserver(observer);
+// getCurrentManager().fireEvent(new NightTime());
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/ActivitiesTest.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Cow.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Cow.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Cow.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.activities;
+
+class Cow
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Cow.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Dummy.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Dummy.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Dummy.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,23 @@
+/**
+ *
+ */
+package org.jboss.weld.test.activities;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Scope;
+
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Scope
+ at Inherited
+ at interface Dummy {}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Dummy.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Field.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Field.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Field.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,16 @@
+package org.jboss.weld.test.activities;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+class Field
+{
+
+ @Inject @Tame Instance<Cow> instance;
+
+ public Cow get()
+ {
+ return instance.get();
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Field.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Fox.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Fox.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Fox.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,25 @@
+package org.jboss.weld.test.activities;
+
+import javax.enterprise.event.Observes;
+
+class Fox
+{
+
+ private static boolean observed = false;
+
+ public void observe(@Observes NightTime nighttime)
+ {
+ observed = true;
+ }
+
+ public static boolean isObserved()
+ {
+ return observed;
+ }
+
+ public static void setObserved(boolean observed)
+ {
+ Fox.observed = observed;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Fox.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/NightTime.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/activities/NightTime.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/NightTime.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.activities;
+
+class NightTime
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/NightTime.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Tame.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Tame.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Tame.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,22 @@
+package org.jboss.weld.test.activities;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at interface Tame
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/Tame.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/BeanWithInjection.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/BeanWithInjection.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/BeanWithInjection.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.child;
+package org.jboss.weld.test.activities.child;
class BeanWithInjection
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/MyBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/MyBean.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/MyBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.child;
+package org.jboss.weld.test.activities.child;
@SpecialBindingType
class MyBean
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/SameBeanTypeInChildActivityTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.child;
+package org.jboss.weld.test.activities.child;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/SpecialBindingType.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SpecialBindingType.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/child/SpecialBindingType.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.child;
+package org.jboss.weld.test.activities.child;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Cow.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Cow.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
class Cow
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Donkey.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Donkey.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Donkey.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import javax.enterprise.inject.spi.BeanManager;
import javax.naming.InitialContext;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Dummy.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dummy.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Dummy.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,7 +1,7 @@
/**
*
*/
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Dusk.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Dusk.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Dusk.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/ELCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/ELCurrentActivityTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/EventCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/EventCurrentActivityTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/EventCurrentActivityTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import java.lang.annotation.Annotation;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Field.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Field.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Field.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Horse.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Horse.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Horse.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InactiveScopeTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InactiveScopeTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InactiveScopeTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import java.lang.annotation.Annotation;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InjectedManagerCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InjectedManagerCurrentActivityTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InjectedManagerCurrentActivityTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import java.lang.annotation.Annotation;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InstanceCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/InstanceCurrentActivityTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/JndiManagerCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/JndiManagerCurrentActivityTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/JndiManagerCurrentActivityTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import java.lang.annotation.Annotation;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NightTime.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NightTime.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NightTime.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
class NightTime
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NonNormalScope.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScope.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NonNormalScope.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,7 +1,7 @@
/**
*
*/
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NonNormalScopeTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/NonNormalScopeTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/NonNormalScopeTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import java.lang.annotation.Annotation;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/Tame.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/activities/current/Tame.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.activities.current;
+package org.jboss.weld.test.activities.current;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Bean.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Bean.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Bean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.weld.test.annotatedType;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class Bean
+{
+ int field;
+
+ public Bean(int i)
+ {
+
+ }
+
+ public void method(int i)
+ {
+
+ }
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Bean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Child.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Child.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Child.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.annotatedType;
+
+
+public class Child extends Parent
+ {
+ }
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Child.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/DeclaringTypeTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/DeclaringTypeTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/DeclaringTypeTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.annotatedType;
+
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author kkahn
+ *
+ */
+ at Artifact
+public class DeclaringTypeTest extends AbstractWeldTest
+{
+
+ @Test
+ public void testInheritance()
+ {
+ AnnotatedType<Child> type = getCurrentManager().createAnnotatedType(Child.class);
+ assert type.getConstructors().size() == 1;
+ assert type.getFields().size() == 1;
+ for (AnnotatedField<? super Child> field : type.getFields())
+ {
+ if (field.getJavaMember().getName().equals("parent"))
+ {
+ Assert.assertEquals(Parent.class, field.getJavaMember().getDeclaringClass()); // OK
+ // -
+ // Returns
+ // Parent
+ Assert.assertEquals(Parent.class, field.getDeclaringType().getJavaClass()); // FAIL
+ // -
+ // Returns
+ // Child
+ }
+ else
+ {
+ Assert.fail("Unknown field " + field.getJavaMember());
+ }
+ }
+
+ assert type.getMethods().size() == 1;
+ for (AnnotatedMethod<? super Child> method : type.getMethods())
+ {
+ if (method.getJavaMember().getName().equals("parentMethod"))
+ {
+ Assert.assertEquals(Parent.class, method.getJavaMember().getDeclaringClass()); // OK
+ // -
+ // /Returns
+ // Parent
+ Assert.assertEquals(Parent.class, method.getDeclaringType().getJavaClass()); // FAIL
+ // -
+ // Returns
+ // Child
+ }
+ else
+ {
+ Assert.fail("Unknown method " + method.getJavaMember());
+ }
+ }
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/DeclaringTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/ExampleTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/ExampleTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/ExampleTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,63 @@
+package org.jboss.weld.test.annotatedType;
+
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+ at Artifact
+public class ExampleTest extends AbstractWeldTest
+{
+ @Test
+ public void testAnnotatedCallableGetParameters() throws Exception
+ {
+ AnnotatedType<Bean> type = getCurrentManager().createAnnotatedType(Bean.class);
+
+ assertNoAnnotations(type);
+
+ Assert.assertEquals(1, type.getConstructors().size());
+ for (AnnotatedConstructor<Bean> ctor : type.getConstructors())
+ {
+ assertNoAnnotations(ctor);
+
+ for (AnnotatedParameter<Bean> param : ctor.getParameters())
+ {
+ assertNoAnnotations(param);
+ }
+ }
+
+ Assert.assertEquals(1, type.getMethods().size());
+ for (AnnotatedMethod<? super Bean> method : type.getMethods())
+ {
+ assertNoAnnotations(method);
+
+ for (AnnotatedParameter<? super Bean> param : method.getParameters())
+ {
+ assertNoAnnotations(param);
+ }
+ }
+
+ Assert.assertEquals(1, type.getFields().size());
+ for (AnnotatedField<? super Bean> field : type.getFields())
+ {
+ assertNoAnnotations(field);
+ }
+ }
+
+ private void assertNoAnnotations(Annotated annotated)
+ {
+ Assert.assertEquals(0, annotated.getAnnotations().size());
+ }
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/ExampleTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Parent.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Parent.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Parent.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,11 @@
+package org.jboss.weld.test.annotatedType;
+public class Parent
+{
+ int parent;
+
+ void parentMethod()
+ {
+
+ }
+}
+
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/Parent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/AnnotatedTypeDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/AnnotatedTypeDecoratorTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/AnnotatedTypeDecoratorTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/Foo.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
/**
* @author pmuir
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotated.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotated.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedCallable.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedCallable.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedCallable.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedConstructor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedConstructor.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedConstructor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import java.lang.reflect.Constructor;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedField.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedField.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedField.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedMember.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMember.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedMember.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedMember;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedMethod.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedMethod.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedMethod.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import java.lang.reflect.Method;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedParameter.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedParameter.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedParameter.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import javax.enterprise.inject.spi.Annotated;
import javax.enterprise.inject.spi.AnnotatedCallable;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedType.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/MockAnnotatedType.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/MockAnnotatedType.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
import java.util.HashSet;
import java.util.Set;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/NotAnnotated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/decoration/NotAnnotated.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/annotatedType/decoration/NotAnnotated.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.annotated.decoration;
+package org.jboss.weld.test.annotatedType.decoration;
/**
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Animal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Animal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
interface Animal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/BootstrapTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/BootstrapTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
import java.util.HashMap;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Salmon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Salmon.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Salmon.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
import javax.inject.Named;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/ScottishFish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/ScottishFish.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/ScottishFish.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
interface ScottishFish extends Animal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/SeaBass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/SeaBass.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/SeaBass.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
import javax.enterprise.context.RequestScoped;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Sole.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Sole.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Sole.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
import javax.inject.Named;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Tuna.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Tuna.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Tuna.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
import javax.enterprise.context.RequestScoped;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Whitefish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleSimple/Whitefish.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/multiple/Whitefish.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleSimple;
+package org.jboss.weld.test.beanDeployment.managed.multiple;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/BootstrapTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/BootstrapTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleSimple;
+package org.jboss.weld.test.beanDeployment.managed.single;
import java.util.HashMap;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/Tuna.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleSimple/Tuna.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/managed/single/Tuna.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleSimple;
+package org.jboss.weld.test.beanDeployment.managed.single;
import javax.enterprise.context.RequestScoped;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Animal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Animal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
interface Animal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/BootstrapTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/BootstrapTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import java.util.HashMap;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Elephant.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Elephant.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Elephant.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/ElephantLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ElephantLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/ElephantLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Hound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Hound.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Hound.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/HoundLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/HoundLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/HoundLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Panther.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Panther.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Panther.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/PantherLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/PantherLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/PantherLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
public interface PantherLocal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Salmon.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Salmon.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Salmon.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.inject.Named;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/ScottishFish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/ScottishFish.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/ScottishFish.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
interface ScottishFish extends Animal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/SeaBass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/SeaBass.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/SeaBass.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.enterprise.context.RequestScoped;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Sole.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Sole.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Sole.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.inject.Named;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Synchronous.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Synchronous.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Synchronous.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tame.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tame.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tiger.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tiger.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tiger.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/TigerLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/TigerLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/TigerLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tuna.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Tuna.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Tuna.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import javax.enterprise.context.RequestScoped;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Whitefish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterpriseAndSimple/Whitefish.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/mixed/Whitefish.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple;
+package org.jboss.weld.test.beanDeployment.mixed;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Animal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Animal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
interface Animal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/BootstrapTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/BootstrapTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
import java.util.HashMap;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlyAnimal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DeadlyAnimal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
interface DeadlyAnimal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DeadlySpider.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DeadlySpider.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DeadlySpider.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
interface DeadlySpider extends DeadlyAnimal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/DefangedTarantula.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/DefangedTarantula.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
class DefangedTarantula extends Tarantula
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Spider.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Spider.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Spider.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
class Spider implements Animal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tame.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Tame.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Tarantula.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/Tarantula.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/Tarantula.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleProducerMethod/TarantulaProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/producers/singleProducerMethod/TarantulaProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleProducerMethod;
+package org.jboss.weld.test.beanDeployment.producers.singleProducerMethod;
import javax.enterprise.inject.Produces;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/BootstrapTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/BootstrapTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import java.util.HashMap;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Elephant.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Elephant.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Elephant.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/ElephantLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/ElephantLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/ElephantLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Hound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Hound.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Hound.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/HoundLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/HoundLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/HoundLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Panther.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Panther.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Panther.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/PantherLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/PantherLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/PantherLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
public interface PantherLocal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Synchronous.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Synchronous.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Synchronous.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tame.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Tame.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Tiger.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/Tiger.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/Tiger.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/TigerLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/multipleEnterprise/TigerLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/multiple/TigerLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.multipleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.multiple;
import javax.ejb.Local;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/BootstrapTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/BootstrapTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/BootstrapTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.single;
import java.util.HashMap;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/Hound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Hound.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/Hound.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.single;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/HoundLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/HoundLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/HoundLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.single;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/singleEnterprise/Tame.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanDeployment/session/single/Tame.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.bootstrap.singleEnterprise;
+package org.jboss.weld.test.beanDeployment.session.single;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager)
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/Cat.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Cat.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/Cat.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.test.unit.manager;
-
-import javax.ejb.Stateful;
-
-/**
- * @author pmuir
- *
- */
- at Stateful
-public class Cat implements CatLocal
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/CatLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/CatLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/CatLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.test.unit.manager;
-
-import javax.ejb.Local;
-
-/**
- * @author pmuir
- *
- */
- at Local
-public interface CatLocal
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/EjbDescriptorLookupTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/EjbDescriptorLookupTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/EjbDescriptorLookupTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.test.unit.manager;
-
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionTarget;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.weld.bean.SessionBean;
-import org.jboss.weld.ejb.InternalEjbDescriptor;
-import org.jboss.weld.ejb.spi.EjbDescriptor;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author pmuir
- *
- */
- at Artifact
- at Packaging(PackagingType.EAR)
-public class EjbDescriptorLookupTest extends AbstractWeldTest
-{
-
- @Test
- public void testCorrectSubType()
- {
- EjbDescriptor<CatLocal> descriptor = getCurrentManager().getEjbDescriptor("Cat");
- assert descriptor.getClass().equals(InternalEjbDescriptor.class);
- Bean<CatLocal> bean = getCurrentManager().getBean(descriptor);
- assert bean != null;
- assert bean instanceof SessionBean;
- assert bean.getBeanClass().equals(Cat.class);
- InjectionTarget<CatLocal> it = getCurrentManager().createInjectionTarget(descriptor);
- assert it != null;
- assert it.getInjectionPoints().equals(bean.getInjectionPoints());
- assert it.produce(getCurrentManager().createCreationalContext(bean)) instanceof CatLocal;
- }
-
-}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Foo.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.manager;
+package org.jboss.weld.test.beanManager.serializability;
public class Foo
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/ManagerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/ManagerTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/beanManager/serializability/ManagerTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.manager;
+package org.jboss.weld.test.beanManager.serializability;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/contexts (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ApplicationScopedObject.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplicationScopedObject.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ApplicationScopedObject.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.context;
+package org.jboss.weld.test.contexts;
import java.util.concurrent.atomic.AtomicInteger;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ApplicationScopedTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ApplicationScopedTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ApplicationScopedTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.context;
+package org.jboss.weld.test.contexts;
import java.util.concurrent.CountDownLatch;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ContextTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ContextTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ContextTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.context;
+package org.jboss.weld.test.contexts;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ParameterizedTypeScoped.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScoped.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ParameterizedTypeScoped.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.context;
+package org.jboss.weld.test.contexts;
import java.util.Arrays;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ParameterizedTypeScopedTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/ParameterizedTypeScopedTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/ParameterizedTypeScopedTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.context;
+package org.jboss.weld.test.contexts;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/PassivatingContextTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/PassivatingContextTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/PassivatingContextTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.context;
+package org.jboss.weld.test.contexts;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.ConversationScoped;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/StringHolder.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/context/StringHolder.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/contexts/StringHolder.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.context;
+package org.jboss.weld.test.contexts;
import java.util.List;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/decorators (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBean.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.decorator.simple;
+package org.jboss.weld.test.decorators;
/**
*
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleBeanImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleBeanImpl.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleBeanImpl.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.decorator.simple;
+package org.jboss.weld.test.decorators;
/**
*
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecorator1.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator1.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecorator1.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.decorator.simple;
+package org.jboss.weld.test.decorators;
import javax.decorator.Decorator;
import javax.decorator.Delegate;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecorator2.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecorator2.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecorator2.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.decorator.simple;
+package org.jboss.weld.test.decorators;
import javax.decorator.Decorator;
import javax.decorator.Delegate;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecoratorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/decorator/simple/SimpleDecoratorTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/decorators/SimpleDecoratorTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.decorator.simple;
+package org.jboss.weld.test.decorators;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/Beer.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Beer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/Beer.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/Beer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,30 @@
+package org.jboss.weld.test.el.resolver;
+
+import javax.inject.Named;
+
+public
+ at Named
+class Beer
+{
+ private String name = "Chimay Grande Reserve (Blue)";
+
+ private String style = "Belgium Strong Dark Ale";
+
+ public Beer() {}
+
+ public Beer(String name, String style)
+ {
+ this.name = name;
+ this.style = style;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getStyle()
+ {
+ return style;
+ }
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/Beer.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/BeerProducer.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/BeerProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/BeerProducer.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/BeerProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,23 @@
+package org.jboss.weld.test.el.resolver;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+public class BeerProducer
+{
+ public
+ @Produces
+ @Named
+ Beer getBeerOnTap()
+ {
+ return new Beer("Dragon's Breathe", "IPA");
+ }
+
+ public
+ @Produces
+ @Named
+ String getStyle()
+ {
+ return "Bogus!";
+ }
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/BeerProducer.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/ELResolverTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ELResolverTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/ELResolverTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/ELResolverTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,57 @@
+package org.jboss.weld.test.el.resolver;
+
+import static org.testng.Assert.assertEquals;
+
+import javax.el.ELContext;
+import javax.el.ExpressionFactory;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.mock.el.EL;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * Test the WeldELResolver and that it collaborates with the standard EL resolver chain.
+ *
+ * @author Pete Muir
+ * @author Dan Allen
+ */
+ at Artifact
+public class ELResolverTest extends AbstractWeldTest
+{
+
+ /**
+ * Test that the WeldELResolver only works to resolve the base of an EL
+ * expression, in this case a named bean. Once the base is resolved, the
+ * remainder of the expression should be delegated to the standard chain of
+ * property resolvers. If the WeldELResolver oversteps its bounds by
+ * trying to resolve the property against the Weld namespace, the test
+ * will fail.
+ */
+ @Test
+ public void testResolveBeanPropertyOfNamedBean()
+ {
+ ELContext elContext = EL.createELContext(getCurrentManager());
+ ExpressionFactory exprFactory = EL.EXPRESSION_FACTORY;
+
+ assertEquals(exprFactory.createValueExpression(elContext, "#{beer.style}", String.class).getValue(elContext), "Belgium Strong Dark Ale");
+ }
+
+ /**
+ * Test that the WeldELResolver only works to resolve the base of an EL
+ * expression, in this case from a producer method. Once the base is
+ * resolved, the remainder of the expression should be delegated to the
+ * standard chain of property resolvers. If the WeldELResolver oversteps
+ * its bounds by trying to resolve the property against the Weld
+ * namespace, the test will fail.
+ */
+ @Test
+ public void testResolveBeanPropertyOfProducerBean()
+ {
+ ELContext elContext = EL.createELContext(getCurrentManager());
+ ExpressionFactory exprFactory = EL.EXPRESSION_FACTORY;
+
+ assertEquals(exprFactory.createValueExpression(elContext, "#{beerOnTap.style}", String.class).getValue(elContext), "IPA");
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/el/resolver/ELResolverTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/BowlerHatException.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/BowlerHatException.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/BowlerHatException.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,26 @@
+package org.jboss.weld.test.enterprise;
+
+public class BowlerHatException extends RuntimeException
+{
+
+ public BowlerHatException()
+ {
+ super();
+ }
+
+ public BowlerHatException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public BowlerHatException(String message)
+ {
+ super(message);
+ }
+
+ public BowlerHatException(Throwable cause)
+ {
+ super(cause);
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/BowlerHatException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Cat.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/Cat.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Cat.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Cat.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.enterprise;
+
+import javax.ejb.Stateful;
+
+/**
+ * @author pmuir
+ *
+ */
+ at Stateful
+public class Cat implements CatLocal
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Cat.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/CatLocal.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/CatLocal.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/CatLocal.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/CatLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.enterprise;
+
+import javax.ejb.Local;
+
+/**
+ * @author pmuir
+ *
+ */
+ at Local
+public interface CatLocal
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/CatLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EjbDescriptorLookupTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/manager/EjbDescriptorLookupTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EjbDescriptorLookupTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EjbDescriptorLookupTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.enterprise;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionTarget;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.bean.SessionBean;
+import org.jboss.weld.ejb.InternalEjbDescriptor;
+import org.jboss.weld.ejb.spi.EjbDescriptor;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author pmuir
+ *
+ */
+ at Artifact
+ at Packaging(PackagingType.EAR)
+public class EjbDescriptorLookupTest extends AbstractWeldTest
+{
+
+ @Test
+ public void testCorrectSubType()
+ {
+ EjbDescriptor<CatLocal> descriptor = getCurrentManager().getEjbDescriptor("Cat");
+ assert descriptor.getClass().equals(InternalEjbDescriptor.class);
+ Bean<CatLocal> bean = getCurrentManager().getBean(descriptor);
+ assert bean != null;
+ assert bean instanceof SessionBean;
+ assert bean.getBeanClass().equals(Cat.class);
+ InjectionTarget<CatLocal> it = getCurrentManager().createInjectionTarget(descriptor);
+ assert it != null;
+ assert it.getInjectionPoints().equals(bean.getInjectionPoints());
+ assert it.produce(getCurrentManager().createCreationalContext(bean)) instanceof CatLocal;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EjbDescriptorLookupTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EnterpriseBeanTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EnterpriseBeanTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EnterpriseBeanTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,40 @@
+package org.jboss.weld.test.enterprise;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at IntegrationTest
+ at Packaging(PackagingType.EAR)
+public class EnterpriseBeanTest extends AbstractWeldTest
+{
+
+ @Test(description="WBRI-179")
+ public void testSFSBWithOnlyRemoteInterfacesDeploys()
+ {
+
+ }
+
+ @Test(description="WBRI-275")
+ public void testSLSBBusinessMethodThrowsRuntimeException()
+ {
+ try
+ {
+ getCurrentManager().getInstanceByType(Fedora.class).causeRuntimeException();
+ }
+ catch (Throwable t)
+ {
+ if (isExceptionInHierarchy(t, BowlerHatException.class))
+ {
+ return;
+ }
+ }
+ assert false : "Expected a BowlerHatException to be in the cause stack";
+ }
+
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/EnterpriseBeanTest.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Fedora.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Fedora.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Fedora.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,12 @@
+package org.jboss.weld.test.enterprise;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Fedora
+{
+
+ public void causeRuntimeException();
+
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Fedora.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/FedoraImpl.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/FedoraImpl.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/FedoraImpl.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,14 @@
+package org.jboss.weld.test.enterprise;
+
+import javax.ejb.Stateless;
+
+ at Stateless
+public class FedoraImpl implements Fedora
+{
+
+ public void causeRuntimeException()
+ {
+ throw new BowlerHatException();
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/FedoraImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Hat.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Hat.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Hat.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,9 @@
+package org.jboss.weld.test.enterprise;
+
+import javax.ejb.Stateful;
+
+ at Stateful
+public class Hat implements HatRemote
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/Hat.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/HatRemote.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/HatRemote.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/HatRemote.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,9 @@
+package org.jboss.weld.test.enterprise;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface HatRemote
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/HatRemote.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/AlteStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/AlteStadt.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/AlteStadt.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/BeanImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanImpl.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/BeanImpl.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Stateless;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/BeanLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/BeanLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/BeanLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
public interface BeanLocal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/DirectOrderProcessor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/DirectOrderProcessor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/DirectOrderProcessorLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import java.util.Arrays;
import java.util.HashSet;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/FrankfurtAmMain.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/FrankfurtAmMain.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GeschichtslosStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GeschichtslosStadt.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Giessen.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Giessen.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Giessen.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
public class Giessen implements NeueStadt, GeschichtslosStadt
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GrossStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GrossStadt.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GrossStadt.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GutenbergMuseum.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/GutenbergMuseum.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
public class GutenbergMuseum
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/IndirectOrderProcessor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/IndirectOrderProcessor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/IntermediateOrderProcessor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
class IntermediateOrderProcessor extends OrderProcessor
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Kassel.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Kassel.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Kassel.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/KleinStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/KleinStadt.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/KleinStadt.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/LandgraffenSchloss.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/LandgraffenSchloss.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.annotation.PreDestroy;
import javax.ejb.Remove;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Mainz.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Mainz.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Mainz.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.annotation.PostConstruct;
import javax.ejb.Stateless;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Marburg.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Marburg.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Marburg.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Remove;
import javax.ejb.Stateful;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/MockCreationalContext.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/MockCreationalContext.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.enterprise.context.spi.CreationalContext;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/NeueStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/NeueStadt.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/NeueStadt.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/OrderProcessor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/OrderProcessor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/OrderProcessorLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/OrderProcessorLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/RoemerPassage.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/RoemerPassage.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
class RoemerPassage
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Schloss.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/Schloss.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/Schloss.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/SchoeneStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/SchoeneStadt.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/UniStadt.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/lifecycle/UniStadt.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/enterprise/lifecycle/UniStadt.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.enterprise.lifecycle;
+package org.jboss.weld.test.enterprise.lifecycle;
import javax.ejb.Local;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/event/Bar.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/event/Bar.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/Bar.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,74 @@
+package org.jboss.weld.test.event;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+ at RequestScoped
+public class Bar
+{
+
+ @Inject Event<String> event;
+
+ @Inject @Updated Event<String> updatedEvent;
+
+ @Inject BeanManager manager;
+
+ private boolean unqualifiedObserved;
+ private boolean updatedObserved;
+
+ public void fireWithNoQualifiers()
+ {
+ event.fire("");
+ }
+
+ public void fireWithUpdatedQualifierViaSelect()
+ {
+ event.select(new AnnotationLiteral<Updated>() {}).fire("");
+ }
+
+ public void fireWithNoQualifiersViaManager()
+ {
+ manager.fireEvent("");
+ }
+
+ public void fireWithUpdatedQualifierViaManager()
+ {
+ manager.fireEvent("", new AnnotationLiteral<Updated>() {});
+ }
+
+ public void fireWithUpdatedQualifierViaAnnotation()
+ {
+ updatedEvent.fire("");
+ }
+
+ public void reset()
+ {
+ unqualifiedObserved = false;
+ updatedObserved = false;
+ }
+
+ public void onEvent(@Observes String event)
+ {
+ unqualifiedObserved = true;
+ }
+
+ public void onUpdatedEvent(@Observes @Updated String event)
+ {
+ updatedObserved = true;
+ }
+
+ public boolean isUnqualifiedObserved()
+ {
+ return unqualifiedObserved;
+ }
+
+ public boolean isUpdatedObserved()
+ {
+ return updatedObserved;
+ }
+
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/event/Bar.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/event/EventQualifierTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/EventQualifierTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/event/EventQualifierTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/EventQualifierTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,36 @@
+package org.jboss.weld.test.event;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class EventQualifierTest extends AbstractWeldTest
+{
+
+ @Test(description="WELD-226")
+ public void testDefaultQualifierNotRequired()
+ {
+ Bar bar = getCurrentManager().getInstanceByType(Bar.class);
+ bar.fireWithNoQualifiers();
+ assert bar.isUnqualifiedObserved();
+ assert !bar.isUpdatedObserved();
+ bar.reset();
+ bar.fireWithNoQualifiersViaManager();
+ assert bar.isUnqualifiedObserved();
+ assert !bar.isUpdatedObserved();
+ bar.reset();
+ bar.fireWithUpdatedQualifierViaAnnotation();
+ assert bar.isUnqualifiedObserved();
+ assert bar.isUpdatedObserved();
+ bar.reset();
+ bar.fireWithUpdatedQualifierViaManager();
+ assert bar.isUpdatedObserved();
+ assert bar.isUnqualifiedObserved();
+ bar.reset();
+ bar.fireWithUpdatedQualifierViaSelect();
+ assert bar.isUnqualifiedObserved();
+ assert bar.isUpdatedObserved();
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/event/EventQualifierTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/event/Foo.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/event/Foo.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.event;
+
+public class Foo
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/event/Foo.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/event/NormalScopedBean.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/event/NormalScopedBean.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/NormalScopedBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,16 @@
+
+package org.jboss.weld.test.event;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Any;
+
+ at SessionScoped
+public class NormalScopedBean implements Serializable
+{
+
+ @Any Event<Foo> event;
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/event/NormalScopedBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/event/SimpleEventTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/event/SimpleEventTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/SimpleEventTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,136 @@
+package org.jboss.weld.test.event;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.BeanManagerImpl;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class SimpleEventTest extends AbstractWeldTest
+{
+ private static boolean RECEIVE_1_OBSERVED;
+ private static boolean RECEIVE_2_OBSERVED;
+ private static boolean RECEIVE_3_OBSERVED;
+
+ private static void initFlags() {
+ RECEIVE_1_OBSERVED = false;
+ RECEIVE_2_OBSERVED = false;
+ RECEIVE_3_OBSERVED = false;
+ }
+
+ @Test
+ public void testFireEventOnManager()
+ {
+ BeanManagerImpl manager = getCurrentManager();
+
+ initFlags();
+
+ manager.fireEvent("Fired using Manager Interface with AnnotationLiteral.", new AnnotationLiteral<Updated>(){});
+
+ assert RECEIVE_1_OBSERVED == true;
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_3_OBSERVED == true;
+
+ initFlags();
+
+ manager.fireEvent("Fired using Manager Interface.");
+
+ assert RECEIVE_1_OBSERVED == false; // not called
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_3_OBSERVED == true;
+ }
+
+ @Test
+ public void testFireEventOnEvent()
+ {
+ App app = createContextualInstance(App.class);
+
+ initFlags();
+
+ app.fireEventByBindingDeclaredAtInjectionPoint();
+
+ assert RECEIVE_1_OBSERVED == true;
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_3_OBSERVED == true;
+
+ initFlags();
+
+ app.fireEventByAnnotationLiteral();
+
+ assert RECEIVE_1_OBSERVED == true;
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_3_OBSERVED == true;
+
+ initFlags();
+
+ app.fireEventViaAny();
+
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_1_OBSERVED == false; // not called
+ assert RECEIVE_3_OBSERVED == true;
+
+ initFlags();
+
+ app.fireEventViaWithNoQualifier();
+
+ assert RECEIVE_1_OBSERVED == false; // not called
+ assert RECEIVE_2_OBSERVED == true;
+ assert RECEIVE_3_OBSERVED == true;
+ }
+
+ public static class App
+ {
+ @Inject @Any
+ Event<String> event1;
+
+ @Inject @Updated
+ Event<String> event2;
+
+ @Inject
+ Event<String> event4;
+
+ public void fireEventByAnnotationLiteral()
+ {
+ event1.select(new AnnotationLiteral<Updated>(){}).fire("Fired using Event Interface with AnnotationLiteral.");
+ }
+
+ public void fireEventByBindingDeclaredAtInjectionPoint()
+ {
+ event2.fire("Fired using Event Interface with Binding Declared.");
+ }
+
+ public void fireEventViaAny()
+ {
+ event1.fire("Fired using Event Interface");
+ }
+
+ public void fireEventViaWithNoQualifier()
+ {
+ event4.fire("Fired using Event Interface with no qualifier");
+ }
+ }
+
+ public static class Receiver
+ {
+ public void receive1(@Observes @Updated String s)
+ {
+ RECEIVE_1_OBSERVED = true;
+ }
+
+ public void receive2(@Any @Observes String s)
+ {
+ RECEIVE_2_OBSERVED = true;
+ }
+
+ public void receive3(@Observes String s)
+ {
+ RECEIVE_3_OBSERVED = true;
+ }
+ }
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/event/SimpleEventTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/event/Updated.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/event/Updated.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/Updated.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,22 @@
+package org.jboss.weld.test.event;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RUNTIME)
+ at Target( { TYPE, METHOD, FIELD, PARAMETER })
+ at Documented
+ at interface Updated
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/event/Updated.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/AbstractHtmlUnitTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/AbstractHtmlUnitTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/AbstractHtmlUnitTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.event.tx;
+package org.jboss.weld.test.event.tx;
import java.util.HashSet;
import java.util.Set;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Foo.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.event.tx;
+package org.jboss.weld.test.event.tx;
import java.io.Serializable;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/TxEventTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/TxEventTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/TxEventTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.event.tx;
+package org.jboss.weld.test.event.tx;
import org.jboss.testharness.impl.packaging.Artifact;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/Updated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/tx/Updated.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/event/tx/Updated.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.event.tx;
+package org.jboss.weld.test.event.tx;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/ExceptionHandlingTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/ExceptionHandlingTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.exceptions;
+package org.jboss.weld.test.exceptions;
import javax.enterprise.inject.CreationException;
import javax.enterprise.util.AnnotationLiteral;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/FooException.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/FooException.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/FooException.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.exceptions;
+package org.jboss.weld.test.exceptions;
public class FooException extends Exception
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Large.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Large.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Large.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.exceptions;
+package org.jboss.weld.test.exceptions;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Lorry_Broken.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Lorry_Broken.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Lorry_Broken.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.exceptions;
+package org.jboss.weld.test.exceptions;
class Lorry_Broken
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Ship.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/Ship.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/Ship.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.exceptions;
+package org.jboss.weld.test.exceptions;
class Ship
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/ShipProducer_Broken.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ShipProducer_Broken.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/exceptions/ShipProducer_Broken.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.exceptions;
+package org.jboss.weld.test.exceptions;
import javax.enterprise.inject.Produces;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/extensions (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/extensions)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/ExtensionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/extensions/ExtensionTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/ExtensionTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.extensions;
+package org.jboss.weld.test.extensions;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/extensions/Foo.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.extensions;
+package org.jboss.weld.test.extensions;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/SimpleExtension.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/extensions/SimpleExtension.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/extensions/SimpleExtension.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.extensions;
+package org.jboss.weld.test.extensions;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Ball.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Ball.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Ball.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import javax.ejb.Local;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/BallImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/BallImpl.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/BallImpl.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import javax.ejb.Stateless;
import javax.ejb.Timeout;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Defender.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Defender.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Defender.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundInvoke;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/EnterpriseBeanInterceptionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/EnterpriseBeanInterceptionTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/EnterpriseBeanInterceptionTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import java.lang.reflect.Method;
import java.util.ArrayList;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Goalkeeper.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Goalkeeper.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Goalkeeper.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundInvoke;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Pass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Pass.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Pass.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Referee.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Referee.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Referee.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundTimeout;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Shot.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/Shot.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/Shot.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/TimeBound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb/TimeBound.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb/TimeBound.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb;
+package org.jboss.weld.test.interceptors.ejb;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Ball.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ball.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Ball.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.interceptors.ejb3model;
import javax.interceptor.Interceptors;
import javax.interceptor.ExcludeClassInterceptors;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Defender.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Defender.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Defender.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.interceptors.ejb3model;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Ejb3InterceptionModelTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Ejb3InterceptionModelTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Ejb3InterceptionModelTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.interceptors.ejb3model;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Goalkeeper.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Goalkeeper.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Goalkeeper.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.interceptors.ejb3model;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Referee.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/Referee.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/Referee.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.interceptors.ejb3model;
import javax.interceptor.AroundTimeout;
import javax.interceptor.Interceptor;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/TimeBound.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/ejb3model/TimeBound.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/ejb3model/TimeBound.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.ejb3model;
+package org.jboss.weld.test.interceptors.ejb3model;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Ball.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Ball.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Ball.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Ball.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.test.interceptors.passivation;
+
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+
+ at PassivationActivation
+public class Ball implements Serializable
+{
+ @Shot
+ public void shoot()
+ {
+ }
+
+ @Pass
+ public void pass()
+ {
+ }
+
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Ball.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Defender.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Defender.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Defender.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Defender.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.test.interceptors.passivation;
+
+import java.io.Serializable;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Pass
+ at Interceptor
+public class Defender implements Serializable
+{
+ @AroundInvoke
+ public Object defend(InvocationContext context) throws Exception
+ {
+ return context.proceed();
+ }
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Defender.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Goalkeeper.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Goalkeeper.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Goalkeeper.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Goalkeeper.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.test.interceptors.passivation;
+
+import java.io.Serializable;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at Shot
+ at Interceptor
+public class Goalkeeper implements Serializable
+{
+
+ @AroundInvoke
+ public Object catchBall(InvocationContext invocationContext) throws Exception
+ {
+ return invocationContext.proceed();
+ }
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Goalkeeper.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Pass.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Pass.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Pass.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Pass.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.test.interceptors.passivation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import javax.interceptor.InterceptorBinding;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at InterceptorBinding
+ at Retention(RUNTIME)
+ at Target({ElementType.METHOD, ElementType.TYPE})
+ at Documented
+public @interface Pass
+{
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Pass.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivation.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivation.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivation.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivation.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.test.interceptors.passivation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import javax.interceptor.InterceptorBinding;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at InterceptorBinding
+ at Retention(RUNTIME)
+ at Target({ElementType.TYPE})
+ at Documented
+public @interface PassivationActivation
+{
+}
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivationInterceptor.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationInterceptor.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivationInterceptor.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivationInterceptor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.test.interceptors.passivation;
+
+import java.io.Serializable;
+
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+import javax.ejb.PrePassivate;
+import javax.ejb.PostActivate;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Interceptor @PassivationActivation
+public class PassivationActivationInterceptor implements Serializable
+{
+ public static boolean prePassivateInvoked;
+ public static boolean postActivateInvoked;
+
+ public static String initialMessage;
+
+ public PassivationActivationInterceptor()
+ {
+ this.message = initialMessage;
+ }
+
+ public static PassivationActivationInterceptor instance;
+ public String message = null;
+
+ @PrePassivate
+ public void prePassivate(InvocationContext invocationContext) throws Exception
+ {
+ prePassivateInvoked = true;
+ invocationContext.proceed();
+ instance = this;
+ }
+
+
+ @PostActivate
+ public void postActivate(InvocationContext invocationContext) throws Exception
+ {
+ postActivateInvoked = true;
+ invocationContext.proceed();
+ instance = this;
+ }
+
+}
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivationTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivationTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/PassivationActivationTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.test.interceptors.passivation;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Marius Bogoevici
+ */
+ at Artifact
+ at BeansXml("beans.xml")
+public class PassivationActivationTest extends AbstractWeldTest
+{
+
+ @Test(groups = "incontainer-broken")
+ public void testPassivationAndActivation() throws Exception
+ {
+ Bean bean = getCurrentManager().getBeans(Ball.class).iterator().next();
+ CreationalContext creationalContext = getCurrentManager().createCreationalContext(bean);
+
+ PassivationActivationInterceptor.initialMessage = "Goal!";
+
+ Ball ball = (Ball) bean.create(creationalContext);
+
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ new ObjectOutputStream(byteArrayOutputStream).writeObject(ball);
+
+ PassivationActivationInterceptor oldInterceptor = PassivationActivationInterceptor.instance;
+
+ PassivationActivationInterceptor.initialMessage = "Miss!";
+
+ assert PassivationActivationInterceptor.prePassivateInvoked;
+ assert !PassivationActivationInterceptor.postActivateInvoked;
+ assert PassivationActivationInterceptor.instance != null;
+
+ PassivationActivationInterceptor.prePassivateInvoked = false;
+ PassivationActivationInterceptor.postActivateInvoked = false;
+ PassivationActivationInterceptor.instance = null;
+
+ ball = (Ball)new ObjectInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray())).readObject();
+
+ assert !PassivationActivationInterceptor.prePassivateInvoked;
+ assert PassivationActivationInterceptor.postActivateInvoked;
+ assert PassivationActivationInterceptor.instance != null;
+ assert PassivationActivationInterceptor.instance != oldInterceptor;
+ assert PassivationActivationInterceptor.instance.message != null;
+ assert PassivationActivationInterceptor.instance.message.equals(oldInterceptor.message);
+ }
+}
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Shot.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Shot.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Shot.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Shot.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
+ * contributors by the @authors tag. See the copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.test.interceptors.passivation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import javax.interceptor.InterceptorBinding;
+
+/**
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+ at InterceptorBinding
+ at Retention(RUNTIME)
+ at Target({ElementType.METHOD, ElementType.TYPE})
+ at Documented
+public @interface Shot
+{
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/Shot.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Ball.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/Ball.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Ball.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.passivation.broken.interceptorWithNonSerializableField;
+package org.jboss.weld.test.interceptors.passivation.broken.interceptorWithNonSerializableField;
import java.io.Serializable;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Defender.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/Defender.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Defender.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.interceptor.passivation.broken.interceptorWithNonSerializableField;
+package org.jboss.weld.test.interceptors.passivation.broken.interceptorWithNonSerializableField;
import java.io.Serializable;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/InterceptorWithNonSerializableFieldOnPassivatingBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/InterceptorWithNonSerializableFieldOnPassivatingBean.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/InterceptorWithNonSerializableFieldOnPassivatingBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.passivation.broken.interceptorWithNonSerializableField;
+package org.jboss.weld.test.interceptors.passivation.broken.interceptorWithNonSerializableField;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
@@ -29,8 +29,8 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.test.unit.interceptor.passivation.Ball;
-import org.jboss.weld.test.unit.interceptor.passivation.PassivationActivationInterceptor;
+import org.jboss.weld.test.interceptors.passivation.Ball;
+import org.jboss.weld.test.interceptors.passivation.PassivationActivationInterceptor;
import org.jboss.weld.DeploymentException;
import org.testng.annotations.Test;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Pass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/Pass.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Pass.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.passivation.broken.interceptorWithNonSerializableField;
+package org.jboss.weld.test.interceptors.passivation.broken.interceptorWithNonSerializableField;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Team.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/Team.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/Team.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.interceptor.passivation.broken.interceptorWithNonSerializableField;
+package org.jboss.weld.test.interceptors.passivation.broken.interceptorWithNonSerializableField;
/**
* @author Marius Bogoevici
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Ball.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor/Ball.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Ball.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.passivation.broken.nonSerializableInterceptor;
+package org.jboss.weld.test.interceptors.passivation.broken.nonSerializableInterceptor;
import java.io.Serializable;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Defender.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor/Defender.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Defender.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.interceptor.passivation.broken.nonSerializableInterceptor;
+package org.jboss.weld.test.interceptors.passivation.broken.nonSerializableInterceptor;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundInvoke;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/NonPassivatingInterceptorOnPassivatingBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor/NonPassivatingInterceptorOnPassivatingBean.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/NonPassivatingInterceptorOnPassivatingBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.passivation.broken.nonSerializableInterceptor;
+package org.jboss.weld.test.interceptors.passivation.broken.nonSerializableInterceptor;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
@@ -29,8 +29,8 @@
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.jboss.weld.test.AbstractWeldTest;
-import org.jboss.weld.test.unit.interceptor.passivation.Ball;
-import org.jboss.weld.test.unit.interceptor.passivation.PassivationActivationInterceptor;
+import org.jboss.weld.test.interceptors.passivation.Ball;
+import org.jboss.weld.test.interceptors.passivation.PassivationActivationInterceptor;
import org.jboss.weld.DeploymentException;
import org.testng.annotations.Test;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Pass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor/Pass.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/Pass.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.passivation.broken.nonSerializableInterceptor;
+package org.jboss.weld.test.interceptors.passivation.broken.nonSerializableInterceptor;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/PrimaryInterceptionBinding.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/PrimaryInterceptionBinding.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/PrimaryInterceptionBinding.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import javax.interceptor.InterceptorBinding;
import java.lang.annotation.*;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SecondaryInterceptionBinding.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SecondaryInterceptionBinding.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SecondaryInterceptionBinding.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import javax.interceptor.InterceptorBinding;
import java.lang.annotation.Documented;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBean.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
/**
* @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBeanImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanImpl.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBeanImpl.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import javax.annotation.PostConstruct;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBeanWithStereotype.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleBeanWithStereotype.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleBeanWithStereotype.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import javax.annotation.PostConstruct;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleDecorator.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleDecorator.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleDecorator.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import javax.decorator.Decorator;
import javax.decorator.Delegate;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptor.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import javax.interceptor.Interceptor;
import javax.interceptor.AroundInvoke;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptorStereotype.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorStereotype.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptorStereotype.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptorTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/SimpleInterceptorTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/SimpleInterceptorTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import org.jboss.weld.metadata.TypeStore;
import org.jboss.weld.metadata.cache.InterceptorBindingModel;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/TwoBindingsInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/simple/TwoBindingsInterceptor.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/interceptors/simple/TwoBindingsInterceptor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.jboss.weld.test.unit.interceptor.simple;
+package org.jboss.weld.test.interceptors.simple;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/named (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/named/Important.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/Important.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/named/Important.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.named;
+package org.jboss.weld.test.named;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBinding.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBinding.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBinding.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.named;
+package org.jboss.weld.test.named;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBindingTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/named/NamedBeanWithBindingTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBindingTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.named;
+package org.jboss.weld.test.named;
import javax.enterprise.inject.spi.Bean;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/NewSimpleBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/NewSimpleBeanTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.newsimple;
+package org.jboss.weld.test.newsimple;
import java.util.Set;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/WrappedSimpleBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/newsimple/WrappedSimpleBean.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/WrappedSimpleBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.newsimple;
+package org.jboss.weld.test.newsimple;
import java.io.Serializable;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/ExampleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/ExampleTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/ExampleTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.noncontextual;
+package org.jboss.weld.test.nonContextual;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.AnnotatedType;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/External.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/External.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/External.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.weld.test.unit.noncontextual;
+package org.jboss.weld.test.nonContextual;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/Random.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/Random.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/Random.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.noncontextual;
+package org.jboss.weld.test.nonContextual;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/WebBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/noncontextual/WebBean.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/nonContextual/WebBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.noncontextual;
+package org.jboss.weld.test.nonContextual;
public class WebBean
{
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/IntegerCollectionInjection.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/IntegerCollectionInjection.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/IntegerCollectionInjection.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.field;
+package org.jboss.weld.test.producer.field;
import java.util.Collection;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ListInstance.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListInstance.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ListInstance.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.field;
+package org.jboss.weld.test.producer.field;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ListStringInstance.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ListStringInstance.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ListStringInstance.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.field;
+package org.jboss.weld.test.producer.field;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedCollectionInjection.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedCollectionInjection.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedCollectionInjection.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.field;
+package org.jboss.weld.test.producer.field;
import java.util.Collection;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedListInjection.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedListInjection.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedListInjection.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.field;
+package org.jboss.weld.test.producer.field;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.field;
+package org.jboss.weld.test.producer.field;
import java.util.ArrayList;
import java.util.Arrays;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedProducerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/ParameterizedProducerTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.field;
+package org.jboss.weld.test.producer.field;
import java.util.Collection;
import java.util.List;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/Target.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/field/Target.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/field/Target.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.field;
+package org.jboss.weld.test.producer.field;
import java.util.Collection;
import java.util.List;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Car.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Car.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Car.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import java.io.Serializable;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/CarFactory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/CarFactory.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/CarFactory.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import javax.enterprise.inject.Produces;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/DisposalMethodOnOtherBeanNotResolvedTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Foo.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
/**
* @author pmuir
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/FooDisposer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooDisposer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/FooDisposer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Disposes;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/FooProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/FooProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/FooProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Government.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Government.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Government.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import java.io.Serializable;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Important.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/Important.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/Important.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/IntInjection.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/IntInjection.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/IntInjection.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/ManagerProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/ManagerProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/ManagerProducerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/ManagerProducerTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/ManagerProducerTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.test.AbstractWeldTest;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import javax.enterprise.inject.Produces;
import javax.inject.Named;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import javax.enterprise.inject.spi.Bean;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerWithBinding.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBinding.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerWithBinding.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import java.util.Date;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerWithBindingTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NamedProducerWithBindingTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NamedProducerWithBindingTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import static org.testng.Assert.assertNotNull;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NullProducerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/producer/method/NullProducerTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/producer/method/NullProducerTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.producer.method;
+package org.jboss.weld.test.producer.method;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.test.AbstractWeldTest;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/Foo.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/Foo.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,18 @@
+package org.jboss.weld.test.proxy;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Named;
+
+ at Named
+ at RequestScoped
+class Foo implements Serializable
+{
+
+ public String getMsg()
+ {
+ return "Hi";
+ }
+
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/Foo.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/ProxyTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/ProxyTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/ProxyTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,20 @@
+package org.jboss.weld.test.proxy;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class ProxyTest extends AbstractWeldTest
+{
+
+ @Test(description="WBRI-122")
+ public void testImplementationClassImplementsSerializable()
+ {
+ Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("foo"));
+ getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean));
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/ProxyTest.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/EnterpriseBeanProxyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.proxy.enterprise;
+package org.jboss.weld.test.proxy.enterprise;
import javassist.util.proxy.ProxyObject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/Mouse.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/Mouse.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/Mouse.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.proxy.enterprise;
+package org.jboss.weld.test.proxy.enterprise;
import javax.ejb.Stateless;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/MouseLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/enterprise/MouseLocal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/proxy/enterprise/MouseLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.implementation.proxy.enterprise;
+package org.jboss.weld.test.proxy.enterprise;
import javax.ejb.Local;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Bar.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Bar.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Bar.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.resolution;
+
+public class Bar
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Bar.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Baz.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Baz.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Baz.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,6 @@
+package org.jboss.weld.test.resolution;
+
+public class Baz
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Baz.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Foo.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Foo.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,11 @@
+package org.jboss.weld.test.resolution;
+
+public class Foo extends FooBase<Bar>
+{
+
+ public String getName()
+ {
+ return "foo";
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Foo.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooBase.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooBase.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooBase.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,11 @@
+package org.jboss.weld.test.resolution;
+
+public class FooBase<T>
+{
+
+ public String getName()
+ {
+ return "foobase";
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooBase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooProducer.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooProducer.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,14 @@
+package org.jboss.weld.test.resolution;
+
+import javax.enterprise.inject.Produces;
+
+public class FooProducer
+{
+
+ @Produces @Special
+ public FooBase<Baz> produce()
+ {
+ return new FooBase<Baz>();
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/FooProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupFoo.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupFoo.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupFoo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,22 @@
+package org.jboss.weld.test.resolution;
+
+import javax.inject.Inject;
+
+public class LookupFoo
+{
+
+ @Inject Foo foo;
+
+ @Inject @Special FooBase<Baz> foobaz;
+
+ public Foo getFoo()
+ {
+ return foo;
+ }
+
+ public FooBase<Baz> getFoobaz()
+ {
+ return foobaz;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupFoo.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupInstanceTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupInstanceTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupInstanceTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,24 @@
+package org.jboss.weld.test.resolution;
+
+import java.util.List;
+
+import javax.enterprise.inject.Instance;
+import javax.enterprise.util.TypeLiteral;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.literal.DefaultLiteral;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class LookupInstanceTest extends AbstractWeldTest
+{
+
+
+ @Test
+ public void testLookupInstance() throws Exception
+ {
+ assert createContextualInstance(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), new DefaultLiteral()) == null;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/LookupInstanceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Special.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Special.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Special.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,20 @@
+package org.jboss.weld.test.resolution;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Qualifier
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({FIELD, METHOD, TYPE, PARAMETER})
+public @interface Special
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Special.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Weld256Test.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Weld256Test.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Weld256Test.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Weld256Test.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,19 @@
+package org.jboss.weld.test.resolution;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+ at Artifact
+public class Weld256Test extends AbstractWeldTest
+{
+
+ @Test
+ public void testParameterizedInjection()
+ {
+ LookupFoo lookupFoo = getCurrentManager().getInstanceByType(LookupFoo.class);
+ assert lookupFoo.getFoo().getName().equals("foo");
+ assert lookupFoo.getFoobaz().getName().equals("foobase");
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/Weld256Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Bar.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Bar.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/CircularDependencyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/CircularDependencyTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/CircularDependencyTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.test.AbstractWeldTest;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentLooping.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLooping.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentLooping.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentLoopingProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentLoopingProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentLoopingProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import javax.enterprise.inject.Produces;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentSelfConsumingDependentProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/DependentSelfConsumingDependentProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/DependentSelfConsumingDependentProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import javax.enterprise.inject.Produces;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Farm.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Farm.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Farm.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Fish.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Fish.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Fish.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Foo.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/NormalLooping.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLooping.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/NormalLooping.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/NormalLoopingProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/NormalLoopingProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/NormalLoopingProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/SelfConsumingDependent.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/SelfConsumingDependent.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/SelfConsumingDependent.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Violation.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Violation.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Violation.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import java.io.Serializable;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Water.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/circular/Water.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/circular/Water.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.circular;
+package org.jboss.weld.test.resolution.circular;
import javax.inject.Inject;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279 (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/AbstractFactory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/AbstractFactory.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/AbstractFactory.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.wbri279;
+package org.jboss.weld.test.resolution.wbri279;
public abstract class AbstractFactory<T>
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/DummyParent.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/DummyParent.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/DummyParent.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.wbri279;
+package org.jboss.weld.test.resolution.wbri279;
public class DummyParent
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/IntFactory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntFactory.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/IntFactory.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.wbri279;
+package org.jboss.weld.test.resolution.wbri279;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/IntegerFactory.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/IntegerFactory.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/IntegerFactory.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.wbri279;
+package org.jboss.weld.test.resolution.wbri279;
@IntFactory
public class IntegerFactory extends AbstractFactory<Integer>
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/SomeBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/SomeBean.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/SomeBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.wbri279;
+package org.jboss.weld.test.resolution.wbri279;
import javax.inject.Inject;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/Weld279Test.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri279/Weld279Test.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri279/Weld279Test.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.lookup.wbri279;
+package org.jboss.weld.test.resolution.wbri279;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.test.AbstractWeldTest;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri293 (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri293/ContextualReferenceTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/ContextualReferenceTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri293/ContextualReferenceTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.test.unit.lookup.wbri293;
+package org.jboss.weld.test.resolution.wbri293;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.test.AbstractWeldTest;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri293/Sheep.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/wbri293/Sheep.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/wbri293/Sheep.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.lookup.wbri293;
+package org.jboss.weld.test.resolution.wbri293;
import javax.enterprise.context.RequestScoped;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Animal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Animal.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Animal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.definition;
+package org.jboss.weld.test.stereotypes;
interface Animal
{
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/AnimalOrderStereotype.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalOrderStereotype.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/AnimalOrderStereotype.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.definition;
+package org.jboss.weld.test.stereotypes;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/AnimalStereotype.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/AnimalStereotype.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/AnimalStereotype.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.definition;
+package org.jboss.weld.test.stereotypes;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Beer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Beer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Beer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,30 +0,0 @@
-package org.jboss.weld.test.unit.definition;
-
-import javax.inject.Named;
-
-public
- at Named
-class Beer
-{
- private String name = "Chimay Grande Reserve (Blue)";
-
- private String style = "Belgium Strong Dark Ale";
-
- public Beer() {}
-
- public Beer(String name, String style)
- {
- this.name = name;
- this.style = style;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getStyle()
- {
- return style;
- }
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/BeerProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/BeerProducer.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/BeerProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,23 +0,0 @@
-package org.jboss.weld.test.unit.definition;
-
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
-
-public class BeerProducer
-{
- public
- @Produces
- @Named
- Beer getBeerOnTap()
- {
- return new Beer("Dragon's Breathe", "IPA");
- }
-
- public
- @Produces
- @Named
- String getStyle()
- {
- return "Bogus!";
- }
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/ELResolverTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/ELResolverTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/ELResolverTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,57 +0,0 @@
-package org.jboss.weld.test.unit.definition;
-
-import static org.testng.Assert.assertEquals;
-
-import javax.el.ELContext;
-import javax.el.ExpressionFactory;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.mock.el.EL;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * Test the WeldELResolver and that it collaborates with the standard EL resolver chain.
- *
- * @author Pete Muir
- * @author Dan Allen
- */
- at Artifact
-public class ELResolverTest extends AbstractWeldTest
-{
-
- /**
- * Test that the WeldELResolver only works to resolve the base of an EL
- * expression, in this case a named bean. Once the base is resolved, the
- * remainder of the expression should be delegated to the standard chain of
- * property resolvers. If the WeldELResolver oversteps its bounds by
- * trying to resolve the property against the Weld namespace, the test
- * will fail.
- */
- @Test
- public void testResolveBeanPropertyOfNamedBean()
- {
- ELContext elContext = EL.createELContext(getCurrentManager());
- ExpressionFactory exprFactory = EL.EXPRESSION_FACTORY;
-
- assertEquals(exprFactory.createValueExpression(elContext, "#{beer.style}", String.class).getValue(elContext), "Belgium Strong Dark Ale");
- }
-
- /**
- * Test that the WeldELResolver only works to resolve the base of an EL
- * expression, in this case from a producer method. Once the base is
- * resolved, the remainder of the expression should be delegated to the
- * standard chain of property resolvers. If the WeldELResolver oversteps
- * its bounds by trying to resolve the property against the Weld
- * namespace, the test will fail.
- */
- @Test
- public void testResolveBeanPropertyOfProducerBean()
- {
- ELContext elContext = EL.createELContext(getCurrentManager());
- ExpressionFactory exprFactory = EL.EXPRESSION_FACTORY;
-
- assertEquals(exprFactory.createValueExpression(elContext, "#{beerOnTap.style}", String.class).getValue(elContext), "IPA");
- }
-
-}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Order.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/Order.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/Order.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.definition;
+package org.jboss.weld.test.stereotypes;
class Order
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/RequestScopedAnimalStereotype.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/RequestScopedAnimalStereotype.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/RequestScopedAnimalStereotype.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.definition;
+package org.jboss.weld.test.stereotypes;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/StereotypesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/definition/StereotypesTest.java 2009-11-04 16:47:06 UTC (rev 4659)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/stereotypes/StereotypesTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.unit.definition;
+package org.jboss.weld.test.stereotypes;
import javax.enterprise.context.RequestScoped;
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,302 +0,0 @@
-package org.jboss.weld.test.unit.activities;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Member;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.util.AnnotationLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.BeanManagerImpl;
-import org.jboss.weld.bean.ForwardingBean;
-import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-
-/**
- *
- * Spec version: 20090519
- *
- */
- at Artifact
-public class ActivitiesTest extends AbstractWeldTest
-{
-
- private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
-
- static
- {
- DEFAULT_BINDINGS.add(new DefaultLiteral());
- }
-
- private Bean<?> createDummyBean(BeanManager beanManager, final Type injectionPointType)
- {
- final Set<InjectionPoint> injectionPoints = new HashSet<InjectionPoint>();
- final Set<Type> types = new HashSet<Type>();
- final Set<Annotation> bindings = new HashSet<Annotation>();
- bindings.add(new AnnotationLiteral<Tame>() {});
- types.add(Object.class);
- final Bean<?> bean = new Bean<Object>()
- {
-
- public Set<Annotation> getQualifiers()
- {
- return bindings;
- }
-
- public Set<InjectionPoint> getInjectionPoints()
- {
- return injectionPoints;
- }
-
- public String getName()
- {
- return null;
- }
-
- public Class<? extends Annotation> getScope()
- {
- return Dependent.class;
- }
-
- public Set<Type> getTypes()
- {
- return types;
- }
-
- public boolean isNullable()
- {
- return false;
- }
-
- public Object create(CreationalContext<Object> creationalContext)
- {
- return null;
- }
-
- public void destroy(Object instance, CreationalContext<Object> creationalContext)
- {
-
- }
-
- public Class<?> getBeanClass()
- {
- return Object.class;
- }
-
- public boolean isAlternative()
- {
- return false;
- }
-
- public Set<Class<? extends Annotation>> getStereotypes()
- {
- return Collections.emptySet();
- }
-
- };
- InjectionPoint injectionPoint = new InjectionPoint()
- {
-
- public Bean<?> getBean()
- {
- return bean;
- }
-
- public Set<Annotation> getQualifiers()
- {
- return DEFAULT_BINDINGS;
- }
-
- public Member getMember()
- {
- return null;
- }
-
- public Type getType()
- {
- return injectionPointType;
- }
-
- public Annotated getAnnotated()
- {
- return null;
- }
-
- public boolean isDelegate()
- {
- return false;
- }
-
- public boolean isTransient()
- {
- return false;
- }
-
- };
- injectionPoints.add(injectionPoint);
- return bean;
- }
-
- private static class DummyContext implements Context
- {
-
- public <T> T get(Contextual<T> contextual)
- {
- return null;
- }
-
- public <T> T get(Contextual<T> contextual, CreationalContext<T> creationalContext)
- {
- return null;
- }
-
- public Class<? extends Annotation> getScope()
- {
- return Dummy.class;
- }
-
- public boolean isActive()
- {
- return false;
- }
-
- }
-
- @Test
- public void testBeanBelongingToParentActivityBelongsToChildActivity()
- {
- assert getBeans(Cow.class).size() == 1;
- Contextual<?> bean = getBeans(Cow.class).iterator().next();
- BeanManager childActivity = getCurrentManager().createActivity();
- assert childActivity.getBeans(Cow.class).size() == 1;
- assert childActivity.getBeans(Cow.class).iterator().next().equals(bean);
- }
-
- @Test
- public void testBeanBelongingToParentActivityCanBeInjectedIntoChildActivityBean()
- {
- assert getBeans(Cow.class).size() == 1;
- Contextual<?> bean = getBeans(Cow.class).iterator().next();
- BeanManagerImpl childActivity = getCurrentManager().createActivity();
- Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
- childActivity.addBean(dummyBean);
- assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null;
- }
-
-// @Test
-// public void testObserverBelongingToParentActivityBelongsToChildActivity()
-// {
-// assert getCurrentManager().resolveObservers(new NightTime()).size() == 1;
-// Observer<?> observer = getCurrentManager().resolveObservers(new NightTime()).iterator().next();
-// BeanManager childActivity = getCurrentManager().createActivity();
-// assert childActivity.resolveObservers(new NightTime()).size() == 1;
-// assert childActivity.resolveObservers(new NightTime()).iterator().next().equals(observer);
-// }
-
- @Test
- public void testObserverBelongingToParentFiresForChildActivity()
- {
- Fox.setObserved(false);
- BeanManager childActivity = getCurrentManager().createActivity();
- childActivity.fireEvent(new NightTime());
- assert Fox.isObserved();
- }
-
- @Test
- public void testContextObjectBelongingToParentBelongsToChild()
- {
- Context context = new DummyContext()
- {
-
- @Override
- public boolean isActive()
- {
- return true;
- }
-
- };
- getCurrentManager().addContext(context);
- BeanManager childActivity = getCurrentManager().createActivity();
- assert childActivity.getContext(Dummy.class) != null;
- }
-
- @Test
- public void testBeanBelongingToChildActivityCannotBeInjectedIntoParentActivityBean()
- {
- assert getBeans(Cow.class).size() == 1;
- BeanManagerImpl childActivity = getCurrentManager().createActivity();
- Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
- childActivity.addBean(dummyBean);
- assert getBeans(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0;
- }
-
- @Test(expectedExceptions=UnsatisfiedResolutionException.class)
- public void testInstanceProcessedByParentActivity()
- {
- Context dummyContext = new DummyContext();
- getCurrentManager().addContext(dummyContext);
- assert getBeans(Cow.class).size() == 1;
- final Bean<Cow> bean = getBeans(Cow.class).iterator().next();
- BeanManagerImpl childActivity = getCurrentManager().createActivity();
- final Set<Annotation> bindingTypes = new HashSet<Annotation>();
- bindingTypes.add(new AnnotationLiteral<Tame>() {});
- childActivity.addBean(new ForwardingBean<Cow>()
- {
-
- @Override
- protected Bean<Cow> delegate()
- {
- return bean;
- }
-
- @Override
- public Set<Annotation> getQualifiers()
- {
- return bindingTypes;
- }
-
- @Override
- public Set<Class<? extends Annotation>> getStereotypes()
- {
- return Collections.emptySet();
- }
-
- });
- createContextualInstance(Field.class).get();
- }
-
- @Test
- public void testObserverBelongingToChildDoesNotFireForParentActivity()
- {
-
-// BeanManager childActivity = getCurrentManager().createActivity();
-// ObserverMethod<NightTime> observer = new Observer<NightTime>()
-// {
-//
-// public boolean notify(NightTime event)
-// {
-// assert false;
-// return false;
-// }
-//
-// };
-// //TODO Fix this test to use an observer method in a child activity
-//// childActivity.addObserver(observer);
-// getCurrentManager().fireEvent(new NightTime());
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Cow.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,6 +0,0 @@
-package org.jboss.weld.test.unit.activities;
-
-class Cow
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Dummy.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,23 +0,0 @@
-/**
- *
- */
-package org.jboss.weld.test.unit.activities;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Scope;
-
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Scope
- at Inherited
- at interface Dummy {}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Field.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,16 +0,0 @@
-package org.jboss.weld.test.unit.activities;
-
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
-class Field
-{
-
- @Inject @Tame Instance<Cow> instance;
-
- public Cow get()
- {
- return instance.get();
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Fox.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,25 +0,0 @@
-package org.jboss.weld.test.unit.activities;
-
-import javax.enterprise.event.Observes;
-
-class Fox
-{
-
- private static boolean observed = false;
-
- public void observe(@Observes NightTime nighttime)
- {
- observed = true;
- }
-
- public static boolean isObserved()
- {
- return observed;
- }
-
- public static void setObserved(boolean observed)
- {
- Fox.observed = observed;
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/NightTime.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,6 +0,0 @@
-package org.jboss.weld.test.unit.activities;
-
-class NightTime
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/Tame.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,22 +0,0 @@
-package org.jboss.weld.test.unit.activities;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Target( { TYPE, METHOD, PARAMETER, FIELD })
- at Retention(RUNTIME)
- at Documented
- at Qualifier
- at interface Tame
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Bean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,43 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.weld.test.unit.annotated;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class Bean
-{
- int field;
-
- public Bean(int i)
- {
-
- }
-
- public void method(int i)
- {
-
- }
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Child.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,6 +0,0 @@
-package org.jboss.weld.test.unit.annotated;
-
-
-public class Child extends Parent
- {
- }
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/DeclaringTypeTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.test.unit.annotated;
-
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- * @author kkahn
- *
- */
- at Artifact
-public class DeclaringTypeTest extends AbstractWeldTest
-{
-
- @Test
- public void testInheritance()
- {
- AnnotatedType<Child> type = getCurrentManager().createAnnotatedType(Child.class);
- assert type.getConstructors().size() == 1;
- assert type.getFields().size() == 1;
- for (AnnotatedField<? super Child> field : type.getFields())
- {
- if (field.getJavaMember().getName().equals("parent"))
- {
- Assert.assertEquals(Parent.class, field.getJavaMember().getDeclaringClass()); // OK
- // -
- // Returns
- // Parent
- Assert.assertEquals(Parent.class, field.getDeclaringType().getJavaClass()); // FAIL
- // -
- // Returns
- // Child
- }
- else
- {
- Assert.fail("Unknown field " + field.getJavaMember());
- }
- }
-
- assert type.getMethods().size() == 1;
- for (AnnotatedMethod<? super Child> method : type.getMethods())
- {
- if (method.getJavaMember().getName().equals("parentMethod"))
- {
- Assert.assertEquals(Parent.class, method.getJavaMember().getDeclaringClass()); // OK
- // -
- // /Returns
- // Parent
- Assert.assertEquals(Parent.class, method.getDeclaringType().getJavaClass()); // FAIL
- // -
- // Returns
- // Child
- }
- else
- {
- Assert.fail("Unknown method " + method.getJavaMember());
- }
- }
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/ExampleTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,63 +0,0 @@
-package org.jboss.weld.test.unit.annotated;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Artifact
-public class ExampleTest extends AbstractWeldTest
-{
- @Test
- public void testAnnotatedCallableGetParameters() throws Exception
- {
- AnnotatedType<Bean> type = getCurrentManager().createAnnotatedType(Bean.class);
-
- assertNoAnnotations(type);
-
- Assert.assertEquals(1, type.getConstructors().size());
- for (AnnotatedConstructor<Bean> ctor : type.getConstructors())
- {
- assertNoAnnotations(ctor);
-
- for (AnnotatedParameter<Bean> param : ctor.getParameters())
- {
- assertNoAnnotations(param);
- }
- }
-
- Assert.assertEquals(1, type.getMethods().size());
- for (AnnotatedMethod<? super Bean> method : type.getMethods())
- {
- assertNoAnnotations(method);
-
- for (AnnotatedParameter<? super Bean> param : method.getParameters())
- {
- assertNoAnnotations(param);
- }
- }
-
- Assert.assertEquals(1, type.getFields().size());
- for (AnnotatedField<? super Bean> field : type.getFields())
- {
- assertNoAnnotations(field);
- }
- }
-
- private void assertNoAnnotations(Annotated annotated)
- {
- Assert.assertEquals(0, annotated.getAnnotations().size());
- }
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/annotated/Parent.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,11 +0,0 @@
-package org.jboss.weld.test.unit.annotated;
-public class Parent
-{
- int parent;
-
- void parentMethod()
- {
-
- }
-}
-
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/PreinstantiateBeanManagerTest.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/PreinstantiateBeanManagerTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/PreinstantiateBeanManagerTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.test.unit.bootstrap;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.jboss.weld.mock.MockEELifecycle;
+import org.jboss.weld.mock.TestContainer;
+import org.testng.annotations.Test;
+
+/**
+ * @author kkhan
+ *
+ */
+public class PreinstantiateBeanManagerTest
+{
+
+ @Test
+ public void test()
+ {
+ //Start the container, but do not deploy weld yet
+ List<Class<?>> classes = new ArrayList<Class<?>>();
+ classes.add(WeldBean.class);
+ TestContainer container = new TestContainer(new MockEELifecycle(), classes, null);
+ container.getLifecycle().initialize();
+
+ BeanManager bootstrapManager = container.getBeanManager();
+ assert bootstrapManager != null;
+
+ //Check the bean is null since it is not there yet
+ Set<Bean<?>> beans = bootstrapManager.getBeans(WeldBean.class);
+ assert beans == null || beans.size() == 0;
+
+
+ //Start the application
+ container.getLifecycle().beginApplication();
+ container.ensureRequestActive();
+
+ //Check the manager is the same as before
+ BeanManager manager = container.getBeanManager();
+ assert manager != null;
+ assert bootstrapManager == manager;
+
+ //Check we can get the bean
+ Bean<? extends Object> bean = manager.resolve(manager.getBeans(WeldBean.class));
+ WeldBean weldBean = (WeldBean) manager.getReference(bean, WeldBean.class, manager.createCreationalContext(bean));
+ assert weldBean != null;
+
+ container.stopContainer();
+ }
+
+}
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WeldBean.java (from rev 4659, core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/WeldBean.java)
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WeldBean.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/bootstrap/WeldBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2009, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.weld.test.unit.bootstrap;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class WeldBean
+{
+
+}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/NewEnterpriseBeanTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,72 +0,0 @@
-package org.jboss.weld.test.unit.implementation;
-
-import java.util.Set;
-
-import javax.enterprise.inject.New;
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.weld.bean.NewSessionBean;
-import org.jboss.weld.bean.SessionBean;
-import org.jboss.weld.introspector.WeldAnnotated;
-import org.jboss.weld.literal.NewLiteral;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at Packaging(PackagingType.EAR)
-public class NewEnterpriseBeanTest extends AbstractWeldTest
-{
-
- private static final New NEW_LITERAL = new NewLiteral()
- {
-
- public java.lang.Class<?> value()
- {
- return WrappedEnterpriseBean.class;
- }
-
- };
-
- private SessionBean<WrappedEnterpriseBeanLocal> wrappedEnterpriseBean;
- private NewSessionBean<WrappedEnterpriseBeanLocal> newEnterpriseBean;
-
- public void initNewBean()
- {
- Set<Bean<?>> beans = getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class);
- assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).size() == 1;
- assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next() instanceof SessionBean;
- wrappedEnterpriseBean = (SessionBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class).iterator().next();
-
- assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).size() == 1;
- assert getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next() instanceof NewSessionBean;
- newEnterpriseBean = (NewSessionBean<WrappedEnterpriseBeanLocal>) getCurrentManager().getBeans(WrappedEnterpriseBeanLocal.class, NEW_LITERAL).iterator().next();
-
- }
-
- @Test(groups = { "new", "broken" })
- public void testNewBeanHasImplementationClassOfInjectionPointType()
- {
- initNewBean();
- assert newEnterpriseBean.getType().equals(WrappedEnterpriseBean.class);
- }
-
- @Test(groups = { "new" })
- public void testNewBeanHasSameInitializerMethodsAsWrappedBean()
- {
- initNewBean();
- assert newEnterpriseBean.getInitializerMethods().equals(wrappedEnterpriseBean.getInitializerMethods());
- }
-
- @Test(groups = { "new" })
- public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
- {
- initNewBean();
- Set<? extends WeldAnnotated<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getAnnotatedInjectionPoints();
- Set<? extends WeldAnnotated<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getAnnotatedInjectionPoints();
- assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,14 +0,0 @@
-package org.jboss.weld.test.unit.implementation;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.enterprise.context.SessionScoped;
-
- at SessionScoped
- at Stateful
-class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal
-{
- @Remove
- public void bye() {
- }
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/WrappedEnterpriseBeanLocal.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,9 +0,0 @@
-package org.jboss.weld.test.unit.implementation;
-
-import javax.ejb.Local;
-
- at Local
-public interface WrappedEnterpriseBeanLocal
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/BowlerHatException.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,26 +0,0 @@
-package org.jboss.weld.test.unit.implementation.enterprise;
-
-public class BowlerHatException extends RuntimeException
-{
-
- public BowlerHatException()
- {
- super();
- }
-
- public BowlerHatException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public BowlerHatException(String message)
- {
- super(message);
- }
-
- public BowlerHatException(Throwable cause)
- {
- super(cause);
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/EnterpriseBeanTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,40 +0,0 @@
-package org.jboss.weld.test.unit.implementation.enterprise;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.EAR)
-public class EnterpriseBeanTest extends AbstractWeldTest
-{
-
- @Test(description="WBRI-179")
- public void testSFSBWithOnlyRemoteInterfacesDeploys()
- {
-
- }
-
- @Test(description="WBRI-275")
- public void testSLSBBusinessMethodThrowsRuntimeException()
- {
- try
- {
- getCurrentManager().getInstanceByType(Fedora.class).causeRuntimeException();
- }
- catch (Throwable t)
- {
- if (isExceptionInHierarchy(t, BowlerHatException.class))
- {
- return;
- }
- }
- assert false : "Expected a BowlerHatException to be in the cause stack";
- }
-
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Fedora.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,12 +0,0 @@
-package org.jboss.weld.test.unit.implementation.enterprise;
-
-import javax.ejb.Local;
-
- at Local
-public interface Fedora
-{
-
- public void causeRuntimeException();
-
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/FedoraImpl.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,14 +0,0 @@
-package org.jboss.weld.test.unit.implementation.enterprise;
-
-import javax.ejb.Stateless;
-
- at Stateless
-public class FedoraImpl implements Fedora
-{
-
- public void causeRuntimeException()
- {
- throw new BowlerHatException();
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/Hat.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,9 +0,0 @@
-package org.jboss.weld.test.unit.implementation.enterprise;
-
-import javax.ejb.Stateful;
-
- at Stateful
-public class Hat implements HatRemote
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/enterprise/HatRemote.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,9 +0,0 @@
-package org.jboss.weld.test.unit.implementation.enterprise;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface HatRemote
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Bar.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Bar.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,74 +0,0 @@
-package org.jboss.weld.test.unit.implementation.event;
-
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
-
- at RequestScoped
-public class Bar
-{
-
- @Inject Event<String> event;
-
- @Inject @Updated Event<String> updatedEvent;
-
- @Inject BeanManager manager;
-
- private boolean unqualifiedObserved;
- private boolean updatedObserved;
-
- public void fireWithNoQualifiers()
- {
- event.fire("");
- }
-
- public void fireWithUpdatedQualifierViaSelect()
- {
- event.select(new AnnotationLiteral<Updated>() {}).fire("");
- }
-
- public void fireWithNoQualifiersViaManager()
- {
- manager.fireEvent("");
- }
-
- public void fireWithUpdatedQualifierViaManager()
- {
- manager.fireEvent("", new AnnotationLiteral<Updated>() {});
- }
-
- public void fireWithUpdatedQualifierViaAnnotation()
- {
- updatedEvent.fire("");
- }
-
- public void reset()
- {
- unqualifiedObserved = false;
- updatedObserved = false;
- }
-
- public void onEvent(@Observes String event)
- {
- unqualifiedObserved = true;
- }
-
- public void onUpdatedEvent(@Observes @Updated String event)
- {
- updatedObserved = true;
- }
-
- public boolean isUnqualifiedObserved()
- {
- return unqualifiedObserved;
- }
-
- public boolean isUpdatedObserved()
- {
- return updatedObserved;
- }
-
-}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/EventQualifierTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/EventQualifierTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/EventQualifierTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,36 +0,0 @@
-package org.jboss.weld.test.unit.implementation.event;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class EventQualifierTest extends AbstractWeldTest
-{
-
- @Test(description="WELD-226")
- public void testDefaultQualifierNotRequired()
- {
- Bar bar = getCurrentManager().getInstanceByType(Bar.class);
- bar.fireWithNoQualifiers();
- assert bar.isUnqualifiedObserved();
- assert !bar.isUpdatedObserved();
- bar.reset();
- bar.fireWithNoQualifiersViaManager();
- assert bar.isUnqualifiedObserved();
- assert !bar.isUpdatedObserved();
- bar.reset();
- bar.fireWithUpdatedQualifierViaAnnotation();
- assert bar.isUnqualifiedObserved();
- assert bar.isUpdatedObserved();
- bar.reset();
- bar.fireWithUpdatedQualifierViaManager();
- assert bar.isUpdatedObserved();
- assert bar.isUnqualifiedObserved();
- bar.reset();
- bar.fireWithUpdatedQualifierViaSelect();
- assert bar.isUnqualifiedObserved();
- assert bar.isUpdatedObserved();
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,6 +0,0 @@
-package org.jboss.weld.test.unit.implementation.event;
-
-public class Foo
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/NormalScopedBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,16 +0,0 @@
-
-package org.jboss.weld.test.unit.implementation.event;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-
- at SessionScoped
-public class NormalScopedBean implements Serializable
-{
-
- @Any Event<Foo> event;
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,136 +0,0 @@
-package org.jboss.weld.test.unit.implementation.event;
-
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Inject;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.BeanManagerImpl;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class SimpleEventTest extends AbstractWeldTest
-{
- private static boolean RECEIVE_1_OBSERVED;
- private static boolean RECEIVE_2_OBSERVED;
- private static boolean RECEIVE_3_OBSERVED;
-
- private static void initFlags() {
- RECEIVE_1_OBSERVED = false;
- RECEIVE_2_OBSERVED = false;
- RECEIVE_3_OBSERVED = false;
- }
-
- @Test
- public void testFireEventOnManager()
- {
- BeanManagerImpl manager = getCurrentManager();
-
- initFlags();
-
- manager.fireEvent("Fired using Manager Interface with AnnotationLiteral.", new AnnotationLiteral<Updated>(){});
-
- assert RECEIVE_1_OBSERVED == true;
- assert RECEIVE_2_OBSERVED == true;
- assert RECEIVE_3_OBSERVED == true;
-
- initFlags();
-
- manager.fireEvent("Fired using Manager Interface.");
-
- assert RECEIVE_1_OBSERVED == false; // not called
- assert RECEIVE_2_OBSERVED == true;
- assert RECEIVE_3_OBSERVED == true;
- }
-
- @Test
- public void testFireEventOnEvent()
- {
- App app = createContextualInstance(App.class);
-
- initFlags();
-
- app.fireEventByBindingDeclaredAtInjectionPoint();
-
- assert RECEIVE_1_OBSERVED == true;
- assert RECEIVE_2_OBSERVED == true;
- assert RECEIVE_3_OBSERVED == true;
-
- initFlags();
-
- app.fireEventByAnnotationLiteral();
-
- assert RECEIVE_1_OBSERVED == true;
- assert RECEIVE_2_OBSERVED == true;
- assert RECEIVE_3_OBSERVED == true;
-
- initFlags();
-
- app.fireEventViaAny();
-
- assert RECEIVE_2_OBSERVED == true;
- assert RECEIVE_1_OBSERVED == false; // not called
- assert RECEIVE_3_OBSERVED == true;
-
- initFlags();
-
- app.fireEventViaWithNoQualifier();
-
- assert RECEIVE_1_OBSERVED == false; // not called
- assert RECEIVE_2_OBSERVED == true;
- assert RECEIVE_3_OBSERVED == true;
- }
-
- public static class App
- {
- @Inject @Any
- Event<String> event1;
-
- @Inject @Updated
- Event<String> event2;
-
- @Inject
- Event<String> event4;
-
- public void fireEventByAnnotationLiteral()
- {
- event1.select(new AnnotationLiteral<Updated>(){}).fire("Fired using Event Interface with AnnotationLiteral.");
- }
-
- public void fireEventByBindingDeclaredAtInjectionPoint()
- {
- event2.fire("Fired using Event Interface with Binding Declared.");
- }
-
- public void fireEventViaAny()
- {
- event1.fire("Fired using Event Interface");
- }
-
- public void fireEventViaWithNoQualifier()
- {
- event4.fire("Fired using Event Interface with no qualifier");
- }
- }
-
- public static class Receiver
- {
- public void receive1(@Observes @Updated String s)
- {
- RECEIVE_1_OBSERVED = true;
- }
-
- public void receive2(@Any @Observes String s)
- {
- RECEIVE_2_OBSERVED = true;
- }
-
- public void receive3(@Observes String s)
- {
- RECEIVE_3_OBSERVED = true;
- }
- }
-}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/Updated.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,22 +0,0 @@
-package org.jboss.weld.test.unit.implementation.event;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RUNTIME)
- at Target( { TYPE, METHOD, FIELD, PARAMETER })
- at Documented
- at interface Updated
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,18 +0,0 @@
-package org.jboss.weld.test.unit.implementation.proxy;
-
-import java.io.Serializable;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-
- at Named
- at RequestScoped
-class Foo implements Serializable
-{
-
- public String getMsg()
- {
- return "Hi";
- }
-
-}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/proxy/ProxyTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,20 +0,0 @@
-package org.jboss.weld.test.unit.implementation.proxy;
-
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class ProxyTest extends AbstractWeldTest
-{
-
- @Test(description="WBRI-122")
- public void testImplementationClassImplementsSerializable()
- {
- Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("foo"));
- getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean));
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Ball.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Ball.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Ball.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.weld.test.unit.interceptor.passivation;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
-
- at PassivationActivation
-public class Ball implements Serializable
-{
- @Shot
- public void shoot()
- {
- }
-
- @Pass
- public void pass()
- {
- }
-
-}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Defender.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Defender.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Defender.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.weld.test.unit.interceptor.passivation;
-
-import java.io.Serializable;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Pass
- at Interceptor
-public class Defender implements Serializable
-{
- @AroundInvoke
- public Object defend(InvocationContext context) throws Exception
- {
- return context.proceed();
- }
-}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Goalkeeper.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Goalkeeper.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Goalkeeper.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.weld.test.unit.interceptor.passivation;
-
-import java.io.Serializable;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at Shot
- at Interceptor
-public class Goalkeeper implements Serializable
-{
-
- @AroundInvoke
- public Object catchBall(InvocationContext invocationContext) throws Exception
- {
- return invocationContext.proceed();
- }
-}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Pass.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Pass.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Pass.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.weld.test.unit.interceptor.passivation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import javax.interceptor.InterceptorBinding;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at InterceptorBinding
- at Retention(RUNTIME)
- at Target({ElementType.METHOD, ElementType.TYPE})
- at Documented
-public @interface Pass
-{
-}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivation.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivation.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivation.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.weld.test.unit.interceptor.passivation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import javax.interceptor.InterceptorBinding;
-
-/**
- * @author Marius Bogoevici
- */
- at InterceptorBinding
- at Retention(RUNTIME)
- at Target({ElementType.TYPE})
- at Documented
-public @interface PassivationActivation
-{
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationInterceptor.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationInterceptor.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationInterceptor.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.weld.test.unit.interceptor.passivation;
-
-import java.io.Serializable;
-
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-
-/**
- * @author Marius Bogoevici
- */
- at Interceptor @PassivationActivation
-public class PassivationActivationInterceptor implements Serializable
-{
- public static boolean prePassivateInvoked;
- public static boolean postActivateInvoked;
-
- public static String initialMessage;
-
- public PassivationActivationInterceptor()
- {
- this.message = initialMessage;
- }
-
- public static PassivationActivationInterceptor instance;
- public String message = null;
-
- @PrePassivate
- public void prePassivate(InvocationContext invocationContext) throws Exception
- {
- prePassivateInvoked = true;
- invocationContext.proceed();
- instance = this;
- }
-
-
- @PostActivate
- public void postActivate(InvocationContext invocationContext) throws Exception
- {
- postActivateInvoked = true;
- invocationContext.proceed();
- instance = this;
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/PassivationActivationTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.weld.test.unit.interceptor.passivation;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
-/**
- * @author Marius Bogoevici
- */
- at Artifact
- at BeansXml("beans.xml")
-public class PassivationActivationTest extends AbstractWeldTest
-{
-
- @Test(groups = "incontainer-broken")
- public void testPassivationAndActivation() throws Exception
- {
- Bean bean = getCurrentManager().getBeans(Ball.class).iterator().next();
- CreationalContext creationalContext = getCurrentManager().createCreationalContext(bean);
-
- PassivationActivationInterceptor.initialMessage = "Goal!";
-
- Ball ball = (Ball) bean.create(creationalContext);
-
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- new ObjectOutputStream(byteArrayOutputStream).writeObject(ball);
-
- PassivationActivationInterceptor oldInterceptor = PassivationActivationInterceptor.instance;
-
- PassivationActivationInterceptor.initialMessage = "Miss!";
-
- assert PassivationActivationInterceptor.prePassivateInvoked;
- assert !PassivationActivationInterceptor.postActivateInvoked;
- assert PassivationActivationInterceptor.instance != null;
-
- PassivationActivationInterceptor.prePassivateInvoked = false;
- PassivationActivationInterceptor.postActivateInvoked = false;
- PassivationActivationInterceptor.instance = null;
-
- ball = (Ball)new ObjectInputStream(new ByteArrayInputStream(byteArrayOutputStream.toByteArray())).readObject();
-
- assert !PassivationActivationInterceptor.prePassivateInvoked;
- assert PassivationActivationInterceptor.postActivateInvoked;
- assert PassivationActivationInterceptor.instance != null;
- assert PassivationActivationInterceptor.instance != oldInterceptor;
- assert PassivationActivationInterceptor.instance.message != null;
- assert PassivationActivationInterceptor.instance.message.equals(oldInterceptor.message);
- }
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Shot.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Shot.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/interceptor/passivation/Shot.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual
- * contributors by the @authors tag. See the copyright.txt in the
- * distribution for a full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.weld.test.unit.interceptor.passivation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import javax.interceptor.InterceptorBinding;
-
-/**
- * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
- */
- at InterceptorBinding
- at Retention(RUNTIME)
- at Target({ElementType.METHOD, ElementType.TYPE})
- at Documented
-public @interface Shot
-{
-}
\ No newline at end of file
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Bar.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,6 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-public class Bar
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Baz.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,6 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-public class Baz
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Foo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,11 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-public class Foo extends FooBase<Bar>
-{
-
- public String getName()
- {
- return "foo";
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooBase.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,11 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-public class FooBase<T>
-{
-
- public String getName()
- {
- return "foobase";
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/FooProducer.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,14 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-import javax.enterprise.inject.Produces;
-
-public class FooProducer
-{
-
- @Produces @Special
- public FooBase<Baz> produce()
- {
- return new FooBase<Baz>();
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupFoo.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,22 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-import javax.inject.Inject;
-
-public class LookupFoo
-{
-
- @Inject Foo foo;
-
- @Inject @Special FooBase<Baz> foobaz;
-
- public Foo getFoo()
- {
- return foo;
- }
-
- public FooBase<Baz> getFoobaz()
- {
- return foobaz;
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,24 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-import java.util.List;
-
-import javax.enterprise.inject.Instance;
-import javax.enterprise.util.TypeLiteral;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class LookupInstanceTest extends AbstractWeldTest
-{
-
-
- @Test
- public void testLookupInstance() throws Exception
- {
- assert createContextualInstance(new TypeLiteral<Instance<List<?>>>(){}.getRawType(), new DefaultLiteral()) == null;
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Special.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,20 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
- at Qualifier
- at Retention(RetentionPolicy.RUNTIME)
- at Target({FIELD, METHOD, TYPE, PARAMETER})
-public @interface Special
-{
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Weld256Test.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Weld256Test.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/Weld256Test.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,19 +0,0 @@
-package org.jboss.weld.test.unit.lookup;
-
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.test.AbstractWeldTest;
-import org.testng.annotations.Test;
-
- at Artifact
-public class Weld256Test extends AbstractWeldTest
-{
-
- @Test
- public void testParameterizedInjection()
- {
- LookupFoo lookupFoo = getCurrentManager().getInstanceByType(LookupFoo.class);
- assert lookupFoo.getFoo().getName().equals("foo");
- assert lookupFoo.getFoobaz().getName().equals("foobase");
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/PreinstantiateBeanManagerTest.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.test.unit.preinstantiatebeanmanager;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-
-import org.jboss.weld.mock.MockEELifecycle;
-import org.jboss.weld.mock.TestContainer;
-import org.testng.annotations.Test;
-
-/**
- * @author kkhan
- *
- */
-public class PreinstantiateBeanManagerTest
-{
-
- @Test
- public void test()
- {
- //Start the container, but do not deploy weld yet
- List<Class<?>> classes = new ArrayList<Class<?>>();
- classes.add(WeldBean.class);
- TestContainer container = new TestContainer(new MockEELifecycle(), classes, null);
- container.getLifecycle().initialize();
-
- BeanManager bootstrapManager = container.getBeanManager();
- assert bootstrapManager != null;
-
- //Check the bean is null since it is not there yet
- Set<Bean<?>> beans = bootstrapManager.getBeans(WeldBean.class);
- assert beans == null || beans.size() == 0;
-
-
- //Start the application
- container.getLifecycle().beginApplication();
- container.ensureRequestActive();
-
- //Check the manager is the same as before
- BeanManager manager = container.getBeanManager();
- assert manager != null;
- assert bootstrapManager == manager;
-
- //Check we can get the bean
- Bean<? extends Object> bean = manager.resolve(manager.getBeans(WeldBean.class));
- WeldBean weldBean = (WeldBean) manager.getReference(bean, WeldBean.class, manager.createCreationalContext(bean));
- assert weldBean != null;
-
- container.stopContainer();
- }
-
-}
Deleted: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/WeldBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/WeldBean.java 2009-11-04 17:35:19 UTC (rev 4660)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/preinstantiatebeanmanager/WeldBean.java 2009-11-04 17:59:43 UTC (rev 4661)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2009, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.weld.test.unit.preinstantiatebeanmanager;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class WeldBean
-{
-
-}
More information about the weld-commits
mailing list