martinc 2002/10/12 12:21:18
Modified: src/exercise-taglib/org/apache/struts/webapp/exercise
TestBean.java
web/exercise-taglib logic-empty.jsp
Log:
Add test cases for Collection and Map support in <logic:empty> and
<logic:notEmpty> tags.
Revision Changes Path
1.8 +76 -4
jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java
Index: TestBean.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/TestBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestBean.java 9 Oct 2002 05:09:35 -0000 1.7
+++ TestBean.java 12 Oct 2002 19:21:18 -0000 1.8
@@ -63,7 +63,11 @@
package org.apache.struts.webapp.exercise;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionForm;
@@ -422,6 +426,74 @@
public void setWithNulls(String withNulls) {
this.withNulls = withNulls;
+ }
+
+
+ /**
+ * A List property.
+ */
+ private List listProperty = null;
+
+ public List getListProperty() {
+ if (listProperty == null) {
+ listProperty = new ArrayList();
+ listProperty.add("dummy");
+ }
+ return listProperty;
+ }
+
+ public void setListProperty(List listProperty) {
+ this.listProperty = listProperty;
+ }
+
+ /**
+ * An empty List property.
+ */
+ private List emptyListProperty = null;
+
+ public List getEmptyListProperty() {
+ if (emptyListProperty == null) {
+ emptyListProperty = new ArrayList();
+ }
+ return emptyListProperty;
+ }
+
+ public void setEmptyListProperty(List emptyListProperty) {
+ this.emptyListProperty = emptyListProperty;
+ }
+
+
+ /**
+ * A Map property.
+ */
+ private Map mapProperty = null;
+
+ public Map getMapProperty() {
+ if (mapProperty == null) {
+ mapProperty = new HashMap();
+ mapProperty.put("dummy", "dummy");
+ }
+ return mapProperty;
+ }
+
+ public void setMapProperty(Map mapProperty) {
+ this.mapProperty = mapProperty;
+ }
+
+ /**
+ * An empty Map property.
+ */
+ private Map emptyMapProperty = null;
+
+ public Map getEmptyMapProperty() {
+ if (emptyMapProperty == null) {
+ emptyMapProperty = new HashMap();
+ }
+ return emptyMapProperty;
+ }
+
+ public void setEmptyMapProperty(Map emptyMapProperty) {
+ this.emptyMapProperty = emptyMapProperty;
}
1.2 +49 -1 jakarta-struts/web/exercise-taglib/logic-empty.jsp
Index: logic-empty.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/logic-empty.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logic-empty.jsp 8 Jul 2001 04:15:14 -0000 1.1
+++ logic-empty.jsp 12 Oct 2002 19:21:18 -0000 1.2
@@ -55,7 +55,55 @@
</td>
</tr>
<tr>
- <td>non-string object</td>
+ <td>empty collection</td>
+ <td>empty</td>
+ <td>
+ <logic:empty name="bean" property="emptyListProperty">
+ empty
+ </logic:empty>
+ <logic:notEmpty name="bean" property="emptyListProperty">
+ notEmpty
+ </logic:notEmpty>
+ </td>
+ </tr>
+ <tr>
+ <td>non-empty collection</td>
+ <td>notEmpty</td>
+ <td>
+ <logic:empty name="bean" property="listProperty">
+ empty
+ </logic:empty>
+ <logic:notEmpty name="bean" property="listProperty">
+ notEmpty
+ </logic:notEmpty>
+ </td>
+ </tr>
+ <tr>
+ <td>empty map</td>
+ <td>empty</td>
+ <td>
+ <logic:empty name="bean" property="emptyMapProperty">
+ empty
+ </logic:empty>
+ <logic:notEmpty name="bean" property="emptyMapProperty">
+ notEmpty
+ </logic:notEmpty>
+ </td>
+ </tr>
+ <tr>
+ <td>non-empty map</td>
+ <td>notEmpty</td>
+ <td>
+ <logic:empty name="bean" property="mapProperty">
+ empty
+ </logic:empty>
+ <logic:notEmpty name="bean" property="mapProperty">
+ notEmpty
+ </logic:notEmpty>
+ </td>
+ </tr>
+ <tr>
+ <td>unsupported object</td>
<td>notEmpty</td>
<td>
<logic:empty name="bean" property="intProperty">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
