[webbeans-commits] Webbeans SVN: r166 - in ri/trunk/webbeans-ri: src/main/java/org/jboss/webbeans/model/bean and 4 other directories.

Author: pete.muir(a)jboss.org Date: 2008-10-26 10:25:13 -0400 (Sun, 26 Oct 2008) New Revision: 166 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ParameterizedBean.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/ProducerMethodBeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeSafeResolutionTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java ri/trunk/webbeans-ri/testng.xml Log: Fix remaining tests for 3.2 except xml declared constructors 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 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java 2008-10-26 14:25:13 UTC (rev 166) @@ -37,7 +37,7 @@ protected Class<? extends Annotation> scopeType; private MergedStereotypesModel<T, E> mergedStereotypes; protected Class<? extends Annotation> deploymentType; - protected Class<? extends T> type; + protected Class<T> type; protected InjectableMethod<?> removeMethod; private Set<Class<?>> apiTypes; protected Set<Injectable<?, ?>> injectionPoints; @@ -293,7 +293,7 @@ return scopeType; } - public Class<? extends T> getType() + public Class<T> getType() { return type; } 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 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java 2008-10-26 14:25:13 UTC (rev 166) @@ -155,7 +155,7 @@ { try { - this.type = annotatedMethod.getType(); + // TODO Fix this this.type = annotatedMethod.getType(); } catch (ClassCastException e) { 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 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-10-26 14:25:13 UTC (rev 166) @@ -4,7 +4,6 @@ import java.util.List; import java.util.logging.Logger; -import javax.webbeans.BindingType; import javax.webbeans.DefinitionException; import javax.webbeans.Initializer; @@ -58,69 +57,45 @@ public static void checkType(Class<?> type) { - if (type.isMemberClass()) + if (Reflections.isStaticInnerClass(type)) { - throw new DefinitionException("Simple Web Bean " + type + " cannot be an inner class"); + throw new DefinitionException("Simple Web Bean " + type + " cannot be a static inner class"); } + if (Reflections.isParameterizedType(type)) + { + throw new DefinitionException("Simple Web Bean " + type + " cannot be a parameterized type"); + } } protected void initConstructor() { - if (getType().getConstructors().length == 1) - { - Constructor<T> constructor = (Constructor<T>) getType().getConstructors()[0]; - log.finest("Exactly one constructor (" + constructor +") defined, using it as the bean constructor for " + getType()); - this.constructor = new SimpleConstructor<T>(constructor); - return; - } - if (getType().getConstructors().length > 1) + List<Constructor<T>> initializerAnnotatedConstructors = Reflections.getAnnotatedConstructors(getType(), Initializer.class); + log.finest("Found " + initializerAnnotatedConstructors + " constructors annotated with @Initializer for " + getType()); + if (initializerAnnotatedConstructors.size() > 1) { - List<Constructor<T>> initializerAnnotatedConstructors = Reflections.getConstructors(getType(), Initializer.class); - List<Constructor<T>> bindingTypeAnnotatedConstructors = Reflections.getConstructorsForMetaAnnotatedParameter(getType(), BindingType.class); - log.finest("Found " + initializerAnnotatedConstructors + " constructors annotated with @Initializer for " + getType()); - log.finest("Found " + bindingTypeAnnotatedConstructors + " with parameters annotated with binding types for " + getType()); - if ((initializerAnnotatedConstructors.size() + bindingTypeAnnotatedConstructors.size()) > 1) + if (initializerAnnotatedConstructors.size() > 1) { - if (initializerAnnotatedConstructors.size() > 1) - { - throw new RuntimeException("Cannot have more than one constructor annotated with @Initializer for " + getType()); - } - - else if (bindingTypeAnnotatedConstructors.size() > 1) - { - throw new RuntimeException("Cannot have more than one constructor with binding types specified on constructor parameters for " + getType()); - } - else - { - throw new RuntimeException("Specify a constructor either annotated with @Initializer or with parameters annotated with binding types for " + getType()); - } + throw new DefinitionException("Cannot have more than one constructor annotated with @Initializer for " + getType()); } - else if (initializerAnnotatedConstructors.size() == 1) - { - Constructor<T> constructor = initializerAnnotatedConstructors.get(0); - log.finest("Exactly one constructor (" + constructor +") annotated with @Initializer defined, using it as the bean constructor for " + getType()); - this.constructor = new SimpleConstructor<T>(constructor); - return; - } - else if (bindingTypeAnnotatedConstructors.size() == 1) - { - Constructor<T> constructor = bindingTypeAnnotatedConstructors.get(0); - log.finest("Exactly one constructor (" + constructor +") with parameters annotated with binding types defined, using it as the bean constructor for " + getType()); - this.constructor = new SimpleConstructor<T>(constructor); - return; - } } - - if (getType().getConstructors().length == 0) - { - Constructor<T> constructor = (Constructor<T>) Reflections.getConstructor(getType()); - log.finest("No constructor defined, using implicit no arguement constructor for " + getType()); + else if (initializerAnnotatedConstructors.size() == 1) + { + Constructor<T> constructor = initializerAnnotatedConstructors.get(0); + log.finest("Exactly one constructor (" + constructor +") annotated with @Initializer defined, using it as the bean constructor for " + getType()); this.constructor = new SimpleConstructor<T>(constructor); return; } + + Constructor<T> emptyConstructor = Reflections.getConstructor(getType()); + if (emptyConstructor != null) + { + log.finest("Exactly one constructor (" + constructor +") defined, using it as the bean constructor for " + getType()); + this.constructor = new SimpleConstructor<T>(emptyConstructor); + return; + } - throw new RuntimeException("Cannot determine constructor to use for " + getType()); + throw new DefinitionException("Cannot determine constructor to use for " + getType()); } public SimpleConstructor<T> getConstructor() Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2008-10-26 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2008-10-26 14:25:13 UTC (rev 166) @@ -82,6 +82,16 @@ return Modifier.isAbstract(clazz.getModifiers()); } + public static boolean isStaticInnerClass(Class<?> clazz) + { + return clazz.isMemberClass() && Modifier.isStatic(clazz.getModifiers()); + } + + public static boolean isNonStaticInnerClass(Class<?> clazz) + { + return clazz.isMemberClass() && !Modifier.isStatic(clazz.getModifiers()); + } + public static <T> Constructor<T> getConstructor(Class<T> clazz, Class<?>... parameterTypes) { try @@ -112,7 +122,7 @@ } @SuppressWarnings("unchecked") - public static <T> List<Constructor<T>> getConstructors(Class<? extends T> clazz, Class<? extends Annotation> annotationType) + public static <T> List<Constructor<T>> getAnnotatedConstructors(Class<? extends T> clazz, Class<? extends Annotation> annotationType) { List<Constructor<T>> constructors = new ArrayList<Constructor<T>>(); for (Constructor<?> constructor : clazz.getConstructors()) @@ -217,4 +227,9 @@ { return rawType.isArray(); } + + public static boolean isParameterizedType(Class<?> type) + { + return type.getTypeParameters().length > 0; + } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-26 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-26 14:25:13 UTC (rev 166) @@ -55,7 +55,7 @@ * {@link org.jboss.webbeans.event.DeferredEventNotification#beforeCompletion()} * . */ - @Test + @Test(groups="eventbus") public final void testBeforeCompletion() throws Exception { // When the transaction is committed, the beforeCompletion() method is Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-10-26 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseBeanModelTest.java 2008-10-26 14:25:13 UTC (rev 166) @@ -30,12 +30,6 @@ public class EnterpriseBeanModelTest extends AbstractTest { - @Test @SpecAssertion(section="2.7.2") - public void testSingleStereotype() - { - assert false; - } - @SuppressWarnings("unchecked") @Test public void testStateless() Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-10-26 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-10-26 14:25:13 UTC (rev 166) @@ -30,7 +30,7 @@ public class ProducerMethodBeanModelTest extends AbstractTest { - @Test @SpecAssertion(section="2.5.3") + @Test(groups="producerMethod") @SpecAssertion(section="2.5.3") public void testProducerMethodInheritsDeploymentTypeOfDeclaringWebBean() throws Exception { SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedType(SpiderProducer.class), manager); @@ -40,7 +40,7 @@ tarantulaModel.getDeploymentType().equals(AnotherDeploymentType.class); } - @Test @SpecAssertion(section="3.3") + @Test(groups="producerMethod") @SpecAssertion(section="3.3") public void testStaticMethod() throws SecurityException, NoSuchMethodException { SimpleBeanModel<BeanWithStaticProducerMethod> model = new SimpleBeanModel<BeanWithStaticProducerMethod>(new SimpleAnnotatedType<BeanWithStaticProducerMethod>(BeanWithStaticProducerMethod.class), getEmptyAnnotatedType(BeanWithStaticProducerMethod.class), manager); @@ -58,7 +58,7 @@ assert exception; } - @Test @SpecAssertion(section="3.3") + @Test(groups="producerMethod") @SpecAssertion(section="3.3") public void testApiTypes() throws SecurityException, NoSuchMethodException { SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedType(SpiderProducer.class), manager); @@ -73,7 +73,7 @@ assert !tarantulaModel.getApiTypes().contains(Object.class); } - @Test @SpecAssertion(section="3.3.1") + @Test(groups="producerMethod") @SpecAssertion(section="3.3.1") public void testDefaultBindingType() throws SecurityException, NoSuchMethodException { SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedType(SpiderProducer.class), manager); @@ -84,7 +84,7 @@ assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class); } - @Test + @Test(groups="producerMethod") public void testBindingType() throws SecurityException, NoSuchMethodException { SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedType(SpiderProducer.class), manager); @@ -95,7 +95,7 @@ assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class); } - @Test @SpecAssertion(section="3.3") + @Test(groups="producerMethod") @SpecAssertion(section="3.3") public void testFinalMethod() throws SecurityException, NoSuchMethodException { SimpleBeanModel<BeanWithFinalProducerMethod> model = new SimpleBeanModel<BeanWithFinalProducerMethod>(new SimpleAnnotatedType<BeanWithFinalProducerMethod>(BeanWithFinalProducerMethod.class), getEmptyAnnotatedType(BeanWithFinalProducerMethod.class), manager); @@ -113,7 +113,7 @@ assert exception; } - @Test @SpecAssertion(section="3.3") + @Test(groups="producerMethod") @SpecAssertion(section="3.3") public void testFinalMethodWithDependentScope() throws SecurityException, NoSuchMethodException { SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedType(SpiderProducer.class), manager); @@ -123,7 +123,7 @@ assert trapdoorSpiderModel.getScopeType().equals(Dependent.class); } - @Test @SpecAssertion(section="3.3.6") + @Test(groups="producerMethod") @SpecAssertion(section="3.3.6") public void testNamedMethod() throws SecurityException, NoSuchMethodException { SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedType(SpiderProducer.class), manager); @@ -133,7 +133,7 @@ assert blackWidowSpiderModel.getName().equals("blackWidow"); } - @Test @SpecAssertion(section="3.3.6") + @Test(groups="producerMethod") @SpecAssertion(section="3.3.6") public void testDefaultNamedMethod() throws SecurityException, NoSuchMethodException { SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedType(SpiderProducer.class), manager); @@ -143,7 +143,7 @@ assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs"); } - @Test @SpecAssertion(section="3.3.6") + @Test(groups="producerMethod") @SpecAssertion(section="3.3.6") public void testDefaultNamedJavaBeanMethod() throws SecurityException, NoSuchMethodException { SimpleBeanModel<SpiderProducer> model = new SimpleBeanModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedType(SpiderProducer.class), manager); @@ -213,13 +213,13 @@ assert false; } - @Test @SpecAssertion(section="2.7.2") + @Test(groups="producerMethod") @SpecAssertion(section="2.7.2") public void testSingleStereotype() { assert false; } - @Test @SpecAssertion(section="2.7.2") + @Test(groups="producerMethod") @SpecAssertion(section="2.7.2") public void testStereotypeOnNonProducerMethod() { assert false; 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 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-10-26 14:25:13 UTC (rev 166) @@ -26,7 +26,9 @@ import org.jboss.webbeans.test.beans.Spider; import org.jboss.webbeans.test.beans.Tarantula; import org.jboss.webbeans.test.beans.Turkey; +import org.jboss.webbeans.test.beans.broken.ParameterizedBean; import org.jboss.webbeans.test.beans.broken.OuterBean.InnerBean; +import org.jboss.webbeans.test.beans.broken.OuterBean.StaticInnerBean; import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; import org.testng.annotations.Test; @@ -42,22 +44,22 @@ new SimpleBeanModel<Cow>(new SimpleAnnotatedType<Cow>(Cow.class), getEmptyAnnotatedType(Cow.class), manager); } - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2") - public void testNonStaticInnerClassDeclaredInJavaIsNotAllowed() + @Test(expectedExceptions=DefinitionException.class, groups="innerClass") @SpecAssertion(section="3.2") + public void testStaticInnerClassDeclaredInJavaIsNotAllowed() { - new SimpleBeanModel<InnerBean>(new SimpleAnnotatedType<InnerBean>(InnerBean.class), getEmptyAnnotatedType(InnerBean.class), manager); + new SimpleBeanModel<StaticInnerBean>(new SimpleAnnotatedType<StaticInnerBean>(StaticInnerBean.class), getEmptyAnnotatedType(StaticInnerBean.class), manager); } - @Test @SpecAssertion(section="3.2") - public void testStaticInnerClassDeclaredInJavaAllowed() + @Test(groups="innerClass") @SpecAssertion(section="3.2") + public void testNonStaticInnerClassDeclaredInJavaAllowed() { - assert false; + new SimpleBeanModel<InnerBean>(new SimpleAnnotatedType<InnerBean>(InnerBean.class), getEmptyAnnotatedType(InnerBean.class), manager); } @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2") public void testParameterizedClassDeclaredInJavaIsNotAllowed() { - + new SimpleBeanModel<ParameterizedBean>(new SimpleAnnotatedType<ParameterizedBean>(ParameterizedBean.class), getEmptyAnnotatedType(ParameterizedBean.class), manager); } @Test(expectedExceptions=DefinitionException.class, groups={"interceptors", "decorators"}) @SpecAssertion(section="3.2") @@ -106,19 +108,19 @@ @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.4") public void testAbstractClassDeclaredInXmlIsNotAllowed() { - assert false; + new SimpleBeanModel<Cow>(new SimpleAnnotatedType<Cow>(Cow.class), getEmptyAnnotatedType(Cow.class), manager); } - @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.4") - public void testNonStaticInnerClassDeclaredInXmlIsNotAllowed() + @Test(expectedExceptions=DefinitionException.class, groups="innerClass") @SpecAssertion(section="3.2.4") + public void testStaticInnerClassDeclaredInXmlIsNotAllowed() { - assert false; + new SimpleBeanModel<StaticInnerBean>(new SimpleAnnotatedType<StaticInnerBean>(StaticInnerBean.class), getEmptyAnnotatedType(StaticInnerBean.class), manager); } - @Test @SpecAssertion(section="3.2.4") - public void testStaticInnerClassDeclaredInXmlAllowed() + @Test(groups="innerClass") @SpecAssertion(section="3.2.4") + public void testNonStaticInnerClassDeclaredInXmlAllowed() { - assert false; + new SimpleBeanModel<InnerBean>(new SimpleAnnotatedType<InnerBean>(InnerBean.class), getEmptyAnnotatedType(InnerBean.class), manager); } @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.4") @@ -168,7 +170,8 @@ @Test @SpecAssertion(section="3.2.5.1") public void testEmptyConstructorUsed() { - SimpleConstructor<Donkey> constructor = new SimpleBeanModel<Donkey>(new SimpleAnnotatedType<Donkey>(Donkey.class), getEmptyAnnotatedType(Donkey.class), manager).getConstructor(); assert constructor.getAnnotatedItem().getDelegate().getDeclaringClass().equals(Order.class); + SimpleConstructor<Donkey> constructor = new SimpleBeanModel<Donkey>(new SimpleAnnotatedType<Donkey>(Donkey.class), getEmptyAnnotatedType(Donkey.class), manager).getConstructor(); + assert constructor.getAnnotatedItem().getDelegate().getDeclaringClass().equals(Donkey.class); assert constructor.getAnnotatedItem().getDelegate().getParameterTypes().length == 0; assert constructor.getParameters().size() == 0; } @@ -195,7 +198,7 @@ new SimpleBeanModel<Chicken>(new SimpleAnnotatedType<Chicken>(Chicken.class), getEmptyAnnotatedType(Chicken.class), manager); } - @Test(expectedExceptions=DefinitionException.class, groups="eventBus") @SpecAssertion(section="3.2.5.1") + @Test(expectedExceptions=DefinitionException.class, groups="eventbus") @SpecAssertion(section="3.2.5.1") public void testConstructorHasObservesParameter() { new SimpleBeanModel<Chicken>(new SimpleAnnotatedType<Chicken>(Chicken.class), getEmptyAnnotatedType(Chicken.class), manager); @@ -223,13 +226,13 @@ @Test(expectedExceptions=NonexistentConstructorException.class) @SpecAssertion(section="3.2.5.2") public void testConstructorDeclaredInXmlDoesNotExist() { - + assert false; } @Test @SpecAssertion(section="3.2.5.2") public void testConstructorDeclaredInXmlIgnoresBindingTypesDeclaredInJava() { - + assert false; } @Test @SpecAssertion(section="3.2.5.3") Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeSafeResolutionTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeSafeResolutionTest.java 2008-10-26 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeSafeResolutionTest.java 2008-10-26 14:25:13 UTC (rev 166) @@ -18,6 +18,7 @@ import org.jboss.webbeans.model.bean.SimpleBeanModel; import org.jboss.webbeans.test.annotations.Whitefish; import org.jboss.webbeans.test.beans.Animal; +import org.jboss.webbeans.test.beans.AnimalFarmer; import org.jboss.webbeans.test.beans.Cod; import org.jboss.webbeans.test.beans.Farmer; import org.jboss.webbeans.test.beans.FishFarm; @@ -175,7 +176,7 @@ InjectableField<Farmer<ScottishFish>> scottishFishFarmerField = new InjectableField<Farmer<ScottishFish>>(FishFarm.class.getDeclaredField("scottishFishFarmer")); Bean<ScottishFishFarmer> scottishFishFarmerBean = new BeanImpl<ScottishFishFarmer>(new SimpleBeanModel<ScottishFishFarmer>(new SimpleAnnotatedType<ScottishFishFarmer>(ScottishFishFarmer.class), getEmptyAnnotatedType(ScottishFishFarmer.class), super.manager), manager); - Bean<Farmer> farmerBean = new BeanImpl<Farmer>(new SimpleBeanModel<Farmer>(new SimpleAnnotatedType<Farmer>(Farmer.class), getEmptyAnnotatedType(Farmer.class), super.manager), manager); + Bean<AnimalFarmer> farmerBean = new BeanImpl<AnimalFarmer>(new SimpleBeanModel<AnimalFarmer>(new SimpleAnnotatedType<AnimalFarmer>(AnimalFarmer.class), getEmptyAnnotatedType(AnimalFarmer.class), super.manager), manager); manager.addBean(scottishFishFarmerBean); manager.addBean(farmerBean); Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java 2008-10-26 14:25:13 UTC (rev 166) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans; + +public class AnimalFarmer extends Farmer<Animal> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AnimalFarmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java 2008-10-26 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OuterBean.java 2008-10-26 14:25:13 UTC (rev 166) @@ -9,6 +9,16 @@ public class InnerBean { + public InnerBean() + { + + } + } + + public static class StaticInnerBean + { + + } } Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ParameterizedBean.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ParameterizedBean.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ParameterizedBean.java 2008-10-26 14:25:13 UTC (rev 166) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.test.beans.broken; + +public class ParameterizedBean<T> +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/ParameterizedBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/testng.xml =================================================================== --- ri/trunk/webbeans-ri/testng.xml 2008-10-26 13:34:47 UTC (rev 165) +++ ri/trunk/webbeans-ri/testng.xml 2008-10-26 14:25:13 UTC (rev 166) @@ -19,6 +19,7 @@ <exclude name="el" /> <exclude name="jms" /> <exclude name="interceptors" /> + <exclude name="innerClass" /> </run> </groups> <packages>