Author: pete.muir(a)jboss.org Date: 2008-10-26 07:26:12 -0400 (Sun, 26 Oct 2008) New Revision: 160 Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/APITypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/BeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerExpressionBeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java ri/trunk/webbeans-ri/testng.xml Log: Update tests for 2.7 to PDR, tidy up after an eclipse refactor Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java (rev 0) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java 2008-10-26 11:26:12 UTC (rev 160) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.bindings; + +import javax.webbeans.AnnotationLiteral; +import javax.webbeans.Named; + +public abstract class NamedAnnotationLiteral extends AnnotationLiteral<Named> implements Named {} \ No newline at end of file Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java 2008-10-26 11:26:12 UTC (rev 160) @@ -18,7 +18,6 @@ import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bindings.CurrentAnnotationLiteral; -import org.jboss.webbeans.injectable.BeanConstructor; import org.jboss.webbeans.injectable.Injectable; import org.jboss.webbeans.injectable.InjectableMethod; import org.jboss.webbeans.injectable.InjectableParameter; @@ -277,90 +276,53 @@ return null; } - protected MergedStereotypesModel<T, E> getMergedStereotypes() + public MergedStereotypesModel<T, E> getMergedStereotypes() { return mergedStereotypes; } protected abstract String getDefaultName(); - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getBindingTypes() - */ public Set<Annotation> getBindingTypes() { return bindingTypes; } - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getScopeType() - */ public Class<? extends Annotation> getScopeType() { return scopeType; } - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getType() - */ public Class<? extends T> getType() { return type; } - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getApiTypes() - */ public Set<Class<?>> getApiTypes() { return apiTypes; } - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getConstructor() - */ - public abstract BeanConstructor<T> getConstructor(); - - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getLocation() - */ - public abstract String getLocation(); - - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getDeploymentType() - */ public Class<? extends Annotation> getDeploymentType() { return deploymentType; } - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getName() - */ public String getName() { return name; } - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getRemoveMethod() - */ public InjectableMethod<?> getRemoveMethod() { return removeMethod; } - - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#getInjectionPoints() - */ + public Set<Injectable<?, ?>> getInjectionPoints() { return injectionPoints; } - /* (non-Javadoc) - * @see org.jboss.webbeans.model.Model#isAssignableFrom(org.jboss.webbeans.introspector.AnnotatedItem) - */ public boolean isAssignableFrom(AnnotatedItem<?, ?> annotatedItem) { return this.getAnnotatedItem().isAssignableFrom(annotatedItem); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/BeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/BeanModel.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/BeanModel.java 2008-10-26 11:26:12 UTC (rev 160) @@ -7,6 +7,7 @@ import org.jboss.webbeans.injectable.Injectable; import org.jboss.webbeans.injectable.InjectableMethod; import org.jboss.webbeans.introspector.AnnotatedItem; +import org.jboss.webbeans.model.MergedStereotypesModel; public interface BeanModel<T, E> { @@ -37,4 +38,6 @@ public boolean isAssignableFrom(AnnotatedItem<?, ?> annotatedItem); + public MergedStereotypesModel<T, E> getMergedStereotypes(); + } \ No newline at end of file Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-10-26 11:26:12 UTC (rev 160) @@ -61,7 +61,6 @@ return "EnterpriseBean[" + getType().getName() + "]"; } - @Override public String getLocation() { if (location == null) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java 2008-10-26 11:26:12 UTC (rev 160) @@ -55,13 +55,11 @@ constructor = new SimpleConstructor<T>(classConstructor); } - @Override public BeanConstructor<T> getConstructor() { return constructor; } - @Override public String getLocation() { if (location == null) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerExpressionBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerExpressionBeanModel.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerExpressionBeanModel.java 2008-10-26 11:26:12 UTC (rev 160) @@ -51,7 +51,6 @@ return annotatedItem; } - @Override public BeanConstructor<T> getConstructor() { // TODO Auto-generated method stub @@ -64,7 +63,6 @@ throw new RuntimeException(getLocation() + " Cannot set a default name on producer expressions"); } - @Override public String getLocation() { if (location == null) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java 2008-10-26 11:26:12 UTC (rev 160) @@ -86,7 +86,6 @@ declaringBean = container.getModelManager().getBeanModel(getAnnotatedItem().getDelegate().getDeclaringClass()); } - @Override public BeanConstructor<T> getConstructor() { return constructor; @@ -181,7 +180,6 @@ return declaredBeanType; } - @Override public String getLocation() { if (location == null) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-10-26 11:26:12 UTC (rev 160) @@ -134,7 +134,6 @@ return "SimpleWebBean[" + getAnnotatedItem().toString() + "]"; } - @Override public String getLocation() { if (location == null) Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/APITypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/APITypeTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/APITypeTest.java 2008-10-26 11:26:12 UTC (rev 160) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.test; + +import static org.jboss.webbeans.test.util.Util.createSimpleModel; + +import org.jboss.webbeans.model.bean.BeanModel; +import org.jboss.webbeans.test.beans.Bear; +import org.testng.annotations.Test; + +@SpecVersion("PDR") +public class ApiTypeTest extends AbstractTest +{ + + @Test @SpecAssertion(section="2.2") + public void testApiTypeContainsObject() + { + BeanModel<?, ?> model = createSimpleModel(Bear.class, manager); + assert model.getApiTypes().contains(Object.class); + } + +} Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java 2008-10-26 11:26:12 UTC (rev 160) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test; + +import javax.webbeans.DefinitionException; + +import org.testng.annotations.Test; + +public class JmsModelTest extends AbstractTest +{ + + @Test(expectedExceptions=DefinitionException.class, groups="jms") @SpecAssertion(section="2.6") + public void testJmsEndpointHasName() + { + assert false; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/JmsModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java 2008-10-26 11:26:12 UTC (rev 160) @@ -0,0 +1,149 @@ +package org.jboss.webbeans.test; + +import static org.jboss.webbeans.test.util.Util.createSimpleModel; +import static org.jboss.webbeans.test.util.Util.getEmptyAnnotatedType; + +import java.lang.annotation.Annotation; +import java.util.HashMap; +import java.util.Map; + +import javax.webbeans.DefinitionException; +import javax.webbeans.Named; + +import org.jboss.webbeans.bindings.NamedAnnotationLiteral; +import org.jboss.webbeans.introspector.AnnotatedType; +import org.jboss.webbeans.introspector.SimpleAnnotatedType; +import org.jboss.webbeans.model.bean.BeanModel; +import org.jboss.webbeans.model.bean.SimpleBeanModel; +import org.jboss.webbeans.test.annotations.RiverFishStereotype; +import org.jboss.webbeans.test.beans.Cod; +import org.jboss.webbeans.test.beans.Haddock; +import org.jboss.webbeans.test.beans.Moose; +import org.jboss.webbeans.test.beans.RedSnapper; +import org.jboss.webbeans.test.beans.SeaBass; +import org.jboss.webbeans.test.bindings.RiverFishStereotypeAnnotationLiteral; +import org.testng.annotations.Test; + +@SpecVersion("PDR") +public class NameTest extends AbstractTest +{ + + @Test(groups="el", expectedExceptions=DefinitionException.class) @SpecAssertion(section="2.6") + public void testInvalidElIdentifierUsedAsWebBeanName() + { + assert false; + } + + @Test @SpecAssertion(section="2.6.1") + public void testNonDefaultNamed() + { + SimpleBeanModel<Moose> moose = new SimpleBeanModel<Moose>(new SimpleAnnotatedType<Moose>(Moose.class), getEmptyAnnotatedType(Moose.class), manager); + assert moose.getName().equals("aMoose"); + } + + @Test @SpecAssertion(section="2.6.2") + public void testNonDefaultXmlNamed() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral(){ + + public String value() + { + return "aTrout"; + } + + }); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + + assert trout.getName().equals("aTrout"); + } + + @Test @SpecAssertion(section="2.6.2") + public void testXmlNamedOverridesJavaNamed() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral(){ + + public String value() + { + return "aTrout"; + } + + }); + AnnotatedType<Cod> annotatedItem = new SimpleAnnotatedType<Cod>(Cod.class, annotations); + SimpleBeanModel<Cod> cod = new SimpleBeanModel<Cod>(new SimpleAnnotatedType<Cod>(Cod.class), annotatedItem, manager); + + assert cod.getName().equals("aTrout"); + } + + @Test @SpecAssertion(section={"2.6.2", "2.6.3"}) + public void testJavaNamedUsedWhenNoXmlSpecified() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + AnnotatedType<Cod> annotatedItem = new SimpleAnnotatedType<Cod>(Cod.class, annotations); + SimpleBeanModel<Cod> cod = new SimpleBeanModel<Cod>(new SimpleAnnotatedType<Cod>(Cod.class), annotatedItem, manager); + + assert cod.getName().equals("whitefish"); + } + + @Test @SpecAssertion(section="2.6.3") + public void testDefaultNamed() + { + SimpleBeanModel<Haddock> haddock = new SimpleBeanModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedType(Haddock.class), manager); + assert haddock.getName() != null; + assert haddock.getName().equals("haddock"); + } + + @Test @SpecAssertion(section="2.6.3") + public void testDefaultXmlNamed() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(Named.class, new NamedAnnotationLiteral() { + + public String value() + { + return ""; + } + + }); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + + assert trout.getName() != null; + assert trout.getName().equals("seaBass"); + } + + @Test @SpecAssertion(section="2.6.3") + public void testSterotypeDefaultsName() + { + BeanModel<?, ?> model = createSimpleModel(RedSnapper.class, manager); + assert model.getMergedStereotypes().isBeanNameDefaulted(); + assert model.getName().equals("redSnapper"); + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInJava() + { + SimpleBeanModel<SeaBass> model = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedType(SeaBass.class), manager); + assert model.getName() == null; + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInXml() + { + SimpleBeanModel<SeaBass> model = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedType(SeaBass.class), manager); + assert model.getName() == null; + } + + @Test @SpecAssertion(section="2.6.4") + public void testNotNamedInStereotype() + { + Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + annotations.put(RiverFishStereotype.class, new RiverFishStereotypeAnnotationLiteral()); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleBeanModel<SeaBass> model = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + assert model.getName() == null; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-10-26 11:26:12 UTC (rev 160) @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.Map; -import javax.webbeans.AnnotationLiteral; import javax.webbeans.Current; import javax.webbeans.Dependent; import javax.webbeans.Named; @@ -15,6 +14,7 @@ import org.jboss.webbeans.bindings.CurrentAnnotationLiteral; import org.jboss.webbeans.bindings.DependentAnnotationLiteral; +import org.jboss.webbeans.bindings.NamedAnnotationLiteral; import org.jboss.webbeans.introspector.AnnotatedType; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.bean.SimpleBeanModel; @@ -23,11 +23,8 @@ import org.jboss.webbeans.test.beans.Cow; import org.jboss.webbeans.test.beans.Goldfish; import org.jboss.webbeans.test.beans.Gorilla; -import org.jboss.webbeans.test.beans.Haddock; import org.jboss.webbeans.test.beans.Horse; -import org.jboss.webbeans.test.beans.Moose; import org.jboss.webbeans.test.beans.Order; -import org.jboss.webbeans.test.beans.SeaBass; import org.jboss.webbeans.test.beans.broken.Carp; import org.jboss.webbeans.test.beans.broken.Pig; import org.jboss.webbeans.test.beans.broken.OuterBean.InnerBean; @@ -37,77 +34,8 @@ @SpecVersion("20080925") public class SimpleBeanModelTest extends AbstractTest -{ +{ - private abstract class NamedAnnotationLiteral extends AnnotationLiteral<Named> implements Named {} - - - // **** TESTS FOR SCOPES **** // - - - - // **** TESTS FOR BEAN NAME **** / - - @Test @SpecAssertion(section="2.6.1") - public void testDefaultNamed() - { - SimpleBeanModel<Haddock> haddock = new SimpleBeanModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedType(Haddock.class), manager); - assert haddock.getName() != null; - assert haddock.getName().equals("haddock"); - } - - @Test @SpecAssertion(section="2.6.2") - public void testDefaultXmlNamed() - { - Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral() { - - public String value() - { - return ""; - } - - }); - AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); - SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); - - assert trout.getName() != null; - assert trout.getName().equals("seaBass"); - } - - @Test @SpecAssertion(section="2.6.2") - public void testNonDefaultXmlNamed() - { - Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral(){ - - public String value() - { - return "aTrout"; - } - - }); - AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); - SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); - - assert trout.getName().equals("aTrout"); - } - - @Test @SpecAssertion(section="2.6.4") - public void testNotNamed() - { - SimpleBeanModel<SeaBass> trout = new SimpleBeanModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedType(SeaBass.class), manager); - assert trout.getName() == null; - } - - @Test @SpecAssertion(section="2.6.1") - public void testNonDefaultNamed() - { - SimpleBeanModel<Moose> moose = new SimpleBeanModel<Moose>(new SimpleAnnotatedType<Moose>(Moose.class), getEmptyAnnotatedType(Moose.class), manager); - assert moose.getName().equals("aMoose"); - } - - // **** TESTS FOR STEREOTYPES **** // @SuppressWarnings("unchecked") Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/FishStereotype.java 2008-10-26 11:26:12 UTC (rev 160) @@ -7,6 +7,7 @@ import java.lang.annotation.Target; import javax.webbeans.ApplicationScoped; +import javax.webbeans.Named; import javax.webbeans.Stereotype; import org.jboss.webbeans.test.beans.Animal; @@ -15,6 +16,7 @@ @Target( { TYPE }) @Retention(RUNTIME) @ApplicationScoped +@Named public @interface FishStereotype { Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java 2008-10-26 11:26:12 UTC (rev 160) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.beans; + +import org.jboss.webbeans.test.annotations.FishStereotype; + +@FishStereotype +public class RedSnapper implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RedSnapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/testng.xml =================================================================== --- ri/trunk/webbeans-ri/testng.xml 2008-10-26 10:34:01 UTC (rev 159) +++ ri/trunk/webbeans-ri/testng.xml 2008-10-26 11:26:12 UTC (rev 160) @@ -16,6 +16,8 @@ <exclude name="ejb3" /> <exclude name="annotationDefinition" /> <exclude name="webbeansxml" /> + <exclude name="el" /> + <exclude name="jms" /> </run> </groups> <packages>