Author: scabanovich Date: 2010-06-22 10:06:51 -0400 (Tue, 22 Jun 2010) New Revision: 22929 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentMethod.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/PayBy.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentMethod.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentProcessor.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AsynchronousPaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java Log: https://jira.jboss.org/browse/JBIDE-6512 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AsynchronousPaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AsynchronousPaymentProcessor.java 2010-06-22 13:52:45 UTC (rev 22928) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/AsynchronousPaymentProcessor.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -16,7 +16,7 @@ */ package org.jboss.jsr299.tck.tests.jbt.resolution; -interface AsynchronousPaymentProcessor extends PaymentProcessor +public interface AsynchronousPaymentProcessor extends PaymentProcessor { int getValue(); void setValue(int value); Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentMethod.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentMethod.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentMethod.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -0,0 +1,5 @@ +package org.jboss.jsr299.tck.tests.jbt.resolution.coincidence; + +public interface FirstPaymentMethod { + String CASH = "Roubles"; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentProcessor.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.resolution; + +import javax.enterprise.context.ApplicationScoped; + +import org.jboss.jsr299.tck.tests.jbt.resolution.AsynchronousPaymentProcessor; + +(a)PayBy(FirstPaymentMethod.CASH) +@ApplicationScoped +class FirstPaymentProcessor implements AsynchronousPaymentProcessor { + private int value = 0; + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/FirstPaymentProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.jbt.resolution.coincidence; + +import javax.inject.Inject; + +import org.jboss.jsr299.tck.tests.jbt.resolution.AsynchronousPaymentProcessor; + +class ObtainsInstanceBean { + @Inject @PayBy(FirstPaymentMethod.CASH) AsynchronousPaymentProcessor cashPaymentProcessor; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/PayBy.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/PayBy.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/PayBy.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.jbt.resolution.coincidence; + +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.inject.Qualifier; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +@interface PayBy { + String value(); +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/PayBy.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentMethod.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentMethod.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentMethod.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -0,0 +1,5 @@ +package org.jboss.jsr299.tck.tests.jbt.resolution.coincidence; + +public interface SecondPaymentMethod { + String CASH = "USD"; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentProcessor.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentProcessor.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.resolution.coincidence; + +import javax.enterprise.context.ApplicationScoped; + +import org.jboss.jsr299.tck.tests.jbt.resolution.AsynchronousPaymentProcessor; + +(a)PayBy(SecondPaymentMethod.CASH) +@ApplicationScoped +class SecondPaymentProcessor implements AsynchronousPaymentProcessor { + private int value = 0; + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/coincidence/SecondPaymentProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java 2010-06-22 13:52:45 UTC (rev 22928) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -19,6 +19,7 @@ import javax.enterprise.context.ApplicationScoped; import org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod; +org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE @PayBy(PaymentMethod.CHEQUE) @ApplicationScoped Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java 2010-06-22 13:52:45 UTC (rev 22928) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java 2010-06-22 14:06:51 UTC (rev 22929) @@ -101,4 +101,12 @@ Set<IBean> beans = cdiProject.getBeans(true, injection); assertEquals("Wrong number of the beans", 0, beans.size()); } + + public void testQualifierCoincidingSimpleNameInInjectingBeanAndCoincidingSimpleNameInInjectedBeanResolved() throws CoreException { + IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/coincidence/ObtainsInstanceBean.java", "cashPaymentProcessor"); + Set<IBean> beans = cdiProject.getBeans(true, injection); + assertEquals("Wrong number of the beans", 1, beans.size()); + assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.jbt.resolution.coincidence.FirstPaymentProcessor"); + } + } \ No newline at end of file