Author: pete.muir(a)jboss.org Date: 2009-08-14 17:31:24 -0400 (Fri, 14 Aug 2009) New Revision: 3500 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java Log: Fix test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-08-14 21:21:11 UTC (rev 3499) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-08-14 21:31:24 UTC (rev 3500) @@ -1,6 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise; +import java.util.Set; + import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; @@ -39,8 +42,8 @@ @SpecAssertion(section = "4.2", id = "dj") public void testNonStaticProducerMethodNotIndirectlyInherited() { - assert getBeans(Pear.class, new AnnotationLiteral<Yummy>() {}).size() == 1; - assert getInstanceByType(Pear.class,new AnnotationLiteral<Yummy>() {}).getColour().equals("green"); + Set<Bean<Pear>> beans = getBeans(Pear.class, new AnnotationLiteral<Yummy>() {}); + assert beans.size() == 2; } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java 2009-08-14 21:31:24 UTC (rev 3500) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise; + +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 LightYellow +{ + +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java 2009-08-14 21:21:11 UTC (rev 3499) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java 2009-08-14 21:31:24 UTC (rev 3500) @@ -6,7 +6,7 @@ @Stateful public class LightYellowPearTree extends YellowPearTree implements LightYellowPearTreeLocal { - @Produces @Yummy public Pear producePear() + @Produces @Yummy @LightYellow public Pear produceLightYellowPear() { return new Pear("lightYellow"); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java 2009-08-14 21:21:11 UTC (rev 3499) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java 2009-08-14 21:31:24 UTC (rev 3500) @@ -6,7 +6,7 @@ @Stateful public class PearTree implements PearTreeLocal { - @Produces @Yummy public Pear producePear() + @Produces @Yummy public Pear produceLightYellowPear() { return new Pear("green"); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java 2009-08-14 21:21:11 UTC (rev 3499) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java 2009-08-14 21:31:24 UTC (rev 3500) @@ -5,5 +5,5 @@ @Local public interface PearTreeLocal { - Pear producePear(); + Pear produceLightYellowPear(); }