Author: dazarov Date: 2010-12-15 11:18:54 -0500 (Wed, 15 Dec 2010) New Revision: 27515 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/LocalInt.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Terrier.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.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-7673 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/LocalInt.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/LocalInt.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/LocalInt.java 2010-12-15 16:18:54 UTC (rev 27515) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.ejb.Local; + +@Local +public interface LocalInt { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/LocalInt.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java 2010-12-15 16:18:54 UTC (rev 27515) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.ejb.Stateful; +import javax.enterprise.inject.Disposes; +import javax.persistence.EntityManager; + +@Stateful +public class NotBusinessMethod_Broken implements LocalInt { + + void disposeEntityManager(@Disposes EntityManager em) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.java 2010-12-15 16:18:54 UTC (rev 27515) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.ejb.Stateful; +import javax.enterprise.inject.Disposes; +import javax.persistence.EntityManager; + +@Stateful +public class NotBusinessMethod_BrokenNoInterface { + + void disposeEntityManager(@Disposes EntityManager em) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Terrier.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Terrier.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Terrier.java 2010-12-15 16:18:54 UTC (rev 27515) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.ejb.Local; + +@Local +interface Terrier +{ + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Terrier.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java 2010-12-15 16:18:54 UTC (rev 27515) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.ejb.Stateless; +import javax.enterprise.event.Observes; + +@Stateless +class TibetanTerrier_Broken implements Terrier +{ + void observeSomeEvent(@Observes String someEvent) + { + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.java 2010-12-15 16:18:54 UTC (rev 27515) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.ejb.Stateless; +import javax.enterprise.event.Observes; + +@Stateless +class TibetanTerrier_BrokenNoInterface +{ + void observeSomeEvent(@Observes String someEvent) + { + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.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 2010-12-15 16:10:03 UTC (rev 27514) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2010-12-15 16:18:54 UTC (rev 27515) @@ -11,17 +11,25 @@ package org.jboss.tools.cdi.ui.test.marker; +import java.io.IOException; +import java.io.InputStream; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; 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.CDIValidationErrorManager; import org.jboss.tools.cdi.ui.marker.AddLocalBeanMarkerResolution; import org.jboss.tools.cdi.ui.marker.MakeFieldStaticMarkerResolution; import org.jboss.tools.cdi.ui.marker.MakeMethodBusinessMarkerResolution; import org.jboss.tools.cdi.ui.marker.MakeMethodPublicMarkerResolution; +import org.jboss.tools.test.util.JobUtils; /** * @author Daniel Azarov @@ -30,137 +38,221 @@ public class CDIMarkerResolutionTest extends ValidationTest { public static final String MARKER_TYPE = "org.jboss.tools.cdi.core.cdiproblem"; - public void testMakeFieldStaticResolution() throws CoreException { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerOfSessionBeanBroken.java"); + private void checkResolution(IProject project, String[] fileNames, String markerType, String idName, int id, Class<? extends IMarkerResolution> resolutionClass) throws CoreException { + IFile file = project.getFile(fileNames[0]); assertTrue("File - "+file.getFullPath()+" must be exist",file.exists()); - IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + copyFiles(project, fileNames); - boolean found = false; - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry() - .getResolutions(marker); - for (int j = 0; j < resolutions.length; j++) { - IMarkerResolution resolution = resolutions[j]; - if (resolution instanceof MakeFieldStaticMarkerResolution) { - found = true; - break; + try{ + IMarker[] markers = file.findMarkers(markerType, true, IResource.DEPTH_INFINITE); + + for (int i = 0; i < markers.length; i++) { + IMarker marker = markers[i]; + Integer attribute = ((Integer) marker + .getAttribute(CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME)); + if (attribute != null){ + int messageId = attribute.intValue(); + if(messageId == id){ + IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry() + .getResolutions(marker); + for (int j = 0; j < resolutions.length; j++) { + IMarkerResolution resolution = resolutions[j]; + if (resolution.getClass().equals(resolutionClass)) { + + resolution.run(marker); + + refresh(project); + + IMarker[] newMarkers = file.findMarkers(markerType, true, IResource.DEPTH_INFINITE); + + assertTrue("Marker resolution did not decrease number of problems. was: "+markers.length+" now: "+newMarkers.length, newMarkers.length < markers.length); + + return; + } + } + fail("Marker resolution: "+resolutionClass+" not found"); + } } } - if (found) { - break; - } + fail("Problem marker with id: "+id+" not found"); + }finally{ + restoreFiles(project, fileNames); + + refresh(project); } - assertTrue("Quick fix: \"Make field static\" doesn't exist.", found); } - public void testMakeMethodBusinessResolution() throws CoreException { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer.java"); + private void refresh(IProject project) throws CoreException{ + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + JobUtils.waitForIdle(); - assertTrue("File - "+file.getFullPath()+" must be exist",file.exists()); - - IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); - - boolean found1 = false; - boolean found2 = false; - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry() - .getResolutions(marker); - for (int j = 0; j < resolutions.length; j++) { - IMarkerResolution resolution = resolutions[j]; - if (resolution instanceof MakeMethodBusinessMarkerResolution) { - found1 = true; - } - if (resolution instanceof AddLocalBeanMarkerResolution) { - found2 = true; - } - } - } - assertTrue("Quick fix: \"Make method business\" doesn't exist.", found1); - assertTrue("Quick fix: \"Add @LocalBean annotation\" doesn't exist.", found2); } - - public void testMakeMethodPublicResolution() throws CoreException { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerNoInterface.java"); - - assertTrue("File - "+file.getFullPath()+" must be exist",file.exists()); - - IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); - - boolean found = false; - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry() - .getResolutions(marker); - for (int j = 0; j < resolutions.length; j++) { - IMarkerResolution resolution = resolutions[j]; - if (resolution instanceof MakeMethodPublicMarkerResolution) { - found = true; - break; + + private void copyFiles(IProject project, String[] fileNames) throws CoreException{ + for(String fileName : fileNames){ + IFile file = project.getFile(fileName); + IFile copyFile = project.getFile(fileName+".copy"); + + if(copyFile.exists()) + copyFile.delete(true, null); + + InputStream is = null; + try{ + is = file.getContents(); + copyFile.create(is, true, null); + } finally { + if(is!=null) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } } } - if (found) { - break; - } } - assertTrue("Quick fix: \"Make method public\" doesn't exist.", found); } - public void testMakeMethodBusinessResolution2() throws CoreException { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java"); - - assertTrue("File - "+file.getFullPath()+" must be exist",file.exists()); - - IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); - - boolean found1 = false; - boolean found2 = false; - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry() - .getResolutions(marker); - for (int j = 0; j < resolutions.length; j++) { - IMarkerResolution resolution = resolutions[j]; - if (resolution instanceof MakeMethodBusinessMarkerResolution) { - found1 = true; + private void restoreFiles(IProject project, String[] fileNames) throws CoreException { + for(String fileName : fileNames){ + IFile file = project.getFile(fileName); + IFile copyFile = project.getFile(fileName+".copy"); + InputStream is = null; + try{ + is = copyFile.getContents(); + file.setContents(is, true, false, null); + } finally { + if(is!=null) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } } - if (resolution instanceof AddLocalBeanMarkerResolution) { - found2 = true; - } } + copyFile.delete(true, null); } - assertTrue("Quick fix: \"Make method business\" doesn't exist.", found1); - assertTrue("Quick fix: \"Add @LocalBean annotation\" doesn't exist.", found2); } + + public void testMakeProducerFieldStaticResolution() throws CoreException { + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerOfSessionBeanBroken.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID, + MakeFieldStaticMarkerResolution.class); + } + + public void testMakeProducerMethodBusinessResolution() throws CoreException { + checkResolution( + tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerLocal.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID, + MakeMethodBusinessMarkerResolution.class); + } + + public void testAddLocalBeanResolution() throws CoreException { + checkResolution( + tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducer.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerLocal.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID, + AddLocalBeanMarkerResolution.class); + } - public void testMakeMethodBusinessResolution3() throws CoreException { - IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/disposers/NotBusinessMethod_Broken.java"); - - assertTrue("File - "+file.getFullPath()+" must be exist",file.exists()); - - IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); - - boolean found1 = false; - boolean found2 = false; - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry() - .getResolutions(marker); - for (int j = 0; j < resolutions.length; j++) { - IMarkerResolution resolution = resolutions[j]; - if (resolution instanceof MakeMethodBusinessMarkerResolution) { - found1 = true; - } - if (resolution instanceof AddLocalBeanMarkerResolution) { - found2 = true; - } - } - } - assertTrue("Quick fix: \"Make method business\" doesn't exist.", found1); - assertTrue("Quick fix: \"Add @LocalBean annotation\" doesn't exist.", found2); + public void testMakeProducerMethodPublicResolution() throws CoreException { + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/FooProducerNoInterface.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID, + MakeMethodPublicMarkerResolution.class); } + + public void testMakeObserverParamMethodBusinessResolution() throws CoreException { + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Terrier.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID, + MakeMethodBusinessMarkerResolution.class); + } + public void testAddLocalBeanResolution2() throws CoreException { + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_Broken.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Terrier.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID, + AddLocalBeanMarkerResolution.class); + } + + public void testMakeObserverParamMethodPublicResolution() throws CoreException { + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TibetanTerrier_BrokenNoInterface.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID, + MakeMethodPublicMarkerResolution.class); + } + + public void testMakeDisposerParamMethodBusinessResolution() throws CoreException { + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/LocalInt.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID, + MakeMethodBusinessMarkerResolution.class); + } + + public void testAddLocalBeanResolution3() throws CoreException { + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_Broken.java", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/LocalInt.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID, + AddLocalBeanMarkerResolution.class); + } + + public void testMakeDisposerParamMethodPublicResolution() throws CoreException { + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NotBusinessMethod_BrokenNoInterface.java" + }, + MARKER_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID, + MakeMethodPublicMarkerResolution.class); + } + }