[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit/javascript FormScriptingTest.java,1.12,1.13

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

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

Modified Files:
	FormScriptingTest.java 
Log Message:
bug #618140: implement JavaScript support for FileSubmit control

Index: FormScriptingTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/javascript/FormScriptingTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FormScriptingTest.java	1 Oct 2002 18:05:10 -0000	1.12
+++ FormScriptingTest.java	31 Oct 2002 04:54:58 -0000	1.13
@@ -19,19 +19,12 @@
  * DEALINGS IN THE SOFTWARE.
  *
  *******************************************************************************************************************/
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebResponse;
-import com.meterware.httpunit.WebForm;
-import com.meterware.httpunit.HttpUnitTest;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebClient;
-import com.meterware.httpunit.WebLink;
+import com.meterware.httpunit.*;
 import com.meterware.pseudoserver.PseudoServlet;
 import com.meterware.pseudoserver.WebResource;
 
 import java.io.IOException;
-
-import org.xml.sax.SAXException;
+import java.io.File;
 
 import junit.textui.TestRunner;
 import junit.framework.TestSuite;
@@ -326,13 +319,13 @@
                                             "</body></html>" );
         WebConversation wc = new WebConversation();
         WebResponse response = wc.getResponse( getHostPath() + "/OnCommand.html" );
-        WebForm form = response.getFormWithName( "realform" );
+        response.getFormWithName( "realform" );
         verifyCheckbox( /* default */ wc, true,  /* checked */ true,  /* value */ "good" );
         verifyCheckbox( /* default */ wc, false, /* checked */ false, /* value */ "bad" );
     }
 
 
-    private void verifyCheckbox( WebClient wc, boolean defaultChecked, boolean checked, String value ) throws SAXException {
+    private void verifyCheckbox( WebClient wc, boolean defaultChecked, boolean checked, String value ) {
         assertEquals( "Message " + 1 + "-1", "checkbox ready default = " + defaultChecked, wc.popNextAlert() );
         assertEquals( "Message " + 1 + "-2", "checkbox ready checked = " + checked, wc.popNextAlert() );
         assertEquals( "Message " + 1 + "-3", "checkbox ready value = " + value, wc.popNextAlert() );
@@ -384,13 +377,13 @@
                                             "</body></html>" );
         WebConversation wc = new WebConversation();
         WebResponse response = wc.getResponse( getHostPath() + "/OnCommand.html" );
-        WebForm form = response.getFormWithName( "realform" );
+        response.getFormWithName( "realform" );
         verifyRadio( /* default */ wc, true,  /* checked */ true,  /* value */ "good" );
         verifyRadio( /* default */ wc, false, /* checked */ false, /* value */ "bad" );
     }
 
 
-    private void verifyRadio( WebClient wc, boolean defaultChecked, boolean checked, String value ) throws SAXException {
+    private void verifyRadio( WebClient wc, boolean defaultChecked, boolean checked, String value ) {
         assertEquals( "Message " + 1 + "-1", "radio ready default = " + defaultChecked, wc.popNextAlert() );
         assertEquals( "Message " + 1 + "-2", "radio ready checked = " + checked, wc.popNextAlert() );
         assertEquals( "Message " + 1 + "-3", "radio ready value = " + value, wc.popNextAlert() );
@@ -509,6 +502,27 @@
         response.getFormWithName( "the_form" ).setParameter( "choices", "1" );
         response.getLinks()[0].mouseOver();
         assertEquals( "after change message", "selected #0", wc.popNextAlert() );
+    }
+
+
+    public void testFileSubmitProperties() throws Exception {
+        File file = new File( "temp.html" );
+        defineResource(  "OnCommand.html",  "<html><head></head>" +
+                                            "<body'>" +
+                                            "<form name='the_form'>" +
+                                            "  <input type='file' name='file'>" +
+                                            "</form>" +
+                                            "<a href='#' onMouseOver=\"alert( 'file selected is [' + document.the_form.file.value + ']' );\">which</a>" +
+                                            "</body></html>" );
+        WebConversation wc = new WebConversation();
+        WebResponse response = wc.getResponse( getHostPath() + "/OnCommand.html" );
+        response.getLinks()[0].mouseOver();
+        assertEquals( "1st message", "file selected is []", wc.popNextAlert() );
+
+        WebForm form = response.getFormWithName( "the_form" );
+        form.setParameter( "file", new UploadFileSpec[] { new UploadFileSpec( file ) } );
+        response.getLinks()[0].mouseOver();
+        assertEquals( "2nd message", "file selected is [" + file.getAbsolutePath() + "]", wc.popNextAlert() );
     }