Author: scabanovich Date: 2008-04-22 12:00:18 -0400 (Tue, 22 Apr 2008) New Revision: 7688 Modified: 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 Log: JBIDE-2060 Modified: 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 2008-04-22 14:28:23 UTC (rev 7687) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFKickStart1/JavaSource/demo/User.java 2008-04-22 16:00:18 UTC (rev 7688) @@ -30,4 +30,16 @@ public void setName(String name) { this.name = name; } + + public void getX1() { + + } + + public String getX2(int i) { + return ""; + } + + public void setX3(int i, int j) { + + } } \ No newline at end of file Modified: 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 2008-04-22 14:28:23 UTC (rev 7687) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2008-04-22 16:00:18 UTC (rev 7688) @@ -6,9 +6,13 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.common.model.XModelObject; 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.jsf.model.pv.JSFProjectsRoot; +import org.jboss.tools.jsf.model.pv.JSFProjectsTree; +import org.jboss.tools.jst.web.model.pv.WebProjectNode; import org.jboss.tools.jst.web.project.list.IWebPromptingProvider; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; @@ -39,7 +43,16 @@ assertNotNull("No results for bean " + " user.", n.getModel()); assertTrue("Property 'parent' inherited from super class is not found in bean 'user'", result.contains("parent")); + } + + public void testGettersAndSetters() { + IModelNature n = EclipseResourceUtil.getModelNature(project); + List<Object> result = WebPromptingProvider.getInstance().getList(n.getModel(), IWebPromptingProvider.JSF_BEAN_METHODS, "user.", new Properties()); + assertTrue("Method getX1 is not found. It is not a getter because it has type void.", result.contains("getX1")); + assertTrue("Method getX2 is not found. It is not a getter because it has a parameter.", result.contains("getX2")); + assertTrue("Method setX3 is not found. It is not a setter because it has 2 parameters", result.contains("setX3")); + } protected void tearDown() throws Exception { if(provider != null) {