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

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

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

Modified Files:
	NavigationTest.java 
Log Message:
Added support for HttpServletRequest.getRequestDispatcher()

Index: NavigationTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/servletunit/NavigationTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NavigationTest.java	13 Feb 2003 20:25:56 -0000	1.5
+++ NavigationTest.java	17 Mar 2003 01:35:45 -0000	1.6
@@ -92,6 +92,36 @@
     }
 
 
+    public void testForwardViaHttpServletRequest() throws Exception {
+        WebXMLString wxs = new WebXMLString();
+        wxs.addServlet( "/target", TargetServlet.class );
+        wxs.addServlet( "/origin", FowarderServlet2.class );
+
+        ServletRunner sr = new ServletRunner( wxs.asInputStream(), "/context" );
+
+        WebClient wc = sr.newClient();
+        WebResponse response = wc.getResponse( "http://localhost/context/origin?color=green" );
+        assertNotNull( "No response received", response );
+        assertEquals( "Expected response", "color=green: path=/context/target", response.getText() );
+        assertEquals( "Returned cookie count", 0, response.getNewCookieNames().length );
+    }
+
+
+    public void testForwardViaRelativePath() throws Exception {
+        WebXMLString wxs = new WebXMLString();
+        wxs.addServlet( "/some/target", TargetServlet.class );
+        wxs.addServlet( "/some/origin", FowarderServlet3.class );
+
+        ServletRunner sr = new ServletRunner( wxs.asInputStream(), "/context" );
+
+        WebClient wc = sr.newClient();
+        WebResponse response = wc.getResponse( "http://localhost/context/some/origin?color=green" );
+        assertNotNull( "No response received", response );
+        assertEquals( "Expected response", "color=green: path=/context/some/target", response.getText() );
+        assertEquals( "Returned cookie count", 0, response.getNewCookieNames().length );
+    }
+
+
     static class OriginServlet extends HttpServlet {
 
         protected void doGet( HttpServletRequest req, HttpServletResponse resp ) throws ServletException,IOException {
@@ -111,6 +141,24 @@
     }
 
 
+    static class FowarderServlet2 extends HttpServlet {
+
+        protected void doGet( HttpServletRequest req, HttpServletResponse resp ) throws ServletException,IOException {
+            req.getRequestDispatcher( "/target" ).forward( req, resp );
+        }
+
+    }
+
+
+    static class FowarderServlet3 extends HttpServlet {
+
+        protected void doGet( HttpServletRequest req, HttpServletResponse resp ) throws ServletException,IOException {
+            req.getRequestDispatcher( "target" ).forward( req, resp );
+        }
+
+    }
+
+
     static class IncluderServlet extends HttpServlet {
         static final String PREFIX = "expecting: ";
 
@@ -118,7 +166,6 @@
             resp.getWriter().print( PREFIX );
             getServletContext().getRequestDispatcher( "/target?color=blue" ).include( req, resp );
         }
-
     }