Author: akazakov Date: 2011-09-16 15:32:30 -0400 (Fri, 16 Sep 2011) New Revision: 34836 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java Log: https://issues.jboss.org/browse/JBIDE-9723 Injection points declared in producer methods should be validated as injection points of the producer but not as injections of the class bean Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java 2011-09-16 19:03:47 UTC (rev 34835) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java 2011-09-16 19:32:30 UTC (rev 34836) @@ -1,17 +1,36 @@ package org.jboss.jsr299.tck.tests.jbt.validation.inject.producer; import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.InjectionPoint; +import javax.inject.Inject; @ApplicationScoped public class ProducerWInjections { - @Produces - public Test produce(InjectionPoint ip) { + @Inject + public ProducerWInjections(InjectionPoint broken) { + } + + @Produces + public Test produceOk(InjectionPoint ok) { return null; } + @Produces + @ApplicationScoped + public Test produceBroken(InjectionPoint broken) { + return null; + } + + public void disposeBroken(@Disposes Test arg1, InjectionPoint broken) { + } + + public void observeBroken(@Observes Test arg1, InjectionPoint broken) { + } + public static class Test { } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-09-16 19:03:47 UTC (rev 34835) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-09-16 19:32:30 UTC (rev 34836) @@ -1039,6 +1039,20 @@ } /** + * 5.5.7. Injection point metadata + * - bean that declares any scope other than @Dependent has an injection point of type InjectionPoint and qualifier @Default + * + * See https://issues.jboss.org/browse/JBIDE-9717 + * + * @throws Exception + */ + public void testBeansWithInjectionPointParams() throws Exception { + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/producer/ProducerWInjections.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, 14, 24, 28, 31); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, 18); + } + + /** * 8.1.2. Decorator delegate injection points * - decorator has more than one delegate injection point *