Author: scabanovich Date: 2011-08-16 19:06:29 -0400 (Tue, 16 Aug 2011) New Revision: 33993 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean1.class trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean2.class trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean3.class trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/inputname.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/inputname.xhtml Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java Log: JBIDE-8280 https://issues.jboss.org/browse/JBIDE-8280 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JSF2Web</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + </natures> +</projectDescription> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/.jsdtscope =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/.jsdtscope (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/.jsdtscope 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,8 @@ +#Mon Aug 15 14:39:16 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="JSF2Web"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="JSF2Web"/> + <property name="java-output-path" value="/JSF2Web/build/classes"/> + </wb-module> +</project-modules> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 7.0 Runtime"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="jst.web"/> + <fixed facet="java"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="3.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS model-entity="JSFProcess"/> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config metadata-complete="true" version="2.0" + 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_2_0.xsd"/> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="2.0" 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_2_0.xsd"/> Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="2.0" 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_2_0.xsd"/> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean1.class =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean2.class =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean2.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean3.class =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean3.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/inputname.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/inputname.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/inputname.xhtml 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,11 @@ +<!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="demo.resources2" var="mmm"/> +<h:outputText value="#{myb}"/> +<h:outputText value="#{mybean1}"/> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,11 @@ +package test.beans; + +import javax.faces.bean.ManagedBean; + +@ManagedBean(name="mybean1") +public class Bean1 { + public String getName() { + return "#{}"; + } + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,8 @@ +package test.beans; + +import javax.faces.bean.ManagedBean; + +@ManagedBean(name="mybean2") +public class Bean2 { + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,8 @@ +package test.beans; + +import javax.faces.bean.ManagedBean; + +@ManagedBean(name="mybean2") +public class Bean3 { + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/inputname.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/inputname.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/inputname.xhtml 2011-08-16 23:06:29 UTC (rev 33993) @@ -0,0 +1,11 @@ +<!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="demo.resources2" var="mmm"/> +<h:outputText value="#{myb}"/> +<h:outputText value="#{mybean1}"/> +</html> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-08-16 23:05:05 UTC (rev 33992) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-08-16 23:06:29 UTC (rev 33993) @@ -10,30 +10,37 @@ ******************************************************************************/ package org.jboss.tools.jsf.test; +import java.util.List; import java.util.Set; import junit.framework.TestCase; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.el.core.parser.ELParser; +import org.jboss.tools.common.el.core.parser.ELParserFactory; +import org.jboss.tools.common.el.core.parser.ELParserUtil; +import org.jboss.tools.jsf.jsf2.bean.el.JSF2ElResolver; import org.jboss.tools.jsf.jsf2.bean.model.IJSF2ManagedBean; import org.jboss.tools.jsf.jsf2.bean.model.IJSF2Project; import org.jboss.tools.jsf.jsf2.bean.model.JSF2ProjectFactory; -import org.jboss.tools.test.util.TestProjectProvider; +import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; public class JSF2ModelTest extends TestCase { - TestProjectProvider provider = null; IProject project = null; + IProject webproject = null; - public JSF2ModelTest() {} - - public void setUp() throws Exception { - project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("JSF2Beans"); - if(project==null) { - provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSF2Beans", false); - project = provider.getProject(); - } - + public JSF2ModelTest() { + project = ResourcesPlugin.getWorkspace().getRoot().getProject("JSF2Beans"); + webproject = ResourcesPlugin.getWorkspace().getRoot().getProject("JSF2Web"); } public void testModel() { @@ -45,11 +52,62 @@ assertEquals(2, beans.size()); } - protected void tearDown() throws Exception { - if(provider != null) { - provider.dispose(); - provider=null; + /** + * Modifies metadata-complete flag in /WEB-INF/faces-config.xml. + * Checks that the flag is loaded correctly into model. + * Checks that JSF2ElResolver takes into account that flag. + * + * @throws CoreException + */ + public void testMetadataCompleteAndElResolver() throws CoreException { + IJSF2Project jsf2 = JSF2ProjectFactory.getJSF2Project(webproject, true); + assertNotNull(jsf2); + + Set<IJSF2ManagedBean> beans = jsf2.getManagedBeans("mybean1"); + assertEquals(1, beans.size()); + + IFile f = webproject.getFile("src/test/beans/inputname.xhtml"); + assertTrue(f.exists()); + + JSF2ElResolver resolver = new JSF2ElResolver(); + ELParser p = ELParserUtil.getJbossFactory().createParser(); + ELInvocationExpression exp = (ELInvocationExpression)p.parse("#{myb}").getInstances().get(0).getExpression(); + + assertFalse(jsf2.isMetadataComplete()); + List<IJSF2ManagedBean> bs = resolver.resolveVariables(f, exp, true, false, 5); + assertFalse(bs.isEmpty()); + + replaceFile(webproject, "WebContent/WEB-INF/faces-config.complete", "WebContent/WEB-INF/faces-config.xml"); + assertTrue(jsf2.isMetadataComplete()); + bs = resolver.resolveVariables(f, exp, true, false, 5); + assertTrue(bs.isEmpty()); + beans = jsf2.getManagedBeans("mybean1"); + assertTrue(beans.isEmpty()); + + replaceFile(webproject, "WebContent/WEB-INF/faces-config.original", "WebContent/WEB-INF/faces-config.xml"); + assertFalse(jsf2.isMetadataComplete()); + bs = resolver.resolveVariables(f, exp, true, false, 5); + assertFalse(bs.isEmpty()); + beans = jsf2.getManagedBeans("mybean1"); + assertEquals(1, beans.size()); + } + + public static void replaceFile(IProject project, String sourcePath, String targetPath) throws CoreException { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + try { + IFile target = project.getFile(new Path(targetPath)); + IFile source = project.getFile(new Path(sourcePath)); + assertTrue(source.exists()); + ValidatorManager.setStatus(ValidatorManager.RUNNING); + if(!target.exists()) { + target.create(source.getContents(), true, new NullProgressMonitor()); + } else { + target.setContents(source.getContents(), true, false, new NullProgressMonitor()); + } + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + } finally { + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); } } - } Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-16 23:05:05 UTC (rev 33992) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-16 23:06:29 UTC (rev 33993) @@ -36,7 +36,15 @@ TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$ suite.addTestSuite(JSFTemplateTest.class); suite.addTestSuite(JSFFacetOnExistingProjectTest.class); - suite.addTestSuite(JSF2ModelTest.class); + + TestSuite jsf2 = new TestSuite(JSF2ModelTest.class.getName()); + jsf2.addTestSuite(JSF2ModelTest.class); + ProjectImportTestSetup testSetup = new ProjectImportTestSetup(jsf2, + "org.jboss.tools.jsf.test", + new String[]{"projects/JSF2Beans", "projects/JSF2Web"}, + new String[]{"JSF2Beans", "JSF2Web"}); + suite.addTest(testSetup); + TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$ old.addTestSuite(JSFModelTest.class); old.addTestSuite(ModelFormat_2_0_0_Test.class);