[jbosstools-commits] JBoss Tools SVN: r24473 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/annotations/qualifier and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2010-08-26 10:01:54 -0400 (Thu, 26 Aug 2010)
New Revision: 24473

Added:
   trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/annotations/qualifier/HairyTargetOk.java
Modified:
   trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
   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/ValidationTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6924 Fixed CDI validator for Qualifier

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties	2010-08-26 13:43:12 UTC (rev 24472)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties	2010-08-26 14:01:54 UTC (rev 24473)
@@ -23,7 +23,7 @@
 MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER=Array-valued member of a qualifier type must be annotated @Nonbinding [JSR-299 §5.2.5]
 MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Annotation-valued member of an interceptor binding type must be annotated @Nonbinding [JSR-299 §9.5.2]
 MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Array-valued member of an interceptor binding type must be annotated @Nonbinding [JSR-299 §9.5.2]
-MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type must be annotated with @Target('{'TYPE, METHOD, FIELD, PARAMETER'}') or @Target('{'METHOD, FIELD'}') [JSR-299 §2.3.2, §10.1]
+MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type must be annotated with @Target('{'TYPE, METHOD, FIELD, PARAMETER'}') or @Target('{'FIELD, PARAMETER'}') [JSR-299 §2.3.2, §10.1]
 MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type must be annotated with @Retention(RUNTIME) [JSR-299 §2.3.2]
 MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE=Stereotype annotation type must be annotated with one of @Target('{'TYPE, METHOD, FIELD'}'), @Target('{'METHOD, FIELD'}'), @Target('{'TYPE'}'),  @Target('{'METHOD'}'),  @Target('{'FIELD'}') [JSR-299 §2.7.1]
 MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE=Stereotype annotation type must be annotated with @Retention(RUNTIME) [JSR-299 §2.7.1]

Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/annotations/qualifier/HairyTargetOk.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/annotations/qualifier/HairyTargetOk.java	                        (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/annotations/qualifier/HairyTargetOk.java	2010-08-26 14:01:54 UTC (rev 24473)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.annotations.qualifier.broken;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+ at Target( { FIELD, PARAMETER })
+ at Retention(RUNTIME)
+ at Documented
+ at Qualifier
+ at Inherited
+ at interface HairyTargetOk {
+
+   public boolean clipped();
+}
\ No newline at end of file


Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/annotations/qualifier/HairyTargetOk.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

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-08-26 13:43:12 UTC (rev 24472)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/QualifierWithMembersTest.java	2010-08-26 14:01:54 UTC (rev 24473)
@@ -102,11 +102,11 @@
 		assertEquals("Wrong number of the beans", 0, beans.size());
 	}
 
+	// TODO This test fails because of https://jira.jboss.org/browse/JBIDE-6517
 	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

Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java	2010-08-26 13:43:12 UTC (rev 24472)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java	2010-08-26 14:01:54 UTC (rev 24473)
@@ -1427,6 +1427,11 @@
 		assertMarkerIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE.substring(0, 56) + ".*", 32);
 	}
 
+	public void testQualifierWithTargetOk() throws Exception {
+		IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/qualifier/HairyTargetOk.java");
+		assertMarkerIsNotCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE.substring(0, 56) + ".*", 14);
+	}
+
 	public void testStereotypeWithMissingTarget() throws Exception {
 		IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/annotations/stereotype/broken/FishStereotype_MissingTarget.java");
 		assertMarkerIsCreated(file, CDIValidationMessages.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE.substring(0, 56) + ".*", 19);