Author: scabanovich
Date: 2008-04-02 09:49:14 -0400 (Wed, 02 Apr 2008)
New Revision: 7268
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/BaseBean.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/User.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-1884 Test added
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/BaseBean.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/BaseBean.java
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/BaseBean.java 2008-04-02
13:49:14 UTC (rev 7268)
@@ -0,0 +1,11 @@
+package demo;
+
+public class BaseBean {
+
+ public String getParent() {
+ return "";
+ }
+
+ public void fuck() {}
+
+}
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/User.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/User.java
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/User.java 2008-04-02
13:49:14 UTC (rev 7268)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * 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 JBoss Developer Studio
+ */
+public class User extends BaseBean {
+
+ private String name;
+
+ /**
+ * @return User Name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param User Name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/WebContent/WEB-INF/faces-config.xml
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/WebContent/WEB-INF/faces-config.xml 2008-04-02
13:38:11 UTC (rev 7267)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/WebContent/WEB-INF/faces-config.xml 2008-04-02
13:49:14 UTC (rev 7268)
@@ -48,23 +48,14 @@
</converter>
<managed-bean>
<description>Input Value Holder</description>
- <managed-bean-name>nameBean</managed-bean-name>
- <managed-bean-class>demo.NameBean</managed-bean-class>
+ <managed-bean-name>user</managed-bean-name>
+ <managed-bean-class>demo.User</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
- <property-name>userName</property-name>
+ <property-name>name</property-name>
<property-class>java.lang.String</property-class>
<value/>
</managed-property>
- <managed-property>
- <property-name>aliases</property-name>
- <property-class>java.util.List</property-class>
- <list-entries>
- <value-class>java.lang.String</value-class>
- <null-value/>
- <value>Red Hat</value>
- </list-entries>
- </managed-property>
</managed-bean>
<navigation-rule>
<from-view-id>/pages/inputname.jsp</from-view-id>
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2008-04-02
13:49:14 UTC (rev 7268)
@@ -0,0 +1,50 @@
+package org.jboss.tools.jsf.test;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.common.model.project.IModelNature;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.jst.web.project.list.IWebPromptingProvider;
+import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+
+import junit.framework.TestCase;
+
+public class JSFBeansTest extends TestCase {
+ TestProjectProvider provider = null;
+ IProject project = null;
+ boolean makeCopy = true;
+
+ public JSFBeansTest() {}
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.test", null,
"JSFKickStart1", false);
+ project = provider.getProject();
+ try {
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void testBeanWithSuper() {
+ IModelNature n = EclipseResourceUtil.getModelNature(project);
+ assertNotNull("Test project " + project.getName() + " has no model
nature.", n);
+ assertNotNull("XModel for project " + project.getName() + " is not
loaded.", n.getModel());
+ List<Object> result = WebPromptingProvider.getInstance().getList(n.getModel(),
IWebPromptingProvider.JSF_BEAN_PROPERTIES, "user.", new Properties());
+ assertNotNull("No results for bean " + " user.", n.getModel());
+
+ assertTrue("Property 'parent' inherited from super class is not found in
bean 'user'", result.contains("parent"));
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+}
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 2008-04-02
13:38:11 UTC (rev 7267)
+++
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2008-04-02
13:49:14 UTC (rev 7268)
@@ -22,6 +22,7 @@
suite.addTestSuite(JSFModelTest.class);
suite.addTestSuite(ModelFormat_2_0_0_Test.class);
suite.addTestSuite(JSFImportTest.class);
+ suite.addTestSuite(JSFBeansTest.class);
return suite;
}