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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	HttpServletResponseTest.java 
Log Message:
Release to enable access from Cactus

Index: HttpServletResponseTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/servletunit/HttpServletResponseTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- HttpServletResponseTest.java	2000/11/21 20:44:59	1.1
+++ HttpServletResponseTest.java	2001/07/06 17:11:04	1.2
@@ -24,7 +24,7 @@
 import java.util.Enumeration;
 import java.util.Vector;
 
-import javax.servlet.ServletException;
+import javax.servlet.*;
 import javax.servlet.http.*;
 
 import junit.framework.Test;
@@ -71,6 +71,59 @@
         assertEquals( "Status code", HttpServletResponse.SC_OK, response.getResponseCode() );
         assertEquals( "Content type", "text/html", response.getContentType() );
         assertEquals( "Title", "Sample Page", response.getTitle() );
+    }
+
+
+    public void testEncoding() throws Exception {
+        String hebrewTitle = "\u05d0\u05d1\u05d2\u05d3";
+        String page = "<html><head><title>" + hebrewTitle + "</title></head>\n" +
+                      "<body>This has no data\n" +
+                      "</body></html>\n";
+        ServletUnitHttpResponse servletResponse = new ServletUnitHttpResponse();
+        servletResponse.setContentType( "text/html; charset=iso-8859-8" );
+        PrintWriter pw = servletResponse.getWriter();
+        pw.print( page );
+        pw.close();
+
+        WebResponse response = new ServletUnitWebResponse( "_self", null, servletResponse );
+        assertEquals( "Character set", "iso-8859-8", response.getCharacterSet() );
+        assertEquals( "Title", hebrewTitle, response.getTitle() );
+    }
+
+
+    public void testStreamResponse() throws Exception {
+        ServletUnitHttpResponse servletResponse = new ServletUnitHttpResponse();
+        servletResponse.setContentType( "text/html" );
+        ServletOutputStream sos = servletResponse.getOutputStream();
+        sos.println( "<html><head><title>Sample Page</title></head><body></body></html>" );
+
+        WebResponse response = new ServletUnitWebResponse( "_self", null, servletResponse );
+        assertEquals( "Status code", HttpServletResponse.SC_OK, response.getResponseCode() );
+        assertEquals( "Content type", "text/html", response.getContentType() );
+        assertEquals( "Title", "Sample Page", response.getTitle() );
+    }
+
+
+    public void testStreamWriterAfterOutputStream() throws Exception {
+        ServletUnitHttpResponse servletResponse = new ServletUnitHttpResponse();
+        servletResponse.setContentType( "text/html" );
+        ServletOutputStream sos = servletResponse.getOutputStream();
+        try {
+            servletResponse.getWriter();
+            fail( "Should have thrown IllegalStateException" );
+        } catch (IllegalStateException e) {
+        }
+    }
+
+
+    public void testStreamOutputStreamAfterWriter() throws Exception {
+        ServletUnitHttpResponse servletResponse = new ServletUnitHttpResponse();
+        servletResponse.getWriter();
+        try {
+            servletResponse.getOutputStream();
+            fail( "Should have thrown IllegalStateException" );
+        } catch (IllegalStateException e) {
+        }
     }
 
 



