Author: akazakov
Date: 2011-12-21 18:31:22 -0500 (Wed, 21 Dec 2011)
New Revision: 37503
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:
https://issues.jboss.org/browse/JBIDE-10187 Add support for a @SuppressWarnings
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-21
23:13:24 UTC (rev 37502)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java 2011-12-21
23:31:22 UTC (rev 37503)
@@ -38,4 +38,10 @@
@Named("fishDulipcatedNameSecond")
public void setFish3BROKEN(Fish fishBROKEN) {
}
+
+ @Inject Fish fish4BROKEN;
+
+ @Inject
+ public void initializeBROKEN((a)javax.enterprise.event.Observes String stringBROKEN) {
+ }
}
\ No newline at end of file
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-21
23:13:24 UTC (rev 37502)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/suppresswarnings/Fish.java 2011-12-21
23:31:22 UTC (rev 37503)
@@ -44,4 +44,11 @@
@Named("fishDulipcatedName")
public void setFish3OK(Fish fishOK) {
}
+
+ @SuppressWarnings("cdi")
+ @Inject Fish fish4OK;
+
+ @Inject
+ public void initializeBROKEN(@SuppressWarnings({"cdi-annotated-observer",
"cdi-ambiguous-dependency"}) @javax.enterprise.event.Observes String stringOK)
{
+ }
}
\ 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/SuppressWarningsTests.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-21
23:13:24 UTC (rev 37502)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/SuppressWarningsTests.java 2011-12-21
23:31:22 UTC (rev 37503)
@@ -50,6 +50,11 @@
restorePreferences(CDIPreferences.PRODUCER_ANNOTATED_INJECT);
}
+ public void testWOSuppress() throws Exception {
+ IFile 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, 39, 42);
+ }
+
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);
@@ -84,9 +89,6 @@
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, 31, 39);
}
public void testMultipleSuppress() throws Exception {
@@ -115,9 +117,11 @@
public void testNameAll() throws Exception {
IFile file =
tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java");
AbstractResourceMarkerTest.assertMarkerIsNotCreated(file,
CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 35);
+ }
- 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, 39);
+ public void testGroupName() throws Exception {
+ IFile file =
tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java");
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file,
CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 49);
}
/**
@@ -170,4 +174,21 @@
AbstractResourceMarkerTest.assertMarkerIsNotCreated(file,
CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 45);
AbstractResourceMarkerTest.assertMarkerIsNotCreated(file,
MessageFormat.format(CDIValidationMessages.DUPLCICATE_EL_NAME, ".*"), 44);
}
+
+ public void testWarningsOnAnnotatedParam() throws Exception {
+ try {
+ modifyPreferences(CDIPreferences.OBSERVER_ANNOTATED_INJECT);
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ IFile file =
tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/Fish.java");
+ TestUtil.validate(file);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file,
CDIValidationMessages.OBSERVER_ANNOTATED_INJECT, 51);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file,
CDIValidationMessages.OBSERVER_ANNOTATED_INJECT, 52);
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ } finally {
+ restorePreferences(CDIPreferences.OBSERVER_ANNOTATED_INJECT);
+ }
+
+ IFile file =
tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/suppresswarnings/AnotherFish.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file,
CDIValidationMessages.OBSERVER_ANNOTATED_INJECT, 44, 45);
+ }
}
\ No newline at end of file