Author: vrubezhny Date: 2009-07-24 15:47:01 -0400 (Fri, 24 Jul 2009) New Revision: 16787 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/JsfJspJbide1807Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java Log: JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied. JsfJspJbide1807Test and JsfJspJbide1813Test Test suites are updated 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 2009-07-24 19:25:09 UTC (rev 16786) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-07-24 19:47:01 UTC (rev 16787) @@ -94,7 +94,7 @@ protected boolean compareProposal(String proposalName, ICompletionProposal[] proposals){ for (int i = 0; i < proposals.length; i++) { - if(proposals[i].getDisplayString().equals(proposalName)) return true; + if(proposals[i].getDisplayString().toLowerCase().equals(proposalName.toLowerCase())) return true; } return false; } 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 2009-07-24 19:25:09 UTC (rev 16786) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2009-07-24 19:47:01 UTC (rev 16787) @@ -26,7 +26,8 @@ // - The "/pages" proposal is added as the main case to test String[] proposals={ "/pages", - "/templates" + "/templates", + "new jsf el expression - create a new attribute value with #{}" }; checkProposals(PAGE_NAME, "<input type=\"image\" src=\"", 25, proposals, true); Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2009-07-24 19:25:09 UTC (rev 16786) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2009-07-24 19:47:01 UTC (rev 16787) @@ -27,6 +27,7 @@ String[] proposals={ "ltr", "rtl", + "new jsf el expression - create a new attribute value with #{}" }; checkProposals(PAGE_NAME, "dir=\"\"", 5, proposals, true);