[Httpunit-commit] CVS: httpunit/test/com/meterware/servletunit StatelessTest.java,1.4,1.5

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

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

Modified Files:
	StatelessTest.java 
Log Message:
from James Murty: support servlet caching, XML parsing cleanup

Index: StatelessTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/servletunit/StatelessTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StatelessTest.java	26 Nov 2001 14:20:13 -0000	1.4
+++ StatelessTest.java	16 May 2002 17:44:20 -0000	1.5
@@ -55,7 +55,7 @@
 
         WebRequest request   = new GetMethodWebRequest( "http://localhost/nothing" );
         try {
-            WebResponse response = sr.getResponse( request );
+            sr.getResponse( request );
             fail( "Should have rejected the request" );
         } catch (HttpNotFoundException e) {
             assertEquals( "Response code", HttpURLConnection.HTTP_NOT_FOUND, e.getResponseCode() );
@@ -63,6 +63,17 @@
     }
 
 
+    public void testServletCaching() throws Exception {
+        final String resourceName = "something/interesting";
+
+        ServletRunner sr = new ServletRunner();
+        sr.registerServlet( resourceName, AccessCountServlet.class.getName() );
+
+        WebRequest request   = new GetMethodWebRequest( "http://localhost/" + resourceName );
+        assertEquals( "First reply", "1", sr.getResponse( request ).getText().trim() );
+        assertEquals( "Second reply", "2", sr.getResponse( request ).getText().trim() );
+    }
+
 
     public void testSimpleGet() throws Exception {
         final String resourceName = "something/interesting";
@@ -137,8 +148,6 @@
 
 
 
-
-
     static class SimpleGetServlet extends HttpServlet {
         static String RESPONSE_TEXT = "the desired content\r\n";
 
@@ -146,6 +155,18 @@
             resp.setContentType( "text/html" );
             PrintWriter pw = resp.getWriter();
             pw.print( RESPONSE_TEXT );
+            pw.close();
+        }
+    }
+
+
+    static class AccessCountServlet extends HttpServlet {
+        private int _numAccesses;
+
+        protected void doGet( HttpServletRequest req, HttpServletResponse resp ) throws ServletException,IOException {
+            resp.setContentType( "text/plain" );
+            PrintWriter pw = resp.getWriter();
+            pw.print( String.valueOf( ++_numAccesses ) );
             pw.close();
         }
     }