Author: akazakov Date: 2011-08-12 19:32:31 -0400 (Fri, 12 Aug 2011) New Revision: 33873 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java Log: https://issues.jboss.org/browse/JBIDE-9532 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-12 23:32:23 UTC (rev 33872) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-12 23:32:31 UTC (rev 33873) @@ -14,11 +14,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jdt.internal.core.JavaModelManager; -import org.eclipse.wst.validation.internal.operations.ValidatorManager; import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest; import org.jboss.tools.jsf.model.pv.test.JsfJbide7975Test; import org.jboss.tools.jsf.test.project.facet.JSFFacetOnExistingProjectTest; @@ -30,7 +26,7 @@ import org.jboss.tools.jsf.test.validation.JSF2ComponentsInClassFolderTest; import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest; import org.jboss.tools.jsf.test.validation.WebContentTest; -import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.jst.jsp.test.ValidationProjectTestSetup; import org.jboss.tools.test.util.ProjectImportTestSetup; public class JsfAllTests { @@ -74,7 +70,7 @@ MessagePropertyRefactoringTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ new String[] { "projects/JSFKickStartOldFormat" }, //$NON-NLS-1$ new String[] { "JSFKickStartOldFormat" })); //$NON-NLS-1$ - suite.addTest(new ProjectImportTestSetup(new TestSuite( + suite.addTest(new ValidationProjectTestSetup(new TestSuite( JSF2ComponentsValidatorTest.class, JSF2ComponentsInClassFolderTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ new String[] { "projects/JSF2ComponentsValidator" }, //$NON-NLS-1$ @@ -87,17 +83,7 @@ // I18nValidatorTest.class), "org.jboss.tools.jsf.test", //$NON-NLS-1$ // new String[] { "projects/i18nTestProject" }, //$NON-NLS-1$ // new String[] { "i18nTestProject" })); //$NON-NLS-1$ - suite.addTest(new ProjectImportTestSetup(new TestSuite(ELValidatorTest.class),"org.jboss.tools.jsf.test","projects/JSFKickStartOldFormat","JSFKickStartOldFormat") { - @Override - protected void setUp() throws Exception { - super.setUp(); - IProject project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("JSFKickStartOldFormat"); - project.refreshLocal(IResource.DEPTH_INFINITE, null); - JobUtils.waitForIdle(); - - ValidatorManager.addProjectBuildValidationSupport(project); - } - } ); + suite.addTest(new ValidationProjectTestSetup(new TestSuite(ELValidatorTest.class),"org.jboss.tools.jsf.test","projects/JSFKickStartOldFormat","JSFKickStartOldFormat")); return new DisableJavaIndexingSetup(suite); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java 2011-08-12 23:32:23 UTC (rev 33872) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/JSF2RefactoringTest.java 2011-08-12 23:32:31 UTC (rev 33873) @@ -6,31 +6,27 @@ import org.eclipse.core.resources.IFolder; 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.core.runtime.NullProgressMonitor; import org.eclipse.ltk.internal.core.refactoring.resource.MoveResourcesProcessor; import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor; import org.jboss.tools.jsf.jsf2.refactoring.JSF2RenameParticipant; import org.jboss.tools.jsf.jsf2.refactoring.JSf2MoveParticipant; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ProjectImportTestSetup; import org.jboss.tools.tests.AbstractRefactorTest; public class JSF2RefactoringTest extends AbstractRefactorTest { - static String projectName = "JSF2ComponentsValidator"; - static IProject project; + static String PROJECT_NAME = "JSF2ComponentsValidator"; + IProject project; public JSF2RefactoringTest(){ super("Refactor JSF2 Composite Components Test"); } - + + @Override protected void setUp() throws Exception { - project = ProjectImportTestSetup.loadProject(projectName); - project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(2000); + project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); } - + public void testRenameCompositeComponentFile() throws CoreException { ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); @@ -40,15 +36,15 @@ list.add(structure); IFile sourceFile = project.getProject().getFile("/WebContent/resources/demo/input.xhtml"); - + RenameResourceProcessor processor = new RenameResourceProcessor(sourceFile); processor.setNewResourceName("input2.xhtml"); - + JSF2RenameParticipant participant = new JSF2RenameParticipant(); checkRename(processor, sourceFile, "input2.xhtml", participant, list); } - + public void testRenameCompositeComponentFolder() throws CoreException { ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); @@ -58,15 +54,15 @@ list.add(structure); IFolder sourceFolder = project.getProject().getFolder("/WebContent/resources/demo"); - + RenameResourceProcessor processor = new RenameResourceProcessor(sourceFolder); processor.setNewResourceName("demo2"); - + JSF2RenameParticipant participant = new JSF2RenameParticipant(); checkRename(processor, sourceFolder, "demo2", participant, list); } - + public void testMoveCompositeComponentFile() throws CoreException { ArrayList<TestChangeStructure> list = new ArrayList<TestChangeStructure>(); @@ -104,5 +100,4 @@ checkMove(processor, sourceFolder, destinationFolder, participant, list); } - -} +} \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java 2011-08-12 23:32:23 UTC (rev 33872) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsInClassFolderTest.java 2011-08-12 23:32:31 UTC (rev 33873) @@ -13,14 +13,12 @@ import junit.framework.TestCase; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.resources.ResourcesPlugin; import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.jst.web.kb.KbProjectFactory; import org.jboss.tools.jst.web.kb.taglib.IAttribute; import org.jboss.tools.jst.web.kb.taglib.IComponent; import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; -import org.jboss.tools.test.util.ProjectImportTestSetup; /** * @@ -29,8 +27,7 @@ */ public class JSF2ComponentsInClassFolderTest extends TestCase { - private static String projectName = "JSF2ComponentsValidator"; //$NON-NLS-1$ - private static IProject project; + private IProject project; public JSF2ComponentsInClassFolderTest() { super("JSF 2 Components In Class Folder Test"); //$NON-NLS-1$ @@ -38,9 +35,7 @@ @Override protected void setUp() throws Exception { - project = ProjectImportTestSetup.loadProject(projectName); - project.build(IncrementalProjectBuilder.FULL_BUILD, - new NullProgressMonitor()); + project = project = ResourcesPlugin.getWorkspace().getRoot().getProject(JSF2ComponentsValidatorTest.PROJECT_NAME); } public void testJSF2ComponentsInClassFolder() throws Exception { Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2011-08-12 23:32:23 UTC (rev 33872) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2011-08-12 23:32:31 UTC (rev 33873) @@ -8,7 +8,6 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ - package org.jboss.tools.jsf.test.validation; import java.io.IOException; @@ -21,15 +20,13 @@ 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.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.web.validation.JSFValidationMessage; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ProjectImportTestSetup; import org.jboss.tools.tests.AbstractResourceMarkerTest; /** @@ -37,22 +34,20 @@ * @author yzhishko * */ - public class JSF2ComponentsValidatorTest extends TestCase { - private static String projectName = "JSF2ComponentsValidator"; //$NON-NLS-1$ - private static IProject project; + public static String PROJECT_NAME = "JSF2ComponentsValidator"; //$NON-NLS-1$ + private IProject project; public JSF2ComponentsValidatorTest() { super("JSF 2 Components Validator Test"); //$NON-NLS-1$ } + @Override protected void setUp() throws Exception { - project = ProjectImportTestSetup.loadProject(projectName); - project.build(IncrementalProjectBuilder.FULL_BUILD, - new NullProgressMonitor()); - JobUtils.waitForIdle(); + project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); } + //junit test add to check JBIDE-7016 by Maksim Areshkau public void testCreatingFile() throws CoreException, IOException{ final IFile createdFile = JSF2ResourceUtil