Author: vrubezhny
Date: 2009-07-30 11:53:13 -0400 (Thu, 30 Jul 2009)
New Revision: 16905
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
Log:
JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is
applied.
JsfJspJbide1704Test Test suite is updated
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 2009-07-30
15:17:42 UTC (rev 16904)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2009-07-30
15:53:13 UTC (rev 16905)
@@ -44,6 +44,8 @@
doTestJsfJspJbide1704(PAGE_NAME + ".xhtml");
}
+ private static final String THE_ONLY_ALLOWED_TEMPLATE = "New JSF EL Expression -
Create a new attribute value with #{}".toLowerCase();
+
private void doTestJsfJspJbide1704(String pageName) {
openEditor(pageName);
@@ -61,6 +63,13 @@
}
for (int k = 0; result != null && k < result.length; k++) {
// There should not be a proposal of type Red.Proposal in the result
+
+ 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
+ continue;
+ }
+
assertFalse("Content Assistant peturned proposals of type (" +
result[k].getClass().getName() + ").", (result[k] instanceof
AutoContentAssistantProposal));
}
Show replies by date