Author: akazakov Date: 2011-09-12 18:11:11 -0400 (Mon, 12 Sep 2011) New Revision: 34652 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java Log: https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java 2011-09-12 21:39:13 UTC (rev 34651) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java 2011-09-12 22:11:11 UTC (rev 34652) @@ -11,7 +11,7 @@ @Inject @TestQualifier3 @TestQualifier2 Test i5; // has @TestQualifier, @TestQualifier1, @TestQualifier2 and @TestQualifier3 @Inject @TestQualifier2 @TestQualifier3 Test i6; // has @TestQualifier, @TestQualifier1, @TestQualifier2 and @TestQualifier3 - @Inject @TestQualifier Test i7; + @Inject @TestQualifier Test i7; // has @TestQualifier @Inject @TestStereotype Test i8; // has @TestQualifier, @TestQualifier1, @TestQualifier2 and @TestQualifier3 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 21:39:13 UTC (rev 34651) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 22:11:11 UTC (rev 34652) @@ -29,19 +29,20 @@ IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection.java"); assertNotNull("Can't find the bean.", bean); Set<IInjectionPoint> injections = bean.getInjectionPoints(); + assertEquals(9, injections.size()); for (IInjectionPoint injectionPoint : injections) { IAnnotationDeclaration declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.test.core.TestQualifier"); String elementName = injectionPoint.getSourceMember().getElementName(); if(elementName.equals("i4")) { - assertNull(declaration); + assertNull("Have found @TestQualifier for " + elementName, declaration); } else { - assertNotNull(declaration); + assertNotNull("Have not found @TestQualifier for " + elementName, declaration); } declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.test.core.TestQualifier3"); - if(elementName.equals("i1") || elementName.equals("i2") || elementName.equals("i3")) { - assertNull(declaration); + if(elementName.equals("i1") || elementName.equals("i2") || elementName.equals("i3") || elementName.equals("i7")) { + assertNull("Have found @TestQualifier3 for " + elementName, declaration); } else { - assertNotNull(declaration); + assertNotNull("Have not found @TestQualifier3 for " + elementName, declaration); } } }