Author: vrubezhny Date: 2010-09-17 10:35:05 -0400 (Fri, 17 Sep 2010) New Revision: 24991 Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java Log: JBIDE-6529 : jsf test failures Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2010-09-17 14:26:27 UTC (rev 24990) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2010-09-17 14:35:05 UTC (rev 24991) @@ -1,5 +1,7 @@ package org.jboss.tools.jst.jsp.test.ca; +import java.util.List; + import junit.framework.Test; import junit.framework.TestSuite; @@ -59,29 +61,19 @@ JobUtils.waitForIdle(); - ICompletionProposal[] result= null; +// ICompletionProposal[] result= null; String errorMessage = null; - TestUtil.prepareCAInvokation(contentAssistant, viewer, offsetToTest); - - IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant); - if (p != null) { - try { - result= p.computeCompletionProposals(viewer, offsetToTest); - } catch (Throwable x) { - x.printStackTrace(); - } - errorMessage= p.getErrorMessage(); - } + List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest); - assertTrue("Content Assistant returned no proposals", (result != null && result.length > 0)); + assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); boolean bPropoosalToApplyFound = false; - for (int i = 0; i < result.length; i++) { - if (!(result[i] instanceof AutoContentAssistantProposal)) + for (ICompletionProposal p : res) { + if (!(p instanceof AutoContentAssistantProposal)) continue; - AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)result[i]; + AutoContentAssistantProposal proposal = (AutoContentAssistantProposal)p; String proposalString = proposal.getReplacementString(); if (PROPOSAL_TO_APPLY_STRING.equals(proposalString)) {