10:58 a.m.
Author: dazarov
Date: 2008-02-27 11:58:32 -0500 (Wed, 27 Feb 2008)
New Revision: 6605
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/.classpath
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/.project
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.html
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.jsp
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.xhtml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1807
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/.classpath
(rev 0)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/.classpath 2008-02-27
16:58:32 UTC (rev 6605)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output"
path="WebContent/WEB-INF/classes"/>
+</classpath>
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/.project
(rev 0)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/.project 2008-02-27
16:58:32 UTC (rev 6605)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JsfJspJbide1807Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.html
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.html
(rev 0)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.html 2008-02-27
16:58:32 UTC (rev 6605)
@@ -0,0 +1,8 @@
+<html>
+<head>
+ <title>Facelets Greeting Page</title>
+</head>
+<body>
+ <input type="image" src=""/>
+</body>
+</html>
\ No newline at end of file
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.jsp
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.jsp
(rev 0)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.jsp 2008-02-27
16:58:32 UTC (rev 6605)
@@ -0,0 +1,11 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+
+<html>
+<head>
+ <title>Facelets Greeting Page</title>
+</head>
+<body>
+ <input type="image" src=""/>
+</body>
+</html>
\ No newline at end of file
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.xhtml
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.xhtml
(rev 0)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Test/WebContent/pages/greeting.xhtml 2008-02-27
16:58:32 UTC (rev 6605)
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <input type="image" src=""/>
+</html>
\ No newline at end of file
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-02-27
16:39:12 UTC (rev 6604)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-02-27
16:58:32 UTC (rev 6605)
@@ -2,6 +2,7 @@
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1704Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1717Test;
+import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1807Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1759Test;
@@ -15,6 +16,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test");
+ suite.addTestSuite(JsfJspJbide1807Test.class);
suite.addTestSuite(JstJspJbide1585Test.class);
suite.addTestSuite(StrutsJspJbide1648Test.class);
suite.addTestSuite(JstJspJbide1641Test.class);
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 2008-02-27
16:39:12 UTC (rev 6604)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2008-02-27
16:58:32 UTC (rev 6605)
@@ -85,16 +85,25 @@
(document instanceof IStructuredDocument));
}
+ protected void contentAssistantCommonTest(String fileName, int offset, String[]
proposals, boolean exactly){
+ contentAssistantCommonTest(fileName, null, offset, proposals, exactly);
+ }
- protected void contentAssistantCommonTest(String fileName, int offset, String[]
proposals, boolean exactly){
+ protected void contentAssistantCommonTest(String fileName, String substring, int offset,
String[] proposals, boolean exactly){
openEditor(fileName);
+ int position = 0;
+ if(substring != null){
+ String documentContent = document.get();
+ position = documentContent.indexOf(substring);
+ }
+
ICompletionProposal[] result= null;
- IContentAssistProcessor p= TestUtil.getProcessor(viewer, offset, contentAssistant);
+ IContentAssistProcessor p= TestUtil.getProcessor(viewer, position+offset,
contentAssistant);
if (p != null) {
try {
- result= p.computeCompletionProposals(viewer, offset);
+ result= p.computeCompletionProposals(viewer, position+offset);
} catch (Throwable x) {
x.printStackTrace();
}
@@ -102,6 +111,10 @@
assertTrue("Content Assistant returned no proposals", (result != null
&& result.length > 0));
+// for (int i = 0; i < result.length; i++) {
+// System.out.println("proposal - "+result[i].getDisplayString());
+// }
+
for (int i = 0; i < proposals.length; i++) {
assertTrue("Proposal "+proposals[i]+" not found!",
compareProposal(proposals[i], result));
}
Added:
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
(rev 0)
+++
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)
@@ -0,0 +1,65 @@
+package org.jboss.tools.jst.jsp.test.ca;
+
+import org.eclipse.core.resources.IResource;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JsfJspJbide1807Test extends ContentAssistantTestCase{
+ 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"
};
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null,
PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ Throwable exception = null;
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ } catch (Exception x) {
+ exception = x;
+ x.printStackTrace();
+ }
+ assertNull("An exception caught: " + (exception != null?
exception.getMessage() : ""), exception);
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testJsfJspJbide1807Test(){
+ String[][] proposals={
+ {
+ "#{applicationScope}",
+ "#{cookie}",
+ "#{facesContext}",
+ "#{header}",
+ "#{headerValues}",
+ "#{initParam}",
+ "#{param}",
+ "#{paramValues}",
+ "#{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);
+
+ }
+ }
+}