Author: dgolovin Date: 2010-11-16 16:45:13 -0500 (Tue, 16 Nov 2010) New Revision: 26651 Removed: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.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/ContentAssistantTestCase.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java Log: https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared dependencies from test plugin refactored to base.test plugins to avoid skipping tests in case of test errors seam tests cleaned up from VPE ui test dependencies Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-11-16 21:43:49 UTC (rev 26650) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-11-16 21:45:13 UTC (rev 26651) @@ -13,6 +13,7 @@ org.eclipse.ui.ide, org.eclipse.wst.sse.core, org.jboss.tools.jst.jsp, + org.jboss.tools.jst.jsp.base.test, org.jboss.tools.common.text.ext, org.jboss.tools.jst.web, org.jboss.tools.common.text.xml, Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2010-11-16 21:43:49 UTC (rev 26650) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2010-11-16 21:45:13 UTC (rev 26651) @@ -1,153 +0,0 @@ -package org.jboss.tools.jst.jsp.test; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.TextUtilities; -import org.eclipse.jface.text.contentassist.ContentAssistant; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.jface.text.contentassist.IContentAssistant; -import org.eclipse.jface.text.contentassist.IContentAssistantExtension; -import org.eclipse.jface.text.source.SourceViewerConfiguration; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.texteditor.AbstractTextEditor; -import org.eclipse.wst.sse.ui.internal.contentassist.StructuredContentAssistant; -import org.jboss.tools.common.text.xml.contentassist.ProposalSorter; - -public class TestUtil { - - /** The Constant MAX_IDLE. */ - public static final long MAX_IDLE = 5*60*1000L; - - /** - * Returns the CA Processor from content assistant for the given offset in the document. - * - * - * @param viewer - * @param offset - * @param ca - */ - - public static IContentAssistProcessor getProcessor(ITextViewer viewer, int offset, IContentAssistant ca) { - try { - IDocument document= viewer.getDocument(); - String type= TextUtilities.getContentType(document, ((IContentAssistantExtension)ca).getDocumentPartitioning(), offset, true); - return ca.getContentAssistProcessor(type); - } catch (BadLocationException x) { - } - - return null; - } - - /** - * Process UI input but do not return for the specified time interval. - * - * @param waitTimeMillis - * the number of milliseconds - */ - public static void delay(long waitTimeMillis) { - Display display = Display.getCurrent(); - - // If this is the UI thread, - // then process input. - if (display != null) { - long endTimeMillis = System.currentTimeMillis() + waitTimeMillis; - while (System.currentTimeMillis() < endTimeMillis) { - if (!display.readAndDispatch()) - display.sleep(); - } - display.update(); - } - // Otherwise, perform a simple sleep. - else { - try { - Thread.sleep(waitTimeMillis); - } catch (InterruptedException e) { - // Ignored. - } - } - } - - /** - * Wait for idle. - */ - public static void waitForIdle(long maxIdle) { - long start = System.currentTimeMillis(); - while (!Job.getJobManager().isIdle()) { - delay(500); - if ( (System.currentTimeMillis()-start) > maxIdle ) - throw new RuntimeException("A long running task detected"); //$NON-NLS-1$ - } - } - - public static SourceViewerConfiguration getSourceViewerConfiguration(AbstractTextEditor editor) { - Class editorClass = editor.getClass(); - while (editorClass != null) { - try { - Method m = editorClass.getDeclaredMethod("getSourceViewerConfiguration", new Class[] {}); - - if(m != null) { - m.setAccessible(true); - Object result = m.invoke(editor, new Object[]{}); - return (result instanceof SourceViewerConfiguration ? (SourceViewerConfiguration)result : null); - } - } catch (NoSuchMethodException ne) { - } catch (Exception e) { - } - editorClass = editorClass.getSuperclass(); - } - return null; - - } - - public static void prepareCAInvokation(IContentAssistant ca, ITextViewer viewer, int offset) { - if (ca == null || viewer == null) - return; - - // sets cursor position - viewer.getTextWidget().setCaretOffset(offset); - - TestUtil.waitForIdle(TestUtil.MAX_IDLE); - TestUtil.delay(1000); - - ca.showPossibleCompletions(); - } - - public static int MAX_CATEGORIES_COUNT = 10; - public static List<ICompletionProposal> collectProposals(IContentAssistant ca, ITextViewer viewer, int offset) { - prepareCAInvokation(ca, viewer, offset); - - final IContentAssistProcessor p= TestUtil.getProcessor(viewer, offset, ca); - List<ICompletionProposal> res= new ArrayList<ICompletionProposal>(); - // Try to acquire all the proposal categories assuming that there are less than 10 or equal - for (int i = 0; i < MAX_CATEGORIES_COUNT && p != null; i++) { - ICompletionProposal[] result= p.computeCompletionProposals(viewer, offset); - for (int j = 0; result != null && j < result.length; j++) { - res.add(result[j]); - } - } - return ProposalSorter.filterAndSortProposals(res, null, null); - } - /** - * Close all opened editors - * @author mareshkau - */ - public static final void closeAllEditors(){ - IWorkbenchPage page = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - IWorkbenchPart part = page.getViewReferences()[0].getPart(false); - page.activate(part); - // close - page.closeAllEditors(false); - } -} Deleted: 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 2010-11-16 21:43:49 UTC (rev 26650) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2010-11-16 21:45:13 UTC (rev 26651) @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - - -package org.jboss.tools.jst.jsp.test.ca; - - -import org.jboss.tools.test.util.TestProjectProvider; - - -/** - * Abstract class contains of common methods. - * - * @author Eugene Stherbin - * - */ -public abstract class CommonContentAssistantTestCase extends ContentAssistantTestCase { - /** The make copy. */ - protected boolean makeCopy; - - /** The provider. */ - protected TestProjectProvider provider; - - protected abstract String getSetUpProjectName(); - - @Override - public void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", null, getSetUpProjectName(), makeCopy); //$NON-NLS-1$ - project = provider.getProject(); - } - - @Override - public void tearDown() throws Exception { - if (provider != null) { - provider.dispose(); - } - } -} Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2010-11-16 21:43:49 UTC (rev 26650) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2010-11-16 21:45:13 UTC (rev 26651) @@ -1,251 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.tools.jst.jsp.test.ca; - -import java.util.List; - -import junit.framework.TestCase; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistant; -import org.eclipse.jface.text.source.SourceViewerConfiguration; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; -import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; -import org.jboss.tools.jst.jsp.test.TestUtil; -import org.jboss.tools.test.util.WorkbenchUtils; - -public class ContentAssistantTestCase extends TestCase { - protected IProject project = null; - protected JSPMultiPageEditor jspEditor = null; - protected JSPTextEditor jspTextEditor = null; - protected StructuredTextViewer viewer = null; - protected IContentAssistant contentAssistant = null; - protected IDocument document = null; - - public void openEditor(String fileName) { - IEditorPart editorPart = WorkbenchUtils.openEditor(project.getName()+"/"+ fileName); //$NON-NLS-1$ -// System.out.println("openEditor: " + project.getName()+"/"+ fileName); - if (editorPart instanceof JSPMultiPageEditor) - jspEditor = (JSPMultiPageEditor) editorPart; - - jspTextEditor = jspEditor.getJspEditor(); - viewer = jspTextEditor.getTextViewer(); - document = viewer.getDocument(); - SourceViewerConfiguration config = TestUtil - .getSourceViewerConfiguration(jspTextEditor); - contentAssistant = (config == null ? null : config - .getContentAssistant(viewer)); - - assertTrue( - "Cannot get the Content Assistant instance for the editor for page \"" //$NON-NLS-1$ - + fileName + "\"", (contentAssistant != null)); //$NON-NLS-1$ - - assertTrue("The IDocument is not instance of IStructuredDocument for page \"" //$NON-NLS-1$ - + fileName + "\"", //$NON-NLS-1$ - (document instanceof IStructuredDocument)); - - } - - public ICompletionProposal[] checkProposals(String fileName, int offset, String[] proposals, boolean exactly) { - return checkProposals(fileName, null, offset, proposals, exactly, true); - } - - public ICompletionProposal[] checkProposals(String fileName, String substring, int offset, String[] proposals, boolean exactly) { - return checkProposals(fileName, substring, offset, proposals, exactly, false); - } - public ICompletionProposal[] checkProposals(String fileName, String substring, int offset, String[] proposals, boolean exactly, boolean excludeELProposalsFromExactTest){ -// System.out.println("checkProposals >>> Enterring"); -// System.out.println("checkProposals >>> invoking openEditor() for " + fileName); - openEditor(fileName); -// System.out.println("checkProposals >>> openEditor() is invoked for " + fileName); - - int position = 0; - if (substring != null) { - String documentContent = document.get(); - position = documentContent.indexOf(substring); - } - - List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, position+offset); - - assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); //$NON-NLS-1$ - - // for (int i = 0; i < result.length; i++) { - // System.out.println("proposal - "+result[i].getDisplayString()); - // } - - ICompletionProposal[] result = res.toArray(new ICompletionProposal[res.size()]); - int foundCounter = 0; - for (int i = 0; i < proposals.length; i++) { - boolean found = compareProposal(proposals[i], result); - if (found) - foundCounter++; - assertTrue("Proposal " + proposals[i] + " not found!", found ); //$NON-NLS-1$ //$NON-NLS-2$ - } - - if (exactly) { - if (excludeELProposalsFromExactTest) { - assertTrue("Some other proposals were found!", foundCounter == proposals.length); //$NON-NLS-1$ - } else { - assertTrue("Some other proposals were found!", result.length == proposals.length); //$NON-NLS-1$ - } - } - -// System.out.println("checkProposals <<< Exiting"); - return result; - } - - public boolean compareProposal(String proposalName, ICompletionProposal[] proposals){ - for (int i = 0; i < proposals.length; i++) { - if (proposals[i] instanceof AutoContentAssistantProposal) { - AutoContentAssistantProposal ap = (AutoContentAssistantProposal)proposals[i]; - String replacementString = ap.getReplacementString().toLowerCase(); - if (replacementString.equalsIgnoreCase(proposalName)) return true; - - - // For a tag proposal there will be not only the the tag name but all others characters like default attributes, tag ending characters and so on - if (replacementString.indexOf("/>") != -1) { - replacementString = replacementString.substring(0, replacementString.indexOf("/>")); - } - if (replacementString.indexOf('>') != -1) { - replacementString = replacementString.substring(0, replacementString.indexOf('>')); - } - if (replacementString.equalsIgnoreCase(proposalName)) return true; - - String[] replacementStringParts = replacementString.split(" "); //$NON-NLS-1$ - if (replacementStringParts != null && replacementStringParts.length > 0) { - if (replacementStringParts[0].equalsIgnoreCase(proposalName)) return true; - } - - // for an attribute proposal there will be a pare of attribute-value (i.e. attrName="attrValue") - replacementStringParts = replacementString.split("="); //$NON-NLS-1$ - if (replacementStringParts != null && replacementStringParts.length > 0) { - if (replacementStringParts[0].equalsIgnoreCase(proposalName)) return true; - } - - // for an Unclosed EL the closing character is appended to the proposal string (i.e. person} ) - // perform case sensitive compare operation - replacementStringParts = replacementString.split("}"); //$NON-NLS-1$ - if (replacementStringParts != null && replacementStringParts.length > 0) { - if (replacementStringParts[0].equals(proposalName)) return true; - } - - // For an attribute value proposal there will be the quote characters - replacementString = Utils.trimQuotes(replacementString); - if (replacementString.equalsIgnoreCase(proposalName)) return true; - - } else { - if(proposals[i].getDisplayString().toLowerCase().equals(proposalName.toLowerCase())) return true; - } - } - return false; - } - - public void closeEditor() { - if (jspEditor != null) { - PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getActivePage().closeEditor(jspEditor, false); - jspEditor = null; - } - } - - /** - * @return the project - */ - public IProject getProject() { - return project; - } - - /** - * @param project the project to set - */ - public void setProject(IProject project) { - this.project = project; - } - - /** - * @return the jspEditor - */ - public JSPMultiPageEditor getJspEditor() { - return jspEditor; - } - - /** - * @param jspEditor the jspEditor to set - */ - public void setJspEditor(JSPMultiPageEditor jspEditor) { - this.jspEditor = jspEditor; - } - - /** - * @return the jspTextEditor - */ - public JSPTextEditor getJspTextEditor() { - return jspTextEditor; - } - - /** - * @param jspTextEditor the jspTextEditor to set - */ - public void setJspTextEditor(JSPTextEditor jspTextEditor) { - this.jspTextEditor = jspTextEditor; - } - - /** - * @return the viewer - */ - public StructuredTextViewer getViewer() { - return viewer; - } - - /** - * @param viewer the viewer to set - */ - public void setViewer(StructuredTextViewer viewer) { - this.viewer = viewer; - } - - /** - * @return the contentAssistant - */ - public IContentAssistant getContentAssistant() { - return contentAssistant; - } - - /** - * @param contentAssistant the contentAssistant to set - */ - public void setContentAssistant(IContentAssistant contentAssistant) { - this.contentAssistant = contentAssistant; - } - - /** - * @return the document - */ - public IDocument getDocument() { - return document; - } - - /** - * @param document the document to set - */ - public void setDocument(IDocument document) { - this.document = document; - } -} \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2010-11-16 21:43:49 UTC (rev 26650) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2010-11-16 21:45:13 UTC (rev 26651) @@ -36,6 +36,8 @@ org.jboss.tools.jsf.text.ext.richfaces;bundle-version="3.1.0", org.jboss.tools.seam.pages.xml, org.jboss.tools.seam.xml, - org.eclipse.jst.standard.schemas + org.eclipse.jst.standard.schemas, + org.eclipse.wst.standard.schemas, + org.jboss.tools.seam.base.test;bundle-version="1.0.0" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2010-11-16 21:43:49 UTC (rev 26650) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2010-11-16 21:45:13 UTC (rev 26651) @@ -1,313 +0,0 @@ -package org.jboss.tools.seam.core.test.project.facet; - -import java.io.File; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import junit.framework.TestCase; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectNature; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jst.common.project.facet.core.JavaFacet; -import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.seam.core.SeamProjectsSet; -import org.jboss.tools.seam.core.project.facet.SeamRuntime; -import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; -import org.jboss.tools.seam.core.project.facet.SeamVersion; -import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; -import org.jboss.tools.seam.internal.core.project.facet.Seam2ProjectCreator; -import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider; -import org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; - -/** - * Base class for facet related tests; based on the facet test class found in - * WTP test suite. - * - * @author max - * - */ -public abstract class AbstractSeamFacetTest extends TestCase { - - protected static final IWorkspace ws = ResourcesPlugin.getWorkspace(); - - private SeamRuntime seamRuntime; - - protected static final String SEAM_1_2_0 = "Seam 1.2.0"; - protected static final String SEAM_2_0_0 = "Seam 2.0.0"; - - protected static final String SEAM_1_2_HOME = "jbosstools.test.seam.1.2.1.eap.home"; - protected static final String SEAM_2_0_HOME = "jbosstools.test.seam.2.0.1.GA.home"; - - protected static final IProjectFacetVersion seamFacetVersion; - protected static final IProjectFacetVersion dynamicWebVersion; - protected static final IProjectFacetVersion javaVersion; - protected static final IProjectFacetVersion javaFacesVersion; - - private static final IProjectFacet seamFacet; - - static { - seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam"); - seamFacetVersion = seamFacet.getVersion("1.2"); - - javaVersion = JavaFacet.JAVA_50; - dynamicWebVersion = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.5"); - javaFacesVersion = ProjectFacetsManager.getProjectFacet("jst.jsf").getVersion("1.2"); - - } - - protected final ArrayList<IResource> resourcesToCleanup = new ArrayList<IResource>(); - protected final List<Runnable> tearDownOperations = new ArrayList<Runnable>(); - - protected AbstractSeamFacetTest(final String name) { - super(name); - } - - @Override - protected void setUp() throws Exception { - // TODO Auto-generated method stub - super.setUp(); - assertSeamHomeAvailable(); - File folder = getSeamHomeFolder(); - - SeamRuntimeManager.getInstance().addRuntime(SEAM_1_2_0, folder.getAbsolutePath(), SeamVersion.SEAM_1_2, true); - seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_1_2_0); - } - - public static final String SYS_PROP_IS_NOT_DEFINED = "System property {0} is not defined"; - - protected File getSeamHomeFolder() { - String seamHomeFolder = System.getProperty(getSystemPropertyName()); - if(seamHomeFolder==null) { - throw new IllegalStateException( - MessageFormat.format(SYS_PROP_IS_NOT_DEFINED, getSystemPropertyName()) - ); - } - return new File(seamHomeFolder).getAbsoluteFile(); - } - - public static final String SEAM_EAP_121_HOME_PROPERY = "jbosstools.test.seam.1.2.1.eap.home"; - - protected String getSystemPropertyName() { - return SEAM_EAP_121_HOME_PROPERY; - } - - protected void tearDown() throws Exception - - { - - // Wait until all jobs is finished to avoid delete project problems - - boolean oldAutoBuilding = true; - Exception last = null; - try { - oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false); - ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null); - JobUtils.waitForIdle(); - for (IResource r : this.resourcesToCleanup) { - try { - System.out.println("Deleting resource " + r.getLocation()); - if(r instanceof IProject) { - IProject project = (IProject)r; - for (String natureId : project.getDescription().getNatureIds()) { - IProjectNature nature = project.getNature(natureId); - nature.deconfigure(); - } - } - r.delete(true, null); - } catch(Exception e) { - e.printStackTrace(); - last = e; - } - } - - for (Runnable runnable : this.tearDownOperations) { - runnable.run(); - } - } finally { - ResourcesUtils.setBuildAutomatically(oldAutoBuilding); - } - - if(last!=null) throw last; - } - - protected final void addResourceToCleanup(final IResource resource) { - if(resource==null) throw new IllegalArgumentException(); - if(resourcesToCleanup.contains(resource)) throw new IllegalArgumentException(); - this.resourcesToCleanup.add(resource); - } - - protected final void addResourcesToCleanup(final IResource[] resource) { - if(resource==null) throw new IllegalArgumentException(); - this.resourcesToCleanup.addAll(Arrays.asList(resource)); - } - - protected final void addTearDownOperation(final Runnable runnable) { - this.tearDownOperations.add(runnable); - } - - protected IFacetedProject createFacetedProject(final String name) throws CoreException - - { - assertFalse(ws.getRoot().getProject(name).exists()); - final IFacetedProject fpj = ProjectFacetsManager.create(name, null, - null); - final IProject pj = fpj.getProject(); - assertTrue(pj.exists()); - addResourceToCleanup(pj); - - return fpj; - } - - - protected IDataModel createSeamDataModel(String deployType) { - IDataModel config = (IDataModel) new SeamFacetInstallDataModelProvider().create(); - config.setStringProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, SEAM_1_2_0); - config.setBooleanProperty(ISeamFacetDataModelProperties.DB_ALREADY_EXISTS, true); - config.setBooleanProperty(ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, false); - config.setStringProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, deployType); - config.setStringProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "org.session.beans"); - config.setStringProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "org.entity.beans"); - config.setStringProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "org.test.beans"); - config.setStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "noop-connection"); - config.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH, new String[] { "noop-driver.jar" }); - return config; - } - - protected void installDependentFacets(final IFacetedProject fproj) throws CoreException { - fproj.installProjectFacet(javaVersion, null, null); - fproj.installProjectFacet(dynamicWebVersion, null, null); - fproj.installProjectFacet(javaFacesVersion, null, null); - } - - protected void setIfEmpty(IDataModel model, String propertyName, String value){ - String oldValue = model.getStringProperty(propertyName); - if(oldValue == null || "".equals(oldValue)){ - model.setStringProperty(propertyName, value); - } - } - - protected IFacetedProject createSeamProject(String baseProjectName, final IDataModel config) throws CoreException { - final IFacetedProject fproj = ProjectFacetsManager.create(baseProjectName, null, - null); - - installDependentFacets(fproj); -// new SeamFacetPreInstallDelegate().execute(fproj.getProject(), getSeamFacetVersion(), config, null); - fproj.installProjectFacet(getSeamFacetVersion(), config, null); - - SeamProjectsSet seamProjectsSet = new SeamProjectsSet(fproj.getProject()); - assertTrue(seamProjectsSet.getActionFolder().exists()); - assertTrue(seamProjectsSet.getModelFolder().exists()); - - final IProject proj = fproj.getProject(); - - setIfEmpty(config, ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, baseProjectName+"-test"); - setIfEmpty(config, ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, baseProjectName+"-ear"); - setIfEmpty(config, ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, baseProjectName+"-ejb"); - - ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { - - public void run(IProgressMonitor monitor) throws CoreException { - String seamVersionString = config.getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString(); - SeamVersion seamVersion = SeamVersion.parseFromString(seamVersionString); - SeamProjectCreator creator = null; - if(seamVersion == SeamVersion.SEAM_1_2) { - creator = new SeamProjectCreator(config, proj); - } else if(seamVersion == SeamVersion.SEAM_2_0) { - creator = new Seam2ProjectCreator(config, proj); - } else if(seamVersion == SeamVersion.SEAM_2_1) { - creator = new Seam2ProjectCreator(config, proj); - } else if(seamVersion == SeamVersion.SEAM_2_2) { - creator = new Seam2ProjectCreator(config, proj); - } else { - throw new RuntimeException("Can't get seam version from seam facet model"); - } - creator.execute(monitor); - proj.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null); - } - - },new NullProgressMonitor()); - - - this.addResourcesToCleanup(seamProjectsSet.getAllProjects()); - - return fproj; - } - - protected IFacetedProject createSeamWarProject(String name) throws CoreException { - final IFacetedProject fproj = createSeamProject(name, createSeamDataModel("war")); - - final IProject proj = fproj.getProject(); - - assertNotNull(proj); - assertTrue(proj.exists()); - - assertTrue(proj.getWorkspace().getRoot().getProject(proj.getName() + "-test").exists()); - IProject testProject = proj.getWorkspace().getRoot().getProject(proj.getName() + "-test"); - - - return fproj; - } - - protected IFacetedProject createSeamEarProject(String name) throws CoreException { - final IFacetedProject fproj = createSeamProject(name, createSeamDataModel("ear")); - SeamProjectsSet seamProjectsSet = new SeamProjectsSet(fproj.getProject()); - final IProject proj = fproj.getProject(); - assertNotNull(proj); - - assertTrue(seamProjectsSet.getWarProject().exists()); - assertTrue(seamProjectsSet.getTestProject().exists()); - assertTrue(seamProjectsSet.getEjbProject().exists()); - assertTrue(seamProjectsSet.getEarProject().exists()); - - return fproj; - } - - protected IProjectFacetVersion getSeamFacetVersion() { - return seamFacetVersion; - } - - public void assertSeamHomeAvailable() { - File folder = getSeamHomeFolder(); - - assertNotNull("seam home folder was null!", folder); - assertTrue(folder.getAbsolutePath() + " does not exist", folder.exists()); - - //System.out.println("Listing " + folder); - File[] list = folder.listFiles(); - for (int i = 0; i < list.length; i++) { - File string = list[i]; - //System.out.println(i + ": " + string.getName() +(string.isDirectory()?" (dir)":"")); - } - - File seamgen = new File(folder, "seam-gen"); - assertNotNull("seam gen folder was null!", seamgen); - assertTrue(seamgen.getName() + " seamgen does not exist", seamgen.exists()); - - //System.out.println("Listing seamgen " + seamgen); - list = seamgen.listFiles(); - for (int i = 0; i < list.length; i++) { - File string = list[i]; - //System.out.println(i + ": " + string.getName() +(string.isDirectory()?" (dir)":"")); - } - - } - -} \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2010-11-16 21:43:49 UTC (rev 26650) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2010-11-16 21:45:13 UTC (rev 26651) @@ -9,7 +9,6 @@ org.jboss.tools.jst.web.ui, org.jboss.tools.common.model, org.eclipse.ui.navigator, - org.jboss.tools.seam.core.test, org.jboss.tools.seam.core, org.eclipse.jst.j2ee, org.eclipse.ui.ide, @@ -24,9 +23,7 @@ org.jboss.tools.jst.firstrun, org.eclipse.wst.server.core, org.jboss.tools.jst.jsp, - org.jboss.tools.jst.jsp.test, org.eclipse.jdt.ui, - org.jboss.tools.vpe.ui.test, org.jboss.tools.common.el.core, org.jboss.tools.common.ui, org.jboss.tools.common.el.ui, @@ -38,7 +35,11 @@ org.eclipse.jst.jsf.core;bundle-version="1.3.0", org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0", org.eclipse.jst.standard.schemas, - org.eclipse.jst.jee.ejb;bundle-version="1.0.300" + org.eclipse.jst.jee.ejb;bundle-version="1.0.300", + org.jboss.tools.seam.base.test;bundle-version="1.0.0", + org.jboss.tools.jst.jsp.base.test;bundle-version="1.0.0", + org.jboss.tools.tests;bundle-version="3.1.0", + org.jboss.tools.jst.web;bundle-version="3.2.0" Export-Package: org.jboss.tools.seam.ui.test, org.jboss.tools.seam.ui.test.ca, org.jboss.tools.seam.ui.test.hyperlink, Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java 2010-11-16 21:43:49 UTC (rev 26650) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide2227TestCase.java 2010-11-16 21:45:13 UTC (rev 26651) @@ -14,6 +14,7 @@ import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.eclipse.core.resources.IFile; @@ -26,19 +27,21 @@ import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart; import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; +import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.TestProjectProvider; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jboss.tools.test.util.WorkbenchUtils; /** * The Class JBide2227TestCase. */ -public class JBide2227TestCase extends VpeTest { +public class JBide2227TestCase extends TestCase { /** The Constant CA_NAME. */ private static final String CA_NAME = "org.eclipse.wst.html.HTML_DEFAULT"; @@ -52,6 +55,8 @@ /** The Constant PAGE_2. */ private static final String PAGE_2 = "/WebContent/jbide2227/withoutEl.xhtml"; + protected final static String JSP_EDITOR_ID = "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ + /** * Suite. * @@ -112,17 +117,21 @@ assertNotNull("Editor input is null", input); // open and get editor - JSPMultiPageEditor part = openEditor(input); + // get editor + JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI + .getWorkbench().getActiveWorkbenchWindow().getActivePage() + .openEditor(input, JSP_EDITOR_ID, true); + // sets cursor position part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(position); - TestUtil.waitForJobs(); - TestUtil.delay(2000); + JobUtils.waitForIdle(); + JobUtils.delay(2000); SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part.getSourceEditor()) .getSourceViewerConfigurationForTest(); // errase errors which can be on start of editor(for example xuklunner // not found) - setException(null); + StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration; IContentAssistant iContentAssistant = stvc.getContentAssistant((ISourceViewer) part.getSourceEditor().getAdapter( ISourceViewer.class)); @@ -134,8 +143,8 @@ assertNotNull(results); assertEquals(numberOfProposals, results.length); - closeEditors(); - TestUtil.delay(1000L); + WorkbenchUtils.closeAllEditors(); + JobUtils.delay(1000L); } /** @@ -176,19 +185,7 @@ * the throwable */ public void testContentAssistWithEl() throws Throwable { - // wait - TestUtil.waitForJobs(); - // set exception - setException(null); - // Tests CA - check(CA_NAME, PAGE_1, 576, 114); - - // check exception - if (getException() != null) { - - throw getException(); - } } /** @@ -198,8 +195,6 @@ * the throwable */ public void testContentAssistWithoutEl() throws Throwable { - TestUtil.waitForJobs(); - check(CA_NAME, PAGE_2, 580, 11); }