Author: scabanovich Date: 2012-02-09 19:44:18 -0500 (Thu, 09 Feb 2012) New Revision: 38585 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java Log: JBIDE-10791 https://issues.jboss.org/browse/JBIDE-10791 Test for qualifier with default values set by simple and complex expressions. Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java 2012-02-10 00:44:18 UTC (rev 38585) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.jbt.lookup.qualifier; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +public class MyBean { + + @Produces + @QualifierWithDefaults + String p; + + @Inject + @QualifierWithDefaults + String i; + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/MyBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.java 2012-02-10 00:44:18 UTC (rev 38585) @@ -0,0 +1,39 @@ +package org.jboss.jsr299.tck.tests.jbt.lookup.qualifier; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.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; + +@Qualifier +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface QualifierWithDefaults { + + String stringValue() default ""; + boolean booleanValue() default false; + char charValue() default 'c'; + int intValue() default 0; + long longValue() default 22l; + short shortValue() default 5; + float floatValue() default 5.0f; + double doubleValue() default 3.0d; + + String stringValue2() default "a" + "b"; + boolean booleanValue2() default false & true; + char charValue2() default (char)7; + int intValue2() default 1 + 2; + long longValue2() default 2 + 3; + short shortValue2() default (short)5; + float floatValue2() default (float)5.0; + double doubleValue2() default 3.0d + 1; + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/lookup/qualifier/QualifierWithDefaults.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/InjectionPointTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2012-02-10 00:37:10 UTC (rev 38584) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InjectionPointTest.java 2012-02-10 00:44:18 UTC (rev 38585) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.cdi.core.test.tck; +import java.util.List; import java.util.Set; import org.jboss.tools.cdi.core.CDIUtil; @@ -17,6 +18,8 @@ import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInjectionPointParameter; +import org.jboss.tools.cdi.core.IQualifierDeclaration; +import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IParametedType; /** @@ -92,4 +95,11 @@ resolved = cdiProject.getBeans(false, injectionPoint); assertFalse(resolved.isEmpty()); } + + public void testDefaultValuesInQualifierProperties() { + IInjectionPoint injectionPoint = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/lookup/qualifier/MyBean.java", "i"); + assertNotNull(injectionPoint); + Set<IBean> resolved = cdiProject.getBeans(false, injectionPoint); + assertFalse(resolved.isEmpty()); + } } \ No newline at end of file