Author: dazarov
Date: 2008-02-27 12:10:34 -0500 (Wed, 27 Feb 2008)
New Revision: 6606
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1807
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 2008-02-27
16:58:32 UTC (rev 6605)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2008-02-27
17:10:34 UTC (rev 6606)
@@ -7,8 +7,7 @@
TestProjectProvider provider = null;
boolean makeCopy = false;
private static final String PROJECT_NAME = "JsfJspJbide1807Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting";
- private static final String[] PAGE_EXTENSIONS = { ".xhtml", ".jsp"
};
+ private static final String PAGE_NAME = "/WebContent/pages/greeting.xhtml";
public void setUp() throws Exception {
provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null,
PROJECT_NAME, makeCopy);
@@ -30,8 +29,7 @@
}
public void testJsfJspJbide1807Test(){
- String[][] proposals={
- {
+ String[] proposals={
"#{applicationScope}",
"#{cookie}",
"#{facesContext}",
@@ -43,23 +41,8 @@
"#{requestScope}",
"#{sessionScope}",
"#{view}"
- },
- {
- "jsp:attribute",
- "jsp:body",
- "jsp:element",
- "jsp:getProperty",
- "jsp:include",
- "jsp:output",
- "jsp:param",
- "JSP expression - JSP expression <%=..%>"
- }
};
- for(int i = 0; i < PAGE_EXTENSIONS.length; i++){
- System.out.println("Testing file
"+PAGE_NAME+PAGE_EXTENSIONS[i]+"...");
- contentAssistantCommonTest(PAGE_NAME+PAGE_EXTENSIONS[i], "<input
type=\"image\" src=\"", 25, proposals[i], true);
-
- }
+ contentAssistantCommonTest(PAGE_NAME, "<input type=\"image\"
src=\"", 25, proposals, true);
}
}