[jbosstools-commits] JBoss Tools SVN: r34613 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.

Author: scabanovich Date: 2011-09-09 14:34:12 -0400 (Fri, 09 Sep 2011) New Revision: 34613 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/BeanWithInnerQualifier.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java Log: JBIDE-9684 https://issues.jboss.org/browse/JBIDE-9684 Fixed handling annotation types declared as inner types. Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/BeanWithInnerQualifier.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/BeanWithInnerQualifier.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/BeanWithInnerQualifier.java 2011-09-09 18:34:12 UTC (rev 34613) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.definition.qualifier; + +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.Retention; +import java.lang.annotation.Target; + +import javax.inject.Inject; +import javax.inject.Qualifier; + +(a)BeanWithInnerQualifier.InnerQualifier +public class BeanWithInnerQualifier { + + public BeanWithInnerQualifier() {} + + @Inject + @InnerQualifier + BeanWithInnerQualifier a; + + @Qualifier + @Target({ TYPE, METHOD, PARAMETER, FIELD }) + @Retention(RUNTIME) + public @interface InnerQualifier { + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/definition/qualifier/BeanWithInnerQualifier.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2011-09-09 17:36:21 UTC (rev 34612) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierDefinitionTest.java 2011-09-09 18:34:12 UTC (rev 34613) @@ -218,4 +218,16 @@ assertContainsQualifierType(bean, "javax.enterprise.inject.Default"); assertContainsQualifierType(bean, "javax.enterprise.inject.Any"); } + + public void testQualifierDeclaredWithInnerType() throws JavaModelException { + Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier", + "org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier.InnerQualifier"); + assertEquals("Wrong number of beans with org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier type.", 1, beans.size()); + IBean bean = beans.iterator().next(); + Set<IQualifier> qualifiers = bean.getQualifiers(); + assertEquals("Wrong number of qualifiers for org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier type.", 2, qualifiers.size()); + assertContainsQualifierType(bean, "org.jboss.jsr299.tck.tests.definition.qualifier.BeanWithInnerQualifier$InnerQualifier"); + assertContainsQualifierType(bean, "javax.enterprise.inject.Any"); + } + } \ No newline at end of file