Author: dazarov Date: 2010-08-31 12:54:03 -0400 (Tue, 31 Aug 2010) New Revision: 24584 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateDestroyComponent.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateRemoveComponent.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateUnwrapComponent.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java Log: https://jira.jboss.org/browse/JBIDE-4064 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java 2010-08-31 16:17:12 UTC (rev 24583) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/marker/DeleteAnnotaionMarkerResolution.java 2010-08-31 16:54:03 UTC (rev 24584) @@ -34,5 +34,13 @@ public void run(IMarker marker) { deleteAnnotation(qualifiedName); } + + /** + * Returns qualified name for test purpose + * @return + */ + public String getQualifiedName(){ + return qualifiedName; + } } Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java 2010-08-31 16:54:03 UTC (rev 24584) @@ -0,0 +1,64 @@ +package org.domain.SeamWebWarTestProject.session; + +import javax.ejb.Remove; +import javax.ejb.Stateful; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.log.Log; + +@Name("StatefulDuplicateCreateComponent") + +@Stateful +(a)Scope(ScopeType.APPLICATION) +public class StatefulDuplicateCreateComponent { + + private String abc; + + @Logger private Log log; + + + //seam-gen method + public String statefulComponent() + { + //implement your business logic here + log.info("statefulComponent.statefulComponent() action called"); + return "success"; + } + + //add additional action methods + + @Create + public void createMethod(){ + + } + + @Create + public void createMethod2(){ + + } + + @Destroy + public void destroyMethod(){ + + } + + + @Remove + public void removeMethod(){ + + } + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateDestroyComponent.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateDestroyComponent.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateDestroyComponent.java 2010-08-31 16:54:03 UTC (rev 24584) @@ -0,0 +1,56 @@ +package org.domain.SeamWebWarTestProject.session; + +import javax.ejb.Remove; +import javax.ejb.Stateful; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.log.Log; + +@Name("StatefulDuplicateDestroyComponent") + +@Stateful +(a)Scope(ScopeType.APPLICATION) +public class StatefulDuplicateDestroyComponent { + + private String abc; + + @Logger private Log log; + + + //seam-gen method + public String statefulComponent() + { + //implement your business logic here + log.info("statefulComponent.statefulComponent() action called"); + return "success"; + } + + //add additional action methods + @Destroy + public void destroyMethod(){ + + } + + @Destroy + public void destroyMethod2(){ + + } + + @Remove + public void removeMethod(){ + + } + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateDestroyComponent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateRemoveComponent.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateRemoveComponent.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateRemoveComponent.java 2010-08-31 16:54:03 UTC (rev 24584) @@ -0,0 +1,24 @@ +package org.domain.SeamWebWarTestProject.session; + +import javax.ejb.Remove; +import javax.ejb.Stateful; + +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Name; + +@Stateful +@Name("StatefulDuplicateRemoveComponent") +public class StatefulDuplicateRemoveComponent { + + @Destroy + public void destroyMethod(){ + } + + @Remove + public void removeMethod1(){ + } + + @Remove + public void removeMethod2(){ + } +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateRemoveComponent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateUnwrapComponent.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateUnwrapComponent.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateUnwrapComponent.java 2010-08-31 16:54:03 UTC (rev 24584) @@ -0,0 +1,62 @@ +package org.domain.SeamWebWarTestProject.session; + +import javax.ejb.Remove; +import javax.ejb.Stateful; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Unwrap; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.log.Log; + +@Name("StatefulDuplicateUnwrapComponent") + +@Stateful +(a)Scope(ScopeType.APPLICATION) +public class StatefulDuplicateUnwrapComponent { + + private String abc; + + @Logger private Log log; + + + //seam-gen method + public String statefulComponent() + { + //implement your business logic here + log.info("statefulComponent.statefulComponent() action called"); + return "success"; + } + + //add additional action methods + @Destroy + public void destroyMethod(){ + + } + + @Unwrap + public void unwrapMethod(){ + + } + + @Unwrap + public void unwrapMethod2(){ + + } + + @Remove + public void removeMethod(){ + + } + + public String getAbc() { + return abc; + } + + public void setAbc(String abc) { + this.abc = abc; + } + +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateUnwrapComponent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2010-08-31 16:17:12 UTC (rev 24583) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2010-08-31 16:54:03 UTC (rev 24584) @@ -14,12 +14,23 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectNature; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.wst.validation.ValidationFramework; +import org.eclipse.wst.validation.internal.operations.ValidatorManager; +import org.jboss.tools.seam.core.ISeamProject; +import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1645Test; import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1676Test; import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistTest; import org.jboss.tools.seam.ui.test.el.ELExprPartitionerTest; import org.jboss.tools.seam.ui.test.hyperlink.SeamViewHyperlinkPartitionerTest; import org.jboss.tools.seam.ui.test.jbide.JBide3989Test; +import org.jboss.tools.seam.ui.test.marker.SeamMarkerResolutionTest; import org.jboss.tools.seam.ui.test.preferences.SeamPreferencesPageTest; import org.jboss.tools.seam.ui.test.preferences.SeamSettingsPreferencesPageTest; import org.jboss.tools.seam.ui.test.view.SeamComponentsViewAllTests; @@ -32,7 +43,10 @@ import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest; import org.jboss.tools.seam.ui.test.wizard.SeamProjectNamesTest; import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest; +import org.jboss.tools.test.util.JUnitUtils; +import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.test.util.ResourcesUtils; /** * @author eskimo @@ -61,7 +75,23 @@ suite.addTestSuite(SeamCreateTestProjectTest.class); suite.addTestSuite(Seam20XCreateTestProjectTest.class); suite.addTestSuite(SeamProjectNamesTest.class); - suite.addTestSuite(Seam20XProjectNamesTest.class); + suite.addTestSuite(Seam20XProjectNamesTest.class); + suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamMarkerResolutionTest.class),"org.jboss.tools.seam.core.test","projects/SeamWebWarTestProject","SeamWebWarTestProject") { + @Override + protected void setUp() throws Exception { + super.setUp(); + IProject project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("SeamWebWarTestProject"); + project.refreshLocal(IResource.DEPTH_INFINITE, null); + JobUtils.waitForIdle(); + ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true); + seamProject.setRuntimeName("UNKNOWN"); + ValidatorManager.addProjectBuildValidationSupport(project); + project.build(IncrementalProjectBuilder.FULL_BUILD, + new NullProgressMonitor()); + + JobUtils.waitForIdle(); + } + } ); return suite; } } \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2010-08-31 16:54:03 UTC (rev 24584) @@ -0,0 +1,167 @@ +/************************************************************************************* + * Copyright (c) 2008-2009 JBoss by Red Hat and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.seam.ui.test.marker; + +import junit.framework.TestCase; + +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.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.ui.IMarkerResolution; +import org.eclipse.ui.ide.IDE; +import org.jboss.tools.seam.ui.marker.DeleteAnnotaionMarkerResolution; +import org.jboss.tools.test.util.JobUtils; + +/** + * @author Daniel Azarov + * + */ +public class SeamMarkerResolutionTest extends TestCase { + public static final String MARKER_TYPE = "org.eclipse.wst.validation.problemmarker"; + + private IProject project; + + @Override + protected void setUp() throws Exception { + JobUtils.waitForIdle(); + IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("SeamWebWarTestProject"); + this.project = project.getProject(); + } + + @Override + protected void tearDown() throws Exception { + } + + public void testDuplicateRemoveAnnotationResolution() throws CoreException { + String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateRemoveComponent.java"; + IFile file = project.getFile(TARGET_FILE_NAME); + + assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists()); + + IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + + System.out.println("Markers - "+markers.length); + + 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 DeleteAnnotaionMarkerResolution) { + assertEquals("org.jboss.seam.annotations.Remove", ((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName()); + found = true; + break; + } + } + if (found) { + break; + } + } + assertTrue("The quickfix \"Delete @Remove annotation\" doesn't exist.", found); + } + + public void testDuplicateDestroyAnnotationResolution() throws CoreException { + String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateDestroyComponent.java"; + IFile file = project.getFile(TARGET_FILE_NAME); + + assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists()); + + IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + + System.out.println("Markers - "+markers.length); + + 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 DeleteAnnotaionMarkerResolution) { + assertEquals("org.jboss.seam.annotations.Destroy", ((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName()); + found = true; + break; + } + } + if (found) { + break; + } + } + assertTrue("The quickfix \"Delete @Destroy annotation\" doesn't exist.", found); + } + + public void testDuplicateCreateAnnotationResolution() throws CoreException { + String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateCreateComponent.java"; + IFile file = project.getFile(TARGET_FILE_NAME); + + assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists()); + + IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + + System.out.println("Markers - "+markers.length); + + 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 DeleteAnnotaionMarkerResolution) { + assertEquals("org.jboss.seam.annotations.Create", ((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName()); + found = true; + break; + } + } + if (found) { + break; + } + } + assertTrue("The quickfix \"Delete @Create annotation\" doesn't exist.", found); + } + + public void testDuplicateUnwrapAnnotationResolution() throws CoreException { + String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/StatefulDuplicateUnwrapComponent.java"; + IFile file = project.getFile(TARGET_FILE_NAME); + + assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists()); + + IMarker[] markers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + + System.out.println("Markers - "+markers.length); + + 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 DeleteAnnotaionMarkerResolution) { + assertEquals("org.jboss.seam.annotations.Unwrap", ((DeleteAnnotaionMarkerResolution)resolution).getQualifiedName()); + found = true; + break; + } + } + if (found) { + break; + } + } + assertTrue("The quickfix \"Delete @Unwrap annotation\" doesn't exist.", found); + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain