Author: dazarov Date: 2012-02-28 19:48:40 -0500 (Tue, 28 Feb 2012) New Revision: 39183 Modified: trunk/seam/tests/org.jboss.tools.seam.base.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml trunk/seam/tests/org.jboss.tools.seam.base.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java 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/marker/SeamMarkerResolutionTest.java Log: test failures in Seam https://issues.jboss.org/browse/JBIDE-10956 Modified: trunk/seam/tests/org.jboss.tools.seam.base.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.base.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml 2012-02-28 18:27:57 UTC (rev 39182) +++ trunk/seam/tests/org.jboss.tools.seam.base.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.xml 2012-02-29 00:48:40 UTC (rev 39183) @@ -11,5 +11,8 @@ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-1.2.xsd http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd"> + <component class="org.domain.SeamWebWarTestProject.session.StatefulComponentWithAbcField" scope="application"> + <property name="abc">value1</property> + </component> </components> Modified: trunk/seam/tests/org.jboss.tools.seam.base.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.base.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java 2012-02-28 18:27:57 UTC (rev 39182) +++ trunk/seam/tests/org.jboss.tools.seam.base.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java 2012-02-29 00:48:40 UTC (rev 39183) @@ -25,6 +25,11 @@ public void destroyMethod(){ } + + @Destroy + public void destroyMethod2(){ + + } public String getAbc() { return abc; 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 2012-02-28 18:27:57 UTC (rev 39182) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2012-02-29 00:48:40 UTC (rev 39183) @@ -20,6 +20,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.validation.internal.operations.ValidatorManager; +import org.jboss.tools.common.base.test.validation.ValidationProjectTestSetup; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.ui.test.ca.CASeamAddInfoInELMessagesTest; @@ -83,24 +84,7 @@ suite.addTestSuite(Seam20XCreateTestProjectTest.class); suite.addTestSuite(SeamProjectNamesTest.class); suite.addTestSuite(Seam20XProjectNamesTest.class); - suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamMarkerResolutionTest.class),"org.jboss.tools.seam.base.test","projects/SeamWebWarTestProject","SeamWebWarTestProject") { - @Override - protected void setUp() throws Exception { - super.setUp(); - IProject project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("SeamWebWarTestProject"); - if (project == null) - return; - 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(); - } - } ); + suite.addTest(new ValidationProjectTestSetup(new TestSuite(SeamMarkerResolutionTest.class),"org.jboss.tools.seam.base.test","projects/SeamWebWarTestProject","SeamWebWarTestProject")); suite.addTest(new ProjectImportTestSetup(new TestSuite( CASeamAddInfoInELMessagesTest.class), "org.jboss.tools.seam.ui.test", //$NON-NLS-1$ Modified: 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 2012-02-28 18:27:57 UTC (rev 39182) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/marker/SeamMarkerResolutionTest.java 2012-02-29 00:48:40 UTC (rev 39183) @@ -26,6 +26,7 @@ import org.jboss.tools.seam.internal.core.validation.SeamCoreValidator; import org.jboss.tools.seam.ui.marker.AddAnnotatedMethodMarkerResolution; import org.jboss.tools.seam.ui.marker.AddAnnotationMarkerResolution; +import org.jboss.tools.seam.ui.marker.AddSetterMarkerResolution; import org.jboss.tools.seam.ui.marker.ChangeScopeMarkerResolution; import org.jboss.tools.seam.ui.marker.DeleteAnnotationMarkerResolution; import org.jboss.tools.seam.ui.marker.RenameAnnotationMarkerResolution; @@ -46,8 +47,20 @@ this.project = project.getProject(); IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore(); - store.putValue(SeamPreferences.STATEFUL_COMPONENT_DOES_NOT_CONTENT_REMOVE, SeamPreferences.ERROR); - store.putValue(SeamPreferences.STATEFUL_COMPONENT_DOES_NOT_CONTENT_DESTROY, SeamPreferences.ERROR); + + store.putValue(SeamPreferences.DUPLICATE_REMOVE, SeamPreferences.WARNING); + store.putValue(SeamPreferences.DUPLICATE_DESTROY, SeamPreferences.WARNING); + store.putValue(SeamPreferences.DUPLICATE_CREATE, SeamPreferences.WARNING); + store.putValue(SeamPreferences.DUPLICATE_UNWRAP, SeamPreferences.WARNING); + store.putValue(SeamPreferences.CREATE_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.WARNING); + store.putValue(SeamPreferences.UNWRAP_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.WARNING); + store.putValue(SeamPreferences.OBSERVER_DOESNT_BELONG_TO_COMPONENT, SeamPreferences.WARNING); + store.putValue(SeamPreferences.NONUNIQUE_COMPONENT_NAME, SeamPreferences.WARNING); + store.putValue(SeamPreferences.STATEFUL_COMPONENT_DOES_NOT_CONTENT_REMOVE, SeamPreferences.WARNING); + store.putValue(SeamPreferences.STATEFUL_COMPONENT_DOES_NOT_CONTENT_DESTROY, SeamPreferences.WARNING); + store.putValue(SeamPreferences.STATEFUL_COMPONENT_WRONG_SCOPE, SeamPreferences.WARNING); + store.putValue(SeamPreferences.ENTITY_COMPONENT_WRONG_SCOPE, SeamPreferences.WARNING); + store.putValue(SeamPreferences.UNKNOWN_COMPONENT_PROPERTY, SeamPreferences.WARNING); if(store instanceof IPersistentPreferenceStore) { try { @@ -84,16 +97,16 @@ DeleteAnnotationMarkerResolution.class); } -// public void testDuplicateDestroyAnnotationResolution2() throws CoreException { -// MarkerResolutionTestUtil.checkResolution(project, -// new String[]{ -// "src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java" -// }, -// SeamCoreValidator.PROBLEM_TYPE, -// SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME, -// SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID, -// DeleteAnnotationMarkerResolution.class); -// } + public void testDuplicateDestroyAnnotationResolution2() throws CoreException { + MarkerResolutionTestUtil.checkResolution(project, + new String[]{ + "src/action/org/domain/SeamWebWarTestProject/session/StatelessClass.java" + }, + SeamCoreValidator.PROBLEM_TYPE, + SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME, + SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID, + DeleteAnnotationMarkerResolution.class); + } public void testDuplicateCreateAnnotationResolution() throws CoreException { MarkerResolutionTestUtil.checkResolution(project, @@ -249,42 +262,14 @@ ChangeScopeMarkerResolution.class); } -// public void fixMeTestAddSetterForProperty() throws CoreException { -// String TARGET_FILE_NAME = "WebContent/WEB-INF/components.xml"; -// copyContentsFile(TARGET_FILE_NAME, "WebContent/WEB-INF/components.3"); -// -// project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, SeamCoreBuilder.BUILDER_ID, null, null); -// -// JobUtils.waitForIdle(); -// -// IFile file = project.getFile(TARGET_FILE_NAME); -// -// assertTrue("File - "+TARGET_FILE_NAME+" must be exists",file.exists()); -// -// IMarker[] markers = file.findMarkers(SeamCoreValidator.PROBLEM_TYPE, true, IResource.DEPTH_INFINITE); -// -// assertTrue("Problem marker not found", markers.length > 0); -// -// boolean found = false; -// for (int i = 0; i < markers.length; i++) { -// IMarker marker = markers[i]; -// IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry() -// .getResolutions(marker); -// //checkForConfigureProblemSeverity(resolutions); -// //checkForAddSuppressWarnings(file, marker, resolutions); -// for (int j = 0; j < resolutions.length; j++) { -// IMarkerResolution resolution = resolutions[j]; -// if (resolution instanceof AddSetterMarkerResolution) { -// found = true; -// break; -// } -// } -// if (found) { -// break; -// } -// } -// assertTrue("The quickfix \"Add setter for 'abc' property in 'org.domain.SeamWebWarTestProject.session.StatefulComponentWithAbcField' class\" doesn't exist.", found); -// } - - + public void testAddSetterForProperty() throws CoreException { + MarkerResolutionTestUtil.checkResolution(project, + new String[]{ + "WebContent/WEB-INF/components.xml" + }, + SeamCoreValidator.PROBLEM_TYPE, + SeamCoreValidator.MESSAGE_ID_ATTRIBUTE_NAME, + SeamCoreValidator.UNKNOWN_COMPONENT_PROPERTY_ID, + AddSetterMarkerResolution.class); + } }