[jbosstools-commits] JBoss Tools SVN: r31436 - in trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test: src/org/jboss/tools/jst/jsp/test and 1 other directories.

Author: scabanovich Date: 2011-05-23 16:34:29 -0400 (Mon, 23 May 2011) New Revision: 31436 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java Log: JBIDE-8983 https://issues.jboss.org/browse/JBIDE-8983 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF 2011-05-23 20:28:31 UTC (rev 31435) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF 2011-05-23 20:34:29 UTC (rev 31436) @@ -16,7 +16,7 @@ org.junit;bundle-version="3.8.2", org.jboss.tools.jst.web;bundle-version="3.2.0", org.eclipse.ui.ide;bundle-version="3.7.0", - org.jboss.tools.common.text.xml;bundle-version="3.2.0" + org.jboss.tools.common.model.ui Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.jboss.tools.jst.jsp.test, Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-05-23 20:28:31 UTC (rev 31435) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-05-23 20:34:29 UTC (rev 31436) @@ -1,153 +1,7 @@ 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.jboss.tools.common.text.xml.contentassist.test.CATestUtil; -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 extends CATestUtil { -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); - } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2011-05-23 20:28:31 UTC (rev 31435) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2011-05-23 20:34:29 UTC (rev 31436) @@ -11,38 +11,19 @@ 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.swt.widgets.Display; 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.common.text.xml.contentassist.test.AbstractContentAssistantTestCase; 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; +public class ContentAssistantTestCase extends AbstractContentAssistantTestCase { 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); + protected void obtainTextEditor(IEditorPart editorPart) { if (editorPart instanceof JSPMultiPageEditor) jspEditor = (JSPMultiPageEditor) editorPart; @@ -52,141 +33,14 @@ // clean deffered events while (Display.getCurrent().readAndDispatch()); - 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)); - + textEditor = jspTextEditor = jspEditor.getJspEditor(); } - 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); + protected boolean isRelevantProposal(ICompletionProposal proposal) { + return proposal instanceof AutoContentAssistantProposal; } - 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() { @@ -214,45 +68,4 @@ 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