[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit WebPageTest.java,1.21,1.22

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

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

Modified Files:
	WebPageTest.java 
Log Message:
Use user-set default encoding for independent requests

Index: WebPageTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebPageTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WebPageTest.java	24 Jul 2002 17:32:08 -0000	1.21
+++ WebPageTest.java	14 Oct 2002 18:27:45 -0000	1.22
@@ -40,7 +40,7 @@
 /**
  * Unit tests for page structure, style, and headers.
  *
- * @author <a href="mailto:rus...@ac...">Russell Gold</a>
+ * @author <a href="mailto:rus...@ht...">Russell Gold</a>
  * @author <a href="mailto:bx...@bi...">Benoit Xhenseval</a>
  **/
 public class WebPageTest extends HttpUnitTest {
@@ -225,6 +225,37 @@
         WebResponse formPage = wc.getResponse( getHostPath() + "/HebrewForm.html" );
         WebForm form = formPage.getForms()[0];
         WebRequest request = form.getRequest();
+        request.setParameter( "name", hebrewName );
+
+        WebResponse answer = wc.getResponse( request );
+        String[][] cells = answer.getTables()[0].asText();
+
+        assertEquals( "Message", "Hello, " + hebrewName, cells[0][0] );
+        assertEquals( "Character set", "iso-8859-8", answer.getCharacterSet() );
+    }
+
+
+    public void testEncodedRequestWithoutForm() throws Exception {
+        String hebrewName = "\u05d0\u05d1\u05d2\u05d3";
+        defineResource( "SayHello", new PseudoServlet() {
+            public WebResource getPostResponse() {
+                try {
+                    String name = getParameter( "name" )[0];
+                    WebResource result = new WebResource( "<html><body><table><tr><td>Hello, " +
+                                                          new String( name.getBytes( "iso-8859-1" ), "iso-8859-8" ) +
+                                                          "</td></tr></table></body></html>" );
+                    result.setCharacterSet( "iso-8859-8" );
+                    result.setSendCharacterSet( true );
+                    return result;
+                } catch (java.io.UnsupportedEncodingException e) {
+                    return null;
+                }
+            }
+        } );
+
+        WebConversation wc = new WebConversation();
+        HttpUnitOptions.setDefaultCharacterSet( "iso-8859-8" );
+        WebRequest request = new PostMethodWebRequest( getHostPath() + "/SayHello" );
         request.setParameter( "name", hebrewName );
 
         WebResponse answer = wc.getResponse( request );