[jbosstools-commits] JBoss Tools SVN: r11918 - in trunk: jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca and 1 other directory.

Author: dgolovin Date: 2008-11-20 11:43:50 -0500 (Thu, 20 Nov 2008) New Revision: 11918 Modified: trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java Log: Update for vpe.jst.jsp tests (unused packages were removed). TestProjectProvider dispose() methods logs exceptions happened during deleting project Modified: trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -21,10 +21,13 @@ import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.test.util.JobUtils; @@ -73,18 +76,30 @@ return project; } - public void dispose() throws CoreException { - if(project == null || !project.exists()) return; - boolean oldAutoBuilding = true; + public void dispose() { + if (project == null || !project.exists()) { + return; + } try { - oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); - project.close(null); - project.delete(true, null); - JobUtils.waitForIdle(); - } finally { - ResourcesUtils.setBuildAutomatically(oldAutoBuilding); - } + boolean oldAutoBuilding = true; + try { + oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(10); + project.close(null); + JobUtils.waitForIdle(10); + project.delete(true, null); + JobUtils.waitForIdle(10); + } finally { + ResourcesUtils.setBuildAutomatically(oldAutoBuilding); + } + } catch (CoreException ex) { + ILog log = Platform.getLog(Platform.getBundle("org.jboss.tools.common.test")); + IStatus error = new Status( + IStatus.ERROR, + "org.jboss.tools.common.test", + "Exception occurs during project deletion",ex); + log.log(error); + } } TestDescriptionFactory tests = null; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -13,8 +13,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.jboss.tools.common.test.util.TestProjectProvider; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,22 +3,14 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.swt.widgets.Display; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; -import org.jboss.tools.test.util.JobUtils; public class JsfJspJbide1704Test extends ContentAssistantTestCase { TestProjectProvider provider = null; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -5,7 +5,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -1,6 +1,5 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.eclipse.core.resources.IResource; import org.jboss.tools.common.test.util.TestProjectProvider; public class JsfJspJbide1807Test extends ContentAssistantTestCase{ Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -1,6 +1,5 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.eclipse.core.resources.IResource; import org.jboss.tools.common.test.util.TestProjectProvider; public class JsfJspJbide1813Test extends ContentAssistantTestCase{ Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,17 +3,11 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; -import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; -import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; @@ -41,11 +35,11 @@ public void testJsfJspJbide2437 () throws BadLocationException { openEditor(PAGE_NAME); - + JobUtils.waitForIdle(); ICompletionProposal[] result= null; String errorMessage = null; - IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "/templates/common.xhtml", true, false, false, false); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, "/templates/common.xhtml", true, true, false, false); IContentAssistProcessor p= TestUtil.getProcessor(viewer, reg.getOffset(), contentAssistant); assertNotNull("Cannot obtain IContentAssistProcessor instance",p); Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,10 +3,8 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,7 +3,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.jboss.tools.common.test.util.TestProjectProvider; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -6,7 +6,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2008-11-20 16:29:58 UTC (rev 11917) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2008-11-20 16:43:50 UTC (rev 11918) @@ -3,7 +3,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.jboss.tools.common.test.util.TestProjectProvider;