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

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

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

Modified Files:
	StatelessTest.java 
Log Message:
#744214: ServletUnit does not recognize subframes

Index: StatelessTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/servletunit/StatelessTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StatelessTest.java	17 Mar 2003 17:37:05 -0000	1.11
+++ StatelessTest.java	17 Jun 2003 23:23:02 -0000	1.12
@@ -20,6 +20,7 @@
  *
  *******************************************************************************************************************/
 import com.meterware.httpunit.*;
+import com.meterware.pseudoserver.HttpUserAgentTest;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -216,6 +217,21 @@
     }
 
 
+    public void testFrameAccess() throws Exception {
+        ServletRunner sr = new ServletRunner();
+        sr.registerServlet( "Frames", FrameTopServlet.class.getName() );
+        sr.registerServlet( "RedFrame", SimpleGetServlet.class.getName() );
+        sr.registerServlet( "BlueFrame", AccessCountServlet.class.getName() );
+
+        WebClient client = sr.newClient();
+        WebRequest request = new GetMethodWebRequest( "http://host/Frames" );
+        client.getResponse( request );
+        HttpUserAgentTest.assertMatchingSet( "Frames defined for the conversation", new String[] { "_top", "red", "blue" }, client.getFrameNames() );
+        WebResponse response = client.getFrameContents( "red" );
+        assertEquals( "Frame contents", SimpleGetServlet.RESPONSE_TEXT, response.getText() );
+    }
+
+
     static class SimpleGetServlet extends HttpServlet {
 
         static String RESPONSE_TEXT = "the desired content\r\n";
@@ -333,6 +349,22 @@
             resp.setContentType( "text/plain" );
             PrintWriter pw = resp.getWriter();
             pw.print( "You posted " + req.getParameter( "login" ) + "," + req.getParameter( "password" ) );
+            pw.close();
+        }
+
+    }
+
+
+    static class FrameTopServlet extends HttpServlet {
+
+        protected void doGet( HttpServletRequest req, HttpServletResponse resp ) throws ServletException, IOException {
+            resp.setContentType( "text/html" );
+
+            PrintWriter pw = resp.getWriter();
+            pw.println( "<html><head></head><frameset cols='20%,80&'>" );
+            pw.println( "<frame src='RedFrame' name='red'>" );
+            pw.println( "<frame src='BlueFrame' name='blue'>" );
+            pw.println( "</frameset></html>" );
             pw.close();
         }