Author: akazakov Date: 2011-12-13 14:47:01 -0500 (Tue, 13 Dec 2011) New Revision: 37293 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java Log: https://issues.jboss.org/browse/JBIDE-10187 Add support for a @SuppressWarnings Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java 2011-12-13 19:47:01 UTC (rev 37293) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.suppresswarnings; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import javax.inject.Named; + +@Named("fishDulipcatedNameSecond") +public class AnotherFish { // BROKEN + + @Produces AnotherFish fish; + + @Named("fishDulipcatedNameSecond") + @Produces Fish fish2BROKEN; + + @Inject @Produces Fish iFishBROKEN; + + @Inject @Produces Fish iFish2BROKEN; + + @Produces + public void setFish(Fish fishBROKEN) { + } + + @Inject @Produces + public void setFish2OK(Fish fishBROKEN) { + } + + @Produces + public void setFish3(Fish fishBROKEN) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java 2011-12-13 19:47:01 UTC (rev 37293) @@ -0,0 +1,33 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.suppresswarnings; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import javax.inject.Named; + +(a)SuppressWarnings("org.jboss.tools.cdi.core.validator.problem.ambiguousElNames") +@Named("fishDulipcatedName") +public class Fish { + + @Produces Fish fish; + + @Named("fishDulipcatedName") + @Produces Fish fish2OK; + + @SuppressWarnings("org.jboss.tools.cdi.core.validator.problem.producerAnnotatedInject") + @Inject @Produces Fish iFishOK; + + @Inject @Produces Fish iFish2BROKEN; + + @Produces + public void setFish((a)SuppressWarnings("org.jboss.tools.cdi.core.validator.problem.unsatisfiedInjectionPoints") Fish fishOK) { + } + + @SuppressWarnings({"org.jboss.tools.cdi.core.validator.problem.producerAnnotatedInject", "org.jboss.tools.cdi.core.validator.problem.unsatisfiedInjectionPoints"}) + @Inject @Produces + public void setFish2OK(Fish fishOK) { + } + + @Produces + public void setFish3(Fish fishBROKEN) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-12-13 19:31:35 UTC (rev 37292) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-12-13 19:47:01 UTC (rev 37293) @@ -63,6 +63,7 @@ import org.jboss.tools.cdi.core.test.tck.validation.DisableCDISupportTest; import org.jboss.tools.cdi.core.test.tck.validation.ELValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.IncrementalValidationTest; +import org.jboss.tools.cdi.core.test.tck.validation.SuppressWarningsTests; import org.jboss.tools.common.base.test.validation.ValidationExceptionTest; import org.jboss.tools.test.util.ProjectImportTestSetup; @@ -121,6 +122,7 @@ suite.addTestSuite(DeploymentProblemsValidationTests.class); suite.addTestSuite(BeansXmlValidationTest.class); suite.addTestSuite(AnnotationsValidationTest.class); + suite.addTestSuite(SuppressWarningsTests.class); suite.addTestSuite(CoreValidationTest.class); suite.addTestSuite(ELValidationTest.class); suite.addTestSuite(IncrementalValidationTest.class); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-13 19:31:35 UTC (rev 37292) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-13 19:47:01 UTC (rev 37293) @@ -20,8 +20,46 @@ */ public class SuppressWarningsTests extends ValidationTest { - public void testLegalTypesInTyped() throws Exception { - IFile petShopFile = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, 25); + public void testClass() throws Exception { + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java"); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLCICATE_EL_NAME, 8); + + file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.DUPLCICATE_EL_NAME, 7); } + + public void testFieldWithSuppressInParentElement() throws Exception { + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java"); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.DUPLCICATE_EL_NAME, 13); + + file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.DUPLCICATE_EL_NAME, 12); + } + + public void testField() throws Exception { + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java"); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, 17); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, 19); + + file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, 15, 17); + } + + public void testParam() throws Exception { + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java"); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 22); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 31); + + file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 20, 24, 28); + } + + public void testMultipleSuppress() throws Exception { + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java"); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 27); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, 26); + + file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, 23); + } } \ No newline at end of file