Author: tmjee
Date: Sat Jul 22 03:34:07 2006
New Revision: 424544
URL: http://svn.apache.org/viewvc?rev=424544&view=rev
Log:
WW-1389
- Added more tests to test If/Else/ElseIf tag
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java?rev=424544&r1=424543&r2=424544&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/IfTagTest.java
Sat Jul 22 03:34:07 2006
@@ -149,6 +149,115 @@
fail();
}
}
+
+
+ public void testIfElse1() throws Exception {
+ IfTag ifTag = new IfTag();
+ ifTag.setPageContext(pageContext);
+ ifTag.setTest("true");
+
+ ElseTag elseTag = new ElseTag();
+ elseTag.setPageContext(pageContext);
+
+ int r1 = ifTag.doStartTag();
+ ifTag.doEndTag();
+ int r2 = elseTag.doStartTag();
+ elseTag.doEndTag();
+
+ assertEquals(TagSupport.EVAL_BODY_INCLUDE, r1);
+ assertEquals(TagSupport.SKIP_BODY, r2);
+ }
+
+ public void testIfElse2() throws Exception {
+ IfTag ifTag = new IfTag();
+ ifTag.setPageContext(pageContext);
+ ifTag.setTest("false");
+
+ ElseTag elseTag = new ElseTag();
+ elseTag.setPageContext(pageContext);
+
+ int r1 = ifTag.doStartTag();
+ ifTag.doEndTag();
+ int r2 = elseTag.doStartTag();
+ elseTag.doEndTag();
+
+ assertEquals(TagSupport.SKIP_BODY, r1);
+ assertEquals(TagSupport.EVAL_BODY_INCLUDE, r2);
+ }
+
+ public void testIfElseIf() throws Exception {
+ IfTag ifTag = new IfTag();
+ ifTag.setPageContext(pageContext);
+ ifTag.setTest("false");
+
+ ElseIfTag elseIfTag1 = new ElseIfTag();
+ elseIfTag1.setPageContext(pageContext);
+ elseIfTag1.setTest("false");
+
+ ElseIfTag elseIfTag2 = new ElseIfTag();
+ elseIfTag2.setPageContext(pageContext);
+ elseIfTag2.setTest("true");
+
+ ElseIfTag elseIfTag3 = new ElseIfTag();
+ elseIfTag3.setPageContext(pageContext);
+ elseIfTag3.setTest("true");
+
+ int r1 = ifTag.doStartTag();
+ ifTag.doEndTag();
+ int r2 = elseIfTag1.doStartTag();
+ elseIfTag1.doEndTag();
+ int r3 = elseIfTag2.doStartTag();
+ elseIfTag2.doEndTag();
+ int r4 = elseIfTag3.doStartTag();
+ elseIfTag3.doEndTag();
+
+ assertEquals(TagSupport.SKIP_BODY, r1);
+ assertEquals(TagSupport.SKIP_BODY, r2);
+ assertEquals(TagSupport.EVAL_BODY_INCLUDE, r3);
+ assertEquals(TagSupport.SKIP_BODY, r4);
+ }
+
+ public void testIfElseIfElse() throws Exception {
+ IfTag ifTag = new IfTag();
+ ifTag.setPageContext(pageContext);
+ ifTag.setTest("false");
+
+ ElseIfTag elseIfTag1 = new ElseIfTag();
+ elseIfTag1.setPageContext(pageContext);
+ elseIfTag1.setTest("false");
+
+ ElseIfTag elseIfTag2 = new ElseIfTag();
+ elseIfTag2.setPageContext(pageContext);
+ elseIfTag2.setTest("false");
+
+ ElseIfTag elseIfTag3 = new ElseIfTag();
+ elseIfTag3.setPageContext(pageContext);
+ elseIfTag3.setTest("false");
+
+ ElseTag elseTag = new ElseTag();
+ elseTag.setPageContext(pageContext);
+
+ int r1 = ifTag.doStartTag();
+ ifTag.doEndTag();
+ int r2 = elseIfTag1.doStartTag();
+ elseIfTag1.doEndTag();
+ int r3 = elseIfTag2.doStartTag();
+ elseIfTag2.doEndTag();
+ int r4 = elseIfTag3.doStartTag();
+ elseIfTag3.doEndTag();
+ int r5 = elseTag.doStartTag();
+ elseTag.doEndTag();
+
+ assertEquals(TagSupport.SKIP_BODY, r1);
+ assertEquals(TagSupport.SKIP_BODY, r2);
+ assertEquals(TagSupport.SKIP_BODY, r3);
+ assertEquals(TagSupport.SKIP_BODY, r4);
+ assertEquals(TagSupport.EVAL_BODY_INCLUDE, r5);
+ }
+
+
+
+
protected void setUp() throws Exception {
// create the needed objects
