Build testing up to verify #23.

com.gistlabs.mechanize.form.FormTest.testFileUploadWithNoFile() didn't fail when I expected it to.

Author: jheintz

src/main/java/com/gistlabs/mechanize/MechanizeAgent.java

@@ -154,6 +154,9 @@ public Cookies cookies() {
 	}
 
 	/** Returns the content received as a byte buffer. 
+	 * 
+	 * TODO: Move body into util somewhere
+	 * 
 	 * @throws IllegalArgumentException If file exists. */
 	public byte [] getToBuffer(String uri) {
 		InputStream content = null;
@@ -211,6 +214,9 @@ public BufferedImage getImage(String uri) {
 
 	/** Writes the content received to file. 
 	 * This method has a very small memory footprint by using a 4KB buffer.  
+	 * 
+	 * TODO move body into util somewhere
+	 * 
 	 * @throws IllegalArgumentException If file exists. */
 	public void getToFile(String uri, File file) {
 		if(file.exists())
@@ -314,11 +320,13 @@ public Page click(Page page, Element link) {
 	/** Returns the page object received as response to the form submit action. */
 	public Page submit(Form form, Parameters parameters) {
 		RequestBuilder request = doRequest(form.getUri()).set(parameters);
-		if(form.isDoPost() && form.isMultiPart()) {
+		boolean doPost = form.isDoPost();
+		boolean multiPart = form.isMultiPart();
+		if(doPost && multiPart) {
 			request.multiPart();
 			addFiles(request, form);
 		}
-		return form.isDoPost() ? request.post() : request.get(); 
+		return doPost ? request.post() : request.get(); 
 	}
 
 	private void addFiles(RequestBuilder request, Form form) {
@@ -378,7 +386,7 @@ public RequestBuilder add(Parameters parameters) {
 		/** Adds a file to the request also making the request to become a multi-part post request or removes any file registered
 		 *  under the given name if the file value is null. */
 		public RequestBuilder set(String name, File file) {
-			return set(name, (ContentBody) file != null ? new FileBody(file) : null);
+			return set(name, file != null ? new FileBody(file) : null);
 		}
 
 		/** Adds an ContentBody object. */

src/test/java/com/gistlabs/mechanize/MechanizeTestCase.java

@@ -58,24 +58,47 @@ protected FormBuilder newForm(String action) {
 		return new FormBuilder(action);
 	}
 
-	protected FormBuilder newForm(String action, boolean doPost) {
-		return new FormBuilder(action, doPost);
+	protected FormBuilder newForm(String action, String method) {
+		return new FormBuilder(action, method);
 	}
 
 	public static class FormBuilder {
 		StringBuilder content = new StringBuilder();
 		String action;
-		String id = null;
-		String name = null;
-		private final boolean doPost;
+		String id;
+		String name;
+		String method;
+		private String enctype;
 
 		public FormBuilder(String action) {
-			this(action, false);
+			this.action = action;
 		}
 
-		public FormBuilder(String action, boolean doPost) {
-			this.action = action;
-			this.doPost = doPost;
+		public FormBuilder(String action, String method) {
+			this(action);
+			method(method);
+		}
+		
+		public String getAction() {
+			return this.action;
+		}
+		
+		public FormBuilder method(String method) {
+			this.method = method;
+			return this;
+		}
+		
+		public String getMethod() {
+			return this.method;
+		}
+
+		public FormBuilder enctype(String enctype) {
+			this.enctype = enctype;
+			return this;
+		}
+		
+		public String getEnctype() {
+			return this.enctype;
 		}
 
 		public FormBuilder id(String id) {
@@ -108,6 +131,11 @@ private void appendSimpleInput(String type, String name, String value, String...
 				content.append(" " + toAdd);
 			content.append("/>");
 		}
+		
+		public FormBuilder addFileInput(String name, String value) {
+			appendSimpleInput("file", name, value);
+			return this;
+		}
 
 		public FormBuilder addTextArea(String name, String value) {
 			content.append("<textarea");
@@ -174,8 +202,8 @@ public String toString() {
 			appendIfSet(form, "action", action);
 			appendIfSet(form, "id", id);
 			appendIfSet(form, "name", name);
-			if(doPost)
-				form.append("method='post' ");
+			appendIfSet(form, "enctype", enctype);
+			appendIfSet(form, "method", method);
 			form.append(">");
 			form.append(content.toString());
 			form.append("</form>");

src/test/java/com/gistlabs/mechanize/form/FormTest.java

@@ -10,6 +10,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+
 import com.gistlabs.mechanize.MechanizeTestCase;
 import com.gistlabs.mechanize.Page;
 import com.gistlabs.mechanize.form.Form;
@@ -42,7 +45,7 @@ public void testEmptyFormWithGetMethod() {
 	@Test
 	public void testEmptyFormWithPostMethod() {
 		agent.addPageRequest("http://test.com", 
-				newHtml("Test Page", newForm("form", true).id("form")));
+				newHtml("Test Page", newForm("form", "post").id("form")));
 		agent.addPageRequest("POST", "http://test.com/form", newHtml("OK", ""));
 
 		Page page = agent.get("http://test.com");
@@ -312,6 +315,41 @@ public void testSettingValueOfSubmitImageFails() {
 		form.getSubmitImage(byName("submitImage")).setValue("shouldFail");
 	}
 
+	@Test
+	public void testSimpleFileUpload() throws Exception {
+		File tmpFile = File.createTempFile("mechanize", "tmp");
+		
+		agent.addPageRequest("http://test.com", 
+				newHtml("Test Page", newForm("form").method("post").id("form").enctype("multipart/form-data").addFileInput("fileUpload", "")));
+		agent.addPageRequest("POST", "http://test.com/form", newHtml("OK", ""));
+		
+		Page page = agent.get("http://test.com");
+		Form form = page.forms().get(byId("form"));
+		form.getUpload(byName("fileUpload")).setValue(tmpFile);
+		Page response = form.submit();
+		assertEquals("OK", response.getTitle());
+	}
+
+	/**
+	 * TODO: Confirm if this test should indeed pass (it does...)
+	 * See https://github.com/GistLabs/mechanize/pull/23 for request
+	 * 
+	 * @throws Exception
+	 */
+	@Test
+	public void testFileUploadWithNoFile() throws Exception {
+		agent.addPageRequest("http://test.com", 
+				newHtml("Test Page", newForm("form").method("post").id("form").enctype("multipart/form-data").addFileInput("fileUpload", "")));
+		agent.addPageRequest("POST", "http://test.com/form", newHtml("OK", ""));
+		
+		Page page = agent.get("http://test.com");
+		Form form = page.forms().get(byId("form"));
+
+		Page response = form.submit();
+		assertEquals("OK", response.getTitle());
+	}
+
+	
 	//TODO Find a better test
 //	@Test
 //	public void testFileUploadingByUsingMegaFileUpload() {

src/test/java/com/gistlabs/mechanize/integration/test/AmazonAddItemToCartAndUseASecondAgentToRemoveTheItemIT.java

@@ -15,7 +15,6 @@
 import com.gistlabs.mechanize.Page;
 import com.gistlabs.mechanize.cookie.Cookie;
 import com.gistlabs.mechanize.form.Form;
-import com.gistlabs.mechanize.form.SubmitImage;
 
 import org.junit.Test;