[jbosstools-commits] JBoss Tools SVN: r43050 - in trunk/jsf/tests: org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: vrubezhny
Date: 2012-08-15 19:42:28 -0400 (Wed, 15 Aug 2012)
New Revision: 43050

Added:
   trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/MapBean.java
   trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeanMapValuesTest.java
Modified:
   trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
   trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-6135
EL validation failes for valid JSF-EL 

JUnit Test is added for the issue

Added: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/MapBean.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/MapBean.java	                        (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/MapBean.java	2012-08-15 23:42:28 UTC (rev 43050)
@@ -0,0 +1,16 @@
+package test.beans;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.bean.ManagedBean;
+
+ at ManagedBean(name="myBean")
+public class MapBean {
+	Map<String, Collection> myMap = new HashMap<String, Collection>();
+	
+	public Map<String, Collection> getMyMap() {
+		return myMap;
+	}
+}


Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/MapBean.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml	2012-08-15 22:57:38 UTC (rev 43049)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml	2012-08-15 23:42:28 UTC (rev 43050)
@@ -12,4 +12,5 @@
 <h:outputText value="#{mybean2['10']}"/>	
 <h:outputText value="#{mybean2[]}"/>	
 <h:outputText value="#{mybean2['100'].ch}"/>	
+<h:outputText value="#{myBean.myMap['100'].size"/>	
 </html>
\ No newline at end of file

Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeanMapValuesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeanMapValuesTest.java	                        (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeanMapValuesTest.java	2012-08-15 23:42:28 UTC (rev 43050)
@@ -0,0 +1,34 @@
+package org.jboss.tools.jsf.jsp.ca.test;
+
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class CAForJSF2BeanMapValuesTest  extends ContentAssistantTestCase {
+	TestProjectProvider provider = null;
+	boolean makeCopy = true;
+	private static final String PROJECT_NAME = "JSF2Beans";
+	private static final String PAGE_NAME = "/src/test/beans/inputname.xhtml";
+
+	public void setUp() throws Exception {
+		provider = new TestProjectProvider("org.jboss.tools.jsf.base.test",
+				null, PROJECT_NAME, makeCopy);
+		project = provider.getProject();
+	}
+
+	protected void tearDown() throws Exception {
+		if (provider != null) {
+			provider.dispose();
+		}
+	}
+
+	/**
+	 * JBIDE-6135
+	 */
+	public void testForJSF2BeanMapValues() {
+		
+		String[] proposals = { "myBean.myMap['100'].size()" };
+
+		checkProposals(PAGE_NAME, "#{myBean.myMap['100'].si", 24, proposals, false);
+	}
+
+}


Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeanMapValuesTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java	2012-08-15 22:57:38 UTC (rev 43049)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java	2012-08-15 23:42:28 UTC (rev 43050)
@@ -24,6 +24,7 @@
 import org.jboss.tools.jsf.jsp.ca.test.CAForELinStyleTest;
 import org.jboss.tools.jsf.jsp.ca.test.CAForIDTest;
 import org.jboss.tools.jsf.jsp.ca.test.CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test;
+import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeanMapValuesTest;
 import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansInJavaTest;
 import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansTest;
 import org.jboss.tools.jsf.jsp.ca.test.CAForUnclosedELTest;
@@ -63,6 +64,7 @@
 		suite.addTestSuite(CAForUnclosedELTest.class);
 		suite.addTestSuite(CAForCompositeComponentTest.class);
 		suite.addTestSuite(CAForJSF2BeansTest.class);
+		suite.addTestSuite(CAForJSF2BeanMapValuesTest.class); 
 		suite.addTestSuite(CAForJSF2BeansInJavaTest.class);
 //		suite.addTestSuite(MissingKBBuilderTest.class);
 		suite.addTestSuite(CAForInputTagSrcAttributeSuggestsFilePathsJBIDE1807Test.class);