Author: dazarov
Date: 2008-02-26 11:40:00 -0500 (Tue, 26 Feb 2008)
New Revision: 6580
Modified:
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/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/JstJspJbide1585Test.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1812
Modified:
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 2008-02-26
16:17:00 UTC (rev 6579)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2008-02-26
16:40:00 UTC (rev 6580)
@@ -24,7 +24,6 @@
protected JSPMultiPageEditor jspEditor = null;
protected JSPTextEditor jspTextEditor = null;
protected StructuredTextViewer viewer = null;
- protected IStructuredDocumentRegion[] regions = null;
protected IContentAssistant contentAssistant = null;
protected IDocument document = null;
@@ -83,8 +82,6 @@
assertTrue("The IDocument is not instance of IStructuredDocument",
(document instanceof IStructuredDocument));
- IStructuredDocument sDocument = (IStructuredDocument) document;
- regions = sDocument.getStructuredDocumentRegions();
}
protected void closeEditor() {
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-02-26
16:17:00 UTC (rev 6579)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-02-26
16:40:00 UTC (rev 6580)
@@ -7,6 +7,7 @@
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.ui.PlatformUI;
+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;
@@ -67,6 +68,7 @@
openEditor(pageName);
+ IStructuredDocumentRegion[] regions =
((IStructuredDocument)document).getStructuredDocumentRegions();
boolean fLoadBundleTagIsFound = false;
for (int i = 0; i < regions.length; i++) {
@@ -118,13 +120,6 @@
}
-// try {
-// EditorTestHelper.joinBackgroundActivities();
-// } catch (Exception e) {
-// e.printStackTrace();
-// assertTrue("Waiting for the jobs to complete has failed.", false);
-// }
-
closeEditor();
}
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-02-26
16:17:00 UTC (rev 6579)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2008-02-26
16:40:00 UTC (rev 6580)
@@ -79,7 +79,6 @@
}
errorMessage= p.getErrorMessage();
}
-
List<String> customCompletionProposals = new ArrayList<String>();
for (int i = 0; i < result.length; i++) {
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-02-26
16:17:00 UTC (rev 6579)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2008-02-26
16:40:00 UTC (rev 6580)
@@ -70,12 +70,11 @@
}
errorMessage= p.getErrorMessage();
}
-
assertTrue("Content Assistant peturned no proposals", (result != null
&& result.length > 0));
for (int i = 0; i < result.length; i++) {
- assertTrue("Content Assistant peturned proposals which type (" +
result[i].getClass().getName() + ") differs from
RedHatCustomCompletionProposal", (result[i] instanceof
AutoContentAssistantProposal));
+ assertTrue("Content Assistant returned proposals which type (" +
result[i].getClass().getName() + ") differs from
RedHatCustomCompletionProposal", (result[i] instanceof
AutoContentAssistantProposal));
AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[i];
String proposalString = proposal.getReplacementString();
int proposalReplacementOffset = proposal.getReplacementOffset();