craigmcc 01/01/27 18:22:52
Modified: src/test/org/apache/struts/test TestBean.java
web/test bean-define.jsp bean-write.jsp logic-compare.jsp
Log:
Incorporate tests for "short" properties into the unit test suite.
Revision Changes Path
1.5 +18 -4 jakarta-struts/src/test/org/apache/struts/test/TestBean.java
Index: TestBean.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/test/TestBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestBean.java 2001/01/10 01:54:21 1.4
+++ TestBean.java 2001/01/28 02:22:47 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/test/TestBean.java,v 1.4
2001/01/10 01:54:21 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/01/10 01:54:21 $
+ * $Header:
/home/cvs/jakarta-struts/src/test/org/apache/struts/test/TestBean.java,v 1.5
2001/01/28 02:22:47 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/01/28 02:22:47 $
*
* ====================================================================
*
@@ -72,7 +72,7 @@
* General purpose test bean for Struts custom tag tests.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/01/10 01:54:21 $
+ * @version $Revision: 1.5 $ $Date: 2001/01/28 02:22:47 $
*/
public class TestBean extends ActionForm {
@@ -208,6 +208,20 @@
public void setNullProperty(String nullProperty) {
this.nullProperty = nullProperty;
+ }
+
+
+ /**
+ * A short property.
+ */
+ private short shortProperty = (short) 987;
+
+ public short getShortProperty() {
+ return (this.shortProperty);
+ }
+
+ public void setShortProperty(short shortProperty) {
+ this.shortProperty = shortProperty;
}
1.3 +12 -0 jakarta-struts/web/test/bean-define.jsp
Index: bean-define.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/bean-define.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bean-define.jsp 2000/12/30 21:15:39 1.2
+++ bean-define.jsp 2001/01/28 02:22:49 1.3
@@ -19,6 +19,7 @@
<bean:define id="test1_float" name="test1" property="floatProperty"/>
<bean:define id="test1_int" name="test1" property="intProperty"/>
<bean:define id="test1_long" name="test1" property="longProperty"/>
+<bean:define id="test1_short" name="test1" property="shortProperty"/>
<bean:define id="test1_string" name="test1" property="stringProperty"/>
<bean:define id="test1_value" value="ABCDE"/>
@@ -54,6 +55,11 @@
<td><%= test1_long %></td>
</tr>
<tr>
+ <td>short</td>
+ <td><jsp:getProperty name="test1" property="shortProperty"/></td>
+ <td><%= test1_short %></td>
+ </tr>
+ <tr>
<td>string</td>
<td><jsp:getProperty name="test1" property="stringProperty"/></td>
<td><%= test1_string %></td>
@@ -75,6 +81,7 @@
<bean:define id="test2_float" name="test2" property="nested.floatProperty"/>
<bean:define id="test2_int" name="test2" property="nested.intProperty"/>
<bean:define id="test2_long" name="test2" property="nested.longProperty"/>
+<bean:define id="test2_short" name="test2" property="nested.shortProperty"/>
<bean:define id="test2_string" name="test2" property="nested.stringProperty"/>
<table border="1">
@@ -107,6 +114,11 @@
<td>long</td>
<td><jsp:getProperty name="test2" property="longProperty"/></td>
<td><%= test2_long %></td>
+ </tr>
+ <tr>
+ <td>short</td>
+ <td><jsp:getProperty name="test2" property="shortProperty"/></td>
+ <td><%= test2_short %></td>
</tr>
<tr>
<td>string</td>
1.3 +16 -0 jakarta-struts/web/test/bean-write.jsp
Index: bean-write.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/bean-write.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bean-write.jsp 2000/09/23 23:19:36 1.2
+++ bean-write.jsp 2001/01/28 02:22:50 1.3
@@ -18,6 +18,7 @@
pageContext.setAttribute("test1.float", new Float((float) 123.0));
pageContext.setAttribute("test1.int", new Integer(123));
pageContext.setAttribute("test1.long", new Long(321));
+ pageContext.setAttribute("test1.short", new Short((short) 987));
pageContext.setAttribute("test1.string", "This is a string");
%>
@@ -53,6 +54,11 @@
<td><bean:write name="test1.long"/></td>
</tr>
<tr>
+ <td>short</td>
+ <td><%= pageContext.getAttribute("test1.short") %></td>
+ <td><bean:write name="test1.short"/></td>
+</tr>
+<tr>
<td>String</td>
<td><%= pageContext.getAttribute("test1.string") %></td>
<td><bean:write name="test1.string"/></td>
@@ -95,6 +101,11 @@
<td><bean:write name="test2" property="longProperty"/></td>
</tr>
<tr>
+ <td>short</td>
+ <td><jsp:getProperty name="test2" property="shortProperty"/></td>
+ <td><bean:write name="test2" property="shortProperty"/></td>
+</tr>
+<tr>
<td>String</td>
<td><jsp:getProperty name="test2" property="stringProperty"/></td>
<td><bean:write name="test2" property="stringProperty"/></td>
@@ -175,6 +186,11 @@
<td>long</td>
<td><jsp:getProperty name="test5" property="longProperty"/></td>
<td><bean:write name="test5" property="nested.longProperty"/></td>
+</tr>
+<tr>
+ <td>short</td>
+ <td><jsp:getProperty name="test5" property="shortProperty"/></td>
+ <td><bean:write name="test5" property="nested.shortProperty"/></td>
</tr>
<tr>
<td>String</td>
1.2 +164 -65 jakarta-struts/web/test/logic-compare.jsp
Index: logic-compare.jsp
===================================================================
RCS file: /home/cvs/jakarta-struts/web/test/logic-compare.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logic-compare.jsp 2000/09/07 01:36:36 1.1
+++ logic-compare.jsp 2001/01/28 02:22:50 1.2
@@ -19,6 +19,9 @@
String long1 = "321";
String long2 = "111";
String long3 = "333";
+ String short1 = "987";
+ String short2 = "654";
+ String short3 = "999";
String str1 = "This is a string";
String str2 = "Less than";
String str3 = "XYZ greater than";
@@ -225,225 +228,321 @@
</td>
</tr>
<tr>
- <td>long / EQ</td>
- <td><bean:write name="bean" property="longProperty"/></td>
+ <td>int / EQ</td>
+ <td><bean:write name="bean" property="intProperty"/></td>
<td><%= long1 %></td>
- <td>equal greaterEqual lessEqual</td>
+ <td>lessEqual lessThan notEqual</td>
<td>
- <logic:equal name="bean" property="longProperty"
+ <logic:equal name="bean" property="intProperty"
value="<%= long1 %>">
equal
</logic:equal>
- <logic:greaterEqual name="bean" property="longProperty"
+ <logic:greaterEqual name="bean" property="intProperty"
value="<%= long1 %>">
greaterEqual
</logic:greaterEqual>
- <logic:greaterThan name="bean" property="longProperty"
+ <logic:greaterThan name="bean" property="intProperty"
value="<%= long1 %>">
greaterThan
</logic:greaterThan>
- <logic:lessEqual name="bean" property="longProperty"
+ <logic:lessEqual name="bean" property="intProperty"
value="<%= long1 %>">
lessEqual
</logic:lessEqual>
- <logic:lessThan name="bean" property="longProperty"
+ <logic:lessThan name="bean" property="intProperty"
value="<%= long1 %>">
lessThan
</logic:lessThan>
- <logic:notEqual name="bean" property="longProperty"
+ <logic:notEqual name="bean" property="intProperty"
value="<%= long1 %>">
notEqual
</logic:notEqual>
</td>
</tr>
<tr>
- <td>long / GT</td>
- <td><bean:write name="bean" property="longProperty"/></td>
+ <td>int / GT</td>
+ <td><bean:write name="bean" property="intProperty"/></td>
<td><%= long2 %></td>
<td>greaterEqual greaterThan notEqual</td>
<td>
- <logic:equal name="bean" property="longProperty"
+ <logic:equal name="bean" property="intProperty"
value="<%= long2 %>">
equal
</logic:equal>
- <logic:greaterEqual name="bean" property="longProperty"
+ <logic:greaterEqual name="bean" property="intProperty"
value="<%= long2 %>">
greaterEqual
</logic:greaterEqual>
- <logic:greaterThan name="bean" property="longProperty"
+ <logic:greaterThan name="bean" property="intProperty"
value="<%= long2 %>">
greaterThan
</logic:greaterThan>
- <logic:lessEqual name="bean" property="longProperty"
+ <logic:lessEqual name="bean" property="intProperty"
value="<%= long2 %>">
lessEqual
</logic:lessEqual>
- <logic:lessThan name="bean" property="longProperty"
+ <logic:lessThan name="bean" property="intProperty"
value="<%= long2 %>">
lessThan
</logic:lessThan>
- <logic:notEqual name="bean" property="longProperty"
+ <logic:notEqual name="bean" property="intProperty"
value="<%= long2 %>">
notEqual
</logic:notEqual>
</td>
</tr>
<tr>
- <td>long / LT</td>
- <td><bean:write name="bean" property="longProperty"/></td>
+ <td>int / LT</td>
+ <td><bean:write name="bean" property="intProperty"/></td>
<td><%= long3 %></td>
<td>lessEqual lessThan notEqual</td>
<td>
- <logic:equal name="bean" property="longProperty"
+ <logic:equal name="bean" property="intProperty"
value="<%= long3 %>">
equal
</logic:equal>
- <logic:greaterEqual name="bean" property="longProperty"
+ <logic:greaterEqual name="bean" property="intProperty"
value="<%= long3 %>">
greaterEqual
</logic:greaterEqual>
- <logic:greaterThan name="bean" property="longProperty"
+ <logic:greaterThan name="bean" property="intProperty"
value="<%= long3 %>">
greaterThan
</logic:greaterThan>
- <logic:lessEqual name="bean" property="longProperty"
+ <logic:lessEqual name="bean" property="intProperty"
value="<%= long3 %>">
lessEqual
</logic:lessEqual>
- <logic:lessThan name="bean" property="longProperty"
+ <logic:lessThan name="bean" property="intProperty"
value="<%= long3 %>">
lessThan
</logic:lessThan>
- <logic:notEqual name="bean" property="longProperty"
+ <logic:notEqual name="bean" property="intProperty"
value="<%= long3 %>">
notEqual
</logic:notEqual>
</td>
</tr>
<tr>
- <td>int / EQ</td>
- <td><bean:write name="bean" property="intProperty"/></td>
+ <td>string / EQ</td>
+ <td><bean:write name="bean" property="stringProperty"/></td>
+ <td><%= str1 %></td>
+ <td>equal greaterEqual lessEqual</td>
+ <td>
+ <logic:equal name="bean" property="stringProperty"
+ value="<%= str1 %>">
+ equal
+ </logic:equal>
+ <logic:greaterEqual name="bean" property="stringProperty"
+ value="<%= str1 %>">
+ greaterEqual
+ </logic:greaterEqual>
+ <logic:greaterThan name="bean" property="stringProperty"
+ value="<%= str1 %>">
+ greaterThan
+ </logic:greaterThan>
+ <logic:lessEqual name="bean" property="stringProperty"
+ value="<%= str1 %>">
+ lessEqual
+ </logic:lessEqual>
+ <logic:lessThan name="bean" property="stringProperty"
+ value="<%= str1 %>">
+ lessThan
+ </logic:lessThan>
+ <logic:notEqual name="bean" property="stringProperty"
+ value="<%= str1 %>">
+ notEqual
+ </logic:notEqual>
+ </td>
+ </tr>
+ <tr>
+ <td>long / EQ</td>
+ <td><bean:write name="bean" property="longProperty"/></td>
<td><%= long1 %></td>
- <td>lessEqual lessThan notEqual</td>
+ <td>equal greaterEqual lessEqual</td>
<td>
- <logic:equal name="bean" property="intProperty"
+ <logic:equal name="bean" property="longProperty"
value="<%= long1 %>">
equal
</logic:equal>
- <logic:greaterEqual name="bean" property="intProperty"
+ <logic:greaterEqual name="bean" property="longProperty"
value="<%= long1 %>">
greaterEqual
</logic:greaterEqual>
- <logic:greaterThan name="bean" property="intProperty"
+ <logic:greaterThan name="bean" property="longProperty"
value="<%= long1 %>">
greaterThan
</logic:greaterThan>
- <logic:lessEqual name="bean" property="intProperty"
+ <logic:lessEqual name="bean" property="longProperty"
value="<%= long1 %>">
lessEqual
</logic:lessEqual>
- <logic:lessThan name="bean" property="intProperty"
+ <logic:lessThan name="bean" property="longProperty"
value="<%= long1 %>">
lessThan
</logic:lessThan>
- <logic:notEqual name="bean" property="intProperty"
+ <logic:notEqual name="bean" property="longProperty"
value="<%= long1 %>">
notEqual
</logic:notEqual>
</td>
</tr>
<tr>
- <td>int / GT</td>
- <td><bean:write name="bean" property="intProperty"/></td>
+ <td>long / GT</td>
+ <td><bean:write name="bean" property="longProperty"/></td>
<td><%= long2 %></td>
<td>greaterEqual greaterThan notEqual</td>
<td>
- <logic:equal name="bean" property="intProperty"
+ <logic:equal name="bean" property="longProperty"
value="<%= long2 %>">
equal
</logic:equal>
- <logic:greaterEqual name="bean" property="intProperty"
+ <logic:greaterEqual name="bean" property="longProperty"
value="<%= long2 %>">
greaterEqual
</logic:greaterEqual>
- <logic:greaterThan name="bean" property="intProperty"
+ <logic:greaterThan name="bean" property="longProperty"
value="<%= long2 %>">
greaterThan
</logic:greaterThan>
- <logic:lessEqual name="bean" property="intProperty"
+ <logic:lessEqual name="bean" property="longProperty"
value="<%= long2 %>">
lessEqual
</logic:lessEqual>
- <logic:lessThan name="bean" property="intProperty"
+ <logic:lessThan name="bean" property="longProperty"
value="<%= long2 %>">
lessThan
</logic:lessThan>
- <logic:notEqual name="bean" property="intProperty"
+ <logic:notEqual name="bean" property="longProperty"
value="<%= long2 %>">
notEqual
</logic:notEqual>
</td>
</tr>
<tr>
- <td>int / LT</td>
- <td><bean:write name="bean" property="intProperty"/></td>
+ <td>long / LT</td>
+ <td><bean:write name="bean" property="longProperty"/></td>
<td><%= long3 %></td>
<td>lessEqual lessThan notEqual</td>
<td>
- <logic:equal name="bean" property="intProperty"
+ <logic:equal name="bean" property="longProperty"
value="<%= long3 %>">
equal
</logic:equal>
- <logic:greaterEqual name="bean" property="intProperty"
+ <logic:greaterEqual name="bean" property="longProperty"
value="<%= long3 %>">
greaterEqual
</logic:greaterEqual>
- <logic:greaterThan name="bean" property="intProperty"
+ <logic:greaterThan name="bean" property="longProperty"
value="<%= long3 %>">
greaterThan
</logic:greaterThan>
- <logic:lessEqual name="bean" property="intProperty"
+ <logic:lessEqual name="bean" property="longProperty"
value="<%= long3 %>">
lessEqual
</logic:lessEqual>
- <logic:lessThan name="bean" property="intProperty"
+ <logic:lessThan name="bean" property="longProperty"
value="<%= long3 %>">
lessThan
</logic:lessThan>
- <logic:notEqual name="bean" property="intProperty"
+ <logic:notEqual name="bean" property="longProperty"
value="<%= long3 %>">
notEqual
</logic:notEqual>
</td>
</tr>
<tr>
- <td>string / EQ</td>
- <td><bean:write name="bean" property="stringProperty"/></td>
- <td><%= str1 %></td>
+ <td>short / EQ</td>
+ <td><bean:write name="bean" property="shortProperty"/></td>
+ <td><%= short1 %></td>
<td>equal greaterEqual lessEqual</td>
<td>
- <logic:equal name="bean" property="stringProperty"
- value="<%= str1 %>">
+ <logic:equal name="bean" property="shortProperty"
+ value="<%= short1 %>">
equal
</logic:equal>
- <logic:greaterEqual name="bean" property="stringProperty"
- value="<%= str1 %>">
+ <logic:greaterEqual name="bean" property="shortProperty"
+ value="<%= short1 %>">
greaterEqual
</logic:greaterEqual>
- <logic:greaterThan name="bean" property="stringProperty"
- value="<%= str1 %>">
+ <logic:greaterThan name="bean" property="shortProperty"
+ value="<%= short1 %>">
greaterThan
</logic:greaterThan>
- <logic:lessEqual name="bean" property="stringProperty"
- value="<%= str1 %>">
+ <logic:lessEqual name="bean" property="shortProperty"
+ value="<%= short1 %>">
lessEqual
</logic:lessEqual>
- <logic:lessThan name="bean" property="stringProperty"
- value="<%= str1 %>">
+ <logic:lessThan name="bean" property="shortProperty"
+ value="<%= short1 %>">
lessThan
</logic:lessThan>
- <logic:notEqual name="bean" property="stringProperty"
- value="<%= str1 %>">
+ <logic:notEqual name="bean" property="shortProperty"
+ value="<%= short1 %>">
+ notEqual
+ </logic:notEqual>
+ </td>
+ </tr>
+ <tr>
+ <td>short / GT</td>
+ <td><bean:write name="bean" property="shortProperty"/></td>
+ <td><%= short2 %></td>
+ <td>greaterEqual greaterThan notEqual</td>
+ <td>
+ <logic:equal name="bean" property="shortProperty"
+ value="<%= short2 %>">
+ equal
+ </logic:equal>
+ <logic:greaterEqual name="bean" property="shortProperty"
+ value="<%= short2 %>">
+ greaterEqual
+ </logic:greaterEqual>
+ <logic:greaterThan name="bean" property="shortProperty"
+ value="<%= short2 %>">
+ greaterThan
+ </logic:greaterThan>
+ <logic:lessEqual name="bean" property="shortProperty"
+ value="<%= short2 %>">
+ lessEqual
+ </logic:lessEqual>
+ <logic:lessThan name="bean" property="shortProperty"
+ value="<%= short2 %>">
+ lessThan
+ </logic:lessThan>
+ <logic:notEqual name="bean" property="shortProperty"
+ value="<%= short2 %>">
+ notEqual
+ </logic:notEqual>
+ </td>
+ </tr>
+ <tr>
+ <td>short / LT</td>
+ <td><bean:write name="bean" property="shortProperty"/></td>
+ <td><%= short3 %></td>
+ <td>lessEqual lessThan notEqual</td>
+ <td>
+ <logic:equal name="bean" property="shortProperty"
+ value="<%= short3 %>">
+ equal
+ </logic:equal>
+ <logic:greaterEqual name="bean" property="shortProperty"
+ value="<%= short3 %>">
+ greaterEqual
+ </logic:greaterEqual>
+ <logic:greaterThan name="bean" property="shortProperty"
+ value="<%= short3 %>">
+ greaterThan
+ </logic:greaterThan>
+ <logic:lessEqual name="bean" property="shortProperty"
+ value="<%= short3 %>">
+ lessEqual
+ </logic:lessEqual>
+ <logic:lessThan name="bean" property="shortProperty"
+ value="<%= short3 %>">
+ lessThan
+ </logic:lessThan>
+ <logic:notEqual name="bean" property="shortProperty"
+ value="<%= short3 %>">
notEqual
</logic:notEqual>
</td>
