diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilStrutsTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilStrutsTest.java index 9f1f49604..1bd07e5f3 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilStrutsTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilStrutsTest.java @@ -18,11 +18,9 @@ */ package com.opensymphony.xwork2.ognl; +import com.opensymphony.xwork2.test.TestArrayBean; import org.apache.struts2.StrutsInternalTestCase; -import java.util.ArrayList; -import java.util.List; - public class OgnlUtilStrutsTest extends StrutsInternalTestCase { private OgnlUtil ognlUtil; @@ -59,12 +57,12 @@ public class OgnlUtilStrutsTest extends StrutsInternalTestCase { public void testAccessToSizeMethod() throws Exception { // given - List list = new ArrayList<>(); - list.add("1"); - list.add("2"); + TestArrayBean bean = new TestArrayBean(); + bean.getPersons().add("Alice"); + bean.getPersons().add("Mich"); // when - Object value = ognlUtil.getValue("size() > 0", ognlUtil.createDefaultContext(list), list); + Object value = ognlUtil.getValue("persons.size() > 0", ognlUtil.createDefaultContext(bean), bean); // then assertTrue(value instanceof Boolean); diff --git a/core/src/test/java/com/opensymphony/xwork2/test/TestArrayBean.java b/core/src/test/java/com/opensymphony/xwork2/test/TestArrayBean.java new file mode 100644 index 000000000..1a30f057a --- /dev/null +++ b/core/src/test/java/com/opensymphony/xwork2/test/TestArrayBean.java @@ -0,0 +1,17 @@ +package com.opensymphony.xwork2.test; + +import java.util.ArrayList; +import java.util.List; + +public class TestArrayBean { + + private List persons = new ArrayList<>(); + + public void setPersons(List persons) { + this.persons = persons; + } + + public List getPersons() { + return persons; + } +}