You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/12/01 10:35:03 UTC

cvs commit: jakarta-cactus/sample-servlet/src/unit/j2ee13/org/apache/cactus/unit TestJspTagLifecycle.java

vmassol     2002/12/01 01:35:03

  Modified:    sample-servlet/src/unit/j2ee13/org/apache/cactus/unit
                        TestJspTagLifecycle.java
  Log:
  Fixed checkstyle errors + make it work with JUnit 3.7+
  
  Revision  Changes    Path
  1.4       +7 -6      jakarta-cactus/sample-servlet/src/unit/j2ee13/org/apache/cactus/unit/TestJspTagLifecycle.java
  
  Index: TestJspTagLifecycle.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/sample-servlet/src/unit/j2ee13/org/apache/cactus/unit/TestJspTagLifecycle.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestJspTagLifecycle.java	28 Nov 2002 10:57:40 -0000	1.3
  +++ TestJspTagLifecycle.java	1 Dec 2002 09:35:03 -0000	1.4
  @@ -57,7 +57,6 @@
   
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.JspTagException;
  -import javax.servlet.jsp.PageContext;
   import javax.servlet.jsp.tagext.BodyContent;
   import javax.servlet.jsp.jstl.core.LoopTagStatus;
   
  @@ -576,20 +575,20 @@
                       assertEquals(0, status.getIndex());
                       assertEquals(1, status.getCount());
                       assertTrue(status.isFirst());
  -                    assertFalse(status.isLast());
  +                    assertTrue(!status.isLast());
                   }
                   else if (theIteration == 1)
                   {
                       assertEquals(1, status.getIndex());
                       assertEquals(2, status.getCount());
  -                    assertFalse(status.isFirst());
  -                    assertFalse(status.isLast());
  +                    assertTrue(!status.isFirst());
  +                    assertTrue(!status.isLast());
                   }
                   else if (theIteration == 2)
                   {
                       assertEquals(2, status.getIndex());
                       assertEquals(3, status.getCount());
  -                    assertFalse(status.isFirst());
  +                    assertTrue(!status.isFirst());
                       assertTrue(status.isLast());
                   }
               }
  @@ -737,7 +736,9 @@
           {
               lifecycle.invoke();
               fail("Expected JSPTagException");
  -        } catch (JspTagException je) {
  +        } 
  +        catch (JspTagException je)
  +        {
               // expected
           }
       }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>