Author: scabanovich Date: 2011-07-15 20:54:01 -0400 (Fri, 15 Jul 2011) New Revision: 32959 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java Log: JBIDE-5046 https://issues.jboss.org/browse/JBIDE-5046 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath 2011-07-16 00:54:01 UTC (rev 32959) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/jsf-api-2.0.3.jar"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project 2011-07-16 00:54:01 UTC (rev 32959) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JSF2Beans</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + </natures> +</projectDescription> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/.settings/org.eclipse.jdt.core.prefs 2011-07-16 00:54:01 UTC (rev 32959) @@ -0,0 +1,12 @@ +#Fri Jul 15 10:03:53 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.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +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/JSF2Beans/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/Bean2.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml 2011-07-16 00:54:01 UTC (rev 32959) @@ -0,0 +1,10 @@ +<!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="#{}"/> +</html> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/bin/test/beans/inputname.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/lib/jsf-api-2.0.3.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean1.java 2011-07-16 00:54:01 UTC (rev 32959) @@ -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/JSF2Beans/src/test/beans/Bean1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean2.java 2011-07-16 00:54:01 UTC (rev 32959) @@ -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/JSF2Beans/src/test/beans/Bean2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/Bean3.java 2011-07-16 00:54:01 UTC (rev 32959) @@ -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/JSF2Beans/src/test/beans/Bean3.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2011-07-16 00:54:01 UTC (rev 32959) @@ -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 Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Beans/src/test/beans/inputname.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: 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 (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-07-16 00:54:01 UTC (rev 32959) @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2011 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.test; + +import java.util.Set; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +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; + +public class JSF2ModelTest extends TestCase { + TestProjectProvider provider = null; + IProject project = 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 void testModel() { + IJSF2Project jsf2 = JSF2ProjectFactory.getJSF2Project(project, true); + assertNotNull(jsf2); + Set<IJSF2ManagedBean> beans = jsf2.getManagedBeans("mybean1"); + assertEquals(1, beans.size()); + beans = jsf2.getManagedBeans("mybean2"); + assertEquals(2, beans.size()); + } + + protected void tearDown() throws Exception { + if(provider != null) { + provider.dispose(); + provider=null; + } + } + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-07-15 22:28:01 UTC (rev 32958) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-07-16 00:54:01 UTC (rev 32959) @@ -40,6 +40,7 @@ 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 old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$ old.addTestSuite(JSFModelTest.class); old.addTestSuite(ModelFormat_2_0_0_Test.class);