Author: scabanovich Date: 2010-10-05 11:23:45 -0400 (Tue, 05 Oct 2010) New Revision: 25493 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java Log: JBIDE-6398 https://jira.jboss.org/browse/JBIDE-6398 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-10-05 14:09:08 UTC (rev 25492) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-10-05 15:23:45 UTC (rev 25493) @@ -12,7 +12,6 @@ import java.io.IOException; import java.io.InputStream; -import java.text.MessageFormat; import java.util.Set; import org.eclipse.core.resources.IFile; @@ -22,10 +21,10 @@ import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.wst.validation.internal.core.ValidationException; -import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.preferences.JSFSeverityPreferences; import org.jboss.tools.jsf.web.validation.JSFValidationMessages; @@ -34,6 +33,7 @@ import org.jboss.tools.seam.core.ISeamComponentMethod; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamComponentMethodType; +import org.jboss.tools.seam.core.SeamCoreBuilder; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamPreferences; import org.jboss.tools.seam.core.test.validation.ELValidatorWrapper; @@ -81,14 +81,14 @@ protected void tearDown() throws Exception { } - + private void copyContentsFile(String originalName, String newContentName) throws CoreException{ IFile originalFile = project.getFile(originalName); IFile newContentFile = project.getFile(newContentName); copyContentsFile(originalFile, newContentFile); } - + private void copyContentsFile(IFile originalFile, String newContentName) throws CoreException{ IFile newContentFile = project.getFile(newContentName); copyContentsFile(originalFile, newContentFile); @@ -108,7 +108,13 @@ } } } - originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + JobUtils.waitForIdle(); + originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, "org.eclipse.jdt.internal.core.builder.JavaBuilder", null, null); + JobUtils.waitForIdle(); + originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, SeamCoreBuilder.BUILDER_ID, null, null); +// originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + JobUtils.waitForIdle(); } private ISeamProject getSeamProject(IProject project) { @@ -234,7 +240,7 @@ // restore file content copyContentsFile( "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java", - "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.2"); + "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.original"); } public void testStatefulComponentWithoutRemoveMethodValidator() throws CoreException, ValidationException { @@ -676,16 +682,31 @@ // Unpaired Getter/Setter try { enableUnpairGetterOrSetterValidation(true); + String target = "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java"; + copyContentsFile( + target, + "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2"); + copyContentsFile( + "WebContent/abcComponent.xhtml", + "WebContent/abcComponent.4"); +//I am not sure that we need build here. If test is stable, lets remove this. +// project.build(IncrementalProjectBuilder.CLEAN_BUILD, null); +// project.build(IncrementalProjectBuilder.FULL_BUILD, null); +// JobUtils.waitForIdle(); - assertMarkerIsNotCreatedForFile( - new ELValidatorWrapper(project), - "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java", - "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2", - JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, - new Object[] {"actionType","Setter","Getter"}); + IFile targetFile = project.getFile(target); + ELValidatorWrapper wrapper = new ELValidatorWrapper(project); + wrapper.validate(targetFile); +// assertMarkerIsNotCreatedForFile( +// new ELValidatorWrapper(project), +// "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java", +// "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2", +// JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, +// new Object[] {"actionType","Setter","Getter"}, +// true); assertMarkerIsCreatedForLine( - new ELValidatorWrapper(project), + wrapper, "WebContent/abcComponent.xhtml", "WebContent/abcComponent.4", JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, @@ -697,19 +718,29 @@ } public void testPropertyHasOnlyGetterValidator() throws CoreException, ValidationException { - project.build(IncrementalProjectBuilder.FULL_BUILD, null); + //I am not sure that we need build here. If test is stable, lets remove this. +// project.build(IncrementalProjectBuilder.FULL_BUILD, null); try { enableUnpairGetterOrSetterValidation(true); + String target = "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java"; + copyContentsFile( + target, + "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3"); + JobUtils.waitForIdle(); - assertMarkerIsNotCreatedForFile( - new ELValidatorWrapper(project), - "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java", - "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3", - JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, - new Object[] {"actionType", "Getter", "Setter"}); + IFile targetFile = project.getFile(target); + ELValidatorWrapper wrapper = new ELValidatorWrapper(project); + wrapper.validate(targetFile); +// assertMarkerIsNotCreatedForFile( +// new ELValidatorWrapper(project), +// "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java", +// "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3", +// JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, +// new Object[] {"actionType", "Getter", "Setter"}, +// true); assertMarkerIsCreatedForLine( - new ELValidatorWrapper(project), + wrapper, "WebContent/abcComponent.xhtml", "WebContent/abcComponent.original", JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER,