Author: scabanovich Date: 2011-12-16 14:30:56 -0500 (Fri, 16 Dec 2011) New Revision: 37403 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java Modified: 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 trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java Log: JBIDE-10496 https://issues.jboss.org/browse/JBIDE-10496 Tests are added. Modified: 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 2011-12-16 19:30:11 UTC (rev 37402) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java 2011-12-16 19:30:56 UTC (rev 37403) @@ -29,4 +29,8 @@ } @Inject Fish fish3BROKEN; + + public void useEL() { + String s = "#{fishDulipcatedNameSecond.abc}"; + } } \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java 2011-12-16 19:30:56 UTC (rev 37403) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.suppresswarnings; + +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.Typed; + +@SessionScoped +public class AnotherRabbit { + + @Produces + @Typed(Integer.class) + String s; +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: 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 2011-12-16 19:30:11 UTC (rev 37402) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java 2011-12-16 19:30:56 UTC (rev 37403) @@ -33,4 +33,9 @@ @SuppressWarnings("unsatisfiedInjectionPoints") @Inject Fish fish3OK; + + @SuppressWarnings("unknownElVariablePropertyName") + public void useEL() { + String s = "#{fishDulipcatedName.abc}"; + } } \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.java 2011-12-16 19:30:56 UTC (rev 37403) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.suppresswarnings; + +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.Typed; + +@SuppressWarnings("notPassivationCapableBean") +@SessionScoped +public class Rabbit { + + @SuppressWarnings("illegalTypeInTypedDeclaration") + @Produces + @Typed(Integer.class) + String s; +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Rabbit.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/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-16 19:30:11 UTC (rev 37402) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-16 19:30:56 UTC (rev 37403) @@ -15,10 +15,12 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.preferences.CDIPreferences; import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; import org.jboss.tools.common.base.test.validation.TestUtil; +import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages; import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.tests.AbstractResourceMarkerTest; @@ -28,18 +30,26 @@ */ public class SuppressWarningsTests extends ValidationTest { - private void modifyPreferences() throws Exception{ + private void modifyPreferences(String preference) throws Exception{ IPreferenceStore store = CDICorePlugin.getDefault().getPreferenceStore(); - store.putValue(CDIPreferences.PRODUCER_ANNOTATED_INJECT, CDIPreferences.WARNING); + store.putValue(preference, CDIPreferences.WARNING); ((IPersistentPreferenceStore)store).save(); } - private void restorePreferences() throws Exception{ + private void restorePreferences(String preference) throws Exception{ IPreferenceStore store = CDICorePlugin.getDefault().getPreferenceStore(); - store.putValue(CDIPreferences.PRODUCER_ANNOTATED_INJECT, CDIPreferences.ERROR); + store.putValue(preference, CDIPreferences.ERROR); ((IPersistentPreferenceStore)store).save(); } + private void modifyPreferences() throws Exception{ + modifyPreferences(CDIPreferences.PRODUCER_ANNOTATED_INJECT); + } + + private void restorePreferences() throws Exception{ + restorePreferences(CDIPreferences.PRODUCER_ANNOTATED_INJECT); + } + public void testClass() throws Exception { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java"); AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.DUPLCICATE_EL_NAME, ".*"), 8); @@ -109,4 +119,49 @@ file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 20, 24, 28, 31); } + + /** + * + * @throws Exception + */ + public void testEL() throws Exception { + String message = NLS.bind(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, "abc"); + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java"); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, message, 39); + + file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, message, 34); + } + + public void testWarningsOnClassNameRegion() throws Exception { + String message = NLS.bind(CDIValidationMessages.NOT_PASSIVATION_CAPABLE_BEAN, "Rabbit", "SessionScoped"); + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Rabbit.java"); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, message, 9); + + message = NLS.bind(CDIValidationMessages.NOT_PASSIVATION_CAPABLE_BEAN, "AnotherRabbit", "SessionScoped"); + file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, message, 8); + } + + /** + * In creating some markers, validator uses ITypeDeclaration as text source reference. + * It should convert it to IJavaSourceReference when it is relevant. + * + * @throws Exception + */ + public void testWarningsOnTyped() throws Exception { + try { + modifyPreferences(CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION); + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Rabbit.java"); + TestUtil.validate(file); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, 13); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } finally { + restorePreferences(CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION); + } + + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherRabbit.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, 11); + } } \ No newline at end of file