Author: dazarov Date: 2011-02-06 07:47:37 -0500 (Sun, 06 Feb 2011) New Revision: 29027 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchair.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chair.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken3.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken4.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken3.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken4.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchiar.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chiar.java 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-7635 Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchair.java (from rev 28999, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchiar.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchair.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchair.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -0,0 +1,5 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +public class Armchair implements Furniture { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchair.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchiar.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchiar.java 2011-02-05 13:34:42 UTC (rev 29026) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Armchiar.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -1,5 +0,0 @@ -package org.jboss.jsr299.tck.tests.jbt.quickfixes; - -public class Armchiar implements Furniture { - -} Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chair.java (from rev 28999, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chiar.java) =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chair.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chair.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -0,0 +1,5 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +public class Chair implements Furniture { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chair.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chiar.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chiar.java 2011-02-05 13:34:42 UTC (rev 29026) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Chiar.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -1,5 +0,0 @@ -package org.jboss.jsr299.tck.tests.jbt.quickfixes; - -public class Chiar implements Furniture { - -} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken3.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken3.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken3.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.inject.Inject; + + +public class Farm_Broken3 { + @Inject + public void a(Animal animal){ + + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken3.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken4.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken4.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken4.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.inject.Inject; + +public class Farm_Broken4 { + @Inject + public void a(@SmallFarmAnimals Animal animal2){ + + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Farm_Broken4.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken3.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken3.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken3.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.inject.Inject; + +public class Office_Broken3 { + @Inject public void a(Furniture furniture){ + + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken3.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken4.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken4.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken4.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.inject.Inject; + +public class Office_Broken4 { + @Inject + public void a(@OfficeFurniture Furniture officeFurniture){ + + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Office_Broken4.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-02-05 13:34:42 UTC (rev 29026) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-02-06 12:47:37 UTC (rev 29027) @@ -401,10 +401,14 @@ DeleteAllInjectedConstructorsMarkerResolution.class); } - public void testMakeInjectedPointUnambiguousResolution() throws CoreException { + public void testSpecifyBeanWhenMultipleBeansAreEligibleForInjectedFieldResolution() throws CoreException { + System.out.println("testSpecifyBeanWhenMultipleBeansAreEligibleForInjectedFieldResolution..."); checkResolution(tckProject, new String[]{ - "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Farm_Broken1.java" + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Farm_Broken1.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Cow.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Sheep.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Dog.java" }, MARKER_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, @@ -412,10 +416,19 @@ MakeInjectedPointUnambiguousMarkerResolution.class); } - public void testSelectBeanResolution() throws CoreException { + public void testSelectBeanWhenMultipleBeansAreEligibleForInjectedFieldResolution() throws CoreException { + System.out.println("testSelectBeanWhenMultipleBeansAreEligibleForInjectedFieldResolution..."); checkResolution(tckProject, new String[]{ - "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Office_Broken1.java" + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Office_Broken1.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Armchair.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Chair.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Couch.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Cupboard.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Desk.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/HighStool.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Sofa.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Stool.java" }, MARKER_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, @@ -423,10 +436,14 @@ SelectBeanMarkerResolution.class); } - public void testMakeInjectedPointUnambiguousResolution2() throws CoreException { + public void testSpecifyBeanWhenNoBeanIsEligibleForInjectedFieldResolution() throws CoreException { + System.out.println("testSpecifyBeanWhenNoBeanIsEligibleForInjectedFieldResolution..."); checkResolution(tckProject, new String[]{ - "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Farm_Broken2.java" + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Farm_Broken2.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Cow.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Sheep.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Dog.java" }, MARKER_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, @@ -434,15 +451,94 @@ MakeInjectedPointUnambiguousMarkerResolution.class); } - public void testSelectBeanResolution2() throws CoreException { + public void testSelectBeanWhenNoBeanIsEligibleForInjectedFieldResolution() throws CoreException { + System.out.println("testSelectBeanWhenNoBeanIsEligibleForInjectedFieldResolution..."); checkResolution(tckProject, new String[]{ - "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Office_Broken2.java" + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Office_Broken2.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Armchair.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Chair.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Couch.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Cupboard.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Desk.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/HighStool.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Sofa.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Stool.java" }, MARKER_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.UNSATISFIED_INJECTION_POINTS_ID, SelectBeanMarkerResolution.class); } + + public void testSpecifyBeanWhenMultipleBeansAreEligibleForInjectedParameterResolution() throws CoreException { + System.out.println("testSpecifyBeanWhenMultipleBeansAreEligibleForInjectedParameterResolution..."); + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Farm_Broken3.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Cow.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Sheep.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Dog.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.AMBIGUOUS_INJECTION_POINTS_ID, + MakeInjectedPointUnambiguousMarkerResolution.class); + } + public void testSelectBeanWhenMultipleBeansAreEligibleForInjectedParameterResolution() throws CoreException { + System.out.println("testSelectBeanWhenMultipleBeansAreEligibleForInjectedParameterResolution..."); + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Office_Broken3.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Armchair.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Chair.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Couch.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Cupboard.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Desk.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/HighStool.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Sofa.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Stool.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.AMBIGUOUS_INJECTION_POINTS_ID, + SelectBeanMarkerResolution.class); + } + + public void testSpecifyBeanWhenNoBeanIsEligibleForInjectedParameterResolution() throws CoreException { + System.out.println("testSpecifyBeanWhenNoBeanIsEligibleForInjectedParameterResolution..."); + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Farm_Broken4.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Cow.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Sheep.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Dog.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.UNSATISFIED_INJECTION_POINTS_ID, + MakeInjectedPointUnambiguousMarkerResolution.class); + } + + public void testSelectBeanWhenNoBeanIsEligibleForInjectedParameterResolution() throws CoreException { + System.out.println("testSelectBeanWhenNoBeanIsEligibleForInjectedParameterResolution..."); + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Office_Broken4.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Armchair.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Chair.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Couch.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Cupboard.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Desk.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/HighStool.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Sofa.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Stool.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.UNSATISFIED_INJECTION_POINTS_ID, + SelectBeanMarkerResolution.class); + } + }