Author: pete.muir(a)jboss.org Date: 2009-06-26 07:27:58 -0400 (Fri, 26 Jun 2009) New Revision: 2897 Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Cow.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Fox.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/NightTime.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/AbstractFactory.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/DummyParent.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntegerFactory.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/Wbri279Test.java Removed: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Cow.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Dummy.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Field.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Fox.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/NightTime.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Tame.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/javaeepkg/ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/xml/parser/schema/ Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/BeanWithInjection.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/MyBean.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Cow.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NightTime.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/AlteStadt.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Giessen.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GrossStadt.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Kassel.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/KleinStadt.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/NeueStadt.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Schloss.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/UniStadt.java ri/trunk/tests/unit-tests.xml Log: Fix packaging of some tests, WBRI-279 Deleted: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,290 +0,0 @@ -package org.jboss.jsr299.tck.tests.activities; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Member; -import java.lang.reflect.Type; -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.event.Observer; -import javax.enterprise.inject.AnnotationLiteral; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.deployment.Production; -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 org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.MockCreationalContext; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.bean.ForwardingBean; -import org.jboss.webbeans.literal.CurrentLiteral; -import org.jboss.webbeans.test.AbstractWebBeansTest; -import org.testng.annotations.Test; - - -/** - * - * Spec version: 20090519 - * - */ -@Artifact -public class ActivitiesTest extends AbstractWebBeansTest -{ - - private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>(); - - static - { - DEFAULT_BINDINGS.add(new CurrentLiteral()); - } - - 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> getBindings() - { - return bindings; - } - - public Class<? extends Annotation> getDeploymentType() - { - return Production.class; - } - - public Set<InjectionPoint> getInjectionPoints() - { - return injectionPoints; - } - - public String getName() - { - return null; - } - - public Class<? extends Annotation> getScopeType() - { - return Dependent.class; - } - - public Set<Type> getTypes() - { - return types; - } - - public boolean isNullable() - { - return false; - } - - public boolean isSerializable() - { - return false; - } - - public Object create(CreationalContext<Object> creationalContext) - { - return null; - } - - public void destroy(Object instance, CreationalContext<Object> creationalContext) - { - - } - - }; - InjectionPoint injectionPoint = new InjectionPoint() - { - - public Bean<?> getBean() - { - return bean; - } - - public Set<Annotation> getBindings() - { - 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> getScopeType() - { - 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(); - BeanManager childActivity = getCurrentManager().createActivity(); - Bean<?> dummyBean = createDummyBean(childActivity, Cow.class); - childActivity.addBean(dummyBean); - assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), new MockCreationalContext<Cow>()) != 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; - BeanManager 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(); - BeanManager 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> getBindings() - { - return bindingTypes; - } - - }); - createContextualInstance(Field.class).get(); - } - - @Test - public void testObserverBelongingToChildDoesNotFireForParentActivity() - { - BeanManager childActivity = getCurrentManager().createActivity(); - Observer<NightTime> observer = new Observer<NightTime>() - { - - public boolean notify(NightTime event) - { - assert false; - return false; - } - - }; - childActivity.addObserver(observer); - getCurrentManager().fireEvent(new NightTime()); - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Cow.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Cow.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Cow.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.tests.activities; - -class Cow -{ - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Dummy.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Dummy.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Dummy.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,23 +0,0 @@ -/** - * - */ -package org.jboss.jsr299.tck.tests.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.enterprise.context.ScopeType; - -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@ScopeType -@Inherited -@interface Dummy {} \ No newline at end of file Deleted: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Field.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Field.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Field.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.tests.activities; - -import javax.enterprise.inject.Instance; -import javax.inject.Obtains; - -class Field -{ - - @Obtains @Tame Instance<Cow> instance; - - public Cow get() - { - return instance.get(); - } - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Fox.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Fox.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Fox.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,25 +0,0 @@ -package org.jboss.jsr299.tck.tests.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: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/NightTime.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/NightTime.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/NightTime.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.tests.activities; - -class NightTime -{ - -} Deleted: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Tame.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Tame.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.tests.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.enterprise.inject.BindingType; - -@Target( { TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@BindingType -@interface Tame -{ - -} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,290 @@ +package org.jboss.webbeans.test.unit.activities; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Member; +import java.lang.reflect.Type; +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.event.Observer; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.deployment.Production; +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 org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.bean.ForwardingBean; +import org.jboss.webbeans.literal.CurrentLiteral; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle.MockCreationalContext; +import org.testng.annotations.Test; + + +/** + * + * Spec version: 20090519 + * + */ +@Artifact +public class ActivitiesTest extends AbstractWebBeansTest +{ + + private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>(); + + static + { + DEFAULT_BINDINGS.add(new CurrentLiteral()); + } + + 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> getBindings() + { + return bindings; + } + + public Class<? extends Annotation> getDeploymentType() + { + return Production.class; + } + + public Set<InjectionPoint> getInjectionPoints() + { + return injectionPoints; + } + + public String getName() + { + return null; + } + + public Class<? extends Annotation> getScopeType() + { + return Dependent.class; + } + + public Set<Type> getTypes() + { + return types; + } + + public boolean isNullable() + { + return false; + } + + public boolean isSerializable() + { + return false; + } + + public Object create(CreationalContext<Object> creationalContext) + { + return null; + } + + public void destroy(Object instance, CreationalContext<Object> creationalContext) + { + + } + + }; + InjectionPoint injectionPoint = new InjectionPoint() + { + + public Bean<?> getBean() + { + return bean; + } + + public Set<Annotation> getBindings() + { + 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> getScopeType() + { + 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(); + BeanManager childActivity = getCurrentManager().createActivity(); + Bean<?> dummyBean = createDummyBean(childActivity, Cow.class); + childActivity.addBean(dummyBean); + assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), new MockCreationalContext<Cow>()) != 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; + BeanManager 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(); + BeanManager 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> getBindings() + { + return bindingTypes; + } + + }); + createContextualInstance(Field.class).get(); + } + + @Test + public void testObserverBelongingToChildDoesNotFireForParentActivity() + { + BeanManager childActivity = getCurrentManager().createActivity(); + Observer<NightTime> observer = new Observer<NightTime>() + { + + public boolean notify(NightTime event) + { + assert false; + return false; + } + + }; + childActivity.addObserver(observer); + getCurrentManager().fireEvent(new NightTime()); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Cow.java (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Cow.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Cow.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Cow.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.unit.activities; + +class Cow +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Dummy.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Dummy.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,23 @@ +/** + * + */ +package org.jboss.webbeans.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.enterprise.context.ScopeType; + +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@ScopeType +@Inherited +@interface Dummy {} \ No newline at end of file Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Field.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Field.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.unit.activities; + +import javax.enterprise.inject.Instance; +import javax.inject.Obtains; + +class Field +{ + + @Obtains @Tame Instance<Cow> instance; + + public Cow get() + { + return instance.get(); + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Fox.java (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Fox.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Fox.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Fox.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,25 @@ +package org.jboss.webbeans.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; + } + +} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/NightTime.java (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/NightTime.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/NightTime.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/NightTime.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.unit.activities; + +class NightTime +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/Tame.java) =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/Tame.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.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.enterprise.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Tame +{ + +} Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/BeanWithInjection.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/BeanWithInjection.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/BeanWithInjection.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.child; +package org.jboss.webbeans.test.unit.activities.child; class BeanWithInjection { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/MyBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/MyBean.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/MyBean.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.child; +package org.jboss.webbeans.test.unit.activities.child; @SpecialBindingType class MyBean Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/SameBeanTypeInChildActivityTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.child; +package org.jboss.webbeans.test.unit.activities.child; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -99,7 +99,7 @@ return bean; } - @Test(groups = { "ri-broken" }, expectedExceptions = { InjectionException.class }) + @Test(groups = { "broken" }, expectedExceptions = { InjectionException.class }) public void testSameBeanTypeInChildAsParentInjection() { BeanManager childActivity = getCurrentManager().createActivity(); @@ -107,7 +107,7 @@ childActivity.addBean(anotherMyBean); } - @Test(groups = { "ri-broken" }, expectedExceptions = { InjectionException.class }) + @Test(groups = { "broken" }, expectedExceptions = { InjectionException.class }) public void testSameBeanTypeInChildAsIndirectParentInjection() { WebBeansManager childActivity = getCurrentManager().createActivity(); Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/child/SpecialBindingType.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/child/SpecialBindingType.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.child; +package org.jboss.webbeans.test.unit.activities.child; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Cow.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Cow.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Cow.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; class Cow { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Donkey.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Donkey.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Dummy.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dummy.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,7 +1,7 @@ /** * */ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Dusk.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/ELCurrentActivityTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import java.lang.annotation.Annotation; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Field.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Field.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import javax.enterprise.inject.Instance; import javax.inject.Obtains; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Horse.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Horse.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import javax.enterprise.inject.Current; import javax.enterprise.inject.spi.BeanManager; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/InactiveScopeTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InactiveScopeTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import java.lang.annotation.Annotation; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/InjectedManagerCurrentActivityTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InjectedManagerCurrentActivityTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import java.lang.annotation.Annotation; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/InstanceCurrentActivityTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import java.lang.annotation.Annotation; import java.lang.reflect.Type; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/JndiManagerCurrentActivityTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/JndiManagerCurrentActivityTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import java.lang.annotation.Annotation; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NightTime.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/NightTime.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NightTime.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; class NightTime { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScope.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScope.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,7 +1,7 @@ /** * */ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/NonNormalScopeTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/NonNormalScopeTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import java.lang.annotation.Annotation; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Tame.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/Tame.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.activities.current; +package org.jboss.webbeans.test.unit.activities.current; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; Copied: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle (from rev 2896, ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle) Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/AlteStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/AlteStadt.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessor.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import java.util.Arrays; import java.util.HashSet; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GeschichtslosStadt.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Giessen.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Giessen.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; public class Giessen implements NeueStadt, GeschichtslosStadt { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GrossStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GrossStadt.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/GutenbergMuseum.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; public class GutenbergMuseum { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IndirectOrderProcessor.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; class IntermediateOrderProcessor extends OrderProcessor { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Kassel.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Kassel.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/KleinStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/KleinStadt.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/LandgraffenSchloss.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.annotation.PreDestroy; import javax.ejb.Remove; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Mainz.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Mainz.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.annotation.PostConstruct; import javax.ejb.Stateless; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Marburg.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Marburg.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Remove; import javax.ejb.Stateful; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.enterprise.context.spi.CreationalContext; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/NeueStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/NeueStadt.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessor.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/OrderProcessorLocal.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/RoemerPassage.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; class RoemerPassage { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Schloss.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Schloss.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/Schloss.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/SchoeneStadt.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/UniStadt.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/UniStadt.java 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/lifecycle/UniStadt.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; +package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle; import javax.ejb.Local; Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/AbstractFactory.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/AbstractFactory.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/AbstractFactory.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,8 @@ +package org.jboss.webbeans.test.unit.lookup.wbri279; + +public abstract class AbstractFactory<T> +{ + + public abstract T createObject(); + +} Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/AbstractFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/DummyParent.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/DummyParent.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/DummyParent.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.unit.lookup.wbri279; + +public class DummyParent +{ + +} Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/DummyParent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,19 @@ +package org.jboss.webbeans.test.unit.lookup.wbri279; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.enterprise.inject.BindingType; + +(a)Retention(RetentionPolicy.RUNTIME) +@Target( { TYPE, FIELD, METHOD }) +@BindingType +public @interface IntFactory +{ + +} Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntegerFactory.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntegerFactory.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntegerFactory.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.unit.lookup.wbri279; + +@IntFactory +public class IntegerFactory extends AbstractFactory<Integer> +{ + + public static final Integer VALUE = 123; + + public Integer createObject() + { + return VALUE; + } + +} Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/IntegerFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,14 @@ +package org.jboss.webbeans.test.unit.lookup.wbri279; + +public class SomeBean +{ + + @IntFactory + IntegerFactory integerFactory; + + public String getObjectAsString() + { + return integerFactory.createObject().toString(); + } + +} Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/SomeBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/Wbri279Test.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/Wbri279Test.java (rev 0) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/Wbri279Test.java 2009-06-26 11:27:58 UTC (rev 2897) @@ -0,0 +1,37 @@ +/* + * 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.webbeans.test.unit.lookup.wbri279; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.testng.annotations.Test; + +/** + * @author pmuir + * + */ +@Artifact +public class Wbri279Test extends AbstractWebBeansTest +{ + + @Test(description="WBRI-279") + public void testLookupOfGenericTypeSubclass() + { + assert createContextualInstance(SomeBean.class).getObjectAsString().equals(IntegerFactory.VALUE.toString()); + } + +} Property changes on: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/lookup/wbri279/Wbri279Test.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/tests/unit-tests.xml =================================================================== --- ri/trunk/tests/unit-tests.xml 2009-06-25 23:12:36 UTC (rev 2896) +++ ri/trunk/tests/unit-tests.xml 2009-06-26 11:27:58 UTC (rev 2897) @@ -43,11 +43,11 @@ <packages> <!-- <package name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle" />--> <package name="org.jboss.webbeans.test.examples" /> - <package name="org.jboss.webbeans.test.unit.bootstrap" /> + <package name="org.jboss.webbeans.test.unit.activities" /> <package name="org.jboss.webbeans.test.unit.activities.current" /> <package name="org.jboss.webbeans.test.unit.activities.child" /> - <package name="org.jboss.webbeans.test.unit.bootstrap.ordering" /> + <package name="org.jboss.webbeans.test.unit.bootstrap" /> <package name="org.jboss.webbeans.test.unit.bootstrap.environments" /> <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleEnterprise" /> <package name="org.jboss.webbeans.test.unit.bootstrap.environments.multipleEnterpriseAndSimple" /> @@ -61,19 +61,22 @@ <package name="org.jboss.webbeans.test.unit.implementation" /> <package name="org.jboss.webbeans.test.unit.implementation.annotatedItem" /> <package name="org.jboss.webbeans.test.unit.implementation.enterpise" /> + <package name="org.jboss.webbeans.test.unit.implementation.enterpise.lifecycle" /> <package name="org.jboss.webbeans.test.unit.implementation.enterprise.sbi" /> <package name="org.jboss.webbeans.test.unit.implementation.event" /> + <package name="org.jboss.webbeans.test.unit.implementation.exceptions" /> + <package name="org.jboss.webbeans.test.unit.implementation.named" /> <package name="org.jboss.webbeans.test.unit.implementation.newsimple" /> <package name="org.jboss.webbeans.test.unit.implementation.producer.field" /> <package name="org.jboss.webbeans.test.unit.implementation.producer.method" /> <package name="org.jboss.webbeans.test.unit.implementation.proxy" /> <package name="org.jboss.webbeans.test.unit.implementation.proxy.enterprise" /> <package name="org.jboss.webbeans.test.unit.lookup" /> + <package name="org.jboss.webbeans.test.unit.lookup.circular" /> + <package name="org.jboss.webbeans.test.unit.lookup.wbri279" /> <package name="org.jboss.webbeans.test.unit.manager" /> - <package name="org.jboss.webbeans.test.unit.lookup.circular" /> + <package name="org.jboss.webbeans.test.unit.servlet" /> <package name="org.jboss.webbeans.test.unit.xml.deploy" /> - <package name="org.jboss.webbeans.test.unit.xml.parser" /> - <package name="org.jboss.webbeans.test.unit.xml.parser.schema" /> </packages> </test>