[jbosstools-commits] JBoss Tools SVN: r31437 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon May 23 16:56:13 EDT 2011
Author: scabanovich
Date: 2011-05-23 16:56:13 -0400 (Mon, 23 May 2011)
New Revision: 31437
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
Log:
JBIDE-8983
https://issues.jboss.org/browse/JBIDE-8983
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java 2011-05-23 20:34:29 UTC (rev 31436)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1645Test.java 2011-05-23 20:56:13 UTC (rev 31437)
@@ -10,7 +10,7 @@
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences;
import org.jboss.tools.common.el.ui.ca.ELProposalProcessor;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.TestProjectProvider;
@@ -70,10 +70,10 @@
jspTextEditor.setText(documentContentModified);
- ICompletionProposal[] result= null;
- String errorMessage = null;
+// ICompletionProposal[] result= null;
+// String errorMessage = null;
- List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
assertTrue("Content Assistant peturned no proposals", (res != null && res.size() > 0));
for (ICompletionProposal proposal : res) {
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java 2011-05-23 20:34:29 UTC (rev 31436)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java 2011-05-23 20:56:13 UTC (rev 31437)
@@ -10,7 +10,6 @@
import org.eclipse.core.resources.IFile;
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.runtime.CoreException;
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor;
@@ -22,16 +21,14 @@
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.common.el.ui.ca.ELProposalProcessor;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.test.util.TestProjectProvider;
-import org.jboss.tools.test.util.WorkbenchUtils;
public class SeamELContentAssistJbide1676Test extends TestCase {
TestProjectProvider provider = null;
@@ -263,7 +260,7 @@
ISourceViewer viewer = javaEditor.getViewer();
IDocument document = viewer.getDocument();
- SourceViewerConfiguration config = TestUtil.getSourceViewerConfiguration(javaEditor);
+ SourceViewerConfiguration config = CATestUtil.getSourceViewerConfiguration(javaEditor);
IContentAssistant contentAssistant = (config == null ? null : config.getContentAssistant(viewer));
assertTrue("Cannot get the Content Assistant instance for the editor for file \"" + JAVA_FILENAME + "\"", (contentAssistant != null));
@@ -277,7 +274,7 @@
ICompletionProposal[] result= null;
String errorMessage = null;
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
+ IContentAssistProcessor p= CATestUtil.getProcessor(viewer, offsetToTest, contentAssistant);
if (p != null) {
result= p.computeCompletionProposals(viewer, offsetToTest);
}
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2011-05-23 20:34:29 UTC (rev 31436)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2011-05-23 20:56:13 UTC (rev 31437)
@@ -26,7 +26,6 @@
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
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;
@@ -34,9 +33,9 @@
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences;
+import org.jboss.tools.common.text.xml.contentassist.test.CATestUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
-import org.jboss.tools.jst.jsp.test.TestUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.JobUtils;
@@ -478,7 +477,7 @@
ICompletionProposal[] result= null;
String errorMessage = null;
- List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offset);
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offset);
assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0));
// if (errorMessage != null && errorMessage.trim().length() > 0) {
@@ -576,7 +575,7 @@
ICompletionProposal[] result= null;
String errorMessage = null;
- List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offset);
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offset);
assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0));
// if (errorMessage != null && errorMessage.trim().length() > 0) {
// System.out.println("#" + offset + ": ERROR MESSAGE: " + errorMessage);
@@ -648,7 +647,7 @@
String errorMessage = null;
- List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offset);
+ List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offset);
assertNotNull("Proposals were not created.", res);
assertEquals("Incorrect number of proposals for #{'aa'.subst|ring(1)}", 3, res.size());
}
More information about the jbosstools-commits
mailing list