Author: vrubezhny
Date: 2010-10-15 10:46:14 -0400 (Fri, 15 Oct 2010)
New Revision: 25868
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java
Log:
JBIDE-7201
SeamELContentAssist tests failures
SeamELContentAssistJbide1676Test rolled back to revision 21676 because of incorrect
modifications were made
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 2010-10-15
14:21:16 UTC (rev 25867)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistJbide1676Test.java 2010-10-15
14:46:14 UTC (rev 25868)
@@ -1,6 +1,5 @@
package org.jboss.tools.seam.ui.test.ca;
-import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -283,24 +282,34 @@
assertTrue("Cannot find the starting point in the test file \"" +
JAVA_FILENAME + "\"", (start != -1));
+ ICompletionProposal[] result= null;
String errorMessage = null;
- List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant,
viewer, offsetToTest);
- assertTrue("Content Assistant peturned no proposals", (res != null &&
res.size() > 0));
-
+ IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest,
contentAssistant);
+ if (p != null) {
+ try {
+ result= p.computeCompletionProposals(viewer, offsetToTest);
+ } catch (Throwable x) {
+ x.printStackTrace();
+ }
+ errorMessage= p.getErrorMessage();
+ }
+
// if (errorMessage != null && errorMessage.trim().length() > 0) {
// System.out.println("#" + offsetToTest + ": ERROR MESSAGE: " +
errorMessage);
// }
+
+ assertTrue("Content Assistant peturned no proposals", (result != null
&& result.length > 0));
// compare SeamELCompletionProposals in the result to the filtered valid proposals
Set<String> existingProposals = new
TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
Set<String> nonExistingProposals = new
TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
Set<String> filteredValidProposals = getJavaStringValidELProposals();
- for (ICompletionProposal p : res) {
+ for (int j = 0; j < result.length; j++) {
// Look only for SeamELProposalProcessor proposals
- if (p instanceof ELProposalProcessor.Proposal) {
- ELProposalProcessor.Proposal proposal = (ELProposalProcessor.Proposal)p;
+ if (result[j] instanceof ELProposalProcessor.Proposal) {
+ ELProposalProcessor.Proposal proposal = (ELProposalProcessor.Proposal)result[j];
String proposalString = proposal.getPrefixCompletionText(document,
offsetToTest).toString();
if (filteredValidProposals.contains(proposalString)) {