struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject cvs commit: jakarta-struts/src/test/org/apache/struts/taglib/logic TestIterateTag.java
Date Thu, 01 Jul 2004 00:52:02 GMT
husted      2004/06/30 17:52:02

  Modified:    src/test/org/apache/struts/taglib/logic TestIterateTag.java
  Log:
  Apply #29820 "TestIterateTag uses EVAL_BODY_TAG in non static way" submitted by Michael
Rasmussen
  
  Revision  Changes    Path
  1.9       +29 -28    jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java
  
  Index: TestIterateTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/taglib/logic/TestIterateTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestIterateTag.java	14 Mar 2004 06:23:43 -0000	1.8
  +++ TestIterateTag.java	1 Jul 2004 00:52:02 -0000	1.9
  @@ -27,13 +27,14 @@
   import javax.servlet.ServletException;
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.PageContext;
  +
   import junit.framework.Test;
   import junit.framework.TestSuite;
   
   import org.apache.cactus.JspTestCase;
   import org.apache.cactus.WebResponse;
  -import org.apache.struts.taglib.SimpleBeanForTesting;
   import org.apache.commons.lang.StringUtils;
  +import org.apache.struts.taglib.SimpleBeanForTesting;
   
   
   /**
  @@ -111,7 +112,7 @@
   			out.print((String)pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -158,7 +159,7 @@
   			out.print((String)pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -205,7 +206,7 @@
   			out.print((String)pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -273,7 +274,7 @@
   			out.print((String)pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -331,7 +332,7 @@
   			out.print((String)pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -389,7 +390,7 @@
   			out.print((String)pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -443,7 +444,7 @@
   		{
   			out.print((String)pageContext.getAttribute("theId"));
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   
   	}
  @@ -487,7 +488,7 @@
   		{
   			out.print((String)pageContext.getAttribute("theId"));
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   
   	}
  @@ -531,7 +532,7 @@
   		{
   			out.print((String)pageContext.getAttribute("theId"));
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   
   	}
  @@ -590,7 +591,7 @@
   		{
   			out.print((String)pageContext.getAttribute("theId"));
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   
   	}
  @@ -638,7 +639,7 @@
   		{
   			out.print((String)pageContext.getAttribute("theId"));
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   
   	}
  @@ -686,7 +687,7 @@
   		{
   			out.print((String)pageContext.getAttribute("theId"));
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   
   	}
  @@ -749,7 +750,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -796,7 +797,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -843,7 +844,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -907,7 +908,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -958,7 +959,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -1009,7 +1010,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -1070,7 +1071,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -1122,7 +1123,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -1174,7 +1175,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -1240,7 +1241,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -1296,7 +1297,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  @@ -1352,7 +1353,7 @@
   			out.print(pageContext.getAttribute("theId"));
   		    iteration++;
   		
  -		} while (tag.doAfterBody() == tag.EVAL_BODY_TAG);
  +		} while (tag.doAfterBody() == IterateTag.EVAL_BODY_TAG);
   		tag.doEndTag();
   		assertEquals(iterations, iteration);
   	}
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message