[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit FileUploadTest.java,1.4,1.5

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

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

Modified Files:
	FileUploadTest.java 
Log Message:
Added support for file upload context type

Index: FileUploadTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/FileUploadTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FileUploadTest.java	2001/04/18 03:21:06	1.4
+++ FileUploadTest.java	2001/05/16 21:05:30	1.5
@@ -158,10 +158,54 @@
         WebRequest formSubmit = simplePage.getForms()[0].getRequest();
         formSubmit.selectFile( "message", file );
         WebResponse encoding = wc.getResponse( formSubmit );
-        assertEquals( "update=age&message.name=temp.txt&message.lines=2", encoding.getText().trim() );
+        assertEquals( "update=age&text/plain:message.name=temp.txt&message.lines=2", encoding.getText().trim() );
 
         file.delete();
     }
+
+
+    public void testFileContentType() throws Exception {
+        File file = new File( "temp.gif" );
+        FileOutputStream fos = new FileOutputStream( file );
+        fos.write( new byte[] { 1, 2, 3, 4, 0x7f, 0x23 }, 0, 6 );
+        fos.close();
+
+        defineResource( "ListParams", new MimeEcho() );
+        defineWebPage( "Default", "<form method=POST action = \"ListParams\" enctype=\"multipart/form-data\"> " +
+                                  "<Input type=file name=message>" +
+                                  "</form>" );
+        WebConversation wc = new WebConversation();
+        WebRequest request = new GetMethodWebRequest( getHostPath() + "/Default.html" );
+        WebResponse simplePage = wc.getResponse( request );
+        WebRequest formSubmit = simplePage.getForms()[0].getRequest();
+        formSubmit.selectFile( "message", file );
+        WebResponse encoding = wc.getResponse( formSubmit );
+        assertEquals( "image/gif:message.name=temp.gif&message.lines=1", encoding.getText().trim() );
+
+        file.delete();
+    }
+
+
+    public void testSpecifiedFileContentType() throws Exception {
+        File file = new File( "temp.new" );
+        FileOutputStream fos = new FileOutputStream( file );
+        fos.write( new byte[] { 1, 2, 3, 4, 0x7f, 0x23 }, 0, 6 );
+        fos.close();
+
+        defineResource( "ListParams", new MimeEcho() );
+        defineWebPage( "Default", "<form method=POST action = \"ListParams\" enctype=\"multipart/form-data\"> " +
+                                  "<Input type=file name=message>" +
+                                  "</form>" );
+        WebConversation wc = new WebConversation();
+        WebRequest request = new GetMethodWebRequest( getHostPath() + "/Default.html" );
+        WebResponse simplePage = wc.getResponse( request );
+        WebRequest formSubmit = simplePage.getForms()[0].getRequest();
+        formSubmit.selectFile( "message", file, "x-application/new" );
+        WebResponse encoding = wc.getResponse( formSubmit );
+        assertEquals( "x-application/new:message.name=temp.new&message.lines=1", encoding.getText().trim() );
+
+        file.delete();
+    }
 }
 
 
@@ -229,6 +273,7 @@
         if (mbp.getFileName() == null) {
             appendFieldValue( name, sb, mbp );
         } else {
+            sb.append( mbp.getContentType() ).append( ':' );
             appendFileSpecs( name, sb, mbp );
         }
     }