Author: dazarov Date: 2011-07-20 13:36:18 -0400 (Wed, 20 Jul 2011) New Revision: 33076 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.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-7633 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.java 2011-07-20 17:36:18 UTC (rev 33076) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; + +import javax.inject.Scope; + +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Retention(RUNTIME) +@Scope +@Inherited +@Documented +public @interface TestScope3 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope3.qfxresult 2011-07-20 17:36:18 UTC (rev 33076) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; + +import javax.inject.Scope; + +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.FIELD; +import java.lang.annotation.Target; + +@Target({TYPE, METHOD, FIELD}) +@Retention(RUNTIME) +@Scope +@Inherited +@Documented +public @interface TestScope3 { + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.java 2011-07-20 17:36:18 UTC (rev 33076) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; + +import javax.inject.Scope; + +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Target; + +@Target({}) +@Retention(RUNTIME) +@Scope +@Inherited +@Documented +public @interface TestScope4 { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestScope4.qfxresult 2011-07-20 17:36:18 UTC (rev 33076) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; + +import javax.inject.Scope; + +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.FIELD; + +@Target({TYPE, METHOD, FIELD}) +@Retention(RUNTIME) +@Scope +@Inherited +@Documented +public @interface TestScope4 { + +} 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-20 17:21:46 UTC (rev 33075) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-20 17:36:18 UTC (rev 33076) @@ -521,4 +521,32 @@ ChangeTargetAnnotationMarkerResolution.class); } + public void testAddTargetToScopeResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope3.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope3.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID, + AddTargetAnnotationMarkerResolution.class); + } + + public void testChangeTargetToScopeResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope4.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestScope4.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID, + ChangeTargetAnnotationMarkerResolution.class); + } + } \ No newline at end of file