Author: vrubezhny Date: 2008-01-30 15:45:19 -0500 (Wed, 30 Jan 2008) New Revision: 6040 Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/resources.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/templates/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java Log: http://jira.jboss.org/jira/browse/JBIDE-1704 Wrong JSF proposals appear if Ctrl-Space pressed right after the attribute value JUnit Test Case is added for the issue Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,9 @@ +<?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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_07"/> + <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer/JBoss 4.2 Runtime"/> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JsfJbide1704Test</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> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.common.verification.verifybuilder</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.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,7 @@ +#Wed Jan 30 17:08:49 MSK 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,4 @@ +#Wed Jan 30 17:08:50 MSK 2008 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.5.0_07/owners=jst.java\:5.0 +classpath.helper/org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer\:\:JBoss\ 4.2\ Runtime/owners=jst.web\:2.4 +eclipse.preferences.version=1 Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.component 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="JsfJbide1704Test"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="JsfJbide1704Test"/> +<property name="java-output-path" value="build/classes"/> +</wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 4.2 Runtime"/> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.4"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<file-systems VERSION="2.0.0" application-name="JsfJbide1704Test" + model-entity="FileSystems" workspace-home="./WebContent/WEB-INF"> + <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/> + <file-system NAME="WEB-ROOT" info="Content-Type=Web" + location="%workspace.home%/.." model-entity="FileSystemFolder"/> + <file-system NAME="src" location="%workspace.home%/../../JavaSource" model-entity="FileSystemFolder"/> + <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/> + <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/> + <file-system NAME="lib-commons-beanutils.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-beanutils.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-collections.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-collections.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-digester.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-commons-logging.jar" info="hidden=yes" + location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jstl.jar" info="hidden=yes" + location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-standard.jar" info="hidden=yes" + location="%workspace.home%/lib/standard.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-facelets.jar" + location="%workspace.home%/lib/jsf-facelets.jar" model-entity="FileSystemJar"/> + <file-system NAME="flet001" location="%eclipse.project%" model-entity="FileSystemFolder"/> + <file-system NAME="lib-common-annotations.jar" info="hidden=yes" + location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/> + <file-system NAME="lib-jsf-tlds.jar" info="hidden=yes" + location="%workspace.home%/lib/jsf-tlds.jar" model-entity="FileSystemJar"/> + <web SERVLET_VERSION="2.5" model-entity="JstWeb" model-path="/web.xml"> + <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule" + model-path="/faces-config.xml" root="WEB-ROOT" src="src"/> + </web> +</file-systems> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +/** + * Created by Red Hat Developer Studio +* + */ +public class Person { + private String name; + + public Person() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/resources.properties =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/resources.properties (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/resources.properties 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/resources.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + <managed-bean> + <managed-bean-name>person</managed-bean-name> + <managed-bean-class>demo.Person</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <value/> + </managed-property> + </managed-bean> + <navigation-rule> + <from-view-id>/pages/greeting.jsp</from-view-id> + <navigation-case> + <from-outcome>greeting</from-outcome> + <to-view-id>/pages/greeting.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> +</faces-config> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <description>Facelets StarterKit</description> + <display-name>JsfJbide1704Test</display-name> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>facelets.REFRESH_PERIOD</param-name> + <param-value>2</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,20 @@ +<%@ 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> + <f:view> + <f:loadBundle basename="resources" var="msg" /> + + <strong> + <h:outputText value="#{msg.greeting}" /> + &nbsp; + <h:outputText value="#{person.name}" /> + <h:outputText value="!" /> + </strong> + </f:view> +</body> +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,15 @@ +<!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"> + + <f:loadBundle basename="resources" var="msg" /> + <ui:composition template="/templates/common.xhtml"> + <ui:define name="pageTitle">Greeting to User</ui:define> + <ui:define name="pageHeader">Facelets Greeting Page</ui:define> + <ui:define name="body"> + #{msg.greeting} #{person.name}! + </ui:define> + </ui:composition> +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,26 @@ +<!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"> + + <f:loadBundle basename="resources" var="msg" /> + <head> + <title><ui:insert name="pageTitle">Page Title</ui:insert></title> + <style type="text/css"> + body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px; + } + h1 { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 16px; + } + </style> + </head> + + <body> + <h1><ui:insert name="pageHeader">Page Header</ui:insert></h1> + <p><ui:insert name="body">Page Body</ui:insert></p> + </body> +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain 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-01-30 20:42:29 UTC (rev 6039) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2008-01-30 20:45:19 UTC (rev 6040) @@ -1,5 +1,6 @@ package org.jboss.tools.jst.jsp.test; +import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1704Test; 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.StrutsJspJbide1648Test; @@ -14,6 +15,7 @@ suite.addTestSuite(JstJspJbide1585Test.class); suite.addTestSuite(StrutsJspJbide1648Test.class); suite.addTestSuite(JstJspJbide1641Test.class); + suite.addTestSuite(JsfJspJbide1704Test.class); return suite; } Added: 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 (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2008-01-30 20:45:19 UTC (rev 6040) @@ -0,0 +1,192 @@ +package org.jboss.tools.jst.jsp.test.ca; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContentAssistProcessor; +import org.eclipse.jface.text.contentassist.IContentAssistant; +import org.eclipse.jface.text.source.SourceViewerConfiguration; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList; +import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; +import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; +import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; +import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext; +import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.jst.jsp.contentassist.RedHatCustomCompletionProposal; +import org.jboss.tools.jst.jsp.contentassist.RedHatJSPContentAssistProcessor; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; +import org.jboss.tools.jst.jsp.test.TestUtil; +import org.jboss.tools.test.util.xpl.EditorTestHelper; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class JsfJspJbide1704Test extends TestCase { + TestProjectProvider provider = null; + IProject project = null; + boolean makeCopy = false; + private static final String PROJECT_NAME = "JsfJbide1704Test"; + private static final String PAGE_NAME = "/WebContent/pages/greeting"; + private static final String[] PAGE_EXTENSIONS = { ".xhtml", ".jsp" }; + + private static final String PREFIX_TAG_NAME = "f:loadBundle"; + + public static Test suite() { + return new TestSuite(JsfJspJbide1704Test.class); + } + + 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 testJsfJspJbide1704 () { + try { + EditorTestHelper.joinBackgroundActivities(); + } catch (Exception e) { + e.printStackTrace(); + } + + assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null)); + + for (int i = 0; i < PAGE_EXTENSIONS.length; i++) { + doTestJsfJspJbide1704(PAGE_NAME + PAGE_EXTENSIONS[i]); + } + } + + private void doTestJsfJspJbide1704(String pageName) { + IFile jspFile = project.getFile(pageName); + + assertTrue("The file \"" + PAGE_NAME + "\" is not found", (jspFile != null)); + assertTrue("The file \"" + PAGE_NAME + "\" is not found", (jspFile.exists())); + + FileEditorInput editorInput = new FileEditorInput(jspFile); + Throwable exception = null; + IEditorPart editorPart = null; + try { + editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(editorInput, "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"); + } catch (PartInitException ex) { + exception = ex; + ex.printStackTrace(); + assertTrue("The JSP Visual Editor couldn't be initialized.", false); + } + + JSPMultiPageEditor jspEditor = null; + + if (editorPart instanceof JSPMultiPageEditor) + jspEditor = (JSPMultiPageEditor)editorPart; + + // Delay for 3 seconds so that + // the Favorites view can be seen. + try { + EditorTestHelper.joinBackgroundActivities(); + } catch (Exception e) { + e.printStackTrace(); + assertTrue("Waiting for the jobs to complete has failed.", false); + } + TestUtil.delay(3000); + + JSPTextEditor jspTextEditor = jspEditor.getJspEditor(); + StructuredTextViewer viewer = jspTextEditor.getTextViewer(); + IDocument document = viewer.getDocument(); + SourceViewerConfiguration config = TestUtil.getSourceViewerConfiguration(jspTextEditor); + IContentAssistant contentAssistant = (config == null ? null : config.getContentAssistant(viewer)); + + assertTrue("Cannot get the Content Assistant instance for the editor for page \"" + PAGE_NAME + "\"", (contentAssistant != null)); + + assertTrue("The IDocument is not instance of IStructuredDocument", (document instanceof IStructuredDocument)); + + IStructuredDocument sDocument = (IStructuredDocument)document; + IStructuredDocumentRegion[] regions = sDocument.getStructuredDocumentRegions(); + String documentContent = document.get(); + + boolean fLoadBundleTagIsFound = false; + for (int i = 0; i < regions.length; i++) { + IStructuredDocumentRegion sdRegion = regions[i]; + ITextRegionList list = sdRegion.getRegions(); + + // find <f:loadBundle tag first (after this tag the CA is full of JSF- and other kind of proposals + if (!fLoadBundleTagIsFound) { + if (DOMRegionContext.XML_TAG_OPEN == list.get(0).getType() && + DOMRegionContext.XML_TAG_NAME == list.get(1).getType() && + PREFIX_TAG_NAME.equals(sdRegion.getFullText(list.get(1)).trim())) { + fLoadBundleTagIsFound = true; + } + continue; + } + + // + if (DOMRegionContext.XML_TAG_OPEN == list.get(0).getType() && + DOMRegionContext.XML_TAG_NAME == list.get(1).getType()) { + // find all the attribute values and their "after closing quotes" offsets + + for (int j = 2; j < list.size(); j++) { + ITextRegion region = list.get(j); + if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE == region.getType()) { + int length = sdRegion.getFullText(region).trim().length(); + int offsetToTest = sdRegion.getStartOffset(region) + length; + + ICompletionProposal[] result= null; + String errorMessage = null; + + IContentAssistProcessor p= TestUtil.getProcessor(viewer, offsetToTest, contentAssistant); + if (p != null) { + try { + result= p.computeCompletionProposals(viewer, offsetToTest); + } catch (Throwable x) { + x.printStackTrace(); + } + errorMessage= p.getErrorMessage(); + } + +// if (errorMessage != null && errorMessage.trim().length() > 0) { +// System.out.println("#" + offsetToTest + ": ERROR MESSAGE: " + errorMessage); +// } + + for (int k = 0; result != null && k < result.length; k++) { + // There should not be a proposal of type Red.Proposal in the result + assertFalse("Content Assistant peturned proposals of type (" + result[k].getClass().getName() + ").", (result[k] instanceof RedHatCustomCompletionProposal)); + } + } + } + + } + + } + + try { + EditorTestHelper.joinBackgroundActivities(); + } catch (Exception e) { + e.printStackTrace(); + assertTrue("Waiting for the jobs to complete has failed.", false); + } + + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .closeEditor(editorPart, false); + } + +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java ___________________________________________________________________ Name: svn:mime-type + text/plain