You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/07/24 12:58:36 UTC
svn commit: r1150335 -
/tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
Author: markt
Date: Sun Jul 24 10:58:36 2011
New Revision: 1150335
URL: http://svn.apache.org/viewvc?rev=1150335&view=rev
Log:
Add tests for bug 51544 (note tests pass - can't reproduce error yet)
Fix some find bugs issues
Modified:
tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
Modified: tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java?rev=1150335&r1=1150334&r2=1150335&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java (original)
+++ tomcat/trunk/test/org/apache/el/TestValueExpressionImpl.java Sun Jul 24 10:58:36 2011
@@ -18,6 +18,7 @@
package org.apache.el;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -115,7 +116,7 @@ public class TestValueExpressionImpl ext
ELContext context = new ELContextImpl();
Object o1 = "String value";
- Object o2 = new Integer(32);
+ Object o2 = Integer.valueOf(32);
Map<Object,Object> map = new HashMap<Object,Object>();
map.put("key1", o1);
@@ -141,7 +142,7 @@ public class TestValueExpressionImpl ext
ELContext context = new ELContextImpl();
Object o1 = "String value";
- Object o2 = new Integer(32);
+ Object o2 = Integer.valueOf(32);
List<Object> list = new ArrayList<Object>();
list.add(0, o1);
@@ -162,4 +163,46 @@ public class TestValueExpressionImpl ext
assertEquals(o1, ve2.getValue(context));
}
+
+ /**
+ * Test returning an empty list as a bean property.
+ */
+ public void testBug51544Bean() throws Exception {
+ ExpressionFactory factory = ExpressionFactory.newInstance();
+ ELContext context = new ELContextImpl();
+
+ TesterBeanA beanA = new TesterBeanA();
+ beanA.setValList(Collections.emptyList());
+
+ ValueExpression var =
+ factory.createValueExpression(beanA, TesterBeanA.class);
+ context.getVariableMapper().setVariable("beanA", var);
+
+ ValueExpression ve = factory.createValueExpression(
+ context, "${beanA.valList.isEmpty()}", String.class);
+
+ String result = (String) ve.getValue(context);
+ assertEquals("true", result);
+ }
+
+
+ /**
+ * Test using list directly as variable.
+ */
+ public void testBug51544Direct() throws Exception {
+ ExpressionFactory factory = ExpressionFactory.newInstance();
+ ELContext context = new ELContextImpl();
+
+ List<?> list = Collections.emptyList();
+
+ ValueExpression var =
+ factory.createValueExpression(list, List.class);
+ context.getVariableMapper().setVariable("list", var);
+
+ ValueExpression ve = factory.createValueExpression(
+ context, "${list.isEmpty()}", Boolean.class);
+
+ Boolean result = (Boolean) ve.getValue(context);
+ assertEquals(Boolean.TRUE, result);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org