[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit FormParametersTest.java,1.13,1.14 FormSubmitTest.java,1.25,1.26

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

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

Modified Files:
	FormParametersTest.java FormSubmitTest.java 
Log Message:
Minor bug fixes

Index: FormParametersTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/FormParametersTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FormParametersTest.java	30 Aug 2002 18:19:13 -0000	1.13
+++ FormParametersTest.java	5 Sep 2002 14:46:56 -0000	1.14
@@ -148,7 +148,22 @@
         assertEquals( "New hidden value", "new", form.getParameterValue( "secret" ) );
     }
 
-    public void testMultipleTextParameterValidation() throws Exception {
+
+    public void testUnknownParameter() throws Exception {
+        defineWebPage( "Default", "<form method=GET action = '/ask'>" +
+                                  "<Input type=submit></form>" );
+        WebResponse page = _wc.getResponse( getHostPath() + "/Default.html" );
+        WebRequest request = page.getForms()[0].getRequest();
+        HttpUnitOptions.setParameterValuesValidated( true );
+        try {
+            request.setParameter( "secret", "zork" );
+            fail( "Should have rejected set of unknown parameter" );
+        } catch (NoSuchParameterException e) {
+        }
+    }
+
+
+     public void testMultipleTextParameterValidation() throws Exception {
         defineWebPage( "Default", "<form method=GET action = \"/ask\">" +
                                        "<Input type=text name=color>" +
                                        "<Input type=password name=password>" +
@@ -266,27 +281,27 @@
     }
 
 
-public void testFileParameterValue() throws Exception {
-    defineWebPage( "Default", "<form method=POST action='/ask'>" +
-                              "<Input type=file name=File>" +
-                              "<Input type=submit value=Upload></form>" );
-    WebResponse page = _wc.getResponse( getHostPath() + "/Default.html" );
-    WebForm form = page.getForms()[0];
-    String[] values = form.getParameterValues( "File" );
-    assertEquals( "Number of file parameter values", 1, values.length );
-    assertEquals( "Default selected filename", "", values[0] );
-
-    final File file = new File( "dummy.txt" );
-    form.setParameter( "File", new UploadFileSpec[] { new UploadFileSpec( file ) } );
-    assertEquals( "Selected filename", file.getAbsolutePath(), form.getParameterValue( "File" ) );
-
-    WebRequest wr = form.getRequest();
-    assertEquals( "File from validated request", file.getAbsolutePath(), wr.getParameterValues( "File" )[0] );
-
-    HttpUnitOptions.setParameterValuesValidated( false );
-    wr = form.getRequest();
-    assertEquals( "File from unvalidated request", file.getAbsolutePath(), wr.getParameterValues( "File" )[0] );
-}
+    public void testFileParameterValue() throws Exception {
+        defineWebPage( "Default", "<form method=POST action='/ask'>" +
+                                  "<Input type=file name=File>" +
+                                  "<Input type=submit value=Upload></form>" );
+        WebResponse page = _wc.getResponse( getHostPath() + "/Default.html" );
+        WebForm form = page.getForms()[0];
+        String[] values = form.getParameterValues( "File" );
+        assertEquals( "Number of file parameter values", 1, values.length );
+        assertEquals( "Default selected filename", "", values[0] );
+
+        final File file = new File( "dummy.txt" );
+        form.setParameter( "File", new UploadFileSpec[] { new UploadFileSpec( file ) } );
+        assertEquals( "Selected filename", file.getAbsolutePath(), form.getParameterValue( "File" ) );
+
+        WebRequest wr = form.getRequest();
+        assertEquals( "File from validated request", file.getAbsolutePath(), wr.getParameterValues( "File" )[0] );
+
+        HttpUnitOptions.setParameterValuesValidated( false );
+        wr = form.getRequest();
+        assertEquals( "File from unvalidated request", file.getAbsolutePath(), wr.getParameterValues( "File" )[0] );
+    }
 
 
 //---------------------------------------------- private members ------------------------------------------------

Index: FormSubmitTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/FormSubmitTest.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- FormSubmitTest.java	29 Aug 2002 20:51:02 -0000	1.25
+++ FormSubmitTest.java	5 Sep 2002 14:46:56 -0000	1.26
@@ -471,6 +471,22 @@
     }
 
 
+    public void testPostActionParametersAfterSetAction() throws Exception {
+        defineWebPage( "abc/form", "<form name=\"test\" method='POST' action='stop?ready=yes'>" +
+                               "  <input type=\"text\" name=\"aTextField\">" +
+                               "  <input type=\"submit\" name=\"apply\" value=\"Apply\">" +
+                               "</form>" );
+
+        WebResponse wr  = _wc.getResponse( getHostPath() + "/abc/form.html" );
+        WebForm form    = wr.getForms()[0];
+        form.getScriptableObject().setAction( "go?size=3&time=now" );
+        WebRequest req  = form.getRequest( "apply" );
+        req.setParameter( "aTextField", "test" );
+        assertEquals( getHostPath() + "/abc/go?size=3&time=now",
+                            req.getURL().toExternalForm() );
+    }
+
+
 //---------------------------------------------- private members ------------------------------------------------