Author: dazarov Date: 2011-07-19 17:43:36 -0400 (Tue, 19 Jul 2011) New Revision: 33059 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java Log: https://issues.jboss.org/browse/JBIDE-7631 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Documented; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Documented +@Qualifier +public @interface TestQualifier1 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Documented; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; + +@Retention(RUNTIME) +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Documented +@Qualifier +public @interface TestQualifier1 { + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Documented; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; +import java.lang.annotation.Retention; + +@Retention(value = null) +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Documented +@Qualifier +public @interface TestQualifier2 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; + +import java.lang.annotation.Documented; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Retention(RUNTIME) +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Documented +@Qualifier +public @interface TestQualifier2 { + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Target; + +import javax.inject.Scope; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; + +@Scope +@Inherited +@Target({ TYPE, METHOD, FIELD }) +@Documented +public @interface TestScope1 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope1.qfxresult 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Target; + +import javax.inject.Scope; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; + +@Retention(RUNTIME) +@Scope +@Inherited +@Target({ TYPE, METHOD, FIELD }) +@Documented +public @interface TestScope1 { + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Target; + +import javax.inject.Scope; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import java.lang.annotation.Retention; + +@Retention(value = null) +@Scope +@Inherited +@Target({ TYPE, METHOD, FIELD }) +@Documented +public @interface TestScope2 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope2.qfxresult 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Target; + +import javax.inject.Scope; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Retention(RUNTIME) +@Scope +@Inherited +@Target({ TYPE, METHOD, FIELD }) +@Documented +public @interface TestScope2 { + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.TYPE; +import java.lang.annotation.Target; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; +import javax.inject.Named; + +@Stereotype +@Target( { TYPE }) +@ApplicationScoped +@Named +public @interface TestStereotype1 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.TYPE; +import java.lang.annotation.Target; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; +import javax.inject.Named; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; + +@Retention(RUNTIME) +@Stereotype +@Target( { TYPE }) +@ApplicationScoped +@Named +public @interface TestStereotype1 { + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.TYPE; +import java.lang.annotation.Target; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; +import javax.inject.Named; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; + +@Retention(value = null) +@Stereotype +@Target( { TYPE }) +@ApplicationScoped +@Named +public @interface TestStereotype2 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult 2011-07-19 21:43:36 UTC (rev 33059) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.TYPE; +import java.lang.annotation.Target; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; +import javax.inject.Named; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; + +@Retention(RUNTIME) +@Stereotype +@Target( { TYPE }) +@ApplicationScoped +@Named +public @interface TestStereotype2 { + +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-19 21:34:06 UTC (rev 33058) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-19 21:43:36 UTC (rev 33059) @@ -25,9 +25,12 @@ import org.eclipse.ui.IMarkerResolution; import org.eclipse.ui.ide.IDE; import org.jboss.tools.cdi.core.test.tck.validation.ValidationTest; +import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator; import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager; import org.jboss.tools.cdi.ui.marker.AddLocalBeanMarkerResolution; +import org.jboss.tools.cdi.ui.marker.AddRetentionAnnotationMarkerResolution; import org.jboss.tools.cdi.ui.marker.AddSerializableInterfaceMarkerResolution; +import org.jboss.tools.cdi.ui.marker.ChangeRetentionAnnotationMarkerResolution; import org.jboss.tools.cdi.ui.marker.DeleteAllDisposerDuplicantMarkerResolution; import org.jboss.tools.cdi.ui.marker.DeleteAllInjectedConstructorsMarkerResolution; import org.jboss.tools.cdi.ui.marker.MakeFieldStaticMarkerResolution; @@ -43,7 +46,6 @@ * */ public class CDIMarkerResolutionTest extends ValidationTest { - public static final String MARKER_TYPE = "org.jboss.tools.cdi.core.cdiproblem"; private void checkResolution(IProject project, String[] fileNames, String markerType, String idName, int id, Class<? extends IMarkerResolution> resolutionClass) throws CoreException { checkResolution(project, fileNames, new String[]{}, markerType, idName, id, resolutionClass); @@ -193,7 +195,7 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerOfSessionBeanBroken.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID, MakeFieldStaticMarkerResolution.class); @@ -210,7 +212,7 @@ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer1.qfxresult", "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerLocal.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID, MakeMethodBusinessMarkerResolution.class); @@ -225,7 +227,7 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer2.qfxresult", }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID, AddLocalBeanMarkerResolution.class); @@ -239,7 +241,7 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerNoInterface.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID, MakeMethodPublicMarkerResolution.class); @@ -255,7 +257,7 @@ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken1.qfxresult", "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Terrier.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID, MakeMethodBusinessMarkerResolution.class); @@ -269,7 +271,7 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken2.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID, AddLocalBeanMarkerResolution.class); @@ -283,7 +285,7 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID, MakeMethodPublicMarkerResolution.class); @@ -299,7 +301,7 @@ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken1.qfxresult", "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/LocalInt.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID, MakeMethodBusinessMarkerResolution.class); @@ -313,7 +315,7 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken2.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID, AddLocalBeanMarkerResolution.class); @@ -327,7 +329,7 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID, MakeMethodPublicMarkerResolution.class); @@ -341,7 +343,7 @@ // new String[]{ // "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TimestampLogger_Broken.qfxresult" // }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.MULTIPLE_DISPOSERS_FOR_PRODUCER_ID, DeleteAllDisposerDuplicantMarkerResolution.class); @@ -355,7 +357,7 @@ // new String[]{ // "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Goose_Broken.qfxresult" // }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.MULTIPLE_INJECTION_CONSTRUCTORS_ID, DeleteAllInjectedConstructorsMarkerResolution.class); @@ -369,7 +371,7 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Hamina_Broken.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID, AddSerializableInterfaceMarkerResolution.class); @@ -383,9 +385,93 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SecondBean.qfxresult" }, - MARKER_TYPE, + CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.NOT_PASSIVATION_CAPABLE_BEAN_ID, AddSerializableInterfaceMarkerResolution.class); } + + public void testAddRetentionToQualifierResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier1.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier1.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID, + AddRetentionAnnotationMarkerResolution.class); + } + + public void testChangeRetentionToQualifierResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier2.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier2.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID, + ChangeRetentionAnnotationMarkerResolution.class); + } + + public void testAddRetentionToScopeResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope1.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope1.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE_ID, + AddRetentionAnnotationMarkerResolution.class); + } + + public void testChangeRetentionToScopeResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope2.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope2.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE_ID, + ChangeRetentionAnnotationMarkerResolution.class); + } + + public void testAddRetentionToStereotypeResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype1.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype1.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE_ID, + AddRetentionAnnotationMarkerResolution.class); + } + + public void testChangeRetentionToStereotypeResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype2.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestStereotype2.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE_ID, + ChangeRetentionAnnotationMarkerResolution.class); + } } \ No newline at end of file