[Httpunit-commit] CVS: httpunit/test/com/meterware/servletunit HttpServletRequestTest.java,1.1,1.2 SessionTest.java,1.1,1.2

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/test/com/meterware/servletunit
In directory usw-pr-cvs1:/tmp/cvs-serv10126/test/com/meterware/servletunit

Modified Files:
	HttpServletRequestTest.java SessionTest.java 
Log Message:
Corrected errors with link parameter parsing

Index: HttpServletRequestTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/servletunit/HttpServletRequestTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpServletRequestTest.java	2000/11/21 20:44:59	1.1
+++ HttpServletRequestTest.java	2001/11/05 15:50:38	1.2
@@ -125,7 +125,7 @@
         HttpServletRequest request = new ServletUnitHttpRequest( wr, new ServletUnitContext() );
 
         assertNull( "attribute should not be defined yet", request.getAttribute( "unset" ) );
-        assert( "attribute enumeration should be empty", !request.getAttributeNames().hasMoreElements() );
+        assertTrue( "attribute enumeration should be empty", !request.getAttributeNames().hasMoreElements() );
     }
 
 
@@ -139,9 +139,9 @@
         assertEquals( "attribute one", value, request.getAttribute( "one" ) );
 
         Enumeration names = request.getAttributeNames();
-        assert( "attribute enumeration should not be empty", names.hasMoreElements() );
+        assertTrue( "attribute enumeration should not be empty", names.hasMoreElements() );
         assertEquals( "contents in enumeration", "one", names.nextElement() );
-        assert( "attribute enumeration should now be empty", !names.hasMoreElements() );
+        assertTrue( "attribute enumeration should now be empty", !names.hasMoreElements() );
     }
 
 
@@ -169,7 +169,7 @@
 
         session = request.getSession();
         assertNotNull( "No session created", session );
-        assert( "Session not marked as new", session.isNew() );
+        assertTrue( "Session not marked as new", session.isNew() );
     }
 
 

Index: SessionTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/servletunit/SessionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionTest.java	2000/11/21 20:44:59	1.1
+++ SessionTest.java	2001/11/05 15:50:38	1.2
@@ -60,10 +60,10 @@
         ServletUnitContext context = new ServletUnitContext();
         ServletUnitHttpSession session = context.newSession();
         assertNotNull( "Session is null", session );
-        assert( "Session is not marked as new", session.isNew() );
+        assertTrue( "Session is not marked as new", session.isNew() );
         ServletUnitHttpSession session2 = context.newSession();
-        assert( "New session has the same ID", !session.getId().equals( session2.getId() ) );
-        assert( "Different session returned", session.equals( context.getSession( session.getId() ) ) );
+        assertTrue( "New session has the same ID", !session.getId().equals( session2.getId() ) );
+        assertTrue( "Different session returned", session.equals( context.getSession( session.getId() ) ) );
     }
 
 
@@ -71,12 +71,12 @@
         ServletUnitContext context = new ServletUnitContext();
         ServletUnitHttpSession session = context.newSession();
         long accessedAt = session.getLastAccessedTime();
-        assert( "Session is not marked as new", session.isNew() );
+        assertTrue( "Session is not marked as new", session.isNew() );
         try { Thread.currentThread().sleep( 50 ); } catch (InterruptedException e) {};
         assertEquals( "Initial access time", accessedAt, context.getSession( session.getId() ).getLastAccessedTime() ); 
         session.access();
-        assert( "Last access time not changed", accessedAt != context.getSession( session.getId() ).getLastAccessedTime() );
-        assert( "Session is still marked as new", !context.getSession( session.getId() ).isNew() );
+        assertTrue( "Last access time not changed", accessedAt != context.getSession( session.getId() ).getLastAccessedTime() );
+        assertTrue( "Session is still marked as new", !context.getSession( session.getId() ).isNew() );
 
     }