Author: vrubezhny Date: 2010-02-01 13:51:29 -0500 (Mon, 01 Feb 2010) New Revision: 20059 Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 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/JsfJspJbide1807Test.java Log: JBIDE-3290: sorting/filtering is not updating correctly in code completion of source page in VPE JstJspAllTests are corrected against the changes made for the issue Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 2010-02-01 17:08:23 UTC (rev 20058) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 2010-02-01 18:51:29 UTC (rev 20059) @@ -24,7 +24,7 @@ "greetingForm", }; - checkProposals(PAGE_NAME, "<a4j:commandButton focus=\"\"/>", 26, proposals, false); + checkProposals(PAGE_NAME, "<a4j:commandButton focus=\"\"/>", 26, proposals, false, false); } public void testCAForConverterIDTest(){ @@ -32,7 +32,7 @@ "converter1", }; - checkProposals(PAGE_NAME, "<h:inputText value=\"#{user.name}\" required=\"true\" converter=\"\">", 61, proposals, false); + checkProposals(PAGE_NAME, "<h:inputText value=\"#{user.name}\" required=\"true\" converter=\"\">", 61, proposals, false, false); } public void testCAForValidatorIDTest(){ @@ -40,6 +40,6 @@ "validator1", }; - checkProposals(PAGE_NAME, "<f:validator validatorId=\"\" />", 26, proposals, false); + checkProposals(PAGE_NAME, "<f:validator validatorId=\"\" />", 26, proposals, false, false); } } \ No newline at end of file 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 2010-02-01 17:08:23 UTC (rev 20058) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2010-02-01 18:51:29 UTC (rev 20059) @@ -52,11 +52,17 @@ } public ICompletionProposal[] checkProposals(String fileName, int offset, String[] proposals, boolean exactly) { - return checkProposals(fileName, null, offset, proposals, exactly); + return checkProposals(fileName, null, offset, proposals, exactly, true); } - public ICompletionProposal[] checkProposals(String fileName, String substring, int offset, String[] proposals, boolean exactly){ + public ICompletionProposal[] checkProposals(String fileName, String substring, int offset, String[] proposals, boolean exactly) { + return checkProposals(fileName, substring, offset, proposals, exactly, false); + } + 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) { @@ -66,14 +72,19 @@ ICompletionProposal[] result = null; +// System.out.println("checkProposals >>> invoking TestUtil.getProcessor() for position " + (position + offset)); IContentAssistProcessor p = TestUtil.getProcessor(viewer, position + offset, contentAssistant); +// System.out.println("checkProposals >>> TestUtil.getProcessor() is invoked for " + (position + offset)); if (p != null) { try { +// System.out.println("checkProposals >>> invoking p.computeCompletionProposals() for position " + (position + offset)); result = p.computeCompletionProposals(viewer, position + offset); +// System.out.println("checkProposals >>> p.computeCompletionProposals() is invoked for " + (position + offset)); } catch (Throwable x) { x.printStackTrace(); } } +// System.out.println("checkProposals >>> Performing the values check up"); assertTrue("Content Assistant returned no proposals", (result != null && result.length > 0)); @@ -81,14 +92,24 @@ // System.out.println("proposal - "+result[i].getDisplayString()); // } + int foundCounter = 0; for (int i = 0; i < proposals.length; i++) { - assertTrue("Proposal " + proposals[i] + " not found!", compareProposal(proposals[i], result)); + boolean found = compareProposal(proposals[i], result); + if (found) + foundCounter++; + assertTrue("Proposal " + proposals[i] + " not found!", found ); } if (exactly) { - assertTrue("Some other proposals was found!", result.length == proposals.length); + if (excludeELProposalsFromExactTest) { + assertTrue("Some other proposals were found!", foundCounter == proposals.length); + } else { + assertTrue("Some other proposals were found!", result.length == proposals.length); + } } - return result; + +// System.out.println("checkProposals <<< Exiting"); + return result; } public boolean compareProposal(String proposalName, ICompletionProposal[] proposals){ @@ -120,9 +141,7 @@ // 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; } 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 2010-02-01 17:08:23 UTC (rev 20058) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2010-02-01 18:51:29 UTC (rev 20059) @@ -62,11 +62,12 @@ result= p.computeCompletionProposals(viewer, reg.getOffset()); } for (int k = 0; result != null && k < result.length; k++) { - // There should not be a proposal of type Red.Proposal in the result + // There should not be a proposal of type AutoContentAssistantProposal in the result + // (the only exclusion is EL-proposals) if ((result[k] instanceof AutoContentAssistantProposal) && - result[k].getDisplayString().toLowerCase().equals(THE_ONLY_ALLOWED_TEMPLATE)) { - // The only new EL template proposal is allowed to be shown here + ((AutoContentAssistantProposal)result[k]).getReplacementString().startsWith("#{")) { + // The only EL template proposal is allowed to be shown here continue; } Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2010-02-01 17:08:23 UTC (rev 20058) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2010-02-01 18:51:29 UTC (rev 20059) @@ -30,6 +30,6 @@ "#{}" }; - checkProposals(PAGE_NAME, "<input type=\"image\" src=\"", 25, proposals, true); + checkProposals(PAGE_NAME, "<input type=\"image\" src=\"", 25, proposals, true, true); } } \ No newline at end of file